Move towards external targeting items

2024-09-28 23:01:50 +01:00
parent d1690ed3ac
commit 241191ee1b
11 changed files with 38 additions and 27 deletions
@@ -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