Merge pull request #201 from MatthewMarinets/mm/war_council_greyout

sc2: Making war council upgrade grey-out when locked instead of hidden
Ziktofel · Jul 18, 2024 · 6509bbf · 6509bbf
2 parents 6686ba4 + d297805
commit 6509bbf
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git 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
@@ -1554,6 +1554,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>
@@ -1563,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"/>
@@ -2746,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"/>
@@ -2762,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"/>
@@ -2782,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"/>
@@ -2992,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"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5144,7 +5144,6 @@
     </CRequirementOr>
     <CRequirementCountUpgrade id="AP_CountUpgradeVoidZealotWhirlwindCompleteOnly">
         <Flags index="TechTreeCheat" value="0"/>
-        <Tooltip value=""/>
         <Count Link="AP_VoidZealotWhirlwind" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeAdeptKillBounceCompleteOnly">
@@ -5154,7 +5153,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
@@ -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