From 4c303f33d6ca8110d28ec67d64d0666fbd4d5db0 Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 11 Aug 2024 16:15:50 -0700
Subject: [PATCH 01/10] sc2: Adding ascendant war council upgrade -- ability
 efficiency

---
 .../Base.SC2Data/GameData/AbilData.xml                        | 4 ++--
 .../Base.SC2Data/GameData/ButtonData.xml                      | 4 ++++
 .../Base.SC2Data/GameData/RequirementData.xml                 | 4 ++++
 .../Base.SC2Data/GameData/RequirementNodeData.xml             | 4 ++++
 .../Base.SC2Data/GameData/UnitData.xml                        | 1 +
 .../Base.SC2Data/GameData/UpgradeData.xml                     | 4 ++++
 .../enUS.SC2Data/LocalizedData/GameStrings.txt                | 3 +++
 7 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 08756f7de..aa07ccaa6 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -9138,7 +9138,7 @@
         <EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
         <Effect index="0" value="AP_VoidHighTemplarMindBlastDamage"/>
         <Cost>
-            <Vital index="Energy" value="100"/>
+            <Vital index="Energy" value="125"/>
             <Cooldown TimeUse="8"/>
         </Cost>
         <TargetFilters value="Visible;Player,Ally,Structure,Missile,Stasis,Dead,Invulnerable"/>
@@ -9150,7 +9150,7 @@
         <EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
         <Effect index="0" value="AP_VoidHighTemplarPsiOrbInitialPersistent"/>
         <Cost>
-            <Vital index="Energy" value="50"/>
+            <Vital index="Energy" value="75"/>
             <Cooldown TimeUse="2"/>
         </Cost>
         <Range value="13"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index db5062516..6343732a9 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -5056,6 +5056,10 @@
         <Icon value="Assets\Textures\btn-upgrade-protoss-wrathwalker-chargetimeimproved.dds"/>
         <AlertIcon value="Assets\Textures\btn-upgrade-protoss-wrathwalker-chargetimeimproved.dds"/>
     </CButton>
+    <CButton id="AP_AscendantAbilityEfficiency">
+        <Icon value="Assets\Textures\btn-ability-stetmann-stetelliteoverloadenergy.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-stetmann-stetelliteoverloadenergy.dds"/>
+    </CButton>
     <CButton id="AP_Hallucination">
         <Icon value="Assets\Textures\btn-ability-protoss-hallucination-color.dds"/>
         <AlertIcon value="Assets\Textures\btn-ability-protoss-hallucination-color.dds"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index a719b083e..7a860c631 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -3134,6 +3134,10 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeBloodAmuletCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveAscendantAbilityEfficiency">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeAscendantAbilityEfficiencyCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveSentryHallucination">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeSentryHallucinationCompleteOnly"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index b83c1de6f..9c9f41f4a 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5523,6 +5523,10 @@
         <Count Link="AP_BloodAmulet" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeAscendantAbilityEfficiencyCompleteOnly">
+        <Count Link="AP_AscendantAbilityEfficiency" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeSentryHallucinationCompleteOnly">
         <Count Link="AP_SentryHallucination" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 1dc6ed123..942491360 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -14374,6 +14374,7 @@
             <LayoutButtons Face="AP_AlarakHighTemplarImprovedSacrifice" Type="AbilCmd" AbilCmd="AP_AscendantSacrificeInstant,0" Row="1" Column="0"/>
             <LayoutButtons Face="AP_ResearchAlarakHighTemplarPsionicOrbTravelDistancePassive" Type="Passive" Requirements="AP_HaveAlarakHighTemplarPsionicOrbTravelDistance" Row="1" Column="1"/>
             <LayoutButtons Face="AP_BloodAmulet" Type="Passive" Requirements="AP_HaveBloodAmulet" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_AscendantAbilityEfficiency" Type="Passive" Requirements="AP_HaveAscendantAbilityEfficiency" Row="1" Column="3"/>
         </CardLayouts>
         <Radius value="0.375"/>
         <SeparationRadius value="0.375"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 34042a985..1ca31d206 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -11773,6 +11773,10 @@
         <EffectArray Reference="Unit,AP_HighTemplarTaldarim,EnergyStart" Value="150"/>
         <EffectArray Reference="Unit,AP_HighTemplarTaldarim,EnergyMax" Value="50"/>
     </CUpgrade>
+    <CUpgrade id="AP_AscendantAbilityEfficiency">
+        <EffectArray Operation="Subtract" Reference="Abil,AP_VoidHighTemplarMindBlast,Cost[0].Vital[Energy]" Value="25"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_VoidHighTemplarPsiOrb,Cost[0].Vital[Energy]" Value="25"/>
+    </CUpgrade>
     <CUpgrade id="AP_SentryHallucination"/>
     <CUpgrade id="AP_SentryForceField"/>
     <CUpgrade id="AP_AlarakHavocAbilityRange">
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 342fbbe3d..70ad7978c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -848,6 +848,7 @@ Button/Name/AP_ArgusTalisman=Argus Talisman
 Button/Name/AP_ArmorpiercingMode=High Impact Payload
 Button/Name/AP_Armory=Build Armory
 Button/Name/AP_AscendantSacrifice=Sacrifice
+Button/Name/AP_AscendantAbilityEfficiency=Ability Efficiency
 Button/Name/AP_Assimilator=Warp In Assimilator
 Button/Name/AP_AttackChampions=Attack
 Button/Name/AP_AutomatedAssimilator=Orbital Assimilator
@@ -1917,6 +1918,7 @@ Button/Tooltip/AP_ArgusTalisman=Increases starting energy by 150 and maximum ene
 Button/Tooltip/AP_ArmorpiercingMode=Activates the Thor's 250mm Punisher Cannons. Punisher cannons strike a single air target for heavy damage.
 Button/Tooltip/AP_Armory=Contains weapon and armor upgrades for Factory and Starport structures. <n/><n/><c val="ffff8a">Enables:</c><n/>- Thors at the Factory
 Button/Tooltip/AP_AscendantSacrifice=Reduces target friendly unit to <d ref="Effect,AP_AscendantSacrificeDamage,Amount"/> life (shields are not affected).<n/><n/>Grants the Ascendant <d ref="Effect,AP_AscendantSacrificeDamage5,LeechFraction[Energy]"/> energy for each life point reduced, up to its maximum energy.<n/><n/><c val="#ColorAttackInfo">Can only target friendly units.</c>
+Button/Tooltip/AP_AscendantAbilityEfficiency=Ascendant abilities cost <d ref="Upgrade,AP_AscendantAbilityEfficiency,EffectArray[0].Value"/> less energy.
 Button/Tooltip/AP_Assimilator=Warped in over a Vespene Geyser to allow harvesting of vespene gas.
 Button/Tooltip/AP_AssimilatorRich=Warped in over a Vespene Geyser to allow harvesting of vespene gas.
 Button/Tooltip/AP_AttackChampions=Orders selected units to move to the target point, fighting nearby enemies along the way. Targeting a unit with the Attack command orders that it be attacked until it is destroyed.
@@ -4725,6 +4727,7 @@ RequirementNode/Tooltip/AP_CountUnitLurkerDenCompleteOnlyTechTreeCheat=Mutate Hy
 RequirementNode/Tooltip/AP_CountUnitNukeCompleteOnly=Build Nuke at the Shadow Ops
 RequirementNode/Tooltip/AP_CountUpgradeAdeptDisruptiveTransferCompleteOnly=Find Disruptive Transfer (Adept)
 RequirementNode/Tooltip/AP_CountUpgradeAnnihilatorAerialTrackingCompleteOnly=Find Aerial Tracking (Annihilator)
+RequirementNode/Tooltip/AP_CountUpgradeAscendantAbilityEfficiencyCompleteOnly=Find Ability Efficiency (Ascendant)
 RequirementNode/Tooltip/AP_CountUpgradeAvengerCloakCompleteOnly=Find Kryhas Cloak (Avenger)
 RequirementNode/Tooltip/AP_CountUpgradeBloodHunterBrutalEfficiencyCompleteOnly=Find Brutal Efficiency (Blood Hunter)
 RequirementNode/Tooltip/AP_CountUpgradeColossusFireLanceCompleteOnly=Find Fire Lance (Colossus)

From fbe4a4d503948c4d214fcca9eee47334502e1e22 Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 11 Aug 2024 16:29:30 -0700
Subject: [PATCH 02/10] sc2: Adding Arbiter War Council upgrade -- Ability
 Efficiency

---
 .../Base.SC2Data/GameData/AbilData.xml                       | 4 ++--
 .../Base.SC2Data/GameData/ButtonData.xml                     | 4 ++++
 .../Base.SC2Data/GameData/RequirementData.xml                | 4 ++++
 .../Base.SC2Data/GameData/RequirementNodeData.xml            | 4 ++++
 .../Base.SC2Data/GameData/UnitData.xml                       | 1 +
 .../Base.SC2Data/GameData/UpgradeData.xml                    | 5 +++++
 .../enUS.SC2Data/LocalizedData/GameStrings.txt               | 3 +++
 7 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index aa07ccaa6..c697c93e5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -2831,7 +2831,7 @@
         <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
         <Effect index="0" value="AP_ArbiterMPRecallSearch"/>
         <Cost>
-            <Vital index="Energy" value="100"/>
+            <Vital index="Energy" value="150"/>
             <Charge Link=""/>
             <Cooldown Link=""/>
         </Cost>
@@ -2846,7 +2846,7 @@
         <Effect index="0" value="AP_ArbiterMPStasisFieldSearch"/>
         <Flags index="AllowMovement" value="1"/>
         <Cost>
-            <Vital index="Energy" value="50"/>
+            <Vital index="Energy" value="150"/>
         </Cost>
         <Range value="9"/>
         <CursorEffect value="AP_ArbiterMPStasisFieldSearch"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 6343732a9..48cffa4c6 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -2638,6 +2638,10 @@
         <Icon value="Assets\Textures\btn-ability-protoss-stasisfield.dds"/>
         <AlertIcon value="Assets\Textures\btn-ability-protoss-stasisfield.dds"/>
     </CButton>
+    <CButton id="AP_ArbiterAbilityEfficiency">
+        <Icon value="Assets\Textures\btn-ability-stetmann-stetelliteoverloadenergy.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-stetmann-stetelliteoverloadenergy.dds"/>
+    </CButton>
     <CButton id="AP_CorsairMPDisruptionWeb">
         <Icon value="Assets\Textures\btn-ability-protoss-disruptionweb.dds"/>
         <AlertIcon value="Assets\Textures\btn-ability-protoss-disruptionweb.dds"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 7a860c631..6ecbde782 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -2915,6 +2915,10 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeArbiterCloakFieldRangeCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveArbiterAbilityEfficiency">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeArbiterAbilityEfficiencyCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveGraviticDrive">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeGraviticDriveCompleteOnly"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 9c9f41f4a..957a1b088 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5308,6 +5308,10 @@
         <Count Link="AP_ArbiterCloakFieldRange" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeArbiterAbilityEfficiencyCompleteOnly">
+        <Count Link="AP_ArbiterAbilityEfficiency" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeGraviticDriveCompleteOnly">
         <Count Link="AP_GraviticDrive" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 942491360..43ce99c97 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -15415,6 +15415,7 @@
             <LayoutButtons Face="AP_ArbiterEnergyUpgrade" Type="Passive" Requirements="AP_HaveArbiterEnergyUpgrade" Row="1" Column="1"/>
             <LayoutButtons Face="AP_ArbiterSustainingStasisField" Type="Passive" Requirements="AP_HaveArbiterSustainingStasisField" Row="1" Column="2"/>
             <LayoutButtons Face="AP_ArbiterEnhancedCloakingField" Type="Passive" Requirements="AP_HaveArbiterCloakFieldRange" Row="1" Column="3"/>
+            <LayoutButtons Face="AP_ArbiterAbilityEfficiency" Type="Passive" Requirements="AP_HaveArbiterAbilityEfficiency" Row="1" Column="4"/>
         </CardLayouts>
         <Radius value="1"/>
         <SeparationRadius value="1"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 1ca31d206..f71ecf42e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -11504,6 +11504,11 @@
         <EffectArray Reference="Actor,AP_ArbiterMPCloakingFieldRange,Range" Value="1"/>
         <AffectedUnitArray value="AP_ArbiterMP"/>
     </CUpgrade>
+    <CUpgrade id="AP_ArbiterAbilityEfficiency">
+        <EffectArray Operation="Subtract" Reference="Abil,AP_ArbiterMPRecall,Cost[0].Vital[Energy]" Value="50"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_ArbiterMPStasisField,Cost[0].Vital[Energy]" Value="100"/>
+        <AffectedUnitArray value="AP_ArbiterMP"/>
+    </CUpgrade>
     <CUpgrade id="AP_NotPossibleTransportMode"/>
     <CUpgrade id="AP_WarpPrismPhaseBlaster">
         <EffectArray Operation="Subtract" Reference="Weapon,AP_WarpPrismTaldarimWeapon,Options[Disabled]" Value="1"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 70ad7978c..bd7002e42 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -834,6 +834,7 @@ Button/Name/AP_AnnihilatorAerialTracking=Aerial Tracking
 Button/Name/AP_Apocalypse=Apocalypse
 Button/Name/AP_ApolloCloakOnNova=Cloak
 Button/Name/AP_Arbiter=Warp in Arbiter
+Button/Name/AP_ArbiterAbilityEfficiency=Ability Efficiency
 Button/Name/AP_ArbiterCloakField=Cloak Field
 Button/Name/AP_ArbiterEnergyUpgrade=Khaydarin Core
 Button/Name/AP_ArbiterEnhancedCloakingField=Enhanced Cloak Field
@@ -1903,6 +1904,7 @@ Button/Tooltip/AP_AnnihilatorAerialTracking=Allows Shadow Cannon to target air u
 Button/Tooltip/AP_Apocalypse=Deals <d ref="Effect,AP_ApocalypseDamage,Amount"/> damage to enemy units and <d ref="(Effect,AP_ApocalypseDamage,Amount) + (Effect,AP_ApocalypseDamage,AttributeBonus[Structure])"/> damage to enemy structures in a large area.
 Button/Tooltip/AP_ApolloCloakOnNova=Cloaks Nova for <d ref="Behavior,AP_NovaApolloCloak,Duration"/> seconds, preventing enemy units from seeing or attacking her. A cloaked unit will only be revealed by detectors or effects.
 Button/Tooltip/AP_Arbiter=Aiur Faction<n/>Army support craft. Has Stasis Field, Recall and Cloak Field abilities.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
+Button/Tooltip/AP_ArbiterAbilityEfficiency=Reduces the energy cost of Recall by <d ref="$UpgradeEffectArrayValue:AP_ArbiterAbilityEfficiency:Abil,AP_ArbiterMPRecall,Cost[0].Vital[Energy]$"/> and Stasis Field by <d ref="$UpgradeEffectArrayValue:AP_ArbiterAbilityEfficiency:Abil,AP_ArbiterMPStasisField,Cost[0].Vital[Energy]$"/>.
 Button/Tooltip/AP_ArbiterCloakField=Cloaks friendly units near the Arbiter.
 Button/Tooltip/AP_ArbiterEnergyUpgrade=Increases Arbiter's starting energy by 150 and maximum energy by 50.
 Button/Tooltip/AP_ArbiterEnhancedCloakingField=Increases Cloak Field range.
@@ -4727,6 +4729,7 @@ RequirementNode/Tooltip/AP_CountUnitLurkerDenCompleteOnlyTechTreeCheat=Mutate Hy
 RequirementNode/Tooltip/AP_CountUnitNukeCompleteOnly=Build Nuke at the Shadow Ops
 RequirementNode/Tooltip/AP_CountUpgradeAdeptDisruptiveTransferCompleteOnly=Find Disruptive Transfer (Adept)
 RequirementNode/Tooltip/AP_CountUpgradeAnnihilatorAerialTrackingCompleteOnly=Find Aerial Tracking (Annihilator)
+RequirementNode/Tooltip/AP_CountUpgradeArbiterAbilityEfficiencyCompleteOnly=Find Ability Efficiency (Arbiter)
 RequirementNode/Tooltip/AP_CountUpgradeAscendantAbilityEfficiencyCompleteOnly=Find Ability Efficiency (Ascendant)
 RequirementNode/Tooltip/AP_CountUpgradeAvengerCloakCompleteOnly=Find Kryhas Cloak (Avenger)
 RequirementNode/Tooltip/AP_CountUpgradeBloodHunterBrutalEfficiencyCompleteOnly=Find Brutal Efficiency (Blood Hunter)

From 625336113cb0708d0f330ee29e51fb13d2cdc83d Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 11 Aug 2024 16:44:29 -0700
Subject: [PATCH 03/10] sc2: Adding Skylord war council upgrade -- Hyperjump

---
 .../Base.SC2Data/GameData/AbilData.xml                       | 2 +-
 .../Base.SC2Data/GameData/RequirementData.xml                | 4 ++++
 .../Base.SC2Data/GameData/RequirementNodeData.xml            | 4 ++++
 .../Base.SC2Data/GameData/UpgradeData.xml                    | 1 +
 .../enUS.SC2Data/LocalizedData/GameStrings.txt               | 5 +++--
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index c697c93e5..6294db5b1 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -3538,7 +3538,7 @@
             <Cooldown TimeUse="120"/>
         </Cost>
         <Range value="500"/>
-        <CmdButtonArray index="Execute" DefaultButtonFace="AP_CarrierHyperjump"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_CarrierHyperjump" Requirements="AP_HaveSkylordHyperjump"/>
         <!--CmdButtonArray index="Execute" DefaultButtonFace="CarrierHyperjump" Requirements="HaveVoidCarrierHyperjump"/-->
         <CastIntroTime value="0"/>
         <CastOutroTime value="6"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 6ecbde782..f1ea63ba2 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -2899,6 +2899,10 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeCarrierStructuralIntegrityReinforcementsCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveSkylordHyperjump">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeSkylordHyperjumpCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveVoidRaySpeedUpgrade">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeVoidRaySpeedUpgradeCompleteOnly"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 957a1b088..73d582ecf 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5292,6 +5292,10 @@
         <Count Link="AP_CarrierStructuralIntegrityReinforcements" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeSkylordHyperjumpCompleteOnly">
+        <Count Link="AP_SkylordHyperjump" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeVoidRaySpeedUpgradeCompleteOnly">
         <Count Link="AP_VoidRaySpeedUpgrade" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index f71ecf42e..b6d015781 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -11451,6 +11451,7 @@
         <EffectArray Reference="Unit,AP_CarrierTaldarim,LifeArmor" Value="2"/>
         <EffectArray Reference="Unit,AP_CarrierPurifier,LifeArmor" Value="2"/>
     </CUpgrade>
+    <CUpgrade id="AP_SkylordHyperjump"/>
     <CUpgrade id="AP_VoidRaySpeedUpgrade">
         <ScoreAmount value="300"/>
         <ScoreResult value="BuildOrder"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index bd7002e42..345ad274f 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -916,7 +916,7 @@ Button/Name/AP_BurrowSwarmHost=Burrow
 Button/Name/AP_BurstCapacitors=Burst Capacitors
 Button/Name/AP_CalldownMULE=Calldown: MULE
 Button/Name/AP_CarrierAiur=Warp in Carrier
-Button/Name/AP_CarrierHyperjump=Tactical Jump
+Button/Name/AP_CarrierHyperjump=Hyperjump
 Button/Name/AP_CarrierPurifier=Warp in Purger
 Button/Name/AP_CarrierPurifierSolarBeam=Solar Beam
 Button/Name/AP_CarrierStructuralIntegrityReinforcements=Hull of Past Glories
@@ -2015,7 +2015,7 @@ Button/Tooltip/AP_CarrierPurifier=Purifier Faction<n/>Capital ship. Builds and l
 Button/Tooltip/AP_CarrierPurifierSolarBeam=The damage of Puger's Solar Beam increases the longer Puger remains on a single target.
 Button/Tooltip/AP_CarrierRepairDrone=Flying spy. Cloak renders the unit invisible to enemies without detection.<n/><n/><c val="FFE303">Detector</c>
 Button/Tooltip/AP_CarrierStructuralIntegrityReinforcements=Increases Carrier armor by 2.
-Button/Tooltip/AP_CarrierTaldarim=Tal'darim Faction<n/>Capital ship. Builds and launches Interceptors that attack enemy targets. Can use Tactical Jump ability.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
+Button/Tooltip/AP_CarrierTaldarim=Tal'darim Faction<n/>Capital ship. Fires a slow but powerful laser blast that damages enemies in a line.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
 Button/Tooltip/AP_CausticSpray=Emits a stream of acid that deals <d ref="Effect,AP_CausticSprayLevel1_Damage,Amount/Effect,AP_CausticSprayLevel1_Persistent,PeriodicPeriodArray[0]" precision="1"/> damage per second for <d ref="Effect,AP_CausticSprayLevel1_Persistent,PeriodCount*Effect,AP_CausticSprayLevel1_Persistent,PeriodicPeriodArray[0]" precision="1"/> seconds, then increases to <d ref="Effect,AP_CausticSprayLevel2_Damage,Amount/Effect,AP_CausticSprayLevel2_Persistent,PeriodicPeriodArray[0]" precision="1"/> damage per second.<n/><n/><c val="ffff8a">Channeled ability.</c><c val="#ColorAttackInfo"> Can only target enemy structures.</c>
 Button/Tooltip/AP_CentrifugalHooksUpgrade=Increases Baneling movement speed.
 Button/Tooltip/AP_CerberusMines=Increases blast radius and trigger radius by 33%.
@@ -4747,6 +4747,7 @@ RequirementNode/Tooltip/AP_CountUpgradeImmortalImprovedBarrierCompleteOnly=Find
 RequirementNode/Tooltip/AP_CountUpgradeMirageGravitonBeamCompleteOnly=Find Graviton Beam (Mirage)
 RequirementNode/Tooltip/AP_CountUpgradeReaverKhalaiReplicatorsCompleteOnly=Find Khalai Replicators (Reaver)
 RequirementNode/Tooltip/AP_CountUpgradeSkirmisherPeerContemptCompleteOnly=Find Peer Contempt (Skirmisher)
+RequirementNode/Tooltip/AP_CountUpgradeSkylordHyperjumpCompleteOnly=Find Hyperjump (Skylord)
 RequirementNode/Tooltip/AP_CountUpgradeSlayerBlinkCompleteOnly=Find Phase Blink (Slayer)
 RequirementNode/Tooltip/AP_CountUpgradeStalkerPhaseReactorCompleteOnly=Find Phase Reactor (Stalker)
 RequirementNode/Tooltip/AP_CountUpgradeStalwartDualityChargeCompleteOnly=Find Duality Charge (Stalwart)

From cff087b6bebc03bd51aa8cf283ae529c0089b7b3 Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 11 Aug 2024 17:31:23 -0700
Subject: [PATCH 04/10] sc2: Actor data updates for skylord

---
 .../Base.SC2Data/GameData/ActorData.xml             | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index 2558bf4a0..138e0a432 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -33974,12 +33974,17 @@
         <ModelFlags index="OutlineEmitter" value="1"/>
         <On Terms="Abil.AP_CarrierHangar.Launch" Send="AnimPlay Cover Cover 0 0.500000 0.500000 3.000000 AsDuration"/>
         <On Terms="UnitHeightUpdate.*.Land" Send="Create AP_Carrier_Land"/>
-        <On Terms="Abil.AP_CarrierHyperjump.SourceCastStart" Send="SetTintColor 0,192,255 6.000000 OneShot HyperjumpingTint"/>
-        <On Terms="Abil.AP_CarrierHyperjump.SourceFinishStart" Send="ClearTintColor 0.000000 HyperjumpingTint"/>
-        <On Terms="Abil.AP_CarrierHyperjump.SourceCastStart" Send="SetOpacity 0.100000 6.000000 HyperjumpingOpacity"/>
-        <On Terms="Abil.AP_CarrierHyperjump.SourceFinishStart" Send="ClearOpacity 0.000000 HyperjumpingOpacity"/>
+        <On Terms="Behavior.AP_HyperjumpTeleportOut.On" Send="SetTintColor 0,192,255 6.000000 OneShot HyperjumpingTint"/>
+        <On Terms="Behavior.AP_HyperjumpTeleportOut.On" Send="SetOpacity 0.100000 0.600000 HyperjumpingOpacity"/>
+        <On Terms="Behavior.AP_HyperjumpTeleport.On" Send="ClearTintColor 0.000000 HyperjumpingTint"/>
+        <On Terms="Behavior.AP_HyperjumpTeleport.On" Send="ClearOpacity 0.000000 HyperjumpingOpacity"/>
+        <On Terms="Behavior.AP_HyperjumpTeleport.On" Send="ModelSwap AP_CarrierTaldarimWarpInStargate"/>
+        <On Terms="Behavior.AP_HyperjumpTeleport.Off" Send="$Spell"/>
         <On Terms="Behavior.AP_HyperjumpTeleportOut.On" Send="Create AP_CarrierHyperjumpTeleportOut"/>
         <On Terms="Behavior.AP_HyperjumpTeleportIn.On" Send="Create AP_CarrierHyperjumpTeleportIn"/>
+        <On Terms="Behavior.WarpInEffect.On" Send="ModelSwap AP_CarrierTaldarimWarpInStargate"/>
+        <On Terms="Behavior.WarpInEffect.On" Send="$Spell"/>
+        <On Terms="AnimDone; AnimName Spell" Send="ModelSwap Carrier_Taldarim_Collection"/>
         <Baselines index="Walk" BlendIn="1.500000" BlendOut="2.000000"/>
         <PortraitModel value="Carrier_Taldarim_Collection_Portrait"/>
         <Model value="Carrier_Taldarim_Collection"/>

From e2f17ad29d79d13309f95c675081c0f1512f7beb Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 11 Aug 2024 17:41:12 -0700
Subject: [PATCH 05/10] sc2: Adding unlock triggers for ascendant, arbiter,
 skylord war council ups

---
 .../Base.SC2Data/LibABFE498B.galaxy           |  24 +++-
 .../Base.SC2Data/LibABFE498B_h.galaxy         |   3 +
 Mods/ArchipelagoTriggers.SC2Mod/Triggers      | 120 +++++++++++++++++-
 .../LocalizedData/TriggerStrings.txt          |   6 +
 4 files changed, 147 insertions(+), 6 deletions(-)

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index 873cd0a5b..8fb514d13 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1559,7 +1559,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil (int lp_player, int lp_b
         libABFE498B_gf_AP_Triggers_Protoss_unlockHavocEnduringSight, // 14
         libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarPlasmaSurge, // 15
         ap_triggers_PlayerConsumer_sig, // 16
-        ap_triggers_PlayerConsumer_sig, // 17
+        libABFE498B_gf_AP_Triggers_Protoss_unlockAscendantAbilityEfficiency, // 17
         libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonIndomitableWill, // 18
         libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalImprovedBarrier, // 19
         libABFE498B_gf_AP_Triggers_Protoss_unlockVanguardRapidfireCannon, // 20
@@ -1591,11 +1591,11 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil2 (int lp_player, int lp_
         ap_triggers_PlayerConsumer_sig, // 6
         ap_triggers_PlayerConsumer_sig, // 7
         ap_triggers_PlayerConsumer_sig, // 8
-        ap_triggers_PlayerConsumer_sig, // 9
+        libABFE498B_gf_AP_Triggers_Protoss_unlockSkylordHyperjump, // 9
         ap_triggers_PlayerConsumer_sig, // 10
         libABFE498B_gf_AP_Triggers_Protoss_unlockTempestDisintegration, // 11
         ap_triggers_PlayerConsumer_sig, // 12
-        ap_triggers_PlayerConsumer_sig, // 13
+        libABFE498B_gf_AP_Triggers_Protoss_unlockArbiterAbilityEfficiency, // 13
         ap_triggers_PlayerConsumer_sig, // 14
         ap_triggers_PlayerConsumer_sig, // 15
         ap_triggers_PlayerConsumer_sig, // 16
@@ -7195,6 +7195,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockArbiterEnhancedCloakField (int lp_
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ArbiterCloakFieldRange", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Protoss_unlockArbiterAbilityEfficiency (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ArbiterAbilityEfficiency", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierGravitonCatapult (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
@@ -7207,6 +7213,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierHullOfPastGlories (int lp_p
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CarrierStructuralIntegrityReinforcements", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Protoss_unlockSkylordHyperjump (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_SkylordHyperjump", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Protoss_unlockVoidRayFamilyFluxVanes (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
@@ -7556,6 +7568,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockAscendantBloodAmulet (int lp_playe
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_BloodAmulet", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Protoss_unlockAscendantAbilityEfficiency (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_AscendantAbilityEfficiency", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Protoss_unlockSentryFamilyCloakingModule (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 67fb75113..90803fdeb 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -734,8 +734,10 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockArbiterKhaydarinCore (int lp_playe
 void libABFE498B_gf_AP_Triggers_Protoss_unlockArbiterSpacetimeAnchor (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockArbiterResourceEfficiency (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockArbiterEnhancedCloakField (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockArbiterAbilityEfficiency (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierGravitonCatapult (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierHullOfPastGlories (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockSkylordHyperjump (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockVoidRayFamilyFluxVanes (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockVoidRayPrismaticRange (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerReforgedBloodshardCore (int lp_player);
@@ -786,6 +788,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonIndomitableWill (int lp_
 void libABFE498B_gf_AP_Triggers_Protoss_unlockAscendantPowerOverwhelming (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockAscendantPowerChaoticAttunement (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockAscendantBloodAmulet (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockAscendantAbilityEfficiency (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockSentryFamilyCloakingModule (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockSentryFamilyShieldBatteryRapidRecharging (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockSentryForceField (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 020e9bcad..8a47119eb 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -4566,7 +4566,7 @@
                     libABFE498B_gf_AP_Triggers_Protoss_unlockHavocEnduringSight, // 14
                     libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarPlasmaSurge, // 15
                     ap_triggers_PlayerConsumer_sig, // 16
-                    ap_triggers_PlayerConsumer_sig, // 17
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockAscendantAbilityEfficiency, // 17
                     libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonIndomitableWill, // 18
                     libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalImprovedBarrier, // 19
                     libABFE498B_gf_AP_Triggers_Protoss_unlockVanguardRapidfireCannon, // 20
@@ -4625,11 +4625,11 @@
                     ap_triggers_PlayerConsumer_sig, // 6
                     ap_triggers_PlayerConsumer_sig, // 7
                     ap_triggers_PlayerConsumer_sig, // 8
-                    ap_triggers_PlayerConsumer_sig, // 9
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockSkylordHyperjump, // 9
                     ap_triggers_PlayerConsumer_sig, // 10
                     libABFE498B_gf_AP_Triggers_Protoss_unlockTempestDisintegration, // 11
                     ap_triggers_PlayerConsumer_sig, // 12
-                    ap_triggers_PlayerConsumer_sig, // 13
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockArbiterAbilityEfficiency, // 13
                     ap_triggers_PlayerConsumer_sig, // 14
                     ap_triggers_PlayerConsumer_sig, // 15
                     ap_triggers_PlayerConsumer_sig, // 16
@@ -59360,8 +59360,10 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="EFBB1950"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="E73497C3"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="5AF3EE8E"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="78E25228"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="F9130E50"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="DF908E38"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="C80FAA1C"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="7CB9C2C8"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="ED995339"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="EDEC759C"/>
@@ -59412,6 +59414,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="1B25348F"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="3ECDB091"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="38AA59D6"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="06D32BAB"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="BD2B87FB"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="18C8A339"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="6C386B6C"/>
@@ -61023,6 +61026,43 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="78E25228">
+            <Identifier>AP_Triggers_Protoss_unlockArbiterAbilityEfficiency</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="457D5ED0"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="CEEF7B11"/>
+        </Element>
+        <Element Type="ParamDef" Id="457D5ED0">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="C5B2B229"/>
+        </Element>
+        <Element Type="Param" Id="C5B2B229">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="CEEF7B11">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="ED495679"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="9777B45F"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="E016949A"/>
+        </Element>
+        <Element Type="Param" Id="ED495679">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="457D5ED0"/>
+        </Element>
+        <Element Type="Param" Id="9777B45F">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_ArbiterAbilityEfficiency</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="E016949A">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="FunctionDef" Id="F9130E50">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="01EFC2D7"/>
@@ -61095,6 +61135,43 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="C80FAA1C">
+            <Identifier>AP_Triggers_Protoss_unlockSkylordHyperjump</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="0E2814E3"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="39AE0E63"/>
+        </Element>
+        <Element Type="ParamDef" Id="0E2814E3">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="D9CAF979"/>
+        </Element>
+        <Element Type="Param" Id="D9CAF979">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="39AE0E63">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="29FF03CD"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="FEDAC1F7"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="FA3A5311"/>
+        </Element>
+        <Element Type="Param" Id="29FF03CD">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="0E2814E3"/>
+        </Element>
+        <Element Type="Param" Id="FEDAC1F7">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_SkylordHyperjump</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="FA3A5311">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="FunctionDef" Id="7CB9C2C8">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="2BBA3562"/>
@@ -63444,6 +63521,43 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="06D32BAB">
+            <Identifier>AP_Triggers_Protoss_unlockAscendantAbilityEfficiency</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="E14FF809"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="55569709"/>
+        </Element>
+        <Element Type="ParamDef" Id="E14FF809">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="CBE6B78B"/>
+        </Element>
+        <Element Type="Param" Id="CBE6B78B">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="55569709">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="5489BF9F"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="755D3CC6"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="DF6B47F3"/>
+        </Element>
+        <Element Type="Param" Id="5489BF9F">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="E14FF809"/>
+        </Element>
+        <Element Type="Param" Id="755D3CC6">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_AscendantAbilityEfficiency</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="DF6B47F3">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="FunctionDef" Id="BD2B87FB">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="6C910343"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index bdff2ebfa..f53d60510 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -127,6 +127,7 @@ FunctionDef/Name/lib_ABFE498B_05CB2059=AP_Triggers_Terran_unlockMissileTurretHel
 FunctionDef/Name/lib_ABFE498B_064973BA=AP_Triggers_Zerg_CorruptorCorruption
 FunctionDef/Name/lib_ABFE498B_06BB6721=AP_Triggers_Terran_unlockThorProgressiveImmortalityProtocol
 FunctionDef/Name/lib_ABFE498B_06C27655=AP_Triggers_setKerriganPrimal
+FunctionDef/Name/lib_ABFE498B_06D32BAB=AP_Triggers_Protoss_unlockAscendantAbilityEfficiency
 FunctionDef/Name/lib_ABFE498B_06F89231=AP_Triggers_Protoss_unlockColossusFireLance
 FunctionDef/Name/lib_ABFE498B_07D98912=AP_Triggers_Protoss_unlockEnergizer
 FunctionDef/Name/lib_ABFE498B_08AE426A=AP_Triggers_Protoss_unlockImmortalFamilyDisruptorDispersion
@@ -446,6 +447,7 @@ FunctionDef/Name/lib_ABFE498B_78923B5D=AP_Triggers_Zerg_KerriganApocalypse
 FunctionDef/Name/lib_ABFE498B_78A5D20B=AP_Triggers_Zerg_DevourerPrescientSpores
 FunctionDef/Name/lib_ABFE498B_78AA8987=AP_Triggers_Protoss_unlockKhalaiIngenuity
 FunctionDef/Name/lib_ABFE498B_78B0DFD7=AP_Triggers_Zerg_unlockRoach
+FunctionDef/Name/lib_ABFE498B_78E25228=AP_Triggers_Protoss_unlockArbiterAbilityEfficiency
 FunctionDef/Name/lib_ABFE498B_799AE8F5=AP_Triggers_Terran_unlockWraithProgressiveTomahawkPowerCells
 FunctionDef/Name/lib_ABFE498B_79BB773A=AP_Triggers_Terran_unlockNovaNuke
 FunctionDef/Name/lib_ABFE498B_79C5CB9E=AP_Triggers_Zerg_BanelingSplitter
@@ -673,6 +675,7 @@ FunctionDef/Name/lib_ABFE498B_C74D3353=AP_Triggers_Terran_unlockThorLargeScaleFi
 FunctionDef/Name/lib_ABFE498B_C7916C42=AP_Triggers_Protoss_unlockScoutResourceEfficency
 FunctionDef/Name/lib_ABFE498B_C7C892FE=AP_Triggers_Terran_unlockReaperAdvancedCloakingField
 FunctionDef/Name/lib_ABFE498B_C7F40A37=AP_Triggers_Terran_unlockGoliathInternalTechModule
+FunctionDef/Name/lib_ABFE498B_C80FAA1C=AP_Triggers_Protoss_unlockSkylordHyperjump
 FunctionDef/Name/lib_ABFE498B_C84BAA15=AP_Triggers_Zerg_RoachAdaptivePlating
 FunctionDef/Name/lib_ABFE498B_C890813D=AP_Triggers_Terran_unlockRavenInternalTechModule
 FunctionDef/Name/lib_ABFE498B_C8B55BA9=AP_Triggers_Protoss_unlockSupplicantShieldRegeneration
@@ -888,6 +891,7 @@ ParamDef/Name/lib_ABFE498B_0BEEBA94=player
 ParamDef/Name/lib_ABFE498B_0C4763DB=player
 ParamDef/Name/lib_ABFE498B_0D5788FA=player
 ParamDef/Name/lib_ABFE498B_0DD1BD0F=player
+ParamDef/Name/lib_ABFE498B_0E2814E3=player
 ParamDef/Name/lib_ABFE498B_0F261626=player
 ParamDef/Name/lib_ABFE498B_0F39508B=player
 ParamDef/Name/lib_ABFE498B_0F8BCB0A=bitArrayValue
@@ -1070,6 +1074,7 @@ ParamDef/Name/lib_ABFE498B_451C4E77=player
 ParamDef/Name/lib_ABFE498B_452AABC9=player
 ParamDef/Name/lib_ABFE498B_4565F190=player
 ParamDef/Name/lib_ABFE498B_456F83C9=player
+ParamDef/Name/lib_ABFE498B_457D5ED0=player
 ParamDef/Name/lib_ABFE498B_462026A8=player
 ParamDef/Name/lib_ABFE498B_46ACE917=player
 ParamDef/Name/lib_ABFE498B_46C1897F=player
@@ -1569,6 +1574,7 @@ ParamDef/Name/lib_ABFE498B_E0D9067E=player
 ParamDef/Name/lib_ABFE498B_E0E985F2=player
 ParamDef/Name/lib_ABFE498B_E1253FFC=player
 ParamDef/Name/lib_ABFE498B_E138340F=player
+ParamDef/Name/lib_ABFE498B_E14FF809=player
 ParamDef/Name/lib_ABFE498B_E1BBB135=player
 ParamDef/Name/lib_ABFE498B_E20CBDED=player
 ParamDef/Name/lib_ABFE498B_E2A44B95=bitArrayValue

From e5508961853e16beff9ccc31d68659b245f9a0f6 Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 11 Aug 2024 18:39:10 -0700
Subject: [PATCH 06/10] sc2: Making spacetime anchor give an alternate stasis
 ability rather than modifying the old one

---
 .../Base.SC2Data/GameData/AbilData.xml        |  5 ++++
 .../Base.SC2Data/GameData/ActorData.xml       | 14 +++++++++
 .../Base.SC2Data/GameData/BehaviorData.xml    |  6 ++++
 .../Base.SC2Data/GameData/ButtonData.xml      |  6 ++--
 .../Base.SC2Data/GameData/EffectData.xml      | 30 +++++++++++++++++++
 .../Base.SC2Data/GameData/UnitData.xml        |  7 +++--
 .../Base.SC2Data/GameData/UpgradeData.xml     |  6 ++--
 .../LocalizedData/GameHotkeys.txt             |  1 +
 .../LocalizedData/GameStrings.txt             |  4 +--
 9 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 6294db5b1..918dd7022 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -2852,6 +2852,11 @@
         <CursorEffect value="AP_ArbiterMPStasisFieldSearch"/>
         <CmdButtonArray index="Execute" DefaultButtonFace="AP_ArbiterMPStasisField"/>
     </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_ArbiterMPEternalStasisField" parent="AP_ArbiterMPStasisField">
+        <Effect index="0" value="AP_ArbiterMPEternalStasisFieldSearch"/>
+        <CursorEffect value="AP_ArbiterMPEternalStasisFieldSearch"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_ArbiterEternalStasisField" Requirements="AP_HaveArbiterSustainingStasisField"/>
+    </CAbilEffectTarget>
     <CAbilEffectTarget id="AP_AdeptPhaseShift">
         <EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
         <Effect index="0" value="AP_AdeptPhaseShiftInitialSet"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index 138e0a432..8a75ea3c6 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -7101,6 +7101,7 @@
         <PlacementModel value="AP_ArbiterEX2Placement"/>
         <PortraitModel value="AP_ArbiterMPPortrait"/>
         <AbilSoundArray AbilCmd="AP_ArbiterMPStasisField,0" Sound="AP_Arbiter_StasisFieldVO"/>
+        <AbilSoundArray AbilCmd="AP_ArbiterMPEternalStasisField,0" Sound="AP_Arbiter_StasisFieldVO"/>
         <AbilSoundArray AbilCmd="AP_ArbiterMPRecall,0" Sound="AP_Arbiter_RecallVO"/>
         <BarOffset value="40"/>
         <BarWidth value="66"/>
@@ -7132,6 +7133,7 @@
     </CActorSound>
     <CActorModel id="AP_ArbiterMPCastModel" parent="ModelAnimationStyleOneShot">
         <On Terms="Effect.AP_ArbiterMPStasisFieldSearch.Start" Send="Create"/>
+        <On Terms="Effect.AP_ArbiterMPEternalStasisFieldSearch.Start" Send="Create"/>
     </CActorModel>
     <CActorRange id="AP_ArbiterMPCloakingFieldRange">
         <On Terms="SelectionLocalUpdate.AP_ArbiterMP.Start" Send="Create"/>
@@ -7181,10 +7183,14 @@
         <Inherits index="Scale" value="1"/>
         <EditorCategories value=""/>
         <On Terms="Behavior.AP_ArbiterMPStasisField.On" Send="Create"/>
+        <On Terms="Behavior.AP_ArbiterMPEternalStasisField.On" Send="Create"/>
         <On Terms="ActorCreation; ValidateUnit IsColossus" Send="SetScale 1.200000,1.200000,2.500000"/>
         <On Terms="Behavior.AP_ArbiterMPStasisField.Off" Send="AnimBracketStop BSD"/>
         <On Terms="Behavior.AP_ArbiterMPStasisField.On" Target="_Unit" Send="AnimSetPausedAll"/>
         <On Terms="Behavior.AP_ArbiterMPStasisField.Off" Target="_Unit" Send="AnimSetPausedAll 0"/>
+        <On Terms="Behavior.AP_ArbiterMPEternalStasisField.Off" Send="AnimBracketStop BSD"/>
+        <On Terms="Behavior.AP_ArbiterMPEternalStasisField.On" Target="_Unit" Send="AnimSetPausedAll"/>
+        <On Terms="Behavior.AP_ArbiterMPEternalStasisField.Off" Target="_Unit" Send="AnimSetPausedAll 0"/>
         <On Terms="ActorCreation; ValidateUnit AP_IsBrutalisk" Send="SetScale 2.000000"/>
         <Host Subject="_Unit"/>
         <HostSiteOps Ops="SOpAttachCenter"/>
@@ -7192,11 +7198,13 @@
     </CActorModel>
     <CActorSound id="AP_ArbiterMPStasisFieldImpactSound" parent="SoundOneShot">
         <On Terms="Behavior.AP_ArbiterMPStasisField.On" Send="Create"/>
+        <On Terms="Behavior.AP_ArbiterMPEternalStasisField.On" Send="Create"/>
         <Host Subject="_Selectable"/>
         <Sound value="AP_ArbiterMP_StasisFieldOn"/>
     </CActorSound>
     <CActorSound id="AP_ArbiterMPStasisFieldOffSound" parent="SoundOneShot">
         <On Terms="Behavior.AP_ArbiterMPStasisField.Off" Send="Create"/>
+        <On Terms="Behavior.AP_ArbiterMPEternalStasisField.Off" Send="Create"/>
         <Host Subject="_Selectable"/>
         <Sound value="AP_ArbiterMP_StasisFieldOff"/>
     </CActorSound>
@@ -7220,6 +7228,7 @@
     </CActorSound>
     <CActorSound id="AP_ArbiterMP_StasisFieldShockwave" parent="SoundOneShot">
         <On Terms="Effect.AP_ArbiterMPStasisFieldSearch.Start" Send="Create"/>
+        <On Terms="Effect.AP_ArbiterMPEternalStasisFieldSearch.Start" Send="Create"/>
     </CActorSound>
     <CActorSplat id="AP_ArbiterMPRecallCursorSplat" parent="ProtossCursorSplat" abil="AP_ArbiterMPRecall"/>
     <CActorRange id="AP_ArbiterMPRecallRange" parent="RangeAbil" abil="AP_ArbiterMPRecall">
@@ -7227,10 +7236,15 @@
         <IconArcLength value="3.250000"/>
     </CActorRange>
     <CActorSplat id="AP_ArbiterMPStasisFieldCursorSplat" parent="ProtossCursorSplat" abil="AP_ArbiterMPStasisField"/>
+    <CActorSplat id="AP_ArbiterMPEternalStasisFieldCursorSplat" parent="ProtossCursorSplat" abil="AP_ArbiterMPEternalStasisField"/>
     <CActorRange id="AP_ArbiterMPStasisFieldRange" parent="RangeAbil" abil="AP_ArbiterMPStasisField">
         <Icon value="Assets\Textures\RadarIcon2.dds"/>
         <IconArcLength value="3.250000"/>
     </CActorRange>
+    <CActorRange id="AP_ArbiterMPEternalStasisFieldRange" parent="RangeAbil" abil="AP_ArbiterMPEternalStasisField">
+        <Icon value="Assets\Textures\RadarIcon2.dds"/>
+        <IconArcLength value="3.250000"/>
+    </CActorRange>
     <CActorModel id="AP_AlarakLightningStrike" parent="BuffContinuous">
         <On Terms="Behavior.AP_AlarakLightningStrikes.On" Send="Create"/>
         <On Terms="Behavior.AP_AlarakLightningStrikes.Off" Send="AnimBracketStop BSD"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index a1593db18..37e2e8a01 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -3519,6 +3519,9 @@
         <DisplayDuration index="Enemy" value="1"/>
         <Duration value="15"/>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_ArbiterMPEternalStasisFieldTimedLife" parent="AP_ArbiterMPStasisFieldTimedLife">
+        <Duration value="65.5"/>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_ArbiterMPStasisField">
         <InfoIcon value="Assets\Textures\btn-ability-protoss-forcefield-color.dds"/>
         <Duration value="15"/>
@@ -3536,6 +3539,9 @@
             <BehaviorLinkDisableArray value="Detector12"/>
         </Modification>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_ArbiterMPEternalStasisField" parent="AP_ArbiterMPStasisField">
+        <Duration value="65.5"/>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_CorsairDisableFakeWeapon">
         <InfoFlags index="Hidden" value="1"/>
         <DisableValidatorArray value="AP_CorsairFakeWeaponBehaviorDisable"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 48cffa4c6..738b2cbe5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -4881,9 +4881,9 @@
         <AlertIcon value="Assets\Textures\btn-upgrade-protoss-adeptshieldupgrade.dds"/>
         <EditorCategories value="Race:Protoss"/>
     </CButton>
-    <CButton id="AP_ArbiterSustainingStasisField">
-        <Icon value="Assets\Textures\btn-ability-protoss-stasisfield.dds"/>
-        <AlertIcon value="Assets\Textures\btn-ability-protoss-stasisfield.dds"/>
+    <CButton id="AP_ArbiterEternalStasisField">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-fenix-stasisfield.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-protoss-fenix-stasisfield.dds"/>
     </CButton>
     <CButton id="AP_CarrierStructuralIntegrityReinforcements">
         <Icon value="assets\textures\btn-progression-protoss-fenix-14-colossusandcarrierchampionsresearch.dds"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index 60379a9ce..0229e1a6c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -10586,22 +10586,52 @@
         <EditorCategories value="Race:Protoss"/>
         <Behavior value="AP_ArbiterMPStasisField"/>
     </CEffectApplyBehavior>
+    <CEffectRemoveBehavior id="AP_ArbiterMPStasisFieldRB">
+        <BehaviorLink value="AP_ArbiterMPStasisField"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_ArbiterMPEternalStasisFieldApply" parent="AP_ArbiterMPStasisFieldApply">
+        <Behavior value="AP_ArbiterMPEternalStasisField"/>
+    </CEffectApplyBehavior>
+    <CEffectRemoveBehavior id="AP_ArbiterMPEternalStasisFieldRB">
+        <BehaviorLink value="AP_ArbiterMPEternalStasisField"/>
+    </CEffectRemoveBehavior>
     <CEffectEnumArea id="AP_ArbiterMPStasisFieldSearch">
         <EditorCategories value="Race:PrimalZerg"/>
         <ImpactLocation Value="TargetPoint"/>
         <SearchFilters value="-;Self,Player,Ally,Neutral,Structure,Missile,Item,Dead,Hidden"/>
         <AreaArray Radius="5" Effect="AP_ArbiterMPStasisFieldSet"/>
     </CEffectEnumArea>
+    <CEffectEnumArea id="AP_ArbiterMPEternalStasisFieldSearch" parent="AP_ArbiterMPStasisFieldSearch">
+        <AreaArray index="0" Radius="5" Effect="AP_ArbiterMPEternalStasisFieldSet"/>
+    </CEffectEnumArea>
     <CEffectSet id="AP_ArbiterMPStasisFieldSet">
         <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_ArbiterMPEternalStasisFieldRB"/>
+        <EffectArray value="AP_ArbiterMPEternalStasisFieldTimerRB"/>
         <EffectArray value="AP_ArbiterMPStasisFieldApply"/>
         <EffectArray value="AP_ArbiterMPStasisFieldTimerApply"/>
     </CEffectSet>
+    <CEffectSet id="AP_ArbiterMPEternalStasisFieldSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_ArbiterMPStasisFieldRB"/>
+        <EffectArray value="AP_ArbiterMPStasisFieldTimerRB"/>
+        <EffectArray value="AP_ArbiterMPEternalStasisFieldApply"/>
+        <EffectArray value="AP_ArbiterMPEternalStasisFieldTimerApply"/>
+    </CEffectSet>
     <CEffectApplyBehavior id="AP_ArbiterMPStasisFieldTimerApply">
         <ValidatorArray value="NotFrenzied"/>
         <EditorCategories value="Race:Protoss"/>
         <Behavior value="AP_ArbiterMPStasisFieldTimedLife"/>
     </CEffectApplyBehavior>
+    <CEffectRemoveBehavior id="AP_ArbiterMPStasisFieldTimerRB">
+        <BehaviorLink value="AP_ArbiterMPStasisFieldTimedLife"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_ArbiterMPEternalStasisFieldTimerApply" parent="AP_ArbiterMPStasisFieldTimerApply">
+        <Behavior value="AP_ArbiterMPEternalStasisFieldTimedLife"/>
+    </CEffectApplyBehavior>
+    <CEffectRemoveBehavior id="AP_ArbiterMPEternalStasisFieldTimerRB">
+        <BehaviorLink value="AP_ArbiterMPEternalStasisFieldTimedLife"/>
+    </CEffectRemoveBehavior>
     <CEffectDamage id="AP_ArbiterMPWeaponDamage" parent="DU_WEAP">
         <EditorCategories value="Race:Protoss"/>
         <Visibility value="Visible"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 43ce99c97..9e3847557 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -15397,6 +15397,7 @@
         <AbilArray Link="Warpable"/>
         <AbilArray Link="AP_ArbiterMPRecall"/>
         <AbilArray Link="AP_ArbiterMPStasisField"/>
+        <AbilArray Link="AP_ArbiterMPEternalStasisField"/>
         <AbilArray Link="ProgressRally"/>
         <BehaviorArray Link="AP_ArbiterMPCloakField"/>
         <BehaviorArray Link="AP_SOAHeroicShieldProcBuff"/>
@@ -15410,12 +15411,12 @@
             <LayoutButtons Face="AP_ArbiterMPStasisField" Type="AbilCmd" AbilCmd="AP_ArbiterMPStasisField,0" Row="2" Column="0"/>
             <LayoutButtons Face="AP_ArbiterMPRecall" Type="AbilCmd" AbilCmd="AP_ArbiterMPRecall,0" Row="2" Column="1"/>
             <LayoutButtons Face="AP_ArbiterCloakField" Type="Passive" Row="2" Column="2"/>
+            <LayoutButtons Face="AP_ArbiterEternalStasisField" Type="AbilCmd" AbilCmd="AP_ArbiterMPEternalStasisField,0" Row="2" Column="3"/>
             <LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
             <LayoutButtons Face="AP_ArbiterReinforcedHull" Type="Passive" Requirements="AP_HaveArbiterReinforcedHullUpgrade" Row="1" Column="0"/>
             <LayoutButtons Face="AP_ArbiterEnergyUpgrade" Type="Passive" Requirements="AP_HaveArbiterEnergyUpgrade" Row="1" Column="1"/>
-            <LayoutButtons Face="AP_ArbiterSustainingStasisField" Type="Passive" Requirements="AP_HaveArbiterSustainingStasisField" Row="1" Column="2"/>
-            <LayoutButtons Face="AP_ArbiterEnhancedCloakingField" Type="Passive" Requirements="AP_HaveArbiterCloakFieldRange" Row="1" Column="3"/>
-            <LayoutButtons Face="AP_ArbiterAbilityEfficiency" Type="Passive" Requirements="AP_HaveArbiterAbilityEfficiency" Row="1" Column="4"/>
+            <LayoutButtons Face="AP_ArbiterEnhancedCloakingField" Type="Passive" Requirements="AP_HaveArbiterCloakFieldRange" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_ArbiterAbilityEfficiency" Type="Passive" Requirements="AP_HaveArbiterAbilityEfficiency" Row="1" Column="3"/>
         </CardLayouts>
         <Radius value="1"/>
         <SeparationRadius value="1"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index b6d015781..f2ae6b126 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -11426,10 +11426,7 @@
         <EffectArray Reference="Unit,AP_ArbiterMP,EnergyMax" Value="50"/>
         <Icon value="Assets\Textures\btn-upgrade-protoss-adeptshieldupgrade.dds"/>
     </CUpgrade>
-    <CUpgrade id="AP_ArbiterSustainingStasisField">
-        <EffectArray Reference="Behavior,AP_ArbiterMPStasisField,Duration" Value="50.5"/>
-        <EffectArray Reference="Behavior,AP_ArbiterMPStasisFieldTimedLife,Duration" Value="50.5"/>
-    </CUpgrade>
+    <CUpgrade id="AP_ArbiterSustainingStasisField"/>
     <CUpgrade id="AP_ResourceEfficiencyArbiter">
         <EffectArray Operation="Subtract" Reference="Unit,AP_ArbiterMP,CostResource[Minerals]" Value="50"/>
     </CUpgrade>
@@ -11508,6 +11505,7 @@
     <CUpgrade id="AP_ArbiterAbilityEfficiency">
         <EffectArray Operation="Subtract" Reference="Abil,AP_ArbiterMPRecall,Cost[0].Vital[Energy]" Value="50"/>
         <EffectArray Operation="Subtract" Reference="Abil,AP_ArbiterMPStasisField,Cost[0].Vital[Energy]" Value="100"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_ArbiterMPEternalStasisField,Cost[0].Vital[Energy]" Value="100"/>
         <AffectedUnitArray value="AP_ArbiterMP"/>
     </CUpgrade>
     <CUpgrade id="AP_NotPossibleTransportMode"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
index b7ebc94ef..933ddf3b0 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -14,6 +14,7 @@ Button/Hotkey/AP_ApolloCloakOnNova=C
 Button/Hotkey/AP_Arbiter=A
 Button/Hotkey/AP_ArbiterMPRecall=R
 Button/Hotkey/AP_ArbiterMPStasisField=F
+Button/Hotkey/AP_ArbiterEternalStasisField=E
 Button/Hotkey/AP_ArchonHallucination=N
 Button/Hotkey/AP_ArmorpiercingMode=E
 Button/Hotkey/AP_Armory=A
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 345ad274f..1b0808369 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -838,10 +838,10 @@ Button/Name/AP_ArbiterAbilityEfficiency=Ability Efficiency
 Button/Name/AP_ArbiterCloakField=Cloak Field
 Button/Name/AP_ArbiterEnergyUpgrade=Khaydarin Core
 Button/Name/AP_ArbiterEnhancedCloakingField=Enhanced Cloak Field
+Button/Name/AP_ArbiterEternalStasisField=Eternal Stasis Field
 Button/Name/AP_ArbiterMPRecall=Recall
 Button/Name/AP_ArbiterMPStasisField=Stasis Field
 Button/Name/AP_ArbiterReinforcedHull=Chronostatic Reinforcement
-Button/Name/AP_ArbiterSustainingStasisField=Spacetime Anchor
 Button/Name/AP_ArchonHallucination=Summon Archon Hallucination
 Button/Name/AP_AresClassWeaponsSystem=Ares-Class Targeting System
 Button/Name/AP_AresClassWeaponsSystemviking=Phobos-Class Weapons System
@@ -1908,10 +1908,10 @@ Button/Tooltip/AP_ArbiterAbilityEfficiency=Reduces the energy cost of Recall by
 Button/Tooltip/AP_ArbiterCloakField=Cloaks friendly units near the Arbiter.
 Button/Tooltip/AP_ArbiterEnergyUpgrade=Increases Arbiter's starting energy by 150 and maximum energy by 50.
 Button/Tooltip/AP_ArbiterEnhancedCloakingField=Increases Cloak Field range.
+Button/Tooltip/AP_ArbiterEternalStasisField=Places enemy units in target area into stasis for <c val="ffff8a"><d ref="Behavior,AP_ArbiterMPEternalStasisField,Duration"/></c> seconds. Units in stasis cannot move, attack, be attacked or be affected by abilities.<n/><n/>Abilities sure were balanced differently back in Brood War.
 Button/Tooltip/AP_ArbiterMPRecall=Teleports all friendly units in the target area to the location of the Arbiter.
 Button/Tooltip/AP_ArbiterMPStasisField=Places enemy units in target area into stasis for <d ref="Behavior,AP_ArbiterMPStasisField,Duration"/> seconds. Units in stasis cannot move, attack, be attacked or be affected by abilities.
 Button/Tooltip/AP_ArbiterReinforcedHull=Increases Arbiter life by 50 and armor by 1.
-Button/Tooltip/AP_ArbiterSustainingStasisField=Stasis Field lasts <d ref="Upgrade,AP_ArbiterSustainingStasisField,EffectArray[0].Value"/> seconds longer.
 Button/Tooltip/AP_Archon=Powerful psionic attacker.<n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
 Button/Tooltip/AP_ArchonHallucination=These hallucinated copies function like the original unit, but they cannot use active abilities, deal damage, warp in structures, or gather resources, and they die more easily. Hallucinations last <d time="60"/> before they disappear.
 Button/Tooltip/AP_AresClassWeaponsSystem=Increases missile range by 3 and Autocannon range by 1.

From b0966138d380c395658ef0cba5b77246082f314a Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 11 Aug 2024 18:45:08 -0700
Subject: [PATCH 07/10] sc2: Removing (level 1) from eternal stasis button name

---
 .../Base.SC2Data/GameData/AbilData.xml                    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 918dd7022..536cfb5f5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -2852,8 +2852,14 @@
         <CursorEffect value="AP_ArbiterMPStasisFieldSearch"/>
         <CmdButtonArray index="Execute" DefaultButtonFace="AP_ArbiterMPStasisField"/>
     </CAbilEffectTarget>
-    <CAbilEffectTarget id="AP_ArbiterMPEternalStasisField" parent="AP_ArbiterMPStasisField">
+    <CAbilEffectTarget id="AP_ArbiterMPEternalStasisField">
+        <EditorCategories value="AbilityorEffectType:Units"/>
         <Effect index="0" value="AP_ArbiterMPEternalStasisFieldSearch"/>
+        <Flags index="AllowMovement" value="1"/>
+        <Cost>
+            <Vital index="Energy" value="150"/>
+        </Cost>
+        <Range value="9"/>
         <CursorEffect value="AP_ArbiterMPEternalStasisFieldSearch"/>
         <CmdButtonArray index="Execute" DefaultButtonFace="AP_ArbiterEternalStasisField" Requirements="AP_HaveArbiterSustainingStasisField"/>
     </CAbilEffectTarget>

From 13f44a244dad7ba324308a1683219edb04bebc18 Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Sun, 11 Aug 2024 19:22:16 -0700
Subject: [PATCH 08/10] sc2: reordering arbiter buttons to put eternal stasis
 above stasis

---
 .../Base.SC2Data/GameData/UnitData.xml                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 9e3847557..51053d6ba 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -15411,12 +15411,12 @@
             <LayoutButtons Face="AP_ArbiterMPStasisField" Type="AbilCmd" AbilCmd="AP_ArbiterMPStasisField,0" Row="2" Column="0"/>
             <LayoutButtons Face="AP_ArbiterMPRecall" Type="AbilCmd" AbilCmd="AP_ArbiterMPRecall,0" Row="2" Column="1"/>
             <LayoutButtons Face="AP_ArbiterCloakField" Type="Passive" Row="2" Column="2"/>
-            <LayoutButtons Face="AP_ArbiterEternalStasisField" Type="AbilCmd" AbilCmd="AP_ArbiterMPEternalStasisField,0" Row="2" Column="3"/>
             <LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
-            <LayoutButtons Face="AP_ArbiterReinforcedHull" Type="Passive" Requirements="AP_HaveArbiterReinforcedHullUpgrade" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_ArbiterEternalStasisField" Type="AbilCmd" AbilCmd="AP_ArbiterMPEternalStasisField,0" Row="1" Column="0"/>
             <LayoutButtons Face="AP_ArbiterEnergyUpgrade" Type="Passive" Requirements="AP_HaveArbiterEnergyUpgrade" Row="1" Column="1"/>
             <LayoutButtons Face="AP_ArbiterEnhancedCloakingField" Type="Passive" Requirements="AP_HaveArbiterCloakFieldRange" Row="1" Column="2"/>
             <LayoutButtons Face="AP_ArbiterAbilityEfficiency" Type="Passive" Requirements="AP_HaveArbiterAbilityEfficiency" Row="1" Column="3"/>
+            <LayoutButtons Face="AP_ArbiterReinforcedHull" Type="Passive" Requirements="AP_HaveArbiterReinforcedHullUpgrade" Row="1" Column="4"/>
         </CardLayouts>
         <Radius value="1"/>
         <SeparationRadius value="1"/>

From e1ae4af7cbbc7b64abe959cebf2af5a143107f32 Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Mon, 12 Aug 2024 09:18:08 -0700
Subject: [PATCH 09/10] sc2: Adding hides for simple text flag for eternal
 stasis button per MindHawk's request

---
 .../Base.SC2Data/GameData/ButtonData.xml                         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 738b2cbe5..4fa52b57c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -4884,6 +4884,7 @@
     <CButton id="AP_ArbiterEternalStasisField">
         <Icon value="Assets\Textures\btn-upgrade-protoss-fenix-stasisfield.dds"/>
         <AlertIcon value="Assets\Textures\btn-upgrade-protoss-fenix-stasisfield.dds"/>
+        <HidesForSimpleText value="0"/>
     </CButton>
     <CButton id="AP_CarrierStructuralIntegrityReinforcements">
         <Icon value="assets\textures\btn-progression-protoss-fenix-14-colossusandcarrierchampionsresearch.dds"/>

From 902401e98c2ef839e58baf9e4b732fb769254510 Mon Sep 17 00:00:00 2001
From: Ziktofel <ziktofel@gmail.com>
Date: Mon, 12 Aug 2024 20:13:44 +0200
Subject: [PATCH 10/10] Minor string/hotkey cleanup

---
 .../enUS.SC2Data/LocalizedData/GameHotkeys.txt                  | 2 +-
 .../enUS.SC2Data/LocalizedData/GameStrings.txt                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
index 933ddf3b0..4d95b662e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -14,7 +14,7 @@ Button/Hotkey/AP_ApolloCloakOnNova=C
 Button/Hotkey/AP_Arbiter=A
 Button/Hotkey/AP_ArbiterMPRecall=R
 Button/Hotkey/AP_ArbiterMPStasisField=F
-Button/Hotkey/AP_ArbiterEternalStasisField=E
+Button/Hotkey/AP_ArbiterEternalStasisField=T
 Button/Hotkey/AP_ArchonHallucination=N
 Button/Hotkey/AP_ArmorpiercingMode=E
 Button/Hotkey/AP_Armory=A
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 1b0808369..2f4efaf3e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1908,7 +1908,7 @@ Button/Tooltip/AP_ArbiterAbilityEfficiency=Reduces the energy cost of Recall by
 Button/Tooltip/AP_ArbiterCloakField=Cloaks friendly units near the Arbiter.
 Button/Tooltip/AP_ArbiterEnergyUpgrade=Increases Arbiter's starting energy by 150 and maximum energy by 50.
 Button/Tooltip/AP_ArbiterEnhancedCloakingField=Increases Cloak Field range.
-Button/Tooltip/AP_ArbiterEternalStasisField=Places enemy units in target area into stasis for <c val="ffff8a"><d ref="Behavior,AP_ArbiterMPEternalStasisField,Duration"/></c> seconds. Units in stasis cannot move, attack, be attacked or be affected by abilities.<n/><n/>Abilities sure were balanced differently back in Brood War.
+Button/Tooltip/AP_ArbiterEternalStasisField=Places enemy units in target area into stasis for <c val="ffff8a"><d ref="Behavior,AP_ArbiterMPEternalStasisField,Duration"/></c> seconds. Units in stasis cannot move, attack, be attacked or be affected by abilities.
 Button/Tooltip/AP_ArbiterMPRecall=Teleports all friendly units in the target area to the location of the Arbiter.
 Button/Tooltip/AP_ArbiterMPStasisField=Places enemy units in target area into stasis for <d ref="Behavior,AP_ArbiterMPStasisField,Duration"/> seconds. Units in stasis cannot move, attack, be attacked or be affected by abilities.
 Button/Tooltip/AP_ArbiterReinforcedHull=Increases Arbiter life by 50 and armor by 1.