Start unifying heldUse and heldMods

src/Dodge/Data/Item/Combine.hs

@@ -187,7 +187,7 @@ data HeldItemType
     | SPARKGUN
     | TESLAGUN
     | LASGUN
-    | LASCIRCLE
+--    | LASCIRCLE
     | DUALBEAM
     | LASWIDE {_xNum :: Int}
     | TRACTORGUN
@@ -214,7 +214,7 @@ data ItemModuleType
     | INCENDLAS
     | SPLITLAS
     | STATICLAS
-    | WEPTELE
+--    | WEPTELE
     | LAUNCHHOME
     | ATTACHTORCH
     deriving (Eq, Ord, Show, Read) --Generic, Flat)

src/Dodge/Data/Item/HeldUse.hs

@@ -66,22 +66,21 @@ data Luse
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data HeldMod
-    = HeldModNothing
-    | PoisonSprayerMod
+    = PoisonSprayerMod
     | FlameSpitterMod
     | FlameSpitterRepeatMod
     | FlameThrowerMod
     | LauncherMod
     | TeslaMod
-    | CircleLaserMod
+--    | CircleLaserMod
     | LasWideMod Int
     | DualBeamMod
     | LasMod
     | LauncherXMod Int
     | ShatterMod
-    | AmmoCheckMod
-    | AmmoUseCheckMod
-    | AmmoHammerTimeUseOneMod
+--    | AmmoCheckMod
+--    | AmmoUseCheckMod
+--    | AmmoHammerTimeUseOneMod
     | BangCaneMod
     | VolleyGunMod
     | MultiGunMod
@@ -90,7 +89,7 @@ data HeldMod
     | ElephantGunMod
     | AutoAmrMod
     | MachineGunMod
-    | ModWithDirectedTeleport HeldMod
+--    | ModWithDirectedTeleport HeldMod
     | BangStickMod
     | PistolMod
     | AutoPistolMod
@@ -100,6 +99,12 @@ data HeldMod
     | MiniGunMod Int
     | SmgMod
     | BangConeMod
+    | TractorMod --apply with AmmoCheckMod
+    | FireRemoteShellMod
+    | ExplodeRemoteShellMod
+    | DoNothingMod
+    | ForceFieldMod
+    | DetectorMod Detector
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Euse

src/Dodge/Data/Item/Use.hs

@@ -27,8 +27,8 @@ import Dodge.Data.Item.Targeting
 
 data ItemUse
     = HeldUse
-        { _heldUse :: Huse
-        , _heldDelay :: UseDelay
+        { -- _heldUse :: Huse
+         _heldDelay :: UseDelay
         , _heldMods :: HeldMod
         , _heldHammer :: HammerPosition
         , _heldAim :: AimParams
@@ -118,6 +118,7 @@ data Muzzle = Muzzle
     { _mzPos :: V2 Float
     , _mzRot :: Float
     , _mzInaccuracy :: Float
+    , _mzAmmoSlot :: Int
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)