Work on weapon attachments

src/Dodge/Data/Item/Combine.hs

@@ -84,12 +84,11 @@ data CraftType
 --deriving (Eq, Ord, Show, Enum, Read) --Generic, Flat)
 
 data ItemBaseType
-    = NoItemType
-    | HELD {_ibtHeld :: HeldItemType}
+    = HELD {_ibtHeld :: HeldItemType}
     | LEFT {_ibtLeft :: LeftItemType}
     | EQUIP {_ibtEquip :: EquipItemType}
     | AMMO {_ibtAmmo :: AmmoItemType}
-    | Consumable {_ibtConsumable :: ConsumableItemType}
+    | CONSUMABLE {_ibtConsumable :: ConsumableItemType}
     | CRAFT CraftType
     | ATTACH AttachType
     deriving (Eq, Ord, Show, Read)
@@ -98,6 +97,8 @@ data ItemBaseType
 
 data AttachType
     = ZOOMSCOPE
+    | TINMAG
+    | DRUMMAG
     deriving (Eq, Ord, Show, Read)
 
 data ConsumableItemType

src/Dodge/Data/Item/Use.hs

@@ -60,6 +60,7 @@ data ItemUse
 
 data AttachParams
     = ZoomScopeParams
+    | AmmoAttachParams
 
 data ItemUse' 
     = ItemHeld HeldUse'