Work on machine pistol

This commit is contained in:
2025-06-26 01:09:09 +01:00
parent 5b35b4c6c8
commit 7830b0e2c1
14 changed files with 432 additions and 394 deletions
+1 -1
View File
@@ -58,4 +58,4 @@ miniGunX i =
& itType .~ HELD (MINIGUNX i)
-- & itEffect . ieInv .~ ItemReduceWarmTime
-- & itEffect . ieOnDrop .~ ItemSetWarmTime 0
& itParams .~ WarmTime 0
& itParams .~ WarmTime 0 False
+1 -4
View File
@@ -52,11 +52,8 @@ autoPistol = pistol & itType .~ HELD AUTOPISTOL
machinePistol :: Item
machinePistol =
autoPistol
-- & itUse . heldDelay .~ WarmUpNoDelay{
-- --_warmTime = 0,
-- _warmMax = 50, _warmSound = crankSlowS}
& itType .~ HELD MACHINEPISTOL
& itParams .~ WarmTime 0
& itParams .~ WarmTime 0 False
smg :: Item
smg =
+3 -4
View File
@@ -8,7 +8,6 @@ module Dodge.Item.UseDelay
import Dodge.Data.UseDelay
import Control.Lens
import Dodge.Data.Item
import Dodge.SoundLogic.ExternallyGeneratedSounds
useDelay :: Item -> ItemUseDelay
useDelay itm = case itm ^. itType of
@@ -25,12 +24,12 @@ heldUseDelay = \case
PISTOL -> FixedRate 6
AUTOPISTOL -> FixedRate 8
SMG -> FixedRate 8
MACHINEPISTOL -> WarmUpNoDelay 50 crankSlowS
BURSTRIFLE -> FixedRate 15
MACHINEPISTOL -> WarmUpNoDelay 50
BURSTRIFLE -> FixedRate 8 -- time last used gets updated after the last burst fire
BANGCONE -> FixedRate 20
BLUNDERBUSS -> FixedRate 20
GRAPECANNON _ -> FixedRate 20
MINIGUNX _ -> WarmUpNoDelay 100 crankSlowS
MINIGUNX _ -> WarmUpNoDelay 100
VOLLEYGUN{} -> FixedRate 15
RIFLE -> FixedRate 6
ALTERIFLE -> FixedRate 6