Cleanup

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

@@ -93,11 +93,11 @@ bangCaneX i = bangCane
         , useTimeCheck
         , withSoundItemChoiceStart caneStickSoundChoice
         , useAllAmmo
-        , torqueAfterI 0.5
+        , withTorqueAfter
         , duplicateLoadedBarrels
         , applyInaccuracy
         , withMuzFlareI
-        , withRecoilI 50
+        , withRecoil
         ]
     , _itDimension = ItemDimension
         { _dimRad = 8
@@ -122,6 +122,7 @@ bangCaneX i = bangCane
         ,_brlNum = i
         ,_brlInaccuracy = 0.1
         }
+    & itParams . torqueAfter .~ 0.48 + 0.2 * fromIntegral i
 caneStickSoundChoice :: Item -> SoundID
 caneStickSoundChoice it
     | _ammoLoaded (_itConsumption it) < 2 = tap3S 
@@ -194,7 +195,7 @@ burstRifle = repeater
         , useAmmoAmount 1
         , applyInaccuracy
         , withMuzFlareI
-        , withRecoilI 50
+        , withRecoil
         ]
 fastBurstRifle :: Item
 fastBurstRifle = repeater
@@ -212,7 +213,7 @@ fastBurstRifle = repeater
         , useAmmoAmount 1
         , applyInaccuracy
         , withMuzFlareI
-        , withRecoilI 50
+        , withRecoil
         ]
 completeBurstRifle :: Item
 completeBurstRifle = repeater
@@ -231,7 +232,7 @@ completeBurstRifle = repeater
         , useAmmoAmount 1
         , applyInaccuracy
         , withMuzFlareI
-        , withRecoilI 50
+        , withRecoil
         ]
 miniGunUse :: Int -> ItemUse
 miniGunUse i = ruseInstant (useAmmoParams $ Just 1) NoHammer $

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

@@ -98,12 +98,14 @@ elephantGun = bangRod
         , useTimeCheck
         , withSoundStart bangEchoS
         , useAmmoAmount 1
-        , torqueAfterI 0.1
+        , withTorqueAfter
         , applyInaccuracy
         , withThickSmokeI
         , withMuzFlareI
-        , withRecoilI 50
+        , withRecoil
         ]
+    & itParams . recoil .~ 50
+    & itParams . torqueAfter .~ 0.1
 amr :: Item
 amr = elephantGun
     & itName .~ "ANTIMATERIELRIFLE"

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

@@ -142,8 +142,8 @@ pistolAfterHamMods =
     , useAmmoAmount 1
     , withSoundStart tap3S 
     , applyInaccuracy
-    , torqueAfterI 0.2
-    , withRecoilI 10
+    , withTorqueAfter
+    , withRecoil
     , withSidePushI 50
     , withMuzFlareI
     ]
@@ -153,9 +153,9 @@ machinePistolAfterHamMods =
     , useAmmoAmount 1
     , withSoundStart tap1S 
     , applyInaccuracy
-    , torqueAfterI 0.2
+    , withTorqueAfter
     , withSidePushI 50
-    , withRecoilI 20
+    , withRecoil
     , withMuzFlareI
     ]
 smgAfterHamMods :: [ChainEffect]
@@ -164,8 +164,8 @@ smgAfterHamMods =
     , useAmmoAmount 1
     , withSoundStart tap3S 
     , applyInaccuracy
-    , torqueAfterI 0.05
-    , withRecoilI 10
+    , withTorqueAfter
+    , withRecoil
     , withSidePushI 30
     , withMuzFlareI
     ]
@@ -194,6 +194,8 @@ pistol = (bangStick 1)
         . ( rifling .~ 0.8 )
         . ( bore .~ 2 )
         . ( gunBarrels .~ SingleBarrel 0.05 )
+        . ( recoil .~ 10 )
+        . ( torqueAfter .~ 0.2 )
         )
 autoPistol :: Item
 autoPistol = pistol 
@@ -208,6 +210,7 @@ machinePistol = autoPistol
     & itName .~ "MACHINEPISTOL"
     & itType .~ MACHINEPISTOL
     & itModules . at ModAutoMag .~ Nothing
+    & itParams . recoil .~ 20
 smg :: Item
 smg = autoPistol -- & some parameter affecting stability
     & itUse . useMods .~ (ammoCheckI : smgAfterHamMods)
@@ -215,6 +218,7 @@ smg = autoPistol -- & some parameter affecting stability
     & itType .~ SMG
     & itUse . useAim . aimStance .~ TwoHandTwist
     & itDimension . dimPortage . handlePos .~ 2
+    & itParams . torqueAfter .~ 0.05
     & itDimension . dimSPic .~ \it -> noPic (baseSMGShape
         <> makeTinClipAt 0 (V3 7 (-2) 0) it)
 revolverX :: Int -> Item
@@ -233,7 +237,7 @@ revolverX i = revolver
         , applyInaccuracy
         , withMuzFlareI
 --        , spreadLoaded
-        , torqueAfterI 0.2
-        , withRecoilI 10
+        , withTorqueAfter
+        , withRecoil
         ]
     }   & itConsumption . ammoBaseMax .~ i * 6