Work on held item positioning

src/Dodge/Item/Weapon/AmmoParams.hs

@@ -8,7 +8,6 @@ import Dodge.Base
 import Dodge.Particle.Bullet.Spawn
 import Dodge.Creature.HandPos
 import Dodge.Movement.Turn
-import Dodge.Default.AimParams
 import Geometry
 import LensHelp
 

src/Dodge/Item/Weapon/BulletGun/Stick.hs

@@ -30,20 +30,7 @@ bangStickSoundChoice it
 
 bangStick :: Int -> Item
 bangStick i = defaultBulletWeapon 
-    { _itUse = defaultrUse
-        & useDelay . rateMax .~ 8
-        & useMods .~
-            [ ammoHammerCheck
-            , useTimeCheck
-            , withSoundItemChoiceStart bangStickSoundChoice
-            , useAllAmmo
-            , withMuzFlareI
-            , withTorqueAfter
-            , spreadLoaded
---            , applyInaccuracy
-            , withRecoil
-            ]
-    , _itParams = BulletShooter
+    & itParams .~ BulletShooter
         { _muzVel = 0.8
         , _rifling = 0.8
         , _bore = 2
@@ -56,12 +43,23 @@ bangStick i = defaultBulletWeapon
         , _torqueAfter = 0.18 + 0.02 * fromIntegral i
         , _randomOffset = 0
         }
-    , _itInvSize = fromIntegral i / 3
-    , _itDimension = ItemDimension
+    & itInvSize .~ fromIntegral i / 3
+    & itDimension .~ ItemDimension
         { _dimRad = 5
         , _dimCenter = V3 5 0 0
         }
-    }
+    & itUse . useDelay . rateMax .~ 8
+    & itUse . useMods .~
+        [ ammoHammerCheck
+        , useTimeCheck
+        , withSoundItemChoiceStart bangStickSoundChoice
+        , useAllAmmo
+        , withMuzFlareI
+        , withTorqueAfter
+        , spreadLoaded
+--        , applyInaccuracy
+        , withRecoil
+        ]
     & itType . iyBase .~ HELD (BANGSTICK i)
     & itUse . useAim . aimHandlePos .~ 5
     & itUse . useAim . aimMuzPos .~ 10