Start removing heldDelay records

src/Dodge/Item/Display.hs

@@ -43,7 +43,8 @@ itemInternalValue itm
 maybeWarmupStatus :: Item -> Maybe String
 maybeWarmupStatus it = case it ^? itUse . heldDelay . warmMax of
     Nothing -> Nothing
-    Just m -> case m - (_warmTime . _heldDelay $ _itUse it) of
+    --Just m -> case m - (_warmTime . _heldDelay $ _itUse it) of
+    Just m -> case m - (_wTime $ _itParams it) of
         x
             | x <= 1 -> Just "*WARM"
             | otherwise ->

src/Dodge/Item/Draw/SPic.hs

@@ -354,7 +354,8 @@ volleyGunShape i =
 miniGunXPictItem :: Int -> Item -> SPic
 miniGunXPictItem i it = miniGunXPict i spin
   where
-    spin = (-10) + _warmTime (_heldDelay $ _itUse it)
+    --spin = (-10) + _warmTime (_heldDelay $ _itUse it)
+    spin = (-10) + _wTime (_itParams it)
 
 miniGunXPict :: Int -> Int -> SPic
 miniGunXPict i spin =

src/Dodge/Item/Held/Cane.hs

@@ -8,14 +8,10 @@ module Dodge.Item.Held.Cane (
 ) where
 
 import Dodge.SoundLogic.ExternallyGeneratedSounds
---import Dodge.Base
 import Dodge.Data.Item
 import Dodge.Default
 import qualified Data.IntMap.Strict as IM
---import Dodge.Reloading.Action
---import Geometry.Data
 import LensHelp
---import Control.Applicative
 
 defaultBangCane :: Item
 defaultBangCane =
@@ -41,9 +37,7 @@ volleyGun i =
 --        & itUse . heldUseEffect .~ RandomiseMuzzleFrames i
 
 rifle :: Item
-rifle =
-    defaultBangCane
-        & itType .~ HELD RIFLE
+rifle = defaultBangCane & itType .~ HELD RIFLE
 --        & itUse . heldMuzzles . ix 0 . mzPos .~ V2 25 0
 
 alteRifle :: Item
@@ -52,12 +46,6 @@ alteRifle = rifle
     & itAmmoSlots .~ IM.fromList (zip [0..1] $ repeat BulletAmmo)
     & itParams .~ AlteRifleSwitch 0
 
---repeater :: Item
---repeater =
---    rifle
---        & itType . iyModules . at ModRifleMag ?~ EMPTYMODULE
---        & itType . iyBase .~ HELD REPEATER
-
 autoRifle :: Item
 autoRifle =
     rifle
@@ -73,7 +61,9 @@ burstRifle =
 miniGunX :: Int -> Item
 miniGunX i =
     autoRifle
-        & itUse . heldDelay .~ WarmUpNoDelay{_warmTime = 0, _warmMax = 100, _warmSound = crankSlowS}
+        & itUse . heldDelay .~ WarmUpNoDelay{
+            --_warmTime = 0, 
+            _warmMax = 100, _warmSound = crankSlowS}
         & itAmmoSlots .~ singleAmmo BeltBulletAmmo
 --        & itUse . heldMuzzles 
 --            .~ replicate i 
@@ -81,3 +71,4 @@ miniGunX i =
         & itType .~ HELD (MINIGUNX i)
         & itEffect . ieInv .~ ItemReduceWarmTime
         & itEffect . ieOnDrop .~ ItemSetWarmTime 0
+        & itParams .~ WarmTime 0

src/Dodge/Item/Held/SprayGuns.hs

@@ -24,7 +24,7 @@ flameSpitter :: Item
 flameSpitter =
     flameThrower
         & itType .~ HELD FLAMESPITTER
-        & itUse . heldDelay .~ FixedRate{_rateMax = 3, _rateTimeLastUsed = 0}
+        & itUse . heldDelay .~ FixedRate{_rateMax = 3} --, _rateTimeLastUsed = 0}
 --        & itUse . heldParams . weaponInvLock .~ 10
 --        & itUse . heldParams . weaponRepeat .~ [1..9]
 --        & itUse . heldMuzzles . ix 0 . mzEffect . nzPressure .~ UniRandFloat 3 4

src/Dodge/Item/Held/Stick.hs

@@ -53,8 +53,11 @@ autoPistol = pistol & itType .~ HELD AUTOPISTOL
 machinePistol :: Item
 machinePistol =
     autoPistol
-        & itUse . heldDelay .~ WarmUpNoDelay{_warmTime = 0, _warmMax = 50, _warmSound = crankSlowS}
+        & itUse . heldDelay .~ WarmUpNoDelay{
+            --_warmTime = 0, 
+            _warmMax = 50, _warmSound = crankSlowS}
         & itType .~ HELD MACHINEPISTOL
+        & itParams .~ WarmTime 0
 
 smg :: Item
 smg =