Broken commit

src/Dodge/Data/Item/Combine.hs

@@ -87,7 +87,6 @@ data ItemBaseType
     = HELD {_ibtHeld :: HeldItemType}
     | LEFT {_ibtLeft :: LeftItemType}
     | EQUIP {_ibtEquip :: EquipItemType}
-    | AMMO {_ibtAmmo :: AmmoItemType}
     | CONSUMABLE {_ibtConsumable :: ConsumableItemType}
     | CRAFT CraftType
     | ATTACH AttachType
@@ -96,11 +95,21 @@ data ItemBaseType
 --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data AttachType
-    = ZOOMSCOPE
-    | TINMAG
-    | DRUMMAG
+    = SCROLLATTACH ScrollAttachType
+    | AMMOATTACH AmmoAttachType
     deriving (Eq, Ord, Show, Read)
 
+data ScrollAttachType
+    = ZOOMSCOPE
+    deriving (Eq, Ord, Show, Read)
+
+data AmmoAttachType
+    = TINMAG
+    | DRUMMAG
+    | BULLETBELT
+    deriving (Eq, Ord, Show, Read)
+
+
 data ConsumableItemType
     = MEDKIT Int
     | EXPLOSIVES
@@ -191,12 +200,6 @@ data HeldItemType
     | KEYCARD Int
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data AmmoItemType
-    = TINMAGAZINE
-    | DRUMMAGAZINE
-    | BULLETBELT
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 data ItemModuleType
     = EMPTYMODULE
     | MAGNETMAG
@@ -240,12 +243,13 @@ makeLenses ''ItemModuleType
 deriveJSON defaultOptions ''Stack
 deriveJSON defaultOptions ''CraftType
 deriveJSON defaultOptions ''ConsumableItemType
+deriveJSON defaultOptions ''AmmoAttachType
+deriveJSON defaultOptions ''ScrollAttachType
 deriveJSON defaultOptions ''AttachType
 deriveJSON defaultOptions ''Detector
 deriveJSON defaultOptions ''EquipItemType
 deriveJSON defaultOptions ''LeftItemType
 deriveJSON defaultOptions ''HeldItemType
-deriveJSON defaultOptions ''AmmoItemType
 deriveJSON defaultOptions ''ItemModuleType
 deriveJSON defaultOptions ''ModuleSlot
 deriveJSON defaultOptions ''ItemBaseType

src/Dodge/Data/Item/Use.hs

@@ -63,7 +63,9 @@ data AttachParams
 data ScrollAttachParams
     = ZoomScrollParams
         { -- | a camera offset
-          _opticPos :: Point2
+          _opticPos :: Point2  -- this should be relative to the camera rotation
+                                -- then when the camera rotates when firing etc,
+                                -- this doesn't need to be changed
 --        , _scopeZoomChange :: Int
         , _opticZoom :: Float
         , _opticDefaultZoom :: Float