Continue record refactor

2025-06-04 09:50:18 +01:00
parent e1ec4e1a89
commit 9f884b5aa7
10 changed files with 97 additions and 31 deletions
@@ -20,7 +20,6 @@ import Control.Applicative
 defaultBangCane :: Item
 defaultBangCane =
    defaultBulletWeapon
-        & itUse . heldParams . rifling .~ ConstFloat 0.9
 --        & itUse . heldParams . recoil .~ 50
        & itUse . heldParams . torqueAfter .~ 0.1
        & itUse . heldDelay . rateMax .~ 6
@@ -98,7 +97,6 @@ miniGunX i =
        & itUse . heldParams . torqueAfter .~ 0.04 + 0.02 * fromIntegral i
        & itUse . heldParams . sidePush .~ 10 * fromIntegral i
        & itUse . heldParams . randomOffset .~ 10
-        & itUse . heldParams . rifling .~ UniRandFloat 0.8 0.9
        & itType .~ HELD (MINIGUNX i)
        & itEffect . ieInv .~ ItemReduceWarmTime
        & itEffect . ieOnDrop .~ ItemSetWarmTime 0
@@ -19,8 +19,6 @@ bangCone =
                15
                (Muzzle (V2 15 0) 0 0.5 0 NoFlare MuzzleShootBullet (UseExactly 1) 0)
        & itUse . heldMuzzles . ix 0 . mzFlareType .~ BasicFlare
-        & itUse . heldParams . muzVel .~ UniRandFloat 0.5 0.8
-        & itUse . heldParams . rifling .~ UniRandFloat 0.3 0.8
        & itUse . heldParams . torqueAfter .~ 0.1
        & itUse . heldParams . randomOffset .~ 12
        & itType .~ HELD BANGCONE
@@ -20,9 +20,6 @@ rLauncher =
        & itUse . heldMuzzles . ix 0 . mzPos .~ V2 20 0
        & itAmmoSlots .~ singleAmmo LauncherAmmo
        & itType .~ HELD RLAUNCHER
-        & itUse . heldParams . muzVel .~ ConstFloat 0
-        & itUse . heldParams . rifling .~ ConstFloat 0
-        --        & itUse . heldParams . recoil .~ 0
        & itUse . heldParams . torqueAfter .~ 0

 --        & itUse . heldParams . bulGunSound ?~ (tap4S, 0)
@@ -18,7 +18,6 @@ import LensHelp
 bangRod :: Item
 bangRod =
    defaultBulletWeapon
-        & itUse . heldParams . rifling .~ ConstFloat 1
 --        & itUse . heldParams . recoil .~ 50
        & itUse . heldParams . torqueAfter .~ 0.3
 --        & itUse . heldParams . bulGunSound ?~ (bangEchoS,0)
@@ -47,10 +47,7 @@ pistol =
        & itUse . heldMuzzles . ix 0 . mzInaccuracy %~ const 0.05
        & itUse . heldMuzzles . ix 0 . mzFlareType %~ const BasicFlare
        & itUse . heldParams
-            %~ ( (muzVel .~ ConstFloat 0.8)
-                    . (rifling .~ ConstFloat 0.8)
--                    . (recoil .~ 10)
-                    . (torqueAfter .~ 0.2)
+            %~ (  (torqueAfter .~ 0.2)
                    . (sidePush .~ 50)
               )
        & itType .~ HELD PISTOL