Fold together useDelay and itemTriggerType

2025-07-03 22:25:32 +01:00
parent 8a00450e3f
commit a207073846
12 changed files with 404 additions and 365 deletions
@@ -16,45 +16,45 @@ itemTriggerType itm = case itm ^. itType of

 heldTriggerType :: HeldItemType -> TriggerType
 heldTriggerType = \case
-    BANGSTICK{} -> HammerTrigger
-    REWINDER -> HammerTrigger
-    TIMESTOPPER -> HammerTrigger
-    TIMESCROLLER -> HammerTrigger
-    PISTOL -> HammerTrigger
-    MACHINEPISTOL -> AutoTrigger
-    AUTOPISTOL -> AutoTrigger
-    SMG -> AutoTrigger
-    BANGCONE -> HammerTrigger
-    BLUNDERBUSS -> HammerTrigger
-    GRAPECANNON{} -> HammerTrigger
-    MINIGUNX{} -> AutoTrigger
+    BANGSTICK{} -> HammerTrigger 8
+    REWINDER -> HammerTrigger 20
+    TIMESTOPPER -> HammerTrigger 20
+    TIMESCROLLER -> HammerTrigger 20
+    PISTOL -> HammerTrigger 6
+    MACHINEPISTOL -> WarmUpCoolDown 50 100 200
+    AUTOPISTOL -> AutoTrigger 8
+    SMG -> AutoTrigger 8
+    BANGCONE -> HammerTrigger 20
+    BLUNDERBUSS -> HammerTrigger 20
+    GRAPECANNON{} -> HammerTrigger 20
+    MINIGUNX{} -> WarmUpNoDelay 100
    --VOLLEYGUN i -> BurstTrigger $ fmap (3*) [1 .. i-1]
-    VOLLEYGUN i -> VolleyGunTrigger i
-    RIFLE -> HammerTrigger
-    ALTERIFLE -> HammerTrigger
-    AUTORIFLE -> AutoTrigger
-    BURSTRIFLE -> BurstTrigger [3,6]
-    BANGROD -> HammerTrigger
-    ELEPHANTGUN -> HammerTrigger
-    AMR -> HammerTrigger
-    AUTOAMR -> AutoTrigger
-    SNIPERRIFLE -> HammerTrigger
-    FLAMESPITTER -> BurstTrigger [1..9]
-    FLAMETHROWER -> AutoTrigger
-    FLAMETORRENT -> AutoTrigger
-    FLAMEWALL -> AutoTrigger
-    BLOWTORCH -> AutoTrigger
-    SPARKGUN -> AutoTrigger
-    TESLAGUN -> AutoTrigger
-    LASER -> AutoTrigger
-    TRACTORGUN -> AutoTrigger
-    RLAUNCHER -> HammerTrigger
-    RLAUNCHERX{} -> HammerTrigger
-    GLAUNCHER -> HammerTrigger
-    POISONSPRAYER -> AutoTrigger
-    SHATTERGUN -> HammerTrigger
-    TORCH -> AutoTrigger
+    VOLLEYGUN i -> VolleyGunTrigger i 15
+    RIFLE -> HammerTrigger 6
+    ALTERIFLE -> HammerTrigger 6
+    AUTORIFLE -> AutoTrigger 6
+    BURSTRIFLE -> BurstTrigger [3,6] 8 -- time last used gets updated after last burst fire
+    BANGROD -> HammerTrigger 12
+    ELEPHANTGUN -> HammerTrigger 12
+    AMR -> HammerTrigger 12
+    AUTOAMR -> AutoTrigger 12
+    SNIPERRIFLE -> HammerTrigger 12
+    FLAMESPITTER -> BurstTrigger [1..9] 6
+    FLAMETHROWER -> NoTrigger
+    FLAMETORRENT -> NoTrigger
+    FLAMEWALL -> NoTrigger
+    BLOWTORCH -> NoTrigger
+    SPARKGUN -> NoTrigger
+    TESLAGUN -> NoTrigger
+    LASER -> NoTrigger
+    TRACTORGUN -> NoTrigger
+    RLAUNCHER -> HammerTrigger 20
+    RLAUNCHERX{} -> HammerTrigger 20
+    GLAUNCHER -> HammerTrigger 20
+    POISONSPRAYER -> NoTrigger
+    SHATTERGUN -> HammerTrigger 20
+    TORCH -> NoTrigger
    FLATSHIELD -> NoTrigger
    KEYCARD{} -> NoTrigger
-    BLINKER -> AlwaysSingleTrigger
-    BLINKERUNSAFE -> AlwaysSingleTrigger
+    BLINKER -> HammerTrigger 20
+    BLINKERUNSAFE -> HammerTrigger 20