Cleanup module pathing

src/Dodge/Data/Item/Use/Consumption.hs

@@ -2,13 +2,17 @@
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
-module Dodge.Data.Item.Use.Consumption where
+module Dodge.Data.Item.Use.Consumption (
+    module Dodge.Data.Item.Use.Consumption,
+    module Dodge.Data.Item.Use.Consumption.Ammo,
+    module Dodge.Data.Item.Use.Consumption.LoadAction,
+) where
 
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import Dodge.Data.Ammo
-import Dodge.Data.LoadAction
+import Dodge.Data.Item.Use.Consumption.Ammo
+import Dodge.Data.Item.Use.Consumption.LoadAction
 
 data HeldConsumption
     = LoadableAmmo

src/Dodge/Data/Item/Use/Consumption/Ammo.hs

@@ -0,0 +1,65 @@
+{-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+
+module Dodge.Data.Item.Use.Consumption.Ammo (
+    module Dodge.Data.Item.Use.Consumption.Ammo,
+    module Dodge.Data.Bullet,
+    module Dodge.Data.Payload,
+) where
+
+import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+import Dodge.Data.Bullet
+import Dodge.Data.Payload
+import Dodge.Data.Wall
+
+data ProjectileDraw = DrawShell | DrawRemoteShell | DrawDrone | DrawBlankProjectile
+    deriving (Show, Read, Eq, Ord, Enum, Bounded)
+
+data ProjectileCreate = CreateShell | CreateTrackingShell
+    deriving (Show, Read, Eq, Ord, Enum, Bounded)
+
+data ProjectileUpdate
+    = PJThrust {_pjuStart :: Int, _pjuEnd :: Int}
+    | PJSpin {_pjuTime :: Int, _pjuCID :: Int, _pjuSpinAmound :: Int}
+    | PJTrack {_pjuStart :: Int, _pjuEnd :: Int, _pjuITID :: Int}
+    | PJReduceSpin {_pjuReduceSpin :: Float}
+    | PJRemoteDirection {_pjuStart :: Int, _pjuEnd :: Int, _pjuCID :: Int, _pjuITID :: Int}
+    | PJSetScope {_pjuITID :: Int}
+    | PJRetireRemote {_pjuITID :: Int, _pjuTimer :: Int, _pjuPJID :: Int}
+    deriving (Show, Read, Eq, Ord)
+
+data AmmoType
+    = ProjectileAmmo
+        { _amPayload :: Payload
+        , _amString :: String
+        , _amPjDraw :: ProjectileDraw
+        , _amPjCreation :: ProjectileCreate
+        }
+    | BulletAmmo
+        { _amString :: String
+        , _amBullet :: Bullet
+        }
+    | DroneAmmo
+        {_amString :: String}
+    | GasAmmo
+        { _amString :: String
+        , _amCreateGas :: GasCreate
+        }
+    | ForceFieldAmmo
+        { _amForceFieldType :: Wall
+        }
+    | GenericAmmo
+    deriving (Eq, Ord, Show, Read)
+
+data GasCreate = CreatePoisonGas | CreateFlame
+    deriving (Eq, Ord, Show, Enum, Bounded, Read)
+
+makeLenses ''ProjectileUpdate
+makeLenses ''AmmoType
+deriveJSON defaultOptions ''ProjectileDraw
+deriveJSON defaultOptions ''ProjectileCreate
+deriveJSON defaultOptions ''ProjectileUpdate
+deriveJSON defaultOptions ''AmmoType
+deriveJSON defaultOptions ''GasCreate

src/Dodge/Data/Item/Use/Consumption/LoadAction.hs

@@ -0,0 +1,32 @@
+{-# LANGUAGE StrictData #-}
+{-# LANGUAGE TemplateHaskell #-}
+
+module Dodge.Data.Item.Use.Consumption.LoadAction where
+
+import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
+import Dodge.Data.Hammer
+import Sound.Data
+
+data LoadAction
+    = LoadEject {_actionTime :: Int, _actionSound :: SoundID}
+    | LoadInsert {_actionTime :: Int, _actionSound :: SoundID}
+    | LoadAdd {_actionTime :: Int, _actionSound :: SoundID, _insertMax :: Int}
+    | LoadPrime {_actionTime :: Int, _actionSound :: SoundID}
+    deriving (Eq, Ord, Show, Read)
+
+data InvSel = InvSel {_iselPos :: Int, _iselAction :: InvSelAction}
+    deriving (Eq, Ord, Show, Read)
+
+data InvSelAction
+    = NoInvSelAction
+    | ReloadAction {_actionProgress :: Int, _reloadAction :: LoadAction, _actionHammer :: HammerType}
+    deriving (Eq, Ord, Show, Read)
+
+makeLenses ''LoadAction
+makeLenses ''InvSel
+makeLenses ''InvSelAction
+deriveJSON defaultOptions ''LoadAction
+deriveJSON defaultOptions ''InvSel
+deriveJSON defaultOptions ''InvSelAction