sc2: Added liberator guerilla missiles to replace 360 degree sensors

Ziktofel · Jun 16, 2024 · b7f9415 · b7f9415
1 parent eefe601
commit b7f9415
Show file tree

Hide file tree

Showing 18 changed files with 107 additions and 113 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -1501,15 +1501,15 @@
         <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"/>
         <EditorCategories value="AbilityorEffectType:Units"/>
         <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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>