Return to project, unsure about changes

src/Dodge/Data/Item/Combine.hs

@@ -89,7 +89,7 @@ data ItemBaseType
     | EQUIP {_ibtEquip :: EquipItemType}
     | CONSUMABLE {_ibtConsumable :: ConsumableItemType}
     | CRAFT CraftType
-    | ATTACH AttachType
+    | ATTACH {_ibtAttach :: AttachType}
     deriving (Eq, Ord, Show, Read)
 
 --deriving (Eq, Ord, Show, Read) --Generic, Flat)
@@ -97,6 +97,9 @@ data ItemBaseType
 data AttachType
     = SCROLLATTACH ScrollAttachType
     | AMMOATTACH AmmoAttachType
+    | TARGETATTACH {_ibtAttachTarget :: TargetType}
+    | BULPAYLOADATTACH
+    | BULTRAJECTORYATTACH
     deriving (Eq, Ord, Show, Read)
 
 data ScrollAttachType
@@ -239,6 +242,7 @@ makeLenses ''ItemType
 makeLenses ''ItemBaseType
 makeLenses ''HeldItemType
 makeLenses ''ItemModuleType
+makeLenses ''AttachType
 deriveJSON defaultOptions ''Stack
 deriveJSON defaultOptions ''CraftType
 deriveJSON defaultOptions ''ConsumableItemType

src/Dodge/Data/Item/Targeting.hs

@@ -9,7 +9,7 @@ import Data.Aeson
 import Data.Aeson.TH
 
 data TargetType
-    = TargetLaser
+    = TARGETLASER
     | TargetRBPress
     | TargetRBLine
     | TargetRBCreature

src/Dodge/Data/Item/Use.hs

@@ -59,6 +59,7 @@ data ItemUse
 data AttachParams
     = ScrollAttachParams {_scrollAttachParams :: ScrollAttachParams}
     | AmmoAttachParams
+    | TargetAttachParams
 
 data ScrollAttachParams
     = ZoomScrollParams