Remove left click/hotkey item data types

src/Dodge/Data/Creature.hs

@@ -54,10 +54,7 @@ data Creature = Creature
     , _crManipulation :: Manipulation
     , _crInvCapacity :: Int
     , _crInvLock :: Bool
---    , _crInvEquipped :: IM.IntMap EquipPosition
     , _crEquipment :: M.Map EquipPosition Int
---    , _crInvHotkeys :: IM.IntMap Hotkey
---    , _crHotkeys :: M.Map Hotkey Int
     , _crState :: CreatureState
     , _crCorpse :: CreatureCorpse --Creature -> Corpse -> SPic
     , _crMaterial :: Material

src/Dodge/Data/Item/Combine.hs

@@ -14,7 +14,7 @@ import Dodge.Data.Item.Targeting
 
 data ItemType
     = HELD {_ibtHeld :: HeldItemType}
-    | LEFT {_ibtLeft :: LeftItemType}
+--    | LEFT {_ibtLeft :: LeftItemType}
     | EQUIP {_ibtEquip :: EquipItemType}
     | CONSUMABLE {_ibtConsumable :: ConsumableItemType}
     | CRAFT {_ibtCraft :: CraftType}
@@ -116,18 +116,17 @@ data EquipItemType
     | WRIST_ECG
     deriving (Eq, Ord, Show, Read)
 
-data LeftItemType
-    = BOOSTER
-    | STOPWATCH
-    | REWINDWATCH
-    | SCROLLWATCH
-    | BLINKER
-    | BLINKERUNSAFE
-    | SPAWNER
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+--data LeftItemType
+--    = STOPWATCH
+--    | SCROLLWATCH
+--    | SPAWNER
+--    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data HeldItemType
     = BANGSTICK {_xNum :: Int}
+    | REWINDER
+    | TIMESTOPPER
+    | TIMESCROLLER
     | PISTOL
     | MACHINEPISTOL
     | AUTOPISTOL
@@ -163,6 +162,8 @@ data HeldItemType
     | FLATSHIELD
     | KEYCARD Int
     | DETECTOR Detector
+    | BLINKER
+    | BLINKERUNSAFE
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Detector
@@ -180,7 +181,7 @@ deriveJSON defaultOptions ''AmmoMagType
 deriveJSON defaultOptions ''AttachType
 deriveJSON defaultOptions ''Detector
 deriveJSON defaultOptions ''EquipItemType
-deriveJSON defaultOptions ''LeftItemType
+--deriveJSON defaultOptions ''LeftItemType
 deriveJSON defaultOptions ''HeldItemType
 deriveJSON defaultOptions ''ItemType
 

src/Dodge/Data/Item/Effect.hs

@@ -18,9 +18,9 @@ data ItEffect = ItEffect
 
 data ItInvEffect
     = NoInvEffect
-    | ChargeIfEquipped
-    | ChargeIfInInventory
-    | SetCharge Int
+--    | ChargeIfEquipped
+--    | ChargeIfInInventory
+--    | SetCharge Int
     | EffectRootNotroot ItInvEffect ItInvEffect
     | CreateShieldWall
     | RemoveShieldWall

src/Dodge/Data/Item/HeldUse.hs

@@ -20,35 +20,16 @@ data Euse
     | EMagShield
     | EWristShield
     | EHeadLamp
---    | EFuelSource {_euseFuelAmount :: Int, _euseFuelMax :: Int}
---    | EBatterySource {_euseBatteryAmount :: Int, _euseBatteryMax :: Int}
---    | EAmmoSource 
---        { _euseAmmoAmount :: Int
---        , _euseAmmoMax :: Int
---        , _euseAmmoLink :: Maybe Int
---        }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data Luse
-    = LDoNothing
-    | LRewind
-    | LTimePause
-    | LTimeScroll
-    | LBlink
-    | LUnsafeBlink
-    | LBoost
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
---data HeldMod
---    = PistolMod
-----    | FireRemoteShellMod
---    | ExplodeRemoteShellMod
---    | DoNothingMod
+--data Luse
+--    = LDoNothing
+--    | LRewind
+--    | LTimePause
+--    | LTimeScroll
 --    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Euse
 deriveJSON defaultOptions ''Cuse
---deriveJSON defaultOptions ''HeldMod
 deriveJSON defaultOptions ''Euse
---deriveJSON defaultOptions ''Huse
-deriveJSON defaultOptions ''Luse
+--deriveJSON defaultOptions ''Luse

src/Dodge/Data/Item/Use.hs

@@ -40,14 +40,15 @@ data ItemUse
 --        , _heldAmmoTypes :: IM.IntMap AmmoType
         , _heldParams :: HeldParams
         , _heldTriggerType :: TriggerType
+        , _useCondition :: UseCondition
         }
-    | UseHotkey
-        { _leftUse :: Luse
-        , _leftDelay :: UseDelay
-        , _leftHammer :: HammerPosition
-        , _uequipEffect :: EquipEffect
-        , _leftConsumption :: LeftConsumption
-        }
+--    | UseHotkey
+--        { _leftUse :: Luse
+--        , _leftDelay :: UseDelay
+--        , _leftHammer :: HammerPosition
+--        , _uequipEffect :: EquipEffect
+--        , _leftConsumption :: LeftConsumption
+--        }
     | UseConsume { _cUse :: Cuse }
     | UseEquip { _uequipEffect :: EquipEffect }
     | UseAttach {_uaParams :: AttachParams}
@@ -56,6 +57,11 @@ data ItemUse
     | UseBulletMod { _ubMod :: BulletMod }
     deriving (Eq, Show, Read)
 
+data UseCondition
+    = MustBeHeld
+    | UseableAnytime
+    deriving (Eq, Show, Read)
+
 data TriggerType = AutoTrigger | HammerTrigger
     deriving (Eq, Show, Read)
 
@@ -142,6 +148,11 @@ data MuzzleEffect
         }
     | MuzzleShatter
     | MuzzleDetector
+    | MuzzleBlink
+    | MuzzleUnsafeBlink
+    | MuzzleRewind
+    | MuzzleStopper
+    | MuzzleScroller
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data AmmoPerShot 
@@ -192,6 +203,8 @@ makeLenses ''AttachParams
 makeLenses ''AmmoParams
 makeLenses ''MuzzleEffect
 makeLenses ''AmmoPerShot
+makeLenses ''UseCondition
+deriveJSON defaultOptions ''UseCondition
 deriveJSON defaultOptions ''MuzzleEffect
 deriveJSON defaultOptions ''FlareType
 deriveJSON defaultOptions ''TriggerType