Merge branch 'sc2-next' of github.com:Ziktofel/Archipelago-SC2-data i…

…nto sc2-next
Ziktofel · Jul 2, 2024 · e15c583 · e15c583
2 parents fb3cc6f + 1a54a9f
commit e15c583
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -951,7 +951,7 @@ Button/Name/AP_DefilerSCBWPredatoryConsumption=Predatory Consumption
 Button/Name/AP_DeploySpiderMines=Deploy Spider Mines
 Button/Name/AP_DeploySpiderMinesRaven=Deploy Spider Mines
 Button/Name/AP_DestroyerChargingBeam=Reforged Bloodshard Core
-Button/Name/AP_BuildDevastatorTurret=Build Devastation Turret
+Button/Name/AP_BuildDevastatorTurret=Build Devastator Turret
 Button/Name/AP_DevastatorTurretSlow=Concussive Grenades
 Button/Name/AP_DevourerAoEDamage=Corrosive Spray
 Button/Name/AP_DevourerSCBW=Morph to Devourer
@@ -1734,7 +1734,7 @@ Button/Name/AP_OverlordSpeed=Pneumatized Carapace
 Button/Name/AP_OverlordSightUpgrade=Antennae
 Button/Name/AP_MorphToOverseer=Morph to Overseer
 Button/Name/AP_OracleEnergyUpgrade=Bosonic Core
-Button/Name/AP_DevastatorTurretPunisherGrenades=Punisher Grenades
+Button/Name/AP_DevastatorTurretPunisherGrenades=Anti-Armor Munitions
 Button/Name/AP_FleetwideJump=Tactical Jump
 Button/Name/AP_LiberatorCompressedRocketFuel=Compressed Rocket Fuel
 Button/Tooltip/AP_250mmStrikeCannons=Stuns target unit. Deals <d ref="Effect,AP_250mmStrikeCannonsCreatePersistent,PeriodCount * Effect,AP_250mmStrikeCannonsDamage,Amount"/> damage over <d ref="Effect,AP_250mmStrikeCannonsCreatePersistent,PeriodCount * Effect,AP_250mmStrikeCannonsCreatePersistent,PeriodicPeriodArray[0]"/> seconds.

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -4241,7 +4241,7 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockFastDelivery (int lp_player) {
 
     // Implementation
     lv_upgradeLevels = TechTreeUpgradeCount(lp_player, "AP_FastDelivery", c_techCountQueuedOrBetter);
-    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_MercenaryMunitions", 1);
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_FastDelivery", 1);
     if ((lv_upgradeLevels == 0)) {
         lv_index = 0;
         for ( ; ( (auto92A9B087_ai >= 0 && lv_index <= auto92A9B087_ae) || (auto92A9B087_ai < 0 && lv_index >= auto92A9B087_ae) ) ; lv_index += auto92A9B087_ai ) {

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -33719,7 +33719,7 @@
         </Element>
         <Element Type="Param" Id="AB60765D">
             <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
-            <Value>AP_MercenaryMunitions</Value>
+            <Value>AP_FastDelivery</Value>
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>