diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
index 4ce96ee21..040c7f2fc 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -2139,6 +2139,11 @@
         <AlertIcon value="Assets\Textures\btn-progression-protoss-fenix-12-immortalandscoutchampions-research.dds"/>
         <EditorCategories value="Race:Protoss"/>
     </CButton>
+    <CButton id="AP_StalwartDualityCharge">
+        <Icon value="assets\textures\btn-upgrade-protoss-fenix-disruptorpurificationecho.dds"/>
+        <AlertIcon value="assets\textures\btn-upgrade-protoss-fenix-disruptorpurificationecho.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
     <CButton id="AP_ImmortalTaldarimScatterCannon">
         <Icon value="Assets\Textures\BTN-Ability-Protoss-ScatterCannon.dds"/>
         <AlertIcon value="Assets\Textures\BTN-Ability-Protoss-ScatterCannon.dds"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index 534d22a24..56bd02e6d 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -2997,6 +2997,10 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_NotCountUpgradeAnnihilatorAerialTrackingCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveStalwartDualityCharge">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeStalwartDualityChargeCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveDragoonEnchancedStriderServos">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeDragoonEnchancedStriderServosCompleteOnly"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 732a226b4..633823f7d 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5380,6 +5380,10 @@
     <CRequirementNot id="AP_NotCountUpgradeAnnihilatorAerialTrackingCompleteOnly">
         <OperandArray index="0" value="AP_CountUpgradeAnnihilatorAerialTrackingCompleteOnly"/>
     </CRequirementNot>
+    <CRequirementCountUpgrade id="AP_CountUpgradeStalwartDualityChargeCompleteOnly">
+        <Count Link="AP_StalwartDualityCharge" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeDragoonEnchancedStriderServosCompleteOnly">
         <Count Link="AP_DragoonEnhancedStriderServos" 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 c703e1fbd..fa0294c15 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -12888,6 +12888,7 @@
             <LayoutButtons Face="AP_ImmortalSingularityCharge" Type="Passive" Requirements="AP_HaveImmortalIncreasedRange" Row="1" Column="0"/>
             <LayoutButtons Face="AP_ImmortalAdvancedTargetingMechanics" Type="Passive" Requirements="AP_HaveImmortalAirAttack" Row="1" Column="1"/>
             <LayoutButtons Face="AP_DisruptorDispersion" Type="Passive" Requirements="AP_HaveVoidImmortalWeaponSplash" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_StalwartDualityCharge" Type="Passive" Requirements="AP_HaveStalwartDualityCharge" Row="2" Column="1"/>
         </CardLayouts>
     </CUnit>
     <CUnit id="AP_ImmortalBarrier" parent="AP_Immortal">
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 0722ece53..f8b6ce492 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -11563,6 +11563,10 @@
         <EffectArray Operation="Set" Reference="Unit,AP_ImmortalShakuras,Description" Value="Button/Tooltip/AP_ImmortalShakurasAA"/>
         <EditorCategories value="Race:Protoss"/>
     </CUpgrade>
+    <CUpgrade id="AP_StalwartDualityCharge">
+        <EffectArray Reference="Weapon,AP_StalwartWeapon,Range" Value="4"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CUpgrade>
     <CUpgrade id="AP_DragoonEnhancedStriderServos">
         <EffectArray Reference="Unit,AP_Dragoon,Speed" Value="0.375"/>
     </CUpgrade>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 32a2d277e..aa03b5e82 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1613,6 +1613,7 @@ Button/Name/AP_StalkerBlinkShieldRestoreBase=Blink
 Button/Name/AP_StalkerHallucination=Summon 2 Stalker Hallucinations
 Button/Name/AP_StalkerPurifier=Warp in Instigator
 Button/Name/AP_StalkerShakuras=Warp in Stalker
+Button/Name/AP_StalwartDualityCharge=Duality Charge
 Button/Name/AP_Stargate=Warp In Stargate
 Button/Name/AP_Starport=Build Starport
 Button/Name/AP_Stim=Stimpack
@@ -2793,6 +2794,7 @@ Button/Tooltip/AP_StalkerBlinkShieldRestoreBase=Teleports the Stalker to a nearb
 Button/Tooltip/AP_StalkerHallucination=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_StalkerPurifier=Purifier Faction<n/>Ranged support strider. Can store multiple Blink charges.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
 Button/Tooltip/AP_StalkerShakuras=Nerazim Faction<n/>Ranged attack strider. Shields are restored after using Blink.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
+Button/Tooltip/AP_StalwartDualityCharge=Stalwarts gain +<d ref="($UpgradeEffectArrayValue:AP_StalwartDualityCharge:Weapon,AP_StalwartWeapon,Range$)"/> range.
 Button/Tooltip/AP_Stargate=Warps in Protoss air units.
 Button/Tooltip/AP_StargateWarp=Enables warp in of Protoss air units.
 Button/Tooltip/AP_Starport=Air-unit production facility. <n/><n/><c val="ffff8a">Enables:</c><n/>- Vikings<n/>- Medivacs
@@ -4725,6 +4727,7 @@ RequirementNode/Tooltip/AP_CountUpgradeReaverKhalaiReplicatorsCompleteOnly=Find
 RequirementNode/Tooltip/AP_CountUpgradeSkirmisherPeerContemptCompleteOnly=Find Peer Contempt (Skirmisher)
 RequirementNode/Tooltip/AP_CountUpgradeSlayerBlinkCompleteOnly=Find Phase Blink (Slayer)
 RequirementNode/Tooltip/AP_CountUpgradeStalkerPhaseReactorCompleteOnly=Find Phase Reactor (Stalker)
+RequirementNode/Tooltip/AP_CountUpgradeStalwartDualityChargeCompleteOnly=Find Duality Charge (Stalwart)
 RequirementNode/Tooltip/AP_CountUpgradeTerranInfantryWeaponsUltraCapacitorsLevel1CompleteOnly=Terran Infantry Weapons Level 1
 RequirementNode/Tooltip/AP_CountUpgradeTerranInfantryWeaponsUltraCapacitorsLevel2CompleteOnly=Terran Infantry Weapons Level 2
 RequirementNode/Tooltip/AP_CountUpgradeTerranInfantryWeaponsUltraCapacitorsLevel3CompleteOnly=Terran Infantry Weapons Level 3