From b7f9415814d9fbb6c3636bfeebdaf062e73284c9 Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 16 Jun 2024 00:31:41 -0700
Subject: [PATCH] sc2: Added liberator guerilla missiles to replace 360 degree
 sensors

---
 .../Base.SC2Data/GameData/AbilData.xml        | 16 +-------
 .../Base.SC2Data/GameData/ActorData.xml       | 26 +++++--------
 .../Base.SC2Data/GameData/BehaviorData.xml    |  7 ++++
 .../Base.SC2Data/GameData/ButtonData.xml      |  6 +--
 .../Base.SC2Data/GameData/EffectData.xml      | 37 ++++++++++++++-----
 .../Base.SC2Data/GameData/ModelData.xml       |  6 +++
 .../Base.SC2Data/GameData/RequirementData.xml | 11 +-----
 .../GameData/RequirementNodeData.xml          | 10 ++---
 .../Base.SC2Data/GameData/UnitData.xml        |  8 +---
 .../Base.SC2Data/GameData/UpgradeData.xml     | 18 ++-------
 .../Base.SC2Data/GameData/ValidatorData.xml   | 24 ------------
 Mods/ArchipelagoPlayer.SC2Mod/Preload.xml     | 31 ++++++++++++++++
 .../PreloadAssetDB.txt                        |  2 +-
 .../LocalizedData/GameStrings.txt             |  4 +-
 .../Base.SC2Data/LibABFE498B.galaxy           |  6 +--
 .../Base.SC2Data/LibABFE498B_h.galaxy         |  2 +-
 Mods/ArchipelagoTriggers.SC2Mod/Triggers      |  4 +-
 .../LocalizedData/TriggerStrings.txt          |  2 +-
 18 files changed, 107 insertions(+), 113 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 219ef6447..c220a3841 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -1501,7 +1501,7 @@
         <Effect index="0" value="AP_LiberatorTargetMorphOrderInitialSet"/>
         <Range value="9"/>
         <Arc value="360"/>
-        <CmdButtonArray index="Execute" DefaultButtonFace="AP_LiberatorAGMode" Requirements="AP_NotHaveLiberator360DegreeSensorArray"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_LiberatorAGMode"/>
     </CAbilEffectTarget>
     <CAbilEffectTarget id="AP_MercLiberatorAGTarget">
         <AbilSetId value="AP_LiberatorAGTarget"/>
@@ -1509,7 +1509,7 @@
         <Effect index="0" value="AP_MercLiberatorTargetMorphOrderInitialSet"/>
         <Range value="9"/>
         <Arc value="360"/>
-        <CmdButtonArray index="Execute" DefaultButtonFace="AP_MercLiberatorAGMode" Requirements="AP_NotHaveLiberator360DegreeSensorArray"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_MercLiberatorAGMode"/>
     </CAbilEffectTarget>
     <CAbilMorph id="AP_LiberatorMorphtoAA">
         <AbilSetId value="LiberatorAA"/>
@@ -1584,12 +1584,6 @@
             </SectionArray>
         </InfoArray>
     </CAbilMorph>
-    <CAbilMorph id="AP_LiberatorMorhptoAGImproved" parent="AP_LiberatorMorphtoAG">
-        <AbilSetId value="AP_LiberatorAGTarget"/>
-        <CmdButtonArray index="Execute" Requirements="AP_HaveLiberator360DegreeSensorArray">
-            <Flags index="ToSelection" value="1"/>
-        </CmdButtonArray>
-    </CAbilMorph>
     <CAbilMorph id="AP_MercLiberatorMorphtoAG">
         <AbilSetId value="LiberatorAG"/>
         <EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
@@ -1613,12 +1607,6 @@
             </SectionArray>
         </InfoArray>
     </CAbilMorph>
-    <CAbilMorph id="AP_MercLiberatorMorhptoAGImproved" parent="AP_MercLiberatorMorphtoAG">
-        <AbilSetId value="AP_LiberatorAGTarget"/>
-        <CmdButtonArray index="Execute" Requirements="AP_HaveLiberator360DegreeSensorArray">
-            <Flags index="ToSelection" value="1"/>
-        </CmdButtonArray>
-    </CAbilMorph>
     <CAbilBehavior id="AP_LiberatorCloak">
         <AbilSetId value="Clok"/>
         <EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index ae99f6e69..40bd02438 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -24670,6 +24670,15 @@
         <ImpactMap index="None" Model="LiberatorAttackImpact" Sound="Liberator_AA_Launch_Impact"/>
         <ShieldFlashType value="Full"/>
     </CActorAction>
+    <CActorModel id="AP_LiberatorGuerillaMissilesDebuff" parent="ModelAnimationStyleContinuous">
+        <Model value="AP_LiberatorGuerillaMissilesDebuffDisplay"/>
+        <On Terms="Behavior.AP_LiberatorGuerillaMissilesDebuff.On" Send="Create"/>
+        <On Terms="Behavior.AP_LiberatorGuerillaMissilesDebuff.Off" Send="AnimBracketStop BSD"/>
+        <HostSiteOps Ops="SOpAttachCenter" HoldRotation="1"/>
+        <Host Subject="_Unit"/>
+        <Inherits index="Visibility" value="1"/>
+        <AutoScaleFactor value="0.300000"/>
+    </CActorModel>
     <CActorMissile id="AP_LiberatorDamageAttackMissile" parent="GenericAttackMissile" unitName="AP_LiberatorDamageMissile">
         <Model value="LiberatorDamageMissile"/>
     </CActorMissile>
@@ -31919,23 +31928,6 @@
         <LifeArmorIcon value="Assets\Textures\btn-upgrade-zerg-groundcarapace-level0.dds"/>
         <Aliases value="_UnitSmall"/>
     </CActorUnit>
-    <CActorRange id="AP_LiberatorDefenderModeRange">
-        <On Terms="SelectionLocalUpdate.AP_LiberatorAG.Start; ValidateUnit AP_HaveLiberator360DegreeSensorArray" Send="Create"/>
-        <On Terms="SelectionLocalUpdate.AP_MercLiberatorAG.Start; ValidateUnit AP_HaveLiberator360DegreeSensorArray" Send="Create"/>
-        <On Terms="SelectionLocalUpdate.AP_LiberatorAG.StartEditorGround; ValidateUnit AP_HaveLiberator360DegreeSensorArray" Send="Create"/>
-        <On Terms="SelectionLocalUpdate.AP_MercLiberatorAG.StartEditorGround; ValidateUnit AP_HaveLiberator360DegreeSensorArray" Send="Create"/>
-        <On Terms="SelectionLocalUpdate.AP_LiberatorAG.StartEditorFlyer; ValidateUnit AP_HaveLiberator360DegreeSensorArray" Send="Create"/>
-        <On Terms="SelectionLocalUpdate.AP_MercLiberatorAG.StartEditorFlyer; ValidateUnit AP_HaveLiberator360DegreeSensorArray" Send="Create"/>
-        <On Terms="SelectionLocalUpdate.AP_LiberatorAG.Stop" Send="Destroy"/>
-        <On Terms="SelectionLocalUpdate.AP_MercLiberatorAG.Stop" Send="Destroy"/>
-        <On Terms="AbilMorph.*.Start; MorphTo AP_LiberatorAG; ValidateUnit AP_HaveLiberator360DegreeSensorArray; Selected" Send="Create"/>
-        <On Terms="AbilMorph.*.Start; MorphTo AP_MercLiberatorAG; ValidateUnit AP_HaveLiberator360DegreeSensorArray; Selected" Send="Create"/>
-        <On Terms="AbilMorph.*.Start; MorphTo AP_Liberator" Send="Destroy"/>
-        <On Terms="AbilMorph.*.Start; MorphTo AP_MercLiberator" Send="Destroy"/>
-        <On Terms="Upgrade.AP_Liberator360DegreeSensorArray.Add; ValidateUnit AP_IsAPLiberatorAGOrMerc; Selected" Send="Create"/>
-        <On Terms="Upgrade.AP_Liberator360DegreeSensorArray.Remove" Send="Destroy"/>
-        <Weapon value="AP_LiberatorAGWeapon"/>
-    </CActorRange>
     <CActorMissile id="AP_ContaminateMissile" parent="GenericAttackMissile" unitName="AP_ContaminateWeapon">
         <Model value="ContaminateWeapon"/>
     </CActorMissile>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index 03bc40c5a..b83013e94 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -685,6 +685,13 @@
             <VitalMaxArray index="Energy" value="-100"/>
         </Modification>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_LiberatorGuerillaMissilesDebuff">
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <Duration value="8"/>
+        <Modification MoveSpeedMultiplier="0.70" AttackSpeedMultiplier="0.85"/>
+        <InfoIcon value="Assets\Textures\btn-upgrade-terran-nova-hellfiremissiles.dds"/>
+        <Alignment value="Negative"/>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_AutoTurretTimedLife" parent="TimedLife">
         <EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
         <DisplayDuration index="Enemy" value="1"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 7fdab5fdd..f1f3129b2 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -5321,9 +5321,9 @@
     <CButton id="AP_MedivacRapidReignitionSystem">
         <Icon value="Assets\Textures\btn-upgrade-terran-highcapacityfueltanks.dds"/>
     </CButton>
-    <CButton id="AP_Liberator360DegreeSensorArray">
-        <Icon value="Assets\Textures\btn-upgrade-tychus-detection.dds"/>
-        <AlertIcon value="Assets\Textures\btn-upgrade-tychus-detection.dds"/>
+    <CButton id="AP_LiberatorGuerillaMissiles">
+        <Icon value="Assets\Textures\btn-upgrade-terran-nova-hellfiremissiles.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-terran-nova-hellfiremissiles.dds"/>
     </CButton>
     <CButton id="AP_DefilerSCBWImprovedCastRange">
         <Icon value="Assets\Textures\btn-upgrade-zagara-increasebilelauncherrange.dds"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index e4840cc3c..deea221b0 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -2232,19 +2232,18 @@
         <AmmoUnit value="AP_LiberatorAGMissile"/>
     </CEffectLaunchMissile>
     <CEffectSet id="AP_LiberatorAGMissileLMSet">
-        <ValidatorArray value="AP_LiberatorAGTargetsCombine"/>
+        <ValidatorArray value="AP_LiberatorAGTargets"/>
         <EditorCategories value="Race:Terran"/>
         <EffectArray value="AP_LiberatorAGMissileLM"/>
     </CEffectSet>
     <CEffectLaunchMissile id="AP_LiberatorDamageMissileLM">
         <EditorCategories value="Race:Terran"/>
         <LaunchLocation Value="CasterUnit"/>
-        <ImpactEffect value="AP_LiberatorMissileDamage"/>
+        <ImpactEffect value="AP_LiberatorMissileImpact_Set"/>
         <AmmoUnit value="AP_LiberatorDamageMissile"/>
     </CEffectLaunchMissile>
     <CEffectCreatePersistent id="AP_LiberatorInterruptedMorphDelayPersistent">
         <EditorCategories value="Race:Terran"/>
-        <ValidatorArray value="AP_NotHaveLiberator360DegreeSensorArray"/>
         <ExpireEffect value="AP_LiberatorTargetAAMorphOrderSet"/>
         <PeriodCount value="1"/>
         <PeriodicPeriodArray value="0.125"/>
@@ -2259,6 +2258,11 @@
         <PeriodicEffectArray value="AP_LiberatorDamageMissileLM"/>
         <PeriodicPeriodArray value="0.05"/>
     </CEffectCreatePersistent>
+    <CEffectSet id="AP_LiberatorMissileImpact_Set">
+        <EditorCategories value="Race:Terran"/>
+        <EffectArray value="AP_LiberatorMissileDamage"/>
+        <EffectArray value=""/>
+    </CEffectSet>
     <CEffectDamage id="AP_LiberatorMissileDamage" parent="DU_WEAP_MISSILE">
         <EditorCategories value="Race:Terran"/>
         <LaunchLocation Value="SourceUnitOrPoint"/>
@@ -2274,7 +2278,7 @@
         <AreaArray/>
     </CEffectEnumArea>
     <CEffectLaunchMissile id="AP_LiberatorMissileLM">
-        <ValidatorArray index="0" value="AP_LiberatorAGTargetsCombine"/>
+        <ValidatorArray index="0" value="AP_LiberatorAGTargets"/>
         <EditorCategories value="Race:Terran"/>
         <LaunchLocation Value="CasterUnit"/>
         <ImpactEffect value="AP_LiberatorMissileDummy"/>
@@ -2285,10 +2289,19 @@
         <WhichLocation Value="TargetUnit"/>
         <Flags index="Channeled" value="1"/>
         <InitialEffect value="AP_LiberatorMissileBurstPersistent"/>
-        <FinalEffect value="AP_LiberatorMissileDamage"/>
+        <FinalEffect value="AP_LiberatorMissileImpact_Set"/>
         <PeriodCount value="1"/>
         <PeriodicPeriodArray value="0.75"/>
     </CEffectCreatePersistent>
+    <CEffectApplyBehavior id="AP_LiberatorGuerillaMissiles_AB">
+        <EditorCategories value="Race:Terran"/>
+        <Behavior value="AP_LiberatorGuerillaMissilesDebuff"/>
+    </CEffectApplyBehavior>
+    <CEffectEnumArea id="AP_LiberatorGuerillaMissiles_Search">
+        <EditorCategories value="Race:Terran"/>
+        <SearchFilters value="Air;Player,Ally,Neutral,Structure,Missile,Stasis,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1.5" Effect="AP_LiberatorGuerillaMissiles_AB"/>
+    </CEffectEnumArea>
     <CEffectDamage id="AP_MercLiberatorAGDamage" parent="DU_WEAP">
         <EditorCategories value="Race:Terran"/>
         <ImpactLocation Value="TargetUnit"/>
@@ -2308,14 +2321,14 @@
         <AmmoUnit value="AP_LiberatorAGMissile"/>
     </CEffectLaunchMissile>
     <CEffectSet id="AP_MercLiberatorAGMissileLMSet">
-        <ValidatorArray value="AP_LiberatorAGTargetsCombine"/>
+        <ValidatorArray value="AP_LiberatorAGTargets"/>
         <EditorCategories value="Race:Terran"/>
         <EffectArray value="AP_MercLiberatorAGMissileLM"/>
     </CEffectSet>
     <CEffectLaunchMissile id="AP_MercLiberatorDamageMissileLM">
         <EditorCategories value="Race:Terran"/>
         <LaunchLocation Value="CasterUnit"/>
-        <ImpactEffect value="AP_MercLiberatorMissileDamage"/>
+        <ImpactEffect value="AP_MercLiberatorMissileImpact_Set"/>
         <AmmoUnit value="AP_LiberatorDamageMissile"/>
     </CEffectLaunchMissile>
     <CEffectCreatePersistent id="AP_MercLiberatorMissileBurstPersistent">
@@ -2328,6 +2341,11 @@
         <PeriodicEffectArray value="AP_MercLiberatorDamageMissileLM"/>
         <PeriodicPeriodArray value="0.05"/>
     </CEffectCreatePersistent>
+    <CEffectSet id="AP_MercLiberatorMissileImpact_Set">
+        <EditorCategories value="Race:Terran"/>
+        <EffectArray value="AP_MercLiberatorMissileDamage"/>
+        <EffectArray value=""/>
+    </CEffectSet>
     <CEffectDamage id="AP_MercLiberatorMissileDamage" parent="DU_WEAP_MISSILE">
         <EditorCategories value="Race:Terran"/>
         <LaunchLocation Value="SourceUnitOrPoint"/>
@@ -2343,7 +2361,7 @@
         <AreaArray/>
     </CEffectEnumArea>
     <CEffectLaunchMissile id="AP_MercLiberatorMissileLM">
-        <ValidatorArray index="0" value="AP_LiberatorAGTargetsCombine"/>
+        <ValidatorArray index="0" value="AP_LiberatorAGTargets"/>
         <EditorCategories value="Race:Terran"/>
         <LaunchLocation Value="CasterUnit"/>
         <ImpactEffect value="AP_MercLiberatorMissileDummy"/>
@@ -2354,7 +2372,7 @@
         <WhichLocation Value="TargetUnit"/>
         <Flags index="Channeled" value="1"/>
         <InitialEffect value="AP_MercLiberatorMissileBurstPersistent"/>
-        <FinalEffect value="AP_MercLiberatorMissileDamage"/>
+        <FinalEffect value="AP_MercLiberatorMissileImpact_Set"/>
         <PeriodCount value="1"/>
         <PeriodicPeriodArray value="0.75"/>
     </CEffectCreatePersistent>
@@ -2431,7 +2449,6 @@
     </CEffectModifyUnit>
     <CEffectCreatePersistent id="AP_MercLiberatorInterruptedMorphDelayPersistent">
         <EditorCategories value="Race:Terran"/>
-        <ValidatorArray value="AP_NotHaveLiberator360DegreeSensorArray"/>
         <ExpireEffect value="AP_MercLiberatorTargetAAMorphOrderSet"/>
         <PeriodCount value="1"/>
         <PeriodicPeriodArray value="0.125"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
index 0daa0f807..7b26cbae3 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
@@ -13885,6 +13885,12 @@
         <ScaleMin value="1.200000,1.200000,1.200000"/>
     </CModel>
     <CModel id="AP_LiberatorPortrait_BlackOps" parent="Liberator_CovertOps_Collection_Portrait"/>
+    <CModel id="AP_LiberatorGuerillaMissilesDebuffDisplay" parent="PersistentSpellFX">
+        <Model value="Assets\Effects\Protoss\Fenix_Whirlwind\Fenix_Whirlwind.m3"/>
+        <EditorCategories value="Race:Zerg"/>
+        <ScaleMax value="0.400000,0.400000,1.200000"/>
+        <ScaleMin value="0.400000,0.400000,1.200000"/>
+    </CModel>
     <CModel id="AP_HHVikingAssault" parent="Unit" Race="Terran">
         <Occlusion value="Show"/>
         <SelectionRadius value="0.764400"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 60fa182e2..5d06737e9 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -3292,15 +3292,8 @@
     <CRequirement id="AP_HaveMedivacIncreaseSpeedBoost">
         <NodeArray index="Show" Link="AP_CountUpgradeMedivacIncreaseSpeedBoost"/>
     </CRequirement>
-    <CRequirement id="AP_HaveLiberator360DegreeSensorArray">
-        <NodeArray index="Show" Link="AP_CountUpgradeLiberator360DegreeSensorArray"/>
-    </CRequirement>
-    <CRequirement id="AP_HaveLiberator360DegreeSensorArrayNoDefenderMode">
-        <NodeArray index="Use" Link="AP_CountUpgradeNotPossibleDefenderModeCompleteOnly"/>
-        <NodeArray index="Show" Link="AP_CountUpgradeLiberator360DegreeSensorArray"/>
-    </CRequirement>
-    <CRequirement id="AP_NotHaveLiberator360DegreeSensorArray">
-        <NodeArray index="Show" Link="AP_NotCountUpgradeLiberator360DegreeSensorArray"/>
+    <CRequirement id="AP_HaveLiberatorGuerillaMissiles">
+        <NodeArray index="Show" Link="AP_CountUpgradeLiberatorGuerillaMissiles"/>
     </CRequirement>
     <CRequirement id="AP_HaveHERCGrapplePull">
         <NodeArray index="Show" Link="AP_CountUpgradeHERCGrapplePull"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 89bc7dfb6..bb0983731 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -440,7 +440,7 @@
         <Count Link="AP_PermanentCloakGhost" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradePersonalCloakingCompleteOnlyTechTreeCheat">
-        <Tooltip value="RequirementNode/Tooltip/CountUpgradePersonalCloakingCompleteOnly769360710"/>
+        <Tooltip value="RequirementNode/Tooltip/CountUpgradePersonalCloakingCompleteOnly"/>
         <Count Link="AP_PersonalCloaking" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
     <CRequirementNot id="AP_NotCountBehaviorGhostHoldFireBCompleteOnlyAtUnit">
@@ -5756,12 +5756,12 @@
         <Count Link="AP_MedivacIncreaseSpeedBoost" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
-    <CRequirementCountUpgrade id="AP_CountUpgradeLiberator360DegreeSensorArray">
-        <Count Link="AP_Liberator360DegreeSensorArray" State="CompleteOnly"/>
+    <CRequirementCountUpgrade id="AP_CountUpgradeLiberatorGuerillaMissiles">
+        <Count Link="AP_LiberatorGuerillaMissiles" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
-    <CRequirementNot id="AP_NotCountUpgradeLiberator360DegreeSensorArray">
-        <OperandArray index="0" value="AP_CountUpgradeLiberator360DegreeSensorArray"/>
+    <CRequirementNot id="AP_NotCountUpgradeLiberatorGuerillaMissiles">
+        <OperandArray index="0" value="AP_CountUpgradeLiberatorGuerillaMissiles"/>
     </CRequirementNot>
     <CRequirementCountUpgrade id="AP_CountUpgradeHERCGrapplePull">
         <Count Link="AP_HERCGrapplePull" State="CompleteOnly"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 715c38212..d862238e6 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -3299,7 +3299,6 @@
         <AbilArray Link="attack"/>
         <AbilArray Link="move"/>
         <AbilArray Link="AP_LiberatorMorphtoAG"/>
-        <AbilArray Link="AP_LiberatorMorhptoAGImproved"/>
         <AbilArray Link="AP_LiberatorAGTarget"/>
         <AbilArray Link="AP_LiberatorCloak"/>
         <WeaponArray Link="AP_LiberatorMissileLaunchers"/>
@@ -3311,12 +3310,11 @@
             <LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
             <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
             <LayoutButtons Face="AP_LiberatorAGMode" Type="AbilCmd" AbilCmd="AP_LiberatorAGTarget,0" Row="2" Column="0"/>
-            <LayoutButtons Face="AP_LiberatorAGMode" Type="AbilCmd" AbilCmd="AP_LiberatorMorhptoAGImproved,0" Row="2" Column="0"/>
             <LayoutButtons Face="AP_LiberatorAGRangeUpgrade" Type="Passive" Requirements="AP_HaveLiberatorRange" Row="1" Column="0"/>
             <LayoutButtons Face="AP_LiberatorStructureAttack" Type="Passive" Requirements="AP_HaveLiberatorSiegeProtocolNoDefenderMode" Row="1" Column="1"/>
             <LayoutButtons Face="AP_NovaMultiTaskMAFServos" Type="Passive" Requirements="AP_HaveMultiTaskMAFServosLiberator" Row="1" Column="2"/>
             <LayoutButtons Face="AP_LaserTargetingSystem" Type="Passive" Requirements="AP_HaveLaserTargetingSystemLiberator" Row="1" Column="3"/>
-            <LayoutButtons Face="AP_Liberator360DegreeSensorArray" Type="Passive" Requirements="AP_HaveLiberator360DegreeSensorArrayNoDefenderMode" Row="1" Column="4"/>
+            <LayoutButtons Face="AP_LiberatorGuerillaMissiles" Type="Passive" Requirements="AP_HaveLiberatorGuerillaMissiles" Row="1" Column="4"/>
             <LayoutButtons Face="AP_CloakOnLiberator" Type="AbilCmd" AbilCmd="AP_LiberatorCloak,On" Row="2" Column="2"/>
             <LayoutButtons Face="CloakOff" Type="AbilCmd" AbilCmd="AP_LiberatorCloak,Off" Row="2" Column="3"/>
         </CardLayouts>
@@ -3390,7 +3388,7 @@
             <LayoutButtons Face="AP_LiberatorStructureAttack" Type="Passive" Requirements="AP_HaveLiberatorSiegeProtocol" Row="1" Column="1"/>
             <LayoutButtons Face="AP_NovaMultiTaskMAFServos" Type="Passive" Requirements="AP_HaveMultiTaskMAFServosLiberator" Row="1" Column="2"/>
             <LayoutButtons Face="AP_LaserTargetingSystem" Type="Passive" Requirements="AP_HaveLaserTargetingSystemLiberator" Row="1" Column="3"/>
-            <LayoutButtons Face="AP_Liberator360DegreeSensorArray" Type="Passive" Requirements="AP_HaveLiberator360DegreeSensorArray" Row="1" Column="4"/>
+            <LayoutButtons Face="AP_LiberatorGuerillaMissiles" Type="Passive" Requirements="AP_HaveLiberatorGuerillaMissiles" Row="1" Column="4"/>
             <LayoutButtons Face="AP_CloakOnLiberator" Type="AbilCmd" AbilCmd="AP_LiberatorCloak,On" Row="2" Column="2"/>
             <LayoutButtons Face="CloakOff" Type="AbilCmd" AbilCmd="AP_LiberatorCloak,Off" Row="2" Column="3"/>
         </CardLayouts>
@@ -3414,13 +3412,11 @@
         <LifeStart value="250"/>
         <LifeMax value="250"/>
         <AbilArray index="3" Link="AP_MercLiberatorMorphtoAG"/>
-        <AbilArray index="4" Link="AP_MercLiberatorMorhptoAGImproved"/>
         <AbilArray index="5" Link="AP_MercLiberatorAGTarget"/>
         <WeaponArray index="0" Link="AP_MercLiberatorMissileLaunchers"/>
         <WeaponArray index="1" Turret="AP_MercLiberator"/>
         <CardLayouts index="0">
             <LayoutButtons index="5" Face="AP_MercLiberatorAGMode" Type="AbilCmd" AbilCmd="AP_MercLiberatorAGTarget,0" Row="2" Column="0"/>
-            <LayoutButtons index="6" Face="AP_MercLiberatorAGMode" Type="AbilCmd" AbilCmd="AP_MercLiberatorMorhptoAGImproved,0" Row="2" Column="0"/>
         </CardLayouts>
         <Description value="Button/Tooltip/AP_MercLiberator"/>
     </CUnit>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 3cc9255ee..2b9992df2 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -5899,12 +5899,6 @@
         <EffectArray Operation="Divide" Reference="Abil,AP_LiberatorMorphtoAG,InfoArray[0].SectionArray[Facing].DurationArray[Duration]" Value="4.000000"/>
         <EffectArray Operation="Divide" Reference="Abil,AP_LiberatorMorphtoAG,InfoArray[0].SectionArray[Stats].DurationArray[Delay]" Value="4.000000"/>
         <EffectArray Operation="Divide" Reference="Abil,AP_LiberatorMorphtoAG,InfoArray[0].SectionArray[Stats].DurationArray[Duration]" Value="4.000000"/>
-        <EffectArray Operation="Divide" Reference="Abil,AP_LiberatorMorhptoAGImproved,InfoArray[0].SectionArray[Abils].DurationArray[Delay]" Value="4.000000"/>
-        <EffectArray Operation="Divide" Reference="Abil,AP_LiberatorMorhptoAGImproved,InfoArray[0].SectionArray[Actor].DurationArray[Delay]" Value="4.000000"/>
-        <EffectArray Operation="Divide" Reference="Abil,AP_LiberatorMorhptoAGImproved,InfoArray[0].SectionArray[Actor].DurationArray[Duration]" Value="4.000000"/>
-        <EffectArray Operation="Divide" Reference="Abil,AP_LiberatorMorhptoAGImproved,InfoArray[0].SectionArray[Facing].DurationArray[Duration]" Value="4.000000"/>
-        <EffectArray Operation="Divide" Reference="Abil,AP_LiberatorMorhptoAGImproved,InfoArray[0].SectionArray[Stats].DurationArray[Delay]" Value="4.000000"/>
-        <EffectArray Operation="Divide" Reference="Abil,AP_LiberatorMorhptoAGImproved,InfoArray[0].SectionArray[Stats].DurationArray[Duration]" Value="4.000000"/>
         <EffectArray Operation="Divide" Reference="Effect,AP_LiberatorTargetMorphDelayPersistent,PeriodicPeriodArray[0]" Value="4.000000"/>
         <EffectArray Operation="Divide" Reference="Abil,AP_MercLiberatorMorphtoAA,InfoArray[0].SectionArray[Abils].DurationArray[Delay]" Value="4.000000"/>
         <EffectArray Operation="Divide" Reference="Abil,AP_MercLiberatorMorphtoAA,InfoArray[0].SectionArray[Actor].DurationArray[Delay]" Value="4.000000"/>
@@ -5918,12 +5912,6 @@
         <EffectArray Operation="Divide" Reference="Abil,AP_MercLiberatorMorphtoAG,InfoArray[0].SectionArray[Facing].DurationArray[Duration]" Value="4.000000"/>
         <EffectArray Operation="Divide" Reference="Abil,AP_MercLiberatorMorphtoAG,InfoArray[0].SectionArray[Stats].DurationArray[Delay]" Value="4.000000"/>
         <EffectArray Operation="Divide" Reference="Abil,AP_MercLiberatorMorphtoAG,InfoArray[0].SectionArray[Stats].DurationArray[Duration]" Value="4.000000"/>
-        <EffectArray Operation="Divide" Reference="Abil,AP_MercLiberatorMorhptoAGImproved,InfoArray[0].SectionArray[Abils].DurationArray[Delay]" Value="4.000000"/>
-        <EffectArray Operation="Divide" Reference="Abil,AP_MercLiberatorMorhptoAGImproved,InfoArray[0].SectionArray[Actor].DurationArray[Delay]" Value="4.000000"/>
-        <EffectArray Operation="Divide" Reference="Abil,AP_MercLiberatorMorhptoAGImproved,InfoArray[0].SectionArray[Actor].DurationArray[Duration]" Value="4.000000"/>
-        <EffectArray Operation="Divide" Reference="Abil,AP_MercLiberatorMorhptoAGImproved,InfoArray[0].SectionArray[Facing].DurationArray[Duration]" Value="4.000000"/>
-        <EffectArray Operation="Divide" Reference="Abil,AP_MercLiberatorMorhptoAGImproved,InfoArray[0].SectionArray[Stats].DurationArray[Delay]" Value="4.000000"/>
-        <EffectArray Operation="Divide" Reference="Abil,AP_MercLiberatorMorhptoAGImproved,InfoArray[0].SectionArray[Stats].DurationArray[Duration]" Value="4.000000"/>
         <EffectArray Operation="Divide" Reference="Effect,AP_MercLiberatorTargetMorphDelayPersistent,PeriodicPeriodArray[0]" Value="4.000000"/>
         <EditorCategories value="Race:Terran,UpgradeType:Talents"/>
     </CUpgrade>
@@ -11915,11 +11903,11 @@
         <AffectedUnitArray value="AP_WidowMine"/>
         <AffectedUnitArray value="AP_WidowMineBurrowed"/>
     </CUpgrade>
-    <CUpgrade id="AP_Liberator360DegreeSensorArray">
+    <CUpgrade id="AP_LiberatorGuerillaMissiles">
+        <EffectArray Operation="Set" Reference="Effect,AP_LiberatorMissileImpact_Set,EffectArray[1]" Value="AP_LiberatorGuerillaMissiles_Search"/>
+        <EffectArray Operation="Set" Reference="Effect,AP_MercLiberatorMissileImpact_Set,EffectArray[1]" Value="AP_LiberatorGuerillaMissiles_Search"/>
         <AffectedUnitArray value="AP_Liberator"/>
-        <AffectedUnitArray value="AP_LiberatorAG"/>
         <AffectedUnitArray value="AP_MercLiberator"/>
-        <AffectedUnitArray value="AP_MercLiberatorAG"/>
     </CUpgrade>
     <CUpgrade id="AP_HERCGrapplePull"/>
     <CUpgrade id="AP_DefilerImprovedCastRange">
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
index b31a12926..d3694eebf 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -1289,11 +1289,6 @@
         <Behavior value="AP_LiberatorTargetMorphAGAttackable"/>
         <RequireCasterUnit Value="Caster"/>
     </CValidatorUnitCompareBehaviorCount>
-    <CValidatorCombine id="AP_LiberatorAGTargetsCombine">
-        <ResultFailed value="TargetIsOutOfRange"/>
-        <CombineArray value="AP_LiberatorAGTargets"/>
-        <CombineArray value="AP_HaveLiberator360DegreeSensorArray"/>
-    </CValidatorCombine>
     <CValidatorCombine id="AP_LiberatorMorphValidatorCombine">
         <Type value="And"/>
         <CombineArray value="CasterNotDead"/>
@@ -1303,7 +1298,6 @@
         <CombineArray value="AP_LiberatorNotRecallingMothershipCore"/>
         <CombineArray value="AP_IsNotArbiterRecalling"/>
         <CombineArray value="AP_LiberatorAGNotOutOfRange"/>
-        <CombineArray value="AP_NotHaveLiberator360DegreeSensorArray"/>
     </CValidatorCombine>
     <CValidatorUnitCompareBehaviorCount id="AP_LiberatorNotRecallingMothership">
         <WhichUnit Value="Caster"/>
@@ -5417,24 +5411,6 @@
         <Find value="1"/>
         <Value value="AP_HaveMedivacIncreaseSpeedBoost"/>
     </CValidatorPlayerRequirement>
-    <CValidatorPlayerRequirement id="AP_HaveLiberator360DegreeSensorArray">
-        <Find value="1"/>
-        <Value value="AP_HaveLiberator360DegreeSensorArray"/>
-    </CValidatorPlayerRequirement>
-    <CValidatorPlayerRequirement id="AP_NotHaveLiberator360DegreeSensorArray">
-        <Find value="1"/>
-        <Value value="AP_NotHaveLiberator360DegreeSensorArray"/>
-    </CValidatorPlayerRequirement>
-    <CValidatorUnitType id="AP_IsAPLiberatorAG">
-        <Value value="AP_LiberatorAG"/>
-    </CValidatorUnitType>
-    <CValidatorUnitType id="AP_IsAPMercLiberatorAG">
-        <Value value="AP_MercLiberatorAG"/>
-    </CValidatorUnitType>
-    <CValidatorCombine id="AP_IsAPLiberatorAGOrMerc">
-        <CombineArray value="AP_IsAPLiberatorAG"/>
-        <CombineArray value="AP_IsAPMercLiberatorAG"/>
-    </CValidatorCombine>
     <CValidatorUnitCompareField id="AP_UnitNotCollideWithColossus">
         <Field value="Collide[Land5]"/>
         <Value value="0"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml b/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml
index a4a6031dc..7d810959c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Preload.xml
@@ -22,9 +22,40 @@
 <Effect id="AP_SOASuperShieldApply"/>
 <Effect id="AP_SOAStrafeAttackDamage"/>
 <Effect id="AP_SOATimeFreezeVisual"/>
+<Model id="AP_TechReactor"/>
+<Model id="AP_Supplicant"/>
+<Model id="AP_ValkyrieSCBW"/>
+<Model id="AP_ValkyrieSCBW@Death"/>
+<Model id="AP_ValkyrieSCBW@Portrait"/>
+<Model id="AP_ValkyrieSCBWWeapon@Missile"/>
+<Model id="AP_Liberator_BlackOps"/>
+<Model id="AP_LiberatorAG_BlackOps"/>
+<Model id="AP_Liberator_BlackOps_Death"/>
+<Model id="AP_LiberatorPortrait_BlackOps"/>
+<Model id="AP_ThorCE"/>
 <Model id="AP_KerriganLevelUpPortrait"/>
 <Model id="AP_UI_SOA_ButtonActivate"/>
 <Model id="AP_SOA_Calldown_UI"/>
+<Model id="AP_MercCompound"/>
+<Model id="AP_MercCompoundBuild"/>
+<Model id="AP_MercCompoundDeath"/>
+<Model id="AP_MercCompoundPlacement"/>
+<Model id="AP_NovaHeroBase"/>
+<Model id="AP_NovaHeroBlinkSuit"/>
+<Model id="AP_NovaHeroJetpack"/>
+<Model id="AP_NovaHeroDeathWarpOutBase"/>
+<Model id="AP_NovaHeroDeathWarpOutJetpack"/>
+<Model id="AP_NovaWeaponCanisterRifleSnipeAttackBeam"/>
+<Model id="AP_NovaWeaponCanisterRifleSnipeAttackImpact"/>
+<Model id="AP_NovaWeaponCanisterRifleSnipeAttackLaunch"/>
+<Model id="AP_NovaGadgetFlashBangGrenadesWeapon"/>
+<Model id="AP_NovaGadgetPulseGrenadesAttackImpact"/>
+<Model id="AP_HighTemplarShakurasPsiStormImpact"/>
+<Model id="AP_HighTemplarShakurasPsiStormModel"/>
+<Model id="AP_LiberatorGuerillaMissilesDebuffDisplay"/>
+<Unit id="AP_ValkyrieSCBW"/>
+<Unit id="AP_Liberator"/>
+<Unit id="AP_LiberatorAG"/>
 <Unit id="AP_Supplicant"/>
 <Unit id="AP_KerriganReviveCocoon"/>
 <Unit id="AP_ZerglingRespawnControllerUnit"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt b/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
index 9466750b1..0bd09af2d 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
@@ -18417,7 +18417,7 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 id=AP_MedivacRapidReignitionSystem
 asset=Assets\Textures\btn-upgrade-terran-highcapacityfueltanks.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-id=AP_Liberator360DegreeSensorArray
+id=AP_LiberatorGuerillaMissiles
 asset=Assets\Textures\btn-upgrade-tychus-detection.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_DefilerSCBWImprovedCastRange
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 62fe8f1fb..4ac1ef284 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1146,10 +1146,10 @@ Button/Name/AP_Lair=Mutate into Lair
 Button/Name/AP_LaserTargetingSystem=Laser Targeting System
 Button/Name/AP_LegEnhancements=Leg Enhancements
 Button/Name/AP_Liberator=Build Liberator
-Button/Name/AP_Liberator360DegreeSensorArray=360° Sensor Array
 Button/Name/AP_LiberatorAAMode=Fighter Mode
 Button/Name/AP_LiberatorAGMode=Defender Mode
 Button/Name/AP_LiberatorAGRangeUpgrade=Advanced Ballistics
+Button/Name/AP_LiberatorGuerillaMissiles=Guerilla Missiles
 Button/Name/AP_LiberatorStructureAttack=Raid Artillery
 Button/Name/AP_LightningBomb=Disintegration
 Button/Name/AP_LockOn=Lock On
@@ -2191,11 +2191,11 @@ Button/Tooltip/AP_Larva=Morphs into Zerg units.
 Button/Tooltip/AP_LaserTargetingSystem=Increases vision by 2 and weapon range by 1.
 Button/Tooltip/AP_LegEnhancements=Increases movement speed.
 Button/Tooltip/AP_Liberator=Artillery fighter. Loaded with missiles that deal area damage to enemy air targets. Can switch into Defender Mode to provide siege support.<n/><n/><c val="#ColorAttackInfo">Can attack air units.</c>
-Button/Tooltip/AP_Liberator360DegreeSensorArray=Liberators in Defender Mode can attack any target within weapon range.
 Button/Tooltip/AP_LiberatorAAMode=Reverts to Fighter Mode. In this mode Liberators can move, but they can only attack air targets.
 Button/Tooltip/AP_LiberatorAG=Immobile defender. Deals heavy single target damage to ground units. Can switch into Fighter mode to provide air support.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 Button/Tooltip/AP_LiberatorAGMode=Deploys into Defender Mode. In this mode Liberators inflict single target damage to ground units. Liberators in this mode cannot move.
 Button/Tooltip/AP_LiberatorAGRangeUpgrade=Increases the range of Liberators in Defender Mode by 3.
+Button/Tooltip/AP_LiberatorGuerillaMissiles=Missiles fired by Liberators in Fighter Mode will apply a movement and attack speed debuff onto enemies. Effect lasts <d ref="Behavior,AP_LiberatorGuerillaMissilesDebuff,Duration"/> seconds.
 Button/Tooltip/AP_LiberatorStructureAttack=Liberators can attack structures while in Defender Mode.
 Button/Tooltip/AP_LightningBomb=Deals <d ref="Effect,AP_LightningBombDamage,Amount*Behavior,AP_LightningBomb,Duration/Behavior,AP_LightningBomb,Period"/> damage over <d ref="Behavior,AP_LightningBomb,Duration"/> seconds to target enemy unit or structure.
 Button/Tooltip/AP_LockOn=Locks the Cyclone's weapons on the target unit, dealing <d ref="Effect,AP_LockOnCP,PeriodCount*Effect,AP_CycloneWeaponDamage,Amount"/> damage over <d ref="Effect,AP_LockOnCP,PeriodCount * Effect,AP_LockOnCP,PeriodicPeriodArray[0]"/> seconds to ground and flying targets. Can move while firing. Cancels if target moves out of range.
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index af7b4c4be..d80ecca0f 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -465,7 +465,7 @@ void libABFE498B_gf_AP_Triggers_unlockTerranArmory6 (int lp_player, int lp_bitAr
         libABFE498B_gf_AP_Triggers_Terran_unlockMedivacRapidReignitionSystems, // 21
         libABFE498B_gf_AP_Triggers_Terran_unlockBattlecruiserBehemothReactor, //22
         libABFE498B_gf_AP_Triggers_Terran_unlockThorRapidReload, //23
-        libABFE498B_gf_AP_Triggers_Terran_unlockLiberator360DegreeSensorArray, //24
+        libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorGuerillaMissiles, //24
         libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineResourceEfficiency, //25
         libABFE498B_gf_AP_Triggers_Terran_unlockHERCGrapplePull, //26
         libABFE498B_gf_AP_Triggers_Terran_unlockCommandCenterScannerSweep, //27
@@ -3205,10 +3205,10 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorResourceEfficiency (int lp
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ResourceEfficiencyLiberator", 1);
 }
 
-void libABFE498B_gf_AP_Triggers_Terran_unlockLiberator360DegreeSensorArray (int lp_player) {
+void libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorGuerillaMissiles (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
-    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_Liberator360DegreeSensorArray", 1);
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_LiberatorGuerillaMissiles", 1);
 }
 
 void libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineDrillingClaws (int lp_player) {
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 72e1ec74e..461ea39d8 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -354,7 +354,7 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorSmartServos (int lp_player
 void libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorLaserTargetingSystem (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorOptimizedLogistics (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorResourceEfficiency (int lp_player);
-void libABFE498B_gf_AP_Triggers_Terran_unlockLiberator360DegreeSensorArray (int lp_player);
+void libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorGuerillaMissiles (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineDrillingClaws (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineConcealment (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineBlackMarketLaunchers (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 575c071ac..c87d36bbe 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -2535,7 +2535,7 @@
                     libABFE498B_gf_AP_Triggers_Terran_unlockMedivacRapidReignitionSystems, // 21
                     libABFE498B_gf_AP_Triggers_Terran_unlockBattlecruiserBehemothReactor, //22
                     libABFE498B_gf_AP_Triggers_Terran_unlockThorRapidReload, //23
-                    libABFE498B_gf_AP_Triggers_Terran_unlockLiberator360DegreeSensorArray, //24
+                    libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorGuerillaMissiles, //24
                     libABFE498B_gf_AP_Triggers_Terran_unlockWidowMineResourceEfficiency, //25
                     libABFE498B_gf_AP_Triggers_Terran_unlockHERCGrapplePull, //26
                     libABFE498B_gf_AP_Triggers_Terran_unlockCommandCenterScannerSweep, //27
@@ -22780,7 +22780,7 @@
         </Element>
         <Element Type="Param" Id="27111D82">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
-            <Value>AP_Liberator360DegreeSensorArray</Value>
+            <Value>AP_LiberatorGuerillaMissiles</Value>
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index f2c734925..db57fdebc 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -629,7 +629,7 @@ FunctionDef/Name/lib_ABFE498B_CEC91B58=AP_Triggers_Terran_unlockSiegeTankLaserTa
 FunctionDef/Name/lib_ABFE498B_CF57B3C3=AP_Triggers_Terran_unlockMarineOptimizedLogistics
 FunctionDef/Name/lib_ABFE498B_D08BB942=AP_Triggers_Zerg_AberrationMonstrousResilience
 FunctionDef/Name/lib_ABFE498B_D0FFDF93=AP_Triggers_Terran_unlockMedicAdaptiveMedpacks
-FunctionDef/Name/lib_ABFE498B_D133E010=AP_Triggers_Terran_unlockLiberator360DegreeSensorArray
+FunctionDef/Name/lib_ABFE498B_D133E010=AP_Triggers_Terran_unlockLiberatorGuerillaMissiles
 FunctionDef/Name/lib_ABFE498B_D1359197=AP_Triggers_Protoss_unlockAnnihilator
 FunctionDef/Name/lib_ABFE498B_D1655E1B=AP_Triggers_clearZergTech
 FunctionDef/Name/lib_ABFE498B_D18DCDB9=AP_Triggers_Protoss_unlockGroundWeapons