Cleanup UseDelay

src/Dodge/Data.hs

@@ -21,8 +21,10 @@ module Dodge.Data (
     module Dodge.Data.MountedObject,
     module Dodge.Data.AimStance,
     module Dodge.Data.TriggerType,
+    module Dodge.Data.UseDelay,
 ) where
 
+import Dodge.Data.UseDelay
 import Dodge.Data.TriggerType
 import Dodge.Data.AimStance
 import Dodge.Data.Config

src/Dodge/Data/Item/HeldDelay.hs

@@ -1,25 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE StrictData #-}
-{-# LANGUAGE TemplateHaskell #-}
-
-module Dodge.Data.Item.HeldDelay where
-
-import Sound.Data
-import Control.Lens
-import Data.Aeson
-import Data.Aeson.TH
-
-data UseDelay -- should just be Delay
-    = NoDelay
-    | FixedRate
-        { _rateMax :: Int
-        }
-    | WarmUpNoDelay
-        { _warmMax :: Int
-        , _warmSound :: SoundID
-        }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-makeLenses ''UseDelay
-deriveJSON defaultOptions ''UseDelay

src/Dodge/Data/Item/Use.hs

@@ -7,7 +7,7 @@ module Dodge.Data.Item.Use (
     module Dodge.Data.Item.Use,
     module Dodge.Data.Item.Use.Equipment,
     module Dodge.Data.Item.HeldUse,
-    module Dodge.Data.Item.HeldDelay,
+--    module Dodge.Data.Item.HeldDelay,
     module Dodge.Data.Item.Use.Consumption,
     module Dodge.Data.Item.Targeting,
     module Dodge.Data.GenFloat,
@@ -21,7 +21,7 @@ import Data.Aeson.TH
 import qualified Data.Set as S
 import Dodge.Data.GenFloat
 import Dodge.Data.Item.BulletMod
-import Dodge.Data.Item.HeldDelay
+--import Dodge.Data.Item.HeldDelay
 import Dodge.Data.Item.HeldUse
 import Dodge.Data.Item.Scope
 import Dodge.Data.Item.Targeting

src/Dodge/HeldUse.hs

@@ -10,6 +10,7 @@ module Dodge.HeldUse (
     heldEffectMuzzles,
 ) where
 
+import Dodge.Data.UseDelay
 import Dodge.Item.UseDelay
 import Dodge.Base
 import Color