From 3ba3961c8a6a13608f404a469bef675976aabac8 Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Wed, 17 Jul 2024 08:38:50 -0700
Subject: [PATCH 1/2] sc2: Making war council upgrade grey-out when locked
 instead of hidden

---
 .../Base.SC2Data/GameData/RequirementData.xml          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index f7c9e56df..d317dd71c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -1567,7 +1567,7 @@
     </CRequirement>
     <CRequirement id="AP_HaveSlayerBlink">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
-        <NodeArray index="Show" Link="AP_CountUpgradeSlayerBlinkCompleteOnly"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeSlayerBlinkCompleteOnly"/>
     </CRequirement>
     <CRequirement id="AP_HaveHotSBanelingCorrosiveBile">
         <EditorCategories value="Race:Zerg,TechType:Upgrade"/>
@@ -2750,7 +2750,7 @@
     </CRequirement>
     <CRequirement id="AP_HaveVoidZealotWhirlwind">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
-        <NodeArray index="Show" Link="AP_CountUpgradeVoidZealotWhirlwindCompleteOnly"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeVoidZealotWhirlwindCompleteOnly"/>
     </CRequirement>
     <CRequirement id="AP_HaveAdeptKillBounce">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
@@ -2766,7 +2766,7 @@
     </CRequirement>
     <CRequirement id="AP_HaveAdeptDisruptiveTransfer">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
-        <NodeArray index="Show" Link="AP_CountUpgradeAdeptDisruptiveTransferCompleteOnly"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeAdeptDisruptiveTransferCompleteOnly"/>
     </CRequirement>
     <CRequirement id="AP_HaveHighImpactParticleDisruptors">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
@@ -2786,7 +2786,7 @@
     </CRequirement>
     <CRequirement id="AP_HaveDragoonPhalanxSuit">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
-        <NodeArray index="Show" Link="AP_CountUpgradeDragoonPhalanxSuitCompleteOnly"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeDragoonPhalanxSuitCompleteOnly"/>
     </CRequirement>
     <CRequirement id="AP_HavePredatorFury">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
@@ -2996,7 +2996,7 @@
     </CRequirement>
     <CRequirement id="AP_HaveAvengerCloak">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
-        <NodeArray index="Show" Link="AP_CountUpgradeAvengerCloakCompleteOnly"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeAvengerCloakCompleteOnly"/>
     </CRequirement>
     <CRequirement id="AP_HaveHighImpactPsionicStorm">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>

From d2978058f2d542d1aaa6379f2b8bfbeb28ef8e0d Mon Sep 17 00:00:00 2001
From: Matthew <matthew.marinets@gmail.com>
Date: Wed, 17 Jul 2024 20:42:45 -0700
Subject: [PATCH 2/2] sc2: Adding stalker war council grey-out icon; adding
 gamestrings to all war council button requirements

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

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index b115c3477..007cf4d0a 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -3577,7 +3577,7 @@
         </Cost>
         <Range value="500"/>
         <Arc value="360"/>
-        <CmdButtonArray index="Execute" DefaultButtonFace="AP_StalkerBlinkShieldRestoreBase" Requirements="AP_HaveStalkerPhaseReactor">
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_StalkerBlinkShieldRestoreBase" Requirements="AP_ShowStalkerPhaseReactor">
             <Flags index="ToSelection" value="1"/>
         </CmdButtonArray>
     </CAbilEffectTarget>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index d317dd71c..657b0901e 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -1558,6 +1558,10 @@
         <NodeArray index="Show" Link="AP_CountUpgradeVoidStalkerMultishotCompleteOnly"/>
     </CRequirement>
     <CRequirement id="AP_HaveStalkerPhaseReactor">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeStalkerPhaseReactorCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_ShowStalkerPhaseReactor">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeStalkerPhaseReactorCompleteOnly"/>
     </CRequirement>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index 313bb6568..9170efae7 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5151,7 +5151,6 @@
     </CRequirementOr>
     <CRequirementCountUpgrade id="AP_CountUpgradeVoidZealotWhirlwindCompleteOnly">
         <Flags index="TechTreeCheat" value="0"/>
-        <Tooltip value=""/>
         <Count Link="AP_VoidZealotWhirlwind" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeAdeptKillBounceCompleteOnly">
@@ -5161,7 +5160,6 @@
     </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeAdeptPiercingAttackCompleteOnly">
         <Flags index="TechTreeCheat" value="0"/>
-        <Tooltip value=""/>
         <Count Link="AP_AdeptPiercingAttack" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeAdeptShieldUpgradeCompleteOnly">
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 7c5794f53..310a79384 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -4543,6 +4543,12 @@ RequirementNode/Tooltip/AP_CountUnitGreaterSpireCompleteOnly291495724TechTreeChe
 RequirementNode/Tooltip/AP_CountUnitImpalerDenCompleteOnly3322076208TechTreeCheat=Mutate Hydralisk Den into Impaler Den
 RequirementNode/Tooltip/AP_CountUnitLurkerDenCompleteOnlyTechTreeCheat=Mutate Hydralisk Den into Greater Hydralisk Den
 RequirementNode/Tooltip/AP_CountUnitNukeCompleteOnly=Build Nuke at the Shadow Ops
+RequirementNode/Tooltip/AP_CountUpgradeAdeptDisruptiveTransferCompleteOnly=Find Disruptive Transfer (Adept)
+RequirementNode/Tooltip/AP_CountUpgradeAvengerCloakCompleteOnly=Find Kryhas Cloak (Avenger)
+RequirementNode/Tooltip/AP_CountUpgradeDragoonPhalanxSuitCompleteOnly=Find Phalanx Suit (Dragoon)
+RequirementNode/Tooltip/AP_CountUpgradeSlayerBlinkCompleteOnly=Find Phase Blink (Slayer)
+RequirementNode/Tooltip/AP_CountUpgradeStalkerPhaseReactorCompleteOnly=Find Phase Reactor (Stalker)
+RequirementNode/Tooltip/AP_CountUpgradeVoidZealotWhirlwindCompleteOnly=Find Whirlwind (Zealot)
 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