Work on held item usage

src/Dodge/Item/Held/Utility.hs

@@ -1,10 +1,11 @@
 module Dodge.Item.Held.Utility where
 
+import Linear
 import Dodge.Default.Item
 import Color
 import Control.Lens
 import Dodge.Data.Item
-import Geometry.Data
+--import Geometry.Data
 
 flatShield :: Item
 flatShield =
@@ -14,7 +15,6 @@ flatShield =
         & itUse . heldAim . aimTurnSpeed .~ 0.5
         & itUse . heldAim . aimStance .~ TwoHandFlat
         & itUse . heldAim . aimHandlePos .~ 0
-        & itUse . heldAim . aimMuzPos .~ 0
         & itInvSize .~ 3
         & itType . iyBase .~ HELD FLATSHIELD
 
@@ -35,7 +35,7 @@ binoculars =
         & itScope .~ ZoomScope (V2 0 0) 1 0.5 False
         & itType . iyBase .~ HELD BINOCULARS
         & itUse . heldAim . aimHandlePos .~ 5
-        & itUse . heldAim . aimMuzPos .~ 10
+--        & itUse . heldAim . aimMuzPos .~ 10
         & itUse . heldAim . aimStance .~ TwoHandFlat
         & itUse . heldScroll .~ HeldScrollZoom -- zoomLongGun
         & itUse . heldAim . aimZoom .~ defaultItZoom{_izMax = 0.5, _izMin = 0.5, _izFac = 1}
@@ -47,7 +47,7 @@ torch =
         & itEffect . ieInv .~ EffectWhileHeld CreateHeldLight
         & itType . iyBase .~ HELD TORCH
         & itUse . heldAim . aimHandlePos .~ 5
-        & itUse . heldAim . aimMuzPos .~ 10
+        & itUse . heldAim . aimMuzzles . ix 0 . mzPos . _x .~ 10
 
 forceFieldGun :: Item
 forceFieldGun =