Add remote detonator, stop remote screen attaching to nonlauncher ammo

2024-12-25 21:52:09 +00:00
parent c788af47bd
commit ae557f3fd4
11 changed files with 180 additions and 164 deletions
@@ -64,14 +64,18 @@ itemToBreakLists itm itmf = case (itm ^. itType, itmf) of
        )
    (_, AmmoMagSF{}) -> fromMaybe ([], []) $ do
        atype <- itm ^? itConsumables . magType
+        let screenanddet = case atype of
+                LauncherAmmo -> [ (RemoteScreenSF, RemoteScreenLink) 
+                    , (RemoteDetonatorSF, RemoteDetonatorLink)
+                    ]
+                _ -> []
        return
            (
                [ (AmmoModifierSF atype, AmmoModLink)
                , (AmmoTargetingSF atype, AmmoTargetingLink)
                , (AmmoPayloadSF atype, AmmoPayloadLink)
                , (AmmoEffectSF atype, AmmoEffectLink)
-                , (RemoteScreenSF, RemoteScreenLink)
-                ]
+                ] <> screenanddet
            , []
            )
    (_, WeaponTargetingSF) -> (getAmmoLinks itm ++ [(AugmentedHUDSF, AugmentedHUDLink)], [])
@@ -102,6 +106,7 @@ itemToFunction itm = case itm ^. itType of
            AmmoMagSF amtype
    AMMOMAG{} -> maybe UncomposableIsolateSF AmmoMagSF $ itm ^? itConsumables . magType
    ATTACH REMOTESCREEN -> RemoteScreenSF
+    ATTACH REMOTEDETONATOR -> RemoteDetonatorSF
    ATTACH BULLETSYNTH -> AmmoModifierSF BulletAmmo
    ATTACH ZOOMSCOPE -> WeaponScopeSF
    ATTACH HOMINGMODULE -> AmmoTargetingSF LauncherAmmo