Move weapon torque out of records

This commit is contained in:
2025-06-04 11:21:15 +01:00
parent 9f884b5aa7
commit 636a13b678
10 changed files with 279 additions and 216 deletions
-3
View File
@@ -21,7 +21,6 @@ defaultBangCane :: Item
defaultBangCane =
defaultBulletWeapon
-- & itUse . heldParams . recoil .~ 50
& itUse . heldParams . torqueAfter .~ 0.1
& itUse . heldDelay . rateMax .~ 6
-- & itUse . heldMods .~ BangCaneMod
-- & itUse . heldAim . aimHandlePos .~ 5
@@ -39,7 +38,6 @@ volleyGun i =
<*> ZipList [0..i-1]
)
& itUse . heldParams . weaponInvLock .~ i + 1
& itUse . heldParams . torqueAfter .~ 0.1
-- & itUse . heldParams . recoil .~ 30
& itType .~ HELD (VOLLEYGUN i)
& itAmmoSlots .~ IM.fromList (zip [0..i-1] $ repeat BulletAmmo)
@@ -94,7 +92,6 @@ miniGunX i =
.~ replicate i
(Muzzle (V2 30 0) 0 0.05 0 MiniGunFlare MuzzleShootBullet (UseExactly 1) 0)
-- & itUse . heldParams . recoil .~ 10 * fromIntegral i
& itUse . heldParams . torqueAfter .~ 0.04 + 0.02 * fromIntegral i
& itUse . heldParams . sidePush .~ 10 * fromIntegral i
& itUse . heldParams . randomOffset .~ 10
& itType .~ HELD (MINIGUNX i)
-2
View File
@@ -19,7 +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 . torqueAfter .~ 0.1
& itUse . heldParams . randomOffset .~ 12
& itType .~ HELD BANGCONE
@@ -33,5 +32,4 @@ grapeCannon :: Int -> Item
grapeCannon i =
blunderbuss
& itType .~ HELD (GRAPECANNON i)
& itUse . heldParams . torqueAfter .~ (0.1 + 0.2 * fromIntegral i)
& itUse . heldParams . randomOffset .~ (12 + 4 * fromIntegral i)
-1
View File
@@ -20,7 +20,6 @@ rLauncher =
& itUse . heldMuzzles . ix 0 . mzPos .~ V2 20 0
& itAmmoSlots .~ singleAmmo LauncherAmmo
& itType .~ HELD RLAUNCHER
& itUse . heldParams . torqueAfter .~ 0
-- & itUse . heldParams . bulGunSound ?~ (tap4S, 0)
-5
View File
@@ -18,13 +18,8 @@ import LensHelp
bangRod :: Item
bangRod =
defaultBulletWeapon
-- & itUse . heldParams . recoil .~ 50
& itUse . heldParams . torqueAfter .~ 0.3
-- & itUse . heldParams . bulGunSound ?~ (bangEchoS,0)
& itUse . heldDelay . rateMax .~ 12
& itType .~ HELD BANGROD
-- & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
-- & itUse . heldAim . aimHandlePos .~ 5
& itUse . heldMuzzles . ix 0 . mzPos .~ V2 30 0
& itUse . heldMuzzles . ix 0 . mzFlareType .~ HeavySmokeFlare
-- & itUse . heldConsumption . laAmmoType .~ hvBulletAmmo
+1 -7
View File
@@ -19,9 +19,6 @@ poisonSprayer =
flameThrower
& itType .~ HELD POISONSPRAYER
& itAmmoSlots .~ singleAmmo GasAmmo
& itUse . heldParams . gasCreation .~ CreatePoisonGas --aGasCloud
-- & itUse . heldParams . recoil .~ 0
& itUse . heldParams . torqueAfter .~ 0
& itUse . heldParams . randomOffset .~ 0
& itUse . heldParams . sidePush .~ 0
-- & itUse . heldParams . bulGunSound ?~ (foamSprayLoopS,5)
@@ -86,10 +83,7 @@ flameThrower =
& itAmmoSlots .~ singleAmmo GasAmmo
& itType .~ HELD FLAMETHROWER
& itUse . heldParams .~ GasSprayParams
{_gasCreation = CreateFlame
-- , _recoil = 0
, _torqueAfter = 0
, _randomOffset = 0
{ _randomOffset = 0
, _sidePush = 25
-- , _bulGunSound = Nothing
, _weaponInvLock = 0
+1 -4
View File
@@ -17,7 +17,6 @@ bangStick :: Int -> Item
bangStick i =
defaultBulletWeapon
-- & itUse . heldParams . recoil .~ 25
& itUse . heldParams . torqueAfter .~ 0.18 + 0.02 * fromIntegral i
& itType .~ HELD (BANGSTICK i)
& itUse . heldDelay . rateMax .~ 8
& itUse . heldMuzzles
@@ -47,8 +46,7 @@ pistol =
& itUse . heldMuzzles . ix 0 . mzInaccuracy %~ const 0.05
& itUse . heldMuzzles . ix 0 . mzFlareType %~ const BasicFlare
& itUse . heldParams
%~ ( (torqueAfter .~ 0.2)
. (sidePush .~ 50)
%~ ( (sidePush .~ 50)
)
& itType .~ HELD PISTOL
@@ -68,5 +66,4 @@ smg =
& itType .~ HELD SMG
& itUse . heldMuzzles . ix 0 . mzPos .~ V2 20 0
& itUse . heldMuzzles . ix 0 . mzInaccuracy .~ 0
& itUse . heldParams . torqueAfter .~ 0.05
& itUse . heldParams . sidePush .~ 30