Work on machine pistol

src/Dodge/Data/Item/Params.hs

@@ -1,5 +1,5 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -13,15 +13,19 @@ import Dodge.Data.ArcStep
 data ItemParams
     = NoParams
     | FlatShieldParams {_flatShieldWlMIX :: Maybe Int}
-    | Arcing { _currentArc :: [ArcStep]}
+    | Arcing {_currentArc :: [ArcStep]}
     | NozzleAngle {_nzAngle :: Float}
     | VolleyUnfiredBarrels {_unfiredBarrels :: [Int]}
     | AlteRifleSwitch {_alteRifleSwitch :: Int}
-    | WarmTime {_wTime :: Int}
+    | WarmTime
+        { _wTime :: Int
+        , _isWarming :: Bool
+        }
     | ItemParamID {_itParamID :: Int}
 
 data ShrinkGunStatus = FullSize | Shrunk
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+--deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''ItemParams
 deriveJSON defaultOptions ''ShrinkGunStatus

src/Dodge/Data/UseDelay.hs

@@ -5,7 +5,6 @@
 
 module Dodge.Data.UseDelay where
 
-import Sound.Data
 import Control.Lens
 
 data ItemUseDelay -- should just be Delay
@@ -15,7 +14,7 @@ data ItemUseDelay -- should just be Delay
         }
     | WarmUpNoDelay
         { _warmMax :: Int
-        , _warmSound :: SoundID
+--        , _warmSound :: SoundID
         }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)