Move towards external targeting items

src/Dodge/Data/ComposedItem.hs

@@ -15,6 +15,7 @@ import Dodge.Data.Item
 data ComposeLinkType 
     = AmmoInLink Int AmmoType
     | AmmoModLink
+    | AmmoTargetingLink
     | WeaponScopeLink 
     | WeaponTargetingLink 
     | RemoteScreenLink
@@ -28,15 +29,7 @@ data ItemStructuralFunction
     | RemoteScreenSF
     | UncomposableIsolateSF
     | AmmoModifierSF AmmoType
-    deriving (Eq,Ord,Show,Read)
-
-data ComposedItem = WeaponCI
-    | WeaponScopeCI
-    | WeaponTargetingCI
-    | AmmoModifierCI AmmoType
-    | AmmoCI AmmoType
-    | UncomposableCI
-    | RocketRemoteScreenCI
+    | AmmoTargetingSF AmmoType
     deriving (Eq,Ord,Show,Read)
 
 type PartiallyComposedItem = (Item, ItemStructuralFunction, LinkTest)
@@ -55,6 +48,4 @@ data LinkUpdate = LinkUpdate
 
 makeLenses ''LinkTest
 makeLenses ''LinkUpdate
-makeLenses ''ComposedItem
-deriveJSON defaultOptions ''ComposedItem
 deriveJSON defaultOptions ''ComposeLinkType

src/Dodge/Data/Item/Combine.hs

@@ -98,8 +98,8 @@ data AttachType
     = ZOOMSCOPE
     | TARGETATTACH {_ibtAttachTarget :: TargetType}
     | BULLETSYNTHESIZER
-    | ROCKETHOMER
     | REMOTESCREEN
+    | HOMINGMODULE
 --    | BULPAYLOADATTACH
 --    | BULTRAJECTORYATTACH
     deriving (Eq, Ord, Show, Read)

src/Dodge/Data/Item/Use.hs

@@ -73,6 +73,11 @@ data ItemUse
         { -- | a camera offset
           _scopeScope :: Scope
         }
+    | TargetingUse
+        { _tgPos :: Maybe Point2
+        , _tgID :: Maybe Int
+        , _tgActive :: Bool
+        }
     deriving (Eq, Show, Read) --Generic, Flat)
 
 data TriggerType