sc2: Updated HERC Grapple Pull icon; misc cleanup; removed editor err…

…or messages on RequirementNode, Unit, and Behavior Data
Ziktofel · Jun 18, 2024 · dc8fc1e · dc8fc1e
1 parent f1c44c9
commit dc8fc1e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 27 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -18583,7 +18583,7 @@
         <GroupIcon>
             <Image value="Assets\Textures\btn-unit-protoss-fenix.dds"/>
         </GroupIcon>
-        <HeroIcon value="Assets\Textures\BTN-Unit-Protoss-stonezealot.dds"/>
+        <HeroIcon value="Assets\Textures\btn-hero-fenix.dds"/>
         <LifeArmorIcon value="Assets\Textures\btn-upgrade-protoss-groundarmorlevel0.dds"/>
         <SoundArray index="Ready" value="AP_Fenix_Ready"/>
         <SoundArray index="Help" value="AP_Fenix_Help"/>
@@ -18592,7 +18592,7 @@
         <SoundArray index="Attack" value="AP_Fenix_Attack"/>
         <SoundArray index="Pissed" value="AP_Fenix_Pissed"/>
         <UnitFlags index="SuppressDefaultStatusBar" value="1"/>
-        <UnitIcon value="Assets\Textures\BTN-Unit-Protoss-stonezealot.dds"/>
+        <UnitIcon value="Assets\Textures\btn-unit-protoss-fenix.dds"/>
         <Wireframe>
             <Image value="Assets\Textures\wireframe-protoss-fenix.dds"/>
         </Wireframe>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -813,7 +813,7 @@
     </CBehaviorBuff>
     <CBehaviorBuff id="AP_Irradiate">
         <Alignment value="Negative"/>
-        <InfoIcon value="AP\Assets\Textures\btn-ability-terran-irradiate.dds"/>
+        <InfoIcon value="assets\textures\btn-upgrade-swann-irradiate.dds"/>
         <EditorCategories value="AbilityorEffectType:Units"/>
         <Duration value="30"/>
         <Period value="1"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -109,8 +109,8 @@
         <EditorCategories value="Race:Terran"/>
     </CButton>
     <CButton id="AP_HercGrapplePull">
-        <Icon value="AP\Assets\Custom\Textures\btn-ability-herc-grapple-pull.dds"/>
-        <AlertIcon value="AP\Assets\Custom\Textures\btn-ability-herc-grapple-pull.dds"/>
+        <Icon value="assets/textures/btn-ability-tychus-herc-heavyimpact.dds"/>
+        <AlertIcon value="assets/textures/btn-ability-tychus-herc-heavyimpact.dds"/>
         <EditorCategories value="Race:Terran"/>
     </CButton>
     <CButton id="Move">
@@ -223,11 +223,6 @@
         <Icon value="assets\textures\btn-upgrade-raynor-cerberusmines.dds"/>
         <EditorCategories value="Race:Terran"/>
     </CButton>
-    <CButton id="AP_ResearchSpiderMinesSC1">
-        <Icon value="Assets\Textures\btn-unit-terran-spidermine.dds"/>
-        <AlertIcon value="AP\Assets\Textures\btn-unit-terran-spidermine.dds"/>
-        <EditorCategories value="Race:Terran"/>
-    </CButton>
     <CButton id="AP_SpiderMine">
         <Icon value="AP\Assets\Textures\btn-ability-terran-spidermine.dds"/>
         <AlertIcon value="AP\Assets\Textures\btn-ability-terran-spidermine.dds"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Catalog>
-    <CRequirementCountUpgrade default="1" id="AP_SCBW_UpgradeCount">
-        <?token id="x" type="CUpgradeLink" value="Research"?>
-        <Count Link="##x##" State="CompleteOnly"/>
-    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeHotSHaveRaptorCompleteOnly">
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="AP_HotSHaveRaptor" State="CompleteOnly"/>
@@ -3215,15 +3211,21 @@
     <CRequirementAnd id="AP_GhostSCBWLockdown@Show">
         <OperandArray value="AP_GhostSCBWLockdownResearch@Count"/>
     </CRequirementAnd>
-    <CRequirementCountUpgrade id="AP_GhostSCBWLockdownResearch@Count" parent="AP_SCBW_UpgradeCount" x="AP_GhostSCBWLockdownResearch"/>
+    <CRequirementCountUpgrade id="AP_GhostSCBWLockdownResearch@Count">
+        <Count Link="AP_GhostSCBWLockdownResearch" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
     <CRequirementAnd id="AP_MedicSCBWRestoration@Show">
         <OperandArray value="AP_MedicSCBWRestorationResearch@Count"/>
     </CRequirementAnd>
-    <CRequirementCountUpgrade id="AP_MedicSCBWRestorationResearch@Count" parent="AP_SCBW_UpgradeCount" x="AP_MedicSCBWRestorationResearch"/>
+    <CRequirementCountUpgrade id="AP_MedicSCBWRestorationResearch@Count">
+        <Count Link="AP_MedicSCBWRestorationResearch" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
     <CRequirementAnd id="AP_MedicSCBWOpticFlare@Show">
         <OperandArray value="AP_MedicSCBWOpticFlareResearch@Count"/>
     </CRequirementAnd>
-    <CRequirementCountUpgrade id="AP_MedicSCBWOpticFlareResearch@Count" parent="AP_SCBW_UpgradeCount" x="AP_MedicSCBWOpticFlareResearch"/>
+    <CRequirementCountUpgrade id="AP_MedicSCBWOpticFlareResearch@Count">
+        <Count Link="AP_MedicSCBWOpticFlareResearch" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeValkyrieEnhancedClusterLaunchersCompleteOnly">
         <Count Link="AP_ValkyrieEnhancedClusterLaunchers" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
@@ -3261,7 +3263,9 @@
     <CRequirementAnd id="AP_ScienceVesselSCBWEMPShockwave@Show">
         <OperandArray value="AP_ScienceVesselSCBWEMPShockwaveResearch@Count"/>
     </CRequirementAnd>
-    <CRequirementCountUpgrade id="AP_ScienceVesselSCBWEMPShockwaveResearch@Count" parent="AP_SCBW_UpgradeCount" x="AP_ScienceVesselSCBWEMPShockwaveResearch"/>
+    <CRequirementCountUpgrade id="AP_ScienceVesselSCBWEMPShockwaveResearch@Count">
+        <Count Link="AP_ScienceVesselSCBWEMPShockwaveResearch" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
     <CRequirementAnd id="AP_ScienceVesselSCBWDefensiveMatrix@Show">
         <OperandArray value="AP_CountUpgradeScienceVesselDefensiveMatrixCompleteOnly"/>
     </CRequirementAnd>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt b/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
@@ -16771,7 +16771,7 @@ id=AP_HercAcidExplosionImmunity
 asset=Assets\Textures\btn-upgrade-zerg-hydriaticacid.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_HercGrapplePull
-asset=AP\Assets\Custom\Textures\btn-ability-herc-grapple-pull.dds
+asset=Assets\Textures\btn-ability-tychus-herc-heavyimpact.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_StabilizerMedPacks
 asset=Assets\Textures\btn-upgrade-raynor-stabilizermedpacks.dds
@@ -16803,10 +16803,6 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 id=AP_CerberusMines
 asset=assets\textures\btn-upgrade-raynor-cerberusmines.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-id=AP_ResearchSpiderMinesSC1
-asset=AP\Assets\Textures\btn-unit-terran-spidermine.dds
-asset=Assets\Textures\btn-unit-terran-spidermine.dds
-Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_AresClassWeaponsSystem
 asset=assets\textures\btn-upgrade-swann-aresclasstargetingsystem.dds
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt
@@ -303,7 +303,6 @@ Button/Hotkey/AP_Refinery=R
 Button/Hotkey/AP_RepairDrones=E
 Button/Hotkey/AP_ResearchCycloneRapidFireLaunchers=A
 Button/Hotkey/AP_ResearchMagFieldLaunchers=R
-Button/Hotkey/AP_ResearchSpiderMinesSC1=M
 Button/Hotkey/AP_RespawnZergling=Z
 Button/Hotkey/AP_Roach=R
 Button/Hotkey/AP_RoachWarren=R

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1389,7 +1389,6 @@ Button/Name/AP_ResearchAlarakHighTemplarPsionicOrbTravelDistancePassive=Chaotic
 Button/Name/AP_ResearchCycloneRapidFireLaunchers=Research Rapid Fire Launchers
 Button/Name/AP_ResearchLiberatorAGMode=Research Defender Mode
 Button/Name/AP_ResearchMagFieldLaunchers=Research Mag-Field Launchers
-Button/Name/AP_ResearchSpiderMinesSC1=Research Spider Mines
 Button/Name/AP_RespawnZergling=Zergling Reconstitution
 Button/Name/AP_RetributionField=Lightning Field
 Button/Name/AP_RipwaveMissiles=Ripwave Missiles
@@ -2458,7 +2457,6 @@ Button/Tooltip/AP_RepairDrones=Two repair drones automatically heal friendly mec
 Button/Tooltip/AP_ResearchAlarakHighTemplarPsionicOrbTravelDistancePassive=Increases Psionic Orb's travel distance by 25%.
 Button/Tooltip/AP_ResearchCycloneRapidFireLaunchers=Increases the attack speed of the first 12 shots of the <c val="ffff8a">Cyclone's</c> Lock On.
 Button/Tooltip/AP_ResearchMagFieldLaunchers=Increases <c val="ffff8a">Cyclone's</c> attack range by +<d ref="$UpgradeEffectArrayValue:AP_MagFieldLaunchers:Weapon,AP_TyphoonMissilePod,Range$"/>.
-Button/Tooltip/AP_ResearchSpiderMinesSC1=Enables the Vulture to carry Spider Mines. Spider Mines burrow into the ground and become cloaked unless spotted with a detector or effect. When most types of enemy ground units pass nearby, the Spider Mine will unburrow, chase down the units, and detonate.
 Button/Tooltip/AP_RespawnZergling=Respawns up to <d ref="Effect,ZerglingRespawnTooltipDummy,SpawnCount"/> Zerglings at no cost until all Zerglings have returned to life.
 Button/Tooltip/AP_RetributionField=The Predator unleashes a deadly field of electricity each time it attacks. Deals 20 damage.
 Button/Tooltip/AP_RipwaveMissiles=Viking missiles deal area damage.

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
@@ -2703,7 +2703,6 @@ Button/EditorSuffix/AP_QueenStukovSpawnBroodlings=(Stukov)
 Button/EditorSuffix/AP_RapidDeployment=(Hercules)
 Button/EditorSuffix/AP_RapidDeploymentTubes=(Medivac)
 Button/EditorSuffix/AP_ReaverScarabs=
-Button/EditorSuffix/AP_ResearchSpiderMinesSC1=(Vulture)
 Button/EditorSuffix/AP_RuptureUpgrade=Upgrade
 Button/EditorSuffix/AP_SpectreConsumption=(Spectre)
 Button/EditorSuffix/AP_SpectreHoldFire=(Spectre)