Commit on returning to work

src/Dodge/Data/Item.hs

@@ -29,6 +29,7 @@ import Dodge.Data.Item.Params
 import Dodge.Data.Item.Tweak
 import Dodge.Data.Item.Use
 import Dodge.Data.Item.Location
+import Data.Set (Set)
 
 data Item = Item
     { _itUse :: ItemUse
@@ -44,11 +45,20 @@ data Item = Item
     , _itTweaks :: ItemTweaks
     , _itScope :: Scope
     , _itParams :: ItemParams
+    , _itAttachments :: Set ItemAttachment
     }
     --deriving (Eq, Show, Read) --Generic, Flat)
 
+data ItemAttachment = ScopeAttachment
+    | BulletClipAttachment
+    | BulletBeltAttachment
+    | StandAttachment
+    | PowerSourceAttachment
+    deriving (Eq,Ord)
+
 _itUseAimStance :: Item -> AimStance
 _itUseAimStance = _aimStance . _heldAim . _itUse
 
 makeLenses ''Item
+deriveJSON defaultOptions ''ItemAttachment
 deriveJSON defaultOptions ''Item

src/Dodge/Data/Item/Combine.hs

@@ -91,10 +91,15 @@ data ItemBaseType
     | AMMO {_ibtAmmo :: AmmoItemType}
     | Consumable {_ibtConsumable :: ConsumableItemType}
     | CRAFT CraftType
+    | ATTACH AttachType
     deriving (Eq, Ord, Show, Read)
 
 --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
+data AttachType
+    = ZOOMSCOPE
+    deriving (Eq, Ord, Show, Read)
+
 data ConsumableItemType
     = MEDKIT Int
     | EXPLOSIVES
@@ -188,12 +193,11 @@ data HeldItemType
 data AmmoItemType
     = TINMAGAZINE
     | DRUMMAGAZINE
+    | BULLETBELT
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ItemModuleType
     = EMPTYMODULE
-    | DRUMMAG
-    | BELTMAG
     | MAGNETMAG
     | BULPAY BulletSpawn
     | BULBODY BulletEffect
@@ -235,6 +239,7 @@ makeLenses ''ItemModuleType
 deriveJSON defaultOptions ''Stack
 deriveJSON defaultOptions ''CraftType
 deriveJSON defaultOptions ''ConsumableItemType
+deriveJSON defaultOptions ''AttachType
 deriveJSON defaultOptions ''Detector
 deriveJSON defaultOptions ''EquipItemType
 deriveJSON defaultOptions ''LeftItemType

src/Dodge/Data/Item/Scope.hs

@@ -25,8 +25,6 @@ data Scope
 --        , _scopeZoomChange :: Int
         , _scopeZoom :: Float
         , _scopeDefaultZoom :: Float
-        , -- | if the camera offset is also the center of vision
-          _scopeIsCamera :: Bool
         }
     deriving (Eq, Show, Read) --Generic, Flat)
 

src/Dodge/Data/Item/Use.hs

@@ -54,8 +54,13 @@ data ItemUse
         }
     | CraftUse
         {_useAmount :: ItAmount}
+    | AttachUse
+        {_attachParams :: AttachParams}
     --deriving (Eq, Show, Read) --Generic, Flat)
 
+data AttachParams
+    = ZoomScopeParams
+
 data ItemUse' 
     = ItemHeld HeldUse'
     | ItemEquip EquipUse'
@@ -106,6 +111,7 @@ makeLenses ''ItZoom
 makeLenses ''Muzzle
 deriveJSON defaultOptions ''Muzzle
 deriveJSON defaultOptions ''AimStance
+deriveJSON defaultOptions ''AttachParams
 deriveJSON defaultOptions ''ItZoom
 deriveJSON defaultOptions ''AimParams
 deriveJSON defaultOptions ''ItemUse

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

@@ -31,6 +31,11 @@ data AmmoSource
     | AboveSource
     deriving (Eq, Show, Read) --Generic, Flat)
 
+data ExternalSourceType = BulletClip
+    | BulletBelt
+    | ElectricPower
+    deriving (Eq, Show, Read) --Generic, Flat)
+
 data InternalAmmo = InternalAmmo
     { _iaMax :: Int
     , _iaLoaded :: Int