From ac91c108240dfdf909f464b1a883386455e8e06d Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 7 Jul 2024 21:25:49 -0700 Subject: [PATCH 1/3] sc2: Removed unused high-capacity barrels upgrade (supplanted by infernal preigniter) --- .../Base.SC2Data/GameData/ActorData.xml | 19 +++++++++---------- .../Base.SC2Data/GameData/RequirementData.xml | 4 ---- .../GameData/RequirementNodeData.xml | 7 ------- .../Base.SC2Data/GameData/UpgradeData.xml | 10 ---------- .../Base.SC2Data/GameData/ValidatorData.xml | 5 ----- .../PreloadAssetDB.txt | 4 ---- .../LocalizedData/ObjectStrings.txt | 5 ----- 7 files changed, 9 insertions(+), 45 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml index 2d5373850..e97e11d59 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml @@ -1845,7 +1845,6 @@ - @@ -1857,13 +1856,13 @@ - + - + @@ -1894,13 +1893,13 @@ - + - + @@ -8972,13 +8971,13 @@ - + - + @@ -8988,17 +8987,17 @@ - + - + - + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml index f7c9e56df..f6b40cd12 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml @@ -192,10 +192,6 @@ - - - - diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml index 313bb6568..479908771 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml @@ -165,13 +165,6 @@ - - - - - - - diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml index d23ac1bd8..365dc0dc5 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml @@ -2128,16 +2128,6 @@ - - - - - - - - - - diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml index 6eee86f92..62ea122fa 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml @@ -104,11 +104,6 @@ - - - - - diff --git a/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt b/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt index 84121f74e..4877bac73 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt @@ -35397,10 +35397,6 @@ Alert=UpgradeComplete id=AP_FirebatStimpack Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr Alert=UpgradeComplete -id=AP_HighCapacityBarrels -asset=Assets\Textures\btn-upgrade-terran-infernalpreigniter.dds -Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr -Alert=ResearchComplete id=AP_TurboChargedEngines Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr Alert=ResearchComplete_Terr diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt index 57c7e3300..93ded51de 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt @@ -4552,7 +4552,6 @@ Requirement/Name/AP_UseGhostCriusSuit=Use Ghost Crius Suit Requirement/Name/AP_UseGhostOcularImplants=Use Ghost Ocular Implants Requirement/Name/AP_UseHailstormMissilePods=Use Hellstorm Missile Pods Requirement/Name/AP_UseHellionInfernalPreIgniter=Use Hellion Infernal PreIgniter -Requirement/Name/AP_UseHighCapacityBarrels=Use High Capacity Barrels Requirement/Name/AP_UseHiveMindEmulator=Use Hive Mind Emulator Requirement/Name/AP_UseIncineratorNozzles=Use Incinerator Nozzles Requirement/Name/AP_UseJackhammerConcussiveGrenade=Use Concussive Grenade @@ -4770,8 +4769,6 @@ RequirementNode/Name/AP_CountUpgradeGhostMoebiusReactorQueuedOrBetter=CountUpgra RequirementNode/Name/AP_CountUpgradeGhostSkinJunkerCompleteOnly=CountUpgrade(GhostSkinJunker,CompleteOnly) RequirementNode/Name/AP_CountUpgradeHALORocketsCompleteOnly=CountUpgrade(HALORockets,CompleteOnly) RequirementNode/Name/AP_CountUpgradeHellionCampaignInfernalPreIgniterCompleteOnly=CountUpgrade(HellionCampaignInfernalPreIgniter,CompleteOnly) -RequirementNode/Name/AP_CountUpgradeHighCapacityBarrelsCompleteOnlyTechTreeCheat=CountUpgrade(HighCapacityBarrels,CompleteOnly)[TechTreeCheat] -RequirementNode/Name/AP_CountUpgradeHighCapacityBarrelsQueuedOrBetter=CountUpgrade(HighCapacityBarrels,QueuedOrBetter) RequirementNode/Name/AP_CountUpgradeHireDevilDogsPHCompleteOnly=CountUpgrade(HireDevilDogsPH,CompleteOnly) RequirementNode/Name/AP_CountUpgradeHireDukesRevengeCompleteOnly=CountUpgrade(HireDukesRevenge,CompleteOnly) RequirementNode/Name/AP_CountUpgradeHireDuskWingPHCompleteOnly=CountUpgrade(HireDuskWingPH,CompleteOnly) @@ -6391,7 +6388,6 @@ Upgrade/EditorPrefix/AP_HALORockets=AP - Story Mode Tech - (Viking) Upgrade/EditorPrefix/AP_HailstormMissilePods=AP - Story Mode Tech - (Missile Turret) Upgrade/EditorPrefix/AP_HaveCarrier=Void - Tech Unit - Upgrade/EditorPrefix/AP_HellionCampaignInfernalPreIgniter=AP - Story Mode Tech - (Hellion) -Upgrade/EditorPrefix/AP_HighCapacityBarrels=AP - Hellion - Upgrade/EditorPrefix/AP_HiveMindEmulator=AP - Story Mode Lab Tech - Build Upgrade/EditorPrefix/AP_HotSBanelingCorrosiveBile=AP - Story Mode Tech (Swarm) - Baneling - Upgrade/EditorPrefix/AP_HotSBanelingHeal=AP - @@ -6762,7 +6758,6 @@ Validator/Name/AP_GhostNotHoldingFire=Ghost Not Holding Fire Validator/Name/AP_GhostPermanentCloakNotPurchased=Permanent Cloak Not Purchased Validator/Name/AP_HALORocketsResearched=HALO Rockets Researched Validator/Name/AP_HasHellionInfernalPreIgniter=Has Thermite Filaments -Validator/Name/AP_HasHighCapacityBarrels=Has High Capacity Barrels Validator/Name/AP_HasLiberatorMorphBehavior=Has Liberator Morph Behavior Validator/Name/AP_HasNoLiberatorYoink=Has No Liberator Yoink Validator/Name/AP_HasShapedBlast=Has Shaped Blast From f90e32655175ee1ee1e1c0f4823e3ba132d65cd5 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 17 Jul 2024 22:47:33 -0700 Subject: [PATCH 2/3] sc2: Fixed a broken effect reference in hellion beam actor data --- .../Base.SC2Data/GameData/ActorData.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml index e97e11d59..a781f3947 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml @@ -1845,7 +1845,7 @@ - + From 83d3f02eb35ab4435c4e3f70314a1ece339a71b0 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 17 Jul 2024 22:49:57 -0700 Subject: [PATCH 3/3] sc2: Removing unused gamestring --- .../enUS.SC2Data/LocalizedData/GameStrings.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt index 7c5794f53..e4955ab27 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -5161,7 +5161,6 @@ Upgrade/Name/AP_HALORockets=Ripwave Missiles Upgrade/Name/AP_HailstormMissilePods=Hellstorm Batteries Upgrade/Name/AP_HaveCarrier=Have Carrier Upgrade/Name/AP_HellionCampaignInfernalPreIgniter=Thermite Filaments -Upgrade/Name/AP_HighCapacityBarrels=Infernal Pre-igniter Upgrade/Name/AP_HireDevilDogsPH=Hire Devil Dogs PH Upgrade/Name/AP_HireDukesRevenge=Hire Dukes Revenge Upgrade/Name/AP_HireDuskWingPH=Hire Dusk Wing PH