Commit on returning to work

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