diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 1abd1361f..539f47706 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -5685,7 +5685,7 @@
             <Vital index="Energy" value="75"/>
             <Cooldown TimeUse="2"/>
         </Cost>
-        <Range value="11"/>
+        <Range value="9"/>
         <CastOutroTime value="0.5"/>
         <CursorEffect value="AP_HighArchonPsiStormSearch"/>
         <CmdButtonArray index="Execute" DefaultButtonFace="AP_PsiStorm">
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index 85926ed0b..d3f25de4a 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -9757,8 +9757,10 @@
         <AINotifyEffect value="AP_HighArchonPsiStormSearch"/>
     </CEffectCreatePersistent>
     <CEffectSet id="AP_HighArchonPsiStormSearchSet">
-        <EffectArray value="AP_HighArchonPsiStormSearch"/>
-        <EffectArray value="AP_HighArchonPsiStormFriendlySearch"/>
+        <!-- upgrades to "AP_HighArchonPsiStormSearch" -->
+        <EffectArray value="AP_PsiStormSearch"/>
+        <!-- upgrades to "AP_HighArchonPsiStormFriendlySearch" -->
+        <EffectArray value=""/>
         <TargetLocationType value="Point"/>
     </CEffectSet>
     <CEffectEnumArea id="AP_HighArchonPsiStormFriendlySearch">
@@ -9781,7 +9783,7 @@
         <AINotifyFlags index="HurtFriend" value="1"/>
         <AINotifyFlags index="HurtEnemy" value="1"/>
         <SearchFilters value="-;Player,Ally,Neutral,Structure,Missile,Destructible,Stasis,Dead,Hidden,Invulnerable"/>
-        <AreaArray Radius="2.3" Effect="AP_HighArchonPsiStormApplyBehavior"/>
+        <AreaArray Radius="1.5" Effect="AP_HighArchonPsiStormApplyBehavior"/>
         <SearchFlags index="CallForHelp" value="1"/>
     </CEffectEnumArea>
     <CEffectSet id="AP_HighTemplarWeapon">
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 9c023e562..83c9429b8 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -3025,6 +3025,11 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeHighArchonCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveHighArchonAndPlasmaSurge">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeHighArchonCompleteOnly"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeHighTemplarPlasmaSurgeCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveKhaydarinAmuletArchon">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeKhaydarinAmuletArchonCompleteOnly"/>
@@ -3037,6 +3042,10 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_AndCountUpgradeHighTemplarHallucinationCompleteOnlyCountUpgradeHighArchonCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveHighTemplarPlasmaSurge">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeHighTemplarPlasmaSurgeCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveDarkArchonMeld">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeDarkArchonMeldCompleteOnly"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 486f7cef4..d00cf0569 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5438,6 +5438,10 @@
         <OperandArray value="AP_CountUpgradeHighTemplarHallucinationCompleteOnly"/>
         <OperandArray value="AP_CountUpgradeHighArchonCompleteOnly"/>
     </CRequirementAnd>
+    <CRequirementCountUpgrade id="AP_CountUpgradeHighTemplarPlasmaSurgeCompleteOnly">
+        <Count Link="AP_HighTemplarPlasmaSurge" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeDarkArchonMeldCompleteOnly">
         <Count Link="AP_DarkArchonMeld" 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 8d21cca88..51ab9c3d5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -13299,7 +13299,7 @@
             <LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
             <LayoutButtons Face="AP_HighArchonPsiStorm" Type="AbilCmd" AbilCmd="AP_HighArchonPsiStormArchon,Execute" Row="2" Column="1"/>
             <LayoutButtons Face="AP_Feedback" Type="AbilCmd" AbilCmd="AP_FeedbackArchon,Execute" Row="2" Column="0"/>
-            <LayoutButtons Face="AP_HealingPsionicStorm" Type="Passive" Requirements="AP_HaveHighArchon" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_HealingPsionicStorm" Type="Passive" Requirements="AP_HaveHighArchonAndPlasmaSurge" Row="1" Column="1"/>
             <LayoutButtons Face="AP_HighImpactPsiStorm" Type="Passive" Requirements="AP_HaveHighArchonAndHighImpactPsionicStorm" Row="1" Column="2"/>
             <LayoutButtons Face="AP_KhaydarinAmulet" Type="Passive" Requirements="AP_HaveKhaydarinAmuletArchon" Row="1" Column="3"/>
             <LayoutButtons Face="AP_HighTemplarSCBWHallucination" Type="AbilCmd" AbilCmd="AP_HighTemplarSCBWHallucinationHighArchon,Execute" Row="2" Column="2"/>
@@ -13785,7 +13785,7 @@
             <LayoutButtons Face="AP_AWrp" Type="AbilCmd" AbilCmd="AP_ArchonWarp,SelectedUnits" Row="2" Column="3"/>
             <LayoutButtons Face="AP_HighArchonPsiStorm" Type="AbilCmd" AbilCmd="AP_HighArchonPsiStorm,Execute" Row="2" Column="1"/>
             <LayoutButtons Face="AP_Feedback" Type="AbilCmd" AbilCmd="AP_Feedback,Execute" Row="2" Column="0"/>
-            <LayoutButtons Face="AP_HealingPsionicStorm" Type="Passive" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_HealingPsionicStorm" Type="Passive" Requirements="AP_HaveHighTemplarPlasmaSurge" Row="1" Column="1"/>
             <LayoutButtons Face="AP_HighImpactPsiStorm" Type="Passive" Requirements="AP_HaveHighImpactPsionicStorm" Row="1" Column="2"/>
             <LayoutButtons Face="AP_KhaydarinAmulet" Type="Passive" Requirements="AP_HaveKhaydarinAmulet" Row="1" Column="3"/>
             <LayoutButtons Face="AP_HighTemplarSCBWHallucination" Type="AbilCmd" AbilCmd="AP_HighTemplarSCBWHallucination,Execute" Row="2" Column="2"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index a0e3e6ec6..ed6e76b9b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -11518,8 +11518,6 @@
         <EffectArray Reference="Effect,AP_HighArchonPsiStormDamageInitial,Amount" Value="4"/>
         <EffectArray Reference="Effect,AP_PsiStormDamage,Amount" Value="4"/>
         <EffectArray Reference="Effect,AP_PsiStormDamageInitial,Amount" Value="4"/>
-        <EffectArray Operation="Set" Reference="Button,AP_PsiStorm,Tooltip" Value="Button/Tooltip/AP_PsiStormUpgraded"/>
-        <EffectArray Operation="Set" Reference="Button,AP_HighArchonPsiStorm,Tooltip" Value="Button/Tooltip/AP_PsiStormUpgraded"/>
         <EffectArray Operation="Set" Reference="Button,AP_CripplingPsionicStorm,Tooltip" Value="Button/Tooltip/AP_CripplingPsionicStormUpgraded"/>
     </CUpgrade>
     <CUpgrade id="AP_KhaydarinAmulet">
@@ -11529,6 +11527,16 @@
         <EffectArray Reference="Unit,AP_HighTemplarShakuras,EnergyMax" Value="50"/>
     </CUpgrade>
     <CUpgrade id="AP_HighTemplarHallucination"/>
+    <CUpgrade id="AP_HighTemplarPlasmaSurge">
+        <Race value="Prot"/>
+        <AffectedUnitArray value="AP_HighTemplar"/>
+        <AffectedUnitArray value="Archon"/>
+        <EffectArray Operation="Set" Reference="Effect,AP_HighArchonPsiStormSearchSet,EffectArray[0]" Value="AP_HighArchonPsiStormSearch"/>
+        <EffectArray Operation="Set" Reference="Effect,AP_HighArchonPsiStormSearchSet,EffectArray[1]" Value="AP_HighArchonPsiStormFriendlySearch"/>
+        <EffectArray Reference="Effect,AP_HighArchonPsiStormSearch,AreaArray[0].Radius" Value="0.8"/>
+        <EffectArray Reference="Abil,AP_HighArchonPsiStormArchon,Range[0]" Value="2"/>
+        <EffectArray Reference="Abil,AP_HighArchonPsiStorm,Range[0]" Value="2"/>
+    </CUpgrade>
     <CUpgrade id="AP_HighArchon">
         <EffectArray Reference="Unit,AP_Archon,EnergyStart" Value="50"/>
         <EffectArray Reference="Unit,AP_Archon,EnergyMax" Value="200"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 7d72beea5..7c28416df 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -2097,7 +2097,7 @@ Button/Tooltip/AP_HaveNovaGadgetDefensiveDroneSummon=
 Button/Tooltip/AP_HavocEnduringSight=Squad Sight stays up indefinitely and doesn't cost energy.
 Button/Tooltip/AP_Heal=Heals a friendly biological target.<n/><n/><c val="f078ff">Heals <d ref="Effect,AP_MedivacHeal,RechargeVitalRate*Effect,AP_MedivacHeal,DrainVitalCostFactor"/> life per 1 energy.</c>
 Button/Tooltip/AP_HealingDrone=Heals nearby biological and mechanical units.<n/>Times out after <d ref="Behavior,AP_HealingDroneTimedLife,Duration"/> seconds.
-Button/Tooltip/AP_HealingPsionicStorm=Psionic Storm restores <d ref="((Effect,AP_HighArchonPsiStormPersistent,PeriodCount+1)*(Effect,AP_HighArchonPsiStormHeal,RechargeVitalRate))/2"/> shields to friendly units in the target area.<c/>
+Button/Tooltip/AP_HealingPsionicStorm=Psionic Storm can be cast from +<d ref="Upgrade,AP_HighTemplarPlasmaSurge,EffectArray[3].Value"/> range, affects a larger area, and restores <d ref="((Effect,AP_HighArchonPsiStormPersistent,PeriodCount+1)*(Effect,AP_HighArchonPsiStormHeal,RechargeVitalRate))/2"/> shields to friendly units in the target area.<c/>
 Button/Tooltip/AP_HellArmor=Increases Hellion and Hellbat armor by 2.
 Button/Tooltip/AP_HellbatCharge=Increases movement speed in Hellion mode. <n/>In Hellbat mode, launches the Hellbat toward nearby enemy ground units. Briefly stuns enemy units on impact.
 Button/Tooltip/AP_Hellion=Fast scout. Has a flame attack that damages all enemy units in its line of fire.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
@@ -2469,8 +2469,7 @@ Button/Tooltip/AP_ProtossShieldsLevel4=Maximizes the shields of all Protoss unit
 Button/Tooltip/AP_ProtossShieldsLevel5=Maximizes the shields of all Protoss units and structures.
 Button/Tooltip/AP_PsiDisruption=Slows the attack and movement speeds of all nearby Zerg units.<n/><n/><c val="#ColorAttackInfo">Heroic units are immune.</c>
 Button/Tooltip/AP_PsiDisruptor=Defensive structure. Slows the attack and movement speeds of all nearby Zerg units.<n/><n/><c val="#ColorAttackInfo">Heroic units are immune.</c>
-Button/Tooltip/AP_PsiStorm=Creates a storm of psionic energy that lasts 4 seconds, causing up to 80 damage to all enemy units in the target area. Does not damage friendly units.
-Button/Tooltip/AP_PsiStormUpgraded=Creates a storm of psionic energy that lasts 4 seconds, causing up to 112 damage to all enemy units in the target area. Does not damage friendly units.
+Button/Tooltip/AP_PsiStorm=Creates a storm of psionic energy that lasts <d ref="(Effect,AP_HighArchonPsiStormPersistent,PeriodCount*Effect,AP_HighArchonPsiStormPersistent,PeriodicPeriodArray[0]) + Behavior,AP_HighArchonPsiStorm,Duration"/> seconds, causing up to <d ref="Effect,AP_HighArchonPsiStormDamageInitial,Amount + (Effect,AP_HighArchonPsiStormPersistent,PeriodCount * Behavior,AP_HighArchonPsiStorm,Duration * Effect,AP_HighArchonPsiStormDamage,Amount / Behavior,AP_HighArchonPsiStorm,Period)"/> damage to all enemy units in the target area. Does not damage friendly units.
 Button/Tooltip/AP_PsiStrike=Kerrigan dashes through enemies, dealing <d ref="Effect,AP_PsiStrikeDamage,Amount"/> damage to all enemies in her path.<n/><n/><c val="ffff8a">Passive: Movement speed increased by 30%.</c>
 Button/Tooltip/AP_PsionicLift=Enemies in target area are stunned for <d ref="Behavior,AP_PsionicLift,Duration"/> seconds and take <d ref="Behavior,AP_PsionicLift,Duration * Effect,AP_PsionicLiftDamage,Amount"/> damage over time.<n/><n/><c val="ffff8a">Does not stun heroic units.</c>
 Button/Tooltip/AP_PurificationNova=Gains <d ref="Behavior,AP_PurificationNovaSpeedBoost,Modification.MoveSpeedBonus/Unit,AP_Disruptor,Speed*100"/>% increased movement speed and then after <d ref="Behavior,AP_PurificationNova,Duration"/> seconds emits a powerful nova dealing <d ref="Effect,AP_PurificationNovaDamage,Amount"/> splash damage to nearby units.<n/><n/><c val="#ColorAttackInfo">Damages ground units and structures only.</c>
@@ -4566,6 +4565,7 @@ RequirementNode/Tooltip/AP_CountUpgradeDarkTemplarShadowFuryLesserCompleteOnly=F
 RequirementNode/Tooltip/AP_CountUpgradeDragoonPhalanxSuitCompleteOnly=Find Phalanx Suit (Dragoon)
 RequirementNode/Tooltip/AP_CountUpgradeEnergizerMobileChronoBeamCompleteOnly=Find Mobile Chrono Beam (Energizer)
 RequirementNode/Tooltip/AP_CountUpgradeHavocEnduringSightCompleteOnly=Find Enduring Sight (Havoc)
+RequirementNode/Tooltip/AP_CountUpgradeHighTemplarPlasmaSurgeCompleteOnly=Find Plasma Surge (High Templar)
 RequirementNode/Tooltip/AP_CountUpgradeSlayerBlinkCompleteOnly=Find Phase Blink (Slayer)
 RequirementNode/Tooltip/AP_CountUpgradeStalkerPhaseReactorCompleteOnly=Find Phase Reactor (Stalker)
 RequirementNode/Tooltip/AP_CountUpgradeVoidZealotWhirlwindCompleteOnly=Find Whirlwind (Zealot)
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index 868d7ad1b..3a07baf3b 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1557,7 +1557,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil (int lp_player, int lp_b
         libABFE498B_gf_AP_Triggers_Protoss_unlockSentryDoubleShieldRecharge, // 12
         libABFE498B_gf_AP_Triggers_Protoss_unlockEnergizerMobileChronoBeam, // 13
         libABFE498B_gf_AP_Triggers_Protoss_unlockHavocEnduringSight, // 14
-        ap_triggers_PlayerConsumer_sig, // 15
+        libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarPlasmaSurge, // 15
         ap_triggers_PlayerConsumer_sig, // 16
         ap_triggers_PlayerConsumer_sig, // 17
         ap_triggers_PlayerConsumer_sig, // 18
@@ -7168,6 +7168,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarSignifierKhaydarinAmule
 
 }
 
+void libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarPlasmaSurge (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_HighTemplarPlasmaSurge", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Protoss_unlockArchonHighArchon (int lp_player) {
     // Variable Declarations
     int lv_upgradeLevels;
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 36de8324d..b8d7cce9e 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -738,6 +738,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkTemplarDarkArchonMeld (int lp_
 void libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarSignifierUnshackledPisonicStorm (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarSignifierHallucination (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarSignifierKhaydarinAmulet (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarPlasmaSurge (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockArchonHighArchon (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonFeedback (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonMaelstrom (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 0cdb86243..8d4c5a0e5 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -4563,7 +4563,7 @@
                     libABFE498B_gf_AP_Triggers_Protoss_unlockSentryDoubleShieldRecharge, // 12
                     libABFE498B_gf_AP_Triggers_Protoss_unlockEnergizerMobileChronoBeam, // 13
                     libABFE498B_gf_AP_Triggers_Protoss_unlockHavocEnduringSight, // 14
-                    ap_triggers_PlayerConsumer_sig, // 15
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarPlasmaSurge, // 15
                     ap_triggers_PlayerConsumer_sig, // 16
                     ap_triggers_PlayerConsumer_sig, // 17
                     ap_triggers_PlayerConsumer_sig, // 18
@@ -57920,6 +57920,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="B9938D8D"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="C37642B7"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="90C1FDDC"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="92E7D1F2"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="788DDD18"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="D4116829"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="1677C710"/>
@@ -60713,6 +60714,43 @@
             <Value>1</Value>
             <ValueType Type="int"/>
         </Element>
+        <Element Type="FunctionDef" Id="92E7D1F2">
+            <Identifier>AP_Triggers_Protoss_unlockHighTemplarPlasmaSurge</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="84429007"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="B6AE83EE"/>
+        </Element>
+        <Element Type="ParamDef" Id="84429007">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="A7430EC0"/>
+        </Element>
+        <Element Type="Param" Id="A7430EC0">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="B6AE83EE">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="0951F40F"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="F1227FEC"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="58A5D261"/>
+        </Element>
+        <Element Type="Param" Id="0951F40F">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="84429007"/>
+        </Element>
+        <Element Type="Param" Id="F1227FEC">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_HighTemplarPlasmaSurge</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="58A5D261">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="FunctionDef" Id="788DDD18">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="46E012CE"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 98cebff82..ec3a1e7b6 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -503,6 +503,7 @@ FunctionDef/Name/lib_ABFE498B_9223D1F9=AP_Triggers_Terran_unlockNovaApolloSuit
 FunctionDef/Name/lib_ABFE498B_92A35C6A=AP_Triggers_Terran_unlockBansheeAdvancedTargetingOptics
 FunctionDef/Name/lib_ABFE498B_92A8EFCF=AP_Triggers_Terran_unlockAdvancedOptics
 FunctionDef/Name/lib_ABFE498B_92D3C603=AP_Triggers_Terran_unlockVultureIonThrusters
+FunctionDef/Name/lib_ABFE498B_92E7D1F2=AP_Triggers_Protoss_unlockHighTemplarPlasmaSurge
 FunctionDef/Name/lib_ABFE498B_93581A6E=AP_Triggers_Terran_unlockMedivac
 FunctionDef/Name/lib_ABFE498B_95432208=AP_Triggers_Terran_unlockCycloneTargetingOptics
 FunctionDef/Name/lib_ABFE498B_95839BE4=AP_Triggers_Terran_unlockSpectrePsionicLash
@@ -1221,6 +1222,7 @@ ParamDef/Name/lib_ABFE498B_83C76565=player
 ParamDef/Name/lib_ABFE498B_83F60C61=player
 ParamDef/Name/lib_ABFE498B_840FB65F=player
 ParamDef/Name/lib_ABFE498B_841A26CA=player
+ParamDef/Name/lib_ABFE498B_84429007=player
 ParamDef/Name/lib_ABFE498B_8550DAD4=player
 ParamDef/Name/lib_ABFE498B_85B3728E=player
 ParamDef/Name/lib_ABFE498B_85B4F873=player