Commit before partial cleanup, continue weapon effect refactor

src/Dodge/Data/ComposedItem.hs

@@ -13,13 +13,18 @@ import Dodge.Data.Item.Use.Consumption.Ammo
 data ComposeLinkType 
     = AmmoInLink Int AmmoType
     | AmmoModLink
+    | WeaponScopeLink 
+    | WeaponTargetingLink 
+    | RocketRemoteScreenLink
     deriving (Eq,Ord,Show,Read)
 
 data ComposedItem = WeaponCI
     | WeaponScopeCI
+    | WeaponTargetingCI
     | AmmoModifierCI AmmoType
     | AmmoCI AmmoType
     | UncomposableCI
+    | RocketRemoteScreenCI
     deriving (Eq,Ord,Show,Read)
 
 makeLenses ''ComposedItem

src/Dodge/Data/Item/Combine.hs

@@ -98,6 +98,8 @@ data AttachType
     = SCROLLATTACH ScrollAttachType
     | TARGETATTACH {_ibtAttachTarget :: TargetType}
     | BULLETSYNTHESIZER
+    | ROCKETHOMER
+    | ROCKETREMOTESCREEN
 --    | BULPAYLOADATTACH
 --    | BULTRAJECTORYATTACH
     deriving (Eq, Ord, Show, Read)
@@ -178,7 +180,7 @@ data HeldItemType
     | AMR
     | AUTOAMR
     | SNIPERRIFLE
-    | MACHINEGUN
+--    | MACHINEGUN
     | FLAMESPITTER
     | FLAMETHROWER
     | FLAMETORRENT
@@ -188,8 +190,8 @@ data HeldItemType
     | TESLAGUN
     | LASGUN
 --    | LASCIRCLE
-    | DUALBEAM
-    | LASWIDE {_xNum :: Int}
+--    | DUALBEAM
+--    | LASWIDE {_xNum :: Int}
     | TRACTORGUN
     | LAUNCHER
     | LAUNCHERX {_xNum :: Int}

src/Dodge/Data/Item/HeldDelay.hs

@@ -16,17 +16,22 @@ data UseDelay -- should just be Delay
         { _rateMax :: Int
         , _rateTime :: Int
         }
-    | VariableRate
-        { _rateMax :: Int
-        , _rateTime :: Int
-        , _rateMaxMax :: Int
-        , _rateMinMax :: Int
-        }
+--    | VariableRate
+--        { _rateMax :: Int
+--        , _rateTime :: Int
+--        , _rateMaxMax :: Int
+--        , _rateMinMax :: Int
+--        }
     | WarmUpNoDelay
         { _warmTime :: Int
         , _warmMax :: Int
         , _warmSound :: SoundID
         }
+--    | ChargingRate
+--        { _chargeTime :: Int
+--        , _chargeMax :: Int
+--        , _chargeSound :: Maybe SoundID
+--        }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''UseDelay

src/Dodge/Data/Item/HeldUse.hs

@@ -15,14 +15,14 @@ import Control.Lens
 data Huse
     = HeldDoNothing
 --    | HeldUseAmmoParams
-    | HeldOverNozzlesUseGasParams
-    | HeldPJCreation
-    | HeldPJCreationX Int
+--    | HeldOverNozzlesUseGasParams
+--    | HeldPJCreation
+--    | HeldPJCreationX Int
     | HeldFireRemoteShell
     | HeldExplodeRemoteShell Int Int
     | HeldDetectorEffect Detector
 --    | HeldTeslaArc
-    | HeldLaser
+--    | HeldLaser
     | HeldCircleLaser
     | HeldDualLaser
     | HeldTractor
@@ -68,17 +68,17 @@ data Luse
 data HeldMod
     = PistolMod
 --    | PoisonSprayerMod
-    | FlameSpitterMod
-    | FlameSpitterRepeatMod
+--    | FlameSpitterMod
+--    | FlameSpitterRepeatMod
 --    | FlameThrowerMod
 --    | LauncherMod
 --    | TeslaMod
 --    | CircleLaserMod
-    | LasWideMod Int
-    | DualBeamMod
+--    | LasWideMod Int
+--    | DualBeamMod
 --    | LasMod
 --    | LauncherXMod Int
-    | ShatterMod
+--    | ShatterMod
 --    | AmmoCheckMod
 --    | AmmoUseCheckMod
 --    | AmmoHammerTimeUseOneMod
@@ -103,7 +103,7 @@ data HeldMod
     | FireRemoteShellMod
     | ExplodeRemoteShellMod
     | DoNothingMod
-    | ForceFieldMod
+--    | ForceFieldMod
     | DetectorMod Detector
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 

src/Dodge/Data/Item/Use.hs

@@ -39,6 +39,7 @@ data ItemUse
         , _heldAmmoTypes :: IM.IntMap AmmoType
         , _heldParams :: HeldParams
         , _heldTriggerType :: TriggerType
+        , _heldUsageTime :: Int -- this is not yet implemented
 --        , _useTargeting :: Maybe TargetType
         }
     | LeftUse
@@ -163,6 +164,9 @@ data MuzzleEffect
         , _nzCurrentWalkAngle :: Float
         , _nzWalkSpeed :: Float
         }
+        | MuzzleShatter
+        | MuzzleForceField
+        | MuzzleDetector
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Muzzle = Muzzle
@@ -172,6 +176,7 @@ data Muzzle = Muzzle
     , _mzAmmoSlot :: Int
     , _mzFlareType :: FlareType
     , _mzEffect :: MuzzleEffect
+    , _mzChargeRequirement :: Maybe Int
 --    , _mzRecoil :: Float
 --    , _mzTorque :: Float
 --    , _mzSidePush :: Float
@@ -208,6 +213,7 @@ makeLenses ''HeldParams
 makeLenses ''AttachParams
 makeLenses ''ScrollAttachParams
 makeLenses ''AmmoParams
+makeLenses ''MuzzleEffect
 deriveJSON defaultOptions ''MuzzleEffect
 deriveJSON defaultOptions ''FlareType
 deriveJSON defaultOptions ''TriggerType