Commit before rethinking item ammo containers

2024-12-18 19:20:37 +00:00
parent 9bc9dd2a08
commit db8e26b99d
4 changed files with 239 additions and 227 deletions
@@ -26,10 +26,21 @@ import Dodge.Data.Item.Scope
 import Dodge.Data.Item.Use
 import NewInt

-data ItID = ItID deriving (Eq, Ord, Show, Read)
+data ItID = ItID 
+    deriving (Eq, Ord, Show, Read)
+
+data Consumables
+    = NoConsumables
+    | AmmoMag
+        { _magLoadStatus :: ReloadStatus
+        , _magParams :: AmmoParams
+        , _magType :: AmmoType
+        }
+    deriving (Eq, Show, Read)

 data Item = Item
    { _itUse :: ItemUse
+    , _itConsumables :: Consumables
    , _itType :: ItemType
    , _itID :: NewInt ItmInt
    , _itLocation :: ItemLocation
@@ -47,7 +58,9 @@ data ItemTargeting = NoItTargeting
    }

 makeLenses ''ItemTargeting
+makeLenses ''Consumables
 makeLenses ''Item
+deriveJSON defaultOptions ''Consumables
 deriveJSON defaultOptions ''ItemTargeting
 deriveJSON defaultOptions ''ItID
 deriveJSON defaultOptions ''Item