Move TriggerType out of item record

This commit is contained in:
2025-06-04 08:18:05 +01:00
parent e6bb7ac753
commit a1a35745d6
11 changed files with 221 additions and 224 deletions
-3
View File
@@ -29,7 +29,6 @@ teslaGun =
& itUse . heldAim . aimMuzzles . ix 0 . mzEffect .~ MuzzleTesla
& itType .~ HELD TESLAGUN
& itAmmoSlots .~ singleAmmo ElectricalAmmo
& itUse . heldTriggerType .~ AutoTrigger
teslaParams :: ItemParams
teslaParams =
@@ -47,7 +46,6 @@ laser =
& itUse . heldParams .~ BeamShooterParams-- Nothing
& itAmmoSlots .~ singleAmmo ElectricalAmmo
& itUse . heldDelay .~ NoDelay
& itUse . heldTriggerType .~ AutoTrigger
& itUse . heldAim . aimMuzzles . ix 0 . mzPos .~ V2 6 0
& itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0
& itUse . heldAim . aimMuzzles . ix 0 . mzFlareType .~ LasGunFlare
@@ -67,7 +65,6 @@ tractorGun =
defaultHeldItem
& itUse . heldParams .~ BeamShooterParams
& itAmmoSlots .~ singleAmmo ElectricalAmmo
& itUse . heldTriggerType .~ AutoTrigger
& itUse . heldAim . aimMuzzles . ix 0 . mzPos .~ V2 30 0
& itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0
& itUse . heldAim . aimWeight .~ 6
-1
View File
@@ -72,7 +72,6 @@ autoRifle :: Item
autoRifle =
rifle
& itType .~ HELD AUTORIFLE
& itUse . heldTriggerType .~ AutoTrigger
burstRifle :: Item
burstRifle =
-2
View File
@@ -34,7 +34,6 @@ flameSpitter =
& itUse . heldParams . weaponInvLock .~ 10
& itUse . heldParams . weaponRepeat .~ [1..9]
& itUse . heldAim . aimMuzzles . ix 0 . mzEffect . nzPressure .~ UniRandFloat 3 4
& itUse . heldTriggerType .~ HammerTrigger
flameTorrent :: Item
flameTorrent =
@@ -97,4 +96,3 @@ flameThrower =
, _weaponInvLock = 0
, _weaponRepeat = mempty
}
& itUse . heldTriggerType .~ AutoTrigger
+1 -5
View File
@@ -56,11 +56,7 @@ pistol =
& itType .~ HELD PISTOL
autoPistol :: Item
autoPistol =
pistol
& itUse . heldTriggerType .~ AutoTrigger
-- & itUse . heldParams . bulGunSound ?~ (tap1S, 0)
& itType .~ HELD AUTOPISTOL
autoPistol = pistol & itType .~ HELD AUTOPISTOL
machinePistol :: Item
machinePistol =