From be652ed41f250a05a2f8124fb392f948a1167361 Mon Sep 17 00:00:00 2001
From: Ziktofel <ziktofel@gmail.com>
Date: Sun, 30 Jun 2024 23:43:06 +0200
Subject: [PATCH] Add Mechanical Know-how and Mercenary Munitions

---
 .../Base.SC2Data/GameData/UpgradeData.xml     | 229 ++++++++++++++++++
 .../Base.SC2Data/GameData/UpgradeData.xml     |  19 ++
 .../Base.SC2Data/LibABFE498B.galaxy           |  16 +-
 .../Base.SC2Data/LibABFE498B_h.galaxy         |   2 +
 .../ArchipelagoTriggers.SC2Mod/DocumentHeader | Bin 156 -> 156 bytes
 .../GameText.version                          | Bin 44 -> 44 bytes
 Mods/ArchipelagoTriggers.SC2Mod/Triggers      |  78 +++++-
 .../Triggers.version                          | Bin 44 -> 44 bytes
 .../LocalizedData/TriggerStrings.txt          |   4 +
 9 files changed, 344 insertions(+), 4 deletions(-)

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 37f9b302f..a2e2f8fb6 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -12282,4 +12282,233 @@
         <EffectArray Operation="Subtract" Reference="Unit,AP_ScoutMP,CostResource[Vespene]" Value="25"/>
         <EffectArray Reference="Unit,AP_ScoutMP,Food" Value="1"/>
     </CUpgrade>
+    <CUpgrade id="AP_MechanicalKnowHow">
+        <Icon value="Assets\Textures\Talent-Swann-Level14-VehicleHealthIncrease.dds"/>
+        <!-- Use 1.2001 due to floating point math the game does. -->
+        <!--  SCV -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SCV,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SCV,LifeStart" Value="1.2001"/>
+        <!--  Thor -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Thor,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Thor,LifeStart" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_ThorAP,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_ThorAP,LifeStart" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_ThorBuild,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_ThorBuild,LifeStart" Value="1.2001"/>
+        <!--  Siege Tank -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SiegeTank,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SiegeTank,LifeStart" Value="1.2001"/>
+        <!--  Siege Tank (Sieged) -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SiegeTankSieged,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SiegeTankSieged,LifeStart" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SiegeTankSiegedTransportable,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SiegeTankSiegedTransportable,LifeStart" Value="1.2001"/>
+        <!--  DiamondBack -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Diamondback,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Diamondback,LifeStart" Value="1.2001"/>
+        <!--  Hellion -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Hellion,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Hellion,LifeStart" Value="1.2001"/>
+        <!--  Hellbat -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_HellionTank,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_HellionTank,LifeStart" Value="1.2001"/>
+        <!--  Vulture -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Vulture,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Vulture,LifeStart" Value="1.2001"/>
+        <!--  Goliath -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Goliath,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Goliath,LifeStart" Value="1.2001"/>
+        <!--  Merc Goliath -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SpartanCompany,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SpartanCompany,LifeStart" Value="1.2001"/>
+        <!--  Merc Siege Tank Sieged -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SiegeBreakerSieged,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SiegeBreakerSieged,LifeStart" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SiegeBreakerSiegedTransportable,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SiegeBreakerSiegedTransportable,LifeStart" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_InfestedSiegeTankSieged,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_InfestedSiegeTankSieged,LifeStart" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_InfestedSiegeTankSiegedTransportable,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_InfestedSiegeTankSiegedTransportable,LifeStart" Value="1.2001"/>
+        <!-- Merc Siege tank  -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SiegeBreaker,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_SiegeBreaker,LifeStart" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_InfestedSiegeTank,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_InfestedSiegeTank,LifeStart" Value="1.2001"/>
+        <!-- Predator -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Predator,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Predator,LifeStart" Value="1.2001"/>
+        <!-- Widow Mine -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_WidowMine,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_WidowMine,LifeStart" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_WidowMineBurrowed,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_WidowMineBurrowed,LifeStart" Value="1.2001"/>
+        <!-- Cyclone -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Cyclone,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Cyclone,LifeStart" Value="1.2001"/>
+        <!-- Warhound -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_WarHound,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_WarHound,LifeStart" Value="1.2001"/>
+        <!--  Merc Thor -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_MercThor,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_MercThor,LifeStart" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_MercThorAP,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_MercThorAP,LifeStart" Value="1.2001"/>
+        <!--  Banshee -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Banshee,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Banshee,LifeStart" Value="1.2001"/>
+        <!--  Battlecruiser -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Battlecruiser,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Battlecruiser,LifeStart" Value="1.2001"/>
+        <!--  Medivac -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Medivac,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Medivac,LifeStart" Value="1.2001"/>
+        <!--  Raven -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Raven,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Raven,LifeStart" Value="1.2001"/>
+        <!--  Viking -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_VikingAssault,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_VikingAssault,LifeStart" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_VikingFighter,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_VikingFighter,LifeStart" Value="1.2001"/>
+        <!--  Wraith -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Wraith,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Wraith,LifeStart" Value="1.2001"/>
+        <!--  Hercules -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Hercules,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Hercules,LifeStart" Value="1.2001"/>
+        <!--  Merc Battlecruiser -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_DukesRevenge,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_DukesRevenge,LifeStart" Value="1.2001"/>
+        <!--  Merc Banshee -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_DuskWing,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_DuskWing,LifeStart" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_InfestedBanshee,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_InfestedBanshee,LifeStart" Value="1.2001"/>
+        <!--  Science Vessel -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_ScienceVessel,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_ScienceVessel,LifeStart" Value="1.2001"/>
+        <!--  Merc Viking -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_HelsAngelAssault,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_HelsAngelAssault,LifeStart" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_HelsAngelFighter,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_HelsAngelFighter,LifeStart" Value="1.2001"/>
+        <!-- Liberator -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Liberator,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_Liberator,LifeStart" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_LiberatorAG,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_LiberatorAG,LifeStart" Value="1.2001"/>
+        <!-- Valkyrie -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_ValkyrieSCBW,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_ValkyrieSCBW,LifeStart" Value="1.2001"/>
+        <!--  Merc Wraith -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_MercWraith,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_MercWraith,LifeStart" Value="1.2001"/>
+        <!-- Merc Liberator -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_MercLiberator,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_MercLiberator,LifeStart" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_MercLiberatorAG,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_MercLiberatorAG,LifeStart" Value="1.2001"/>
+        <!-- Merc Valkyrie -->
+        <EffectArray Operation="Multiply" Reference="Unit,AP_BrynhildFighter,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_BrynhildFighter,LifeStart" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_BrynhildAssault,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,AP_BrynhildAssault,LifeStart" Value="1.2001"/>
+    </CUpgrade>
+    <CUpgrade id="AP_MercenaryMunitions">
+        <Icon value="Assets\Textures\Talent-Raynor-Level14-InfantryAttackSpeed.dds"/>
+        <EffectArray Reference="Weapon,AP_GaussRifle,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_P38ScytheGuassPistol,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_P38ScytheGuassPistolAir,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_D8Charge,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_D8ChargeAir,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_MercReaperP38ScytheGuassPistol,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_MercReaperP38ScytheGuassPistolAir,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_MercReaperD8Charge,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_MercReaperD8ChargeAir,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_PunisherGrenades,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_C10CanisterRifle,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_Firebat,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_Specter,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_HERCWeapon,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_KelmorianMinerGaussRifle,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_HammerSecurity,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_DevilDogFlameThrower,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_NovaWeaponCanisterRifle,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_NovaWeaponHellfireShotgun,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_NovaWeaponPlasmaRifle,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_NovaWeaponPsiBlade,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_NovaWeaponBlazefireBlade,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_NovaWeaponBlazefireBladeGun,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_ThorsHammer,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_JavelinMissileLaunchers,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_LanceMissileLaunchers,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_MercThorsHammer,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_MercJavelinMissileLaunchers,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_MercLanceMissileLaunchers,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_90mmCannons,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_CrucioShockCannon,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_MedivacSiegeTankAirlift,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_InfernalFlameThrower,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_HellionTank,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_Diamondback,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_VultureMoving,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_Vulture,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_GoliathG,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_GoliathA,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_GoliathGUpgraded,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_GoliathAUpgraded,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_SpartanCompanyG,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_SpartanCompanyA,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_SpartanCompanyGUpgraded,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_SpartanCompanyAUpgraded,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_SiegeBreaker,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_ArcliteShockCannon,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_MedivacMercSiegeTankAirlift,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_Predator,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_TyphoonMissilePod,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_WarHound,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_WarHoundMelee,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_BacklashRockets,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_ATSLaserBattery,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_ATALaserBattery,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_AllPurposeLaserBattery,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_LanzerTorpedoes,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_TwinGatlingCannon,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_WraithG,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_WraithA,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_WraithAG,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_MercWraithG,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_MercWraithA,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_MercWraithAG,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_DuskWingBanshee,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_WreckingCrewAssault,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_WreckingCrewFighter,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_DRBattlecruiserA,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_DRCannonsA,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_DRBattlecruiserFakeA,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_DRBattlecruiserG,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_DRCannonsG,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_DRBattlecruiserFakeG,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_DRAllPurposeLaserBattery,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_DRAllPurposeCannons,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_LiberatorMissileLaunchers,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_LiberatorAGWeapon,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_MercLiberatorMissileLaunchers,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_MercLiberatorAGWeapon,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_ValkyrieSCBWWeapon,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_ValkyrieSCBWWeaponUpgraded,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_ValkyrieG,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_BrynhildFighterAirWeapon,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_BrynhildFighterAirWeaponUpgraded,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_BrynhildFighterG,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_BrynhildAssaultG,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_BrynhildAssaultGUpgraded,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_BrynhildAssaultA,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_BrynhildAssaultAUpgraded,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_NovaRavenSeekerMissile,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_InfestedSiegeBreaker,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_InfestedArcliteShockCannon,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,AP_InfestedBanshee,RateMultiplier" Value="0.15"/>
+    </CUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 219c26b15..1b09d24d3 100644
--- a/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -1602,4 +1602,23 @@
         <EffectArray Reference="Weapon,OdinAntiAir,Range" Value="1"/>
         <EffectArray Reference="Weapon,OdinAntiAir,MinScanRange" Value="1"/>
     </CUpgrade>
+    <CUpgrade id="AP_MechanicalKnowHow">
+        <!-- Override -->
+        <EffectArray Operation="Multiply" Reference="Unit,Odin,LifeMax" Value="1.2001"/>
+        <EffectArray Operation="Multiply" Reference="Unit,Odin,LifeStart" Value="1.2001"/>
+    </CUpgrade>
+    <CUpgrade id="AP_MercenaryMunitions">
+        <!-- Override -->
+        <EffectArray Reference="Weapon,CommandoRifle,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,RaynorWeapon,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,RaynorGaussRifle,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,TychusCommandoChaingun,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,TychusChaingun,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,DutchConcussiveGrenade,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,SwannMelee,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,Nova,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,Tosh,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,Odin,RateMultiplier" Value="0.15"/>
+        <EffectArray Reference="Weapon,OdinAntiAir,RateMultiplier" Value="0.15"/>
+    </CUpgrade>
 </Catalog>
\ No newline at end of file
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index 50b51e2f4..5c636474f 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -509,8 +509,8 @@ void libABFE498B_gf_AP_Triggers_unlockTerranLaboratory (int lp_player, int lp_bi
         libABFE498B_gf_AP_Triggers_Terran_unlockHiSecAutoTracking, // 10
         libABFE498B_gf_AP_Triggers_Terran_unlockAdvancedOptics, // 11
         libABFE498B_gf_AP_Triggers_Terran_unlockRogueForces, // 12
-        ap_triggers_PlayerConsumer_sig, // 13
-        ap_triggers_PlayerConsumer_sig, // 14
+        libABFE498B_gf_AP_Triggers_Terran_unlockMechanicalKnowHow, // 13
+        libABFE498B_gf_AP_Triggers_Terran_unlockMercenaryMunitions, // 14
         ap_triggers_PlayerConsumer_sig, // 15
         ap_triggers_PlayerConsumer_sig, // 16
         ap_triggers_PlayerConsumer_sig, // 17
@@ -4128,6 +4128,18 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockRogueForces (int lp_player) {
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_RogueForces", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Terran_unlockMechanicalKnowHow (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_MechanicalKnowHow", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Terran_unlockMercenaryMunitions (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_MercenaryMunitions", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Terran_unlockNovaGhostVisor (int lp_player) {
     // Automatic Variable Declarations
     // Implementation
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
index 872e95ee3..690efe222 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -410,6 +410,8 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockStructureArmor (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockHiSecAutoTracking (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockAdvancedOptics (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockRogueForces (int lp_player);
+void libABFE498B_gf_AP_Triggers_Terran_unlockMechanicalKnowHow (int lp_player);
+void libABFE498B_gf_AP_Triggers_Terran_unlockMercenaryMunitions (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockNovaGhostVisor (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockNovaRangefinderOculus (int lp_player);
 void libABFE498B_gf_AP_Triggers_Terran_unlockNovaDomination (int lp_player);
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader
index de95fdac4e150ffada51285ee52821fefe004554..ccec5272470114607fae88bb0e42f1427d94c449 100644
GIT binary patch
delta 32
gcmbQkIEQh9j4;RF$O$0K00qnp3=;#yCc1_L0F=oG{Qv*}

delta 32
gcmbQkIEQh9jPU8S(_cWC0ScHI7$ydYO>_+h0KhW}0RR91

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version
index 9ac13c8520d80930ab6f18b681fdb366683ba25e..b8520ad9be7155aa4fb5affcaa4d2a0678dd15b1 100644
GIT binary patch
delta 17
YcmdPVnV`U<z|6pK=UihNBLf2i03);m$^ZZW

delta 17
YcmdPVnV`TU&&<GJdo4GOk%55$03L7y9smFU

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 1ddb16a02..a738fc579 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -2756,8 +2756,8 @@
                     libABFE498B_gf_AP_Triggers_Terran_unlockHiSecAutoTracking, // 10
                     libABFE498B_gf_AP_Triggers_Terran_unlockAdvancedOptics, // 11
                     libABFE498B_gf_AP_Triggers_Terran_unlockRogueForces, // 12
-                    ap_triggers_PlayerConsumer_sig, // 13
-                    ap_triggers_PlayerConsumer_sig, // 14
+                    libABFE498B_gf_AP_Triggers_Terran_unlockMechanicalKnowHow, // 13
+                    libABFE498B_gf_AP_Triggers_Terran_unlockMercenaryMunitions, // 14
                     ap_triggers_PlayerConsumer_sig, // 15
                     ap_triggers_PlayerConsumer_sig, // 16
                     ap_triggers_PlayerConsumer_sig, // 17
@@ -31041,6 +31041,8 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="A580862B"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="92A8EFCF"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="14A68232"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="1459DE94"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="3BDD903D"/>
         </Element>
         <Element Type="FunctionDef" Id="750E7E60">
             <FlagAction/>
@@ -32767,6 +32769,78 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="1459DE94">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="42BC9976"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="E3D7872C"/>
+        </Element>
+        <Element Type="ParamDef" Id="42BC9976">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="168BA8C7"/>
+        </Element>
+        <Element Type="Param" Id="168BA8C7">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="E3D7872C">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="5E93B7B6"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="84EABF13"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="47855483"/>
+        </Element>
+        <Element Type="Param" Id="5E93B7B6">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="42BC9976"/>
+        </Element>
+        <Element Type="Param" Id="84EABF13">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="47855483">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_MechanicalKnowHow</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="FunctionDef" Id="3BDD903D">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="BF402B8E"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="36B735DE"/>
+        </Element>
+        <Element Type="ParamDef" Id="BF402B8E">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="C89C0ED6"/>
+        </Element>
+        <Element Type="Param" Id="C89C0ED6">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="36B735DE">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="3DF582A5"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="692F7EA2"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="7DF39438"/>
+        </Element>
+        <Element Type="Param" Id="3DF582A5">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="BF402B8E"/>
+        </Element>
+        <Element Type="Param" Id="692F7EA2">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="7DF39438">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_MercenaryMunitions</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
         <Element Type="Category" Id="91294A43">
             <Item Type="FunctionDef" Library="ABFE498B" Id="7E29507E"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="81DF4CB5"/>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version
index d46cd8ec9c6332343b0d12d91049ef37c2ee292f..d14c3c0058ce90386b5bd7a735e6f059080f659c 100644
GIT binary patch
delta 17
YcmdPVnV`TU&cVRoc)l@>k%55$03NObEC2ui

delta 17
YcmdPVnV`TU!ok2GpIw{A$iTn=02-zOp8x;=

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 18be2d9dc..9afcd6b7e 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -145,6 +145,7 @@ FunctionDef/Name/lib_ABFE498B_12BEA035=AP_Triggers_Zerg_ImpalerHardenedTentacleS
 FunctionDef/Name/lib_ABFE498B_13ECAA12=AP_Triggers_Terran_unlockScienceVesselImprovedNanoRepair
 FunctionDef/Name/lib_ABFE498B_1429EC3C=AP_Triggers_Zerg_ZerglingSwarmling
 FunctionDef/Name/lib_ABFE498B_1457AC78=AP_Triggers_Protoss_unlockKhaydarinMonolith
+FunctionDef/Name/lib_ABFE498B_1459DE94=AP_Triggers_Terran_unlockMechanicalKnowHow
 FunctionDef/Name/lib_ABFE498B_14A68232=AP_Triggers_Terran_unlockRogueForces
 FunctionDef/Name/lib_ABFE498B_1677C710=AP_Triggers_Protoss_unlockDarkArchonMaelstrom
 FunctionDef/Name/lib_ABFE498B_1685C06F=AP_Triggers_unlockTerranArmory1
@@ -245,6 +246,7 @@ FunctionDef/Name/lib_ABFE498B_3B23A0D3=AP_Triggers_Protoss_unlockColossusPacific
 FunctionDef/Name/lib_ABFE498B_3B7CB7D9=AP_Triggers_Protoss_unlockDarkTemplarFamilyBlink
 FunctionDef/Name/lib_ABFE498B_3BCCC049=AP_Triggers_Protoss_unlockBloodHunter
 FunctionDef/Name/lib_ABFE498B_3BCDC090=AP_Triggers_unlockTerranArmory3
+FunctionDef/Name/lib_ABFE498B_3BDD903D=AP_Triggers_Terran_unlockMercenaryMunitions
 FunctionDef/Name/lib_ABFE498B_3CF92A4F=AP_Triggers_Terran_unlockRavenBioMechanicalRepairDrone
 FunctionDef/Name/lib_ABFE498B_3D0968D8=AP_Triggers_Terran_unlockBunkerShrikeTurret
 FunctionDef/Name/lib_ABFE498B_3D0C8A3E=AP_Triggers_Terran_unlockThor
@@ -948,6 +950,7 @@ ParamDef/Name/lib_ABFE498B_414EFF52=player
 ParamDef/Name/lib_ABFE498B_4153495A=player
 ParamDef/Name/lib_ABFE498B_41EFDA20=player
 ParamDef/Name/lib_ABFE498B_422B4FD0=player
+ParamDef/Name/lib_ABFE498B_42BC9976=player
 ParamDef/Name/lib_ABFE498B_43492E22=player
 ParamDef/Name/lib_ABFE498B_436126E6=player
 ParamDef/Name/lib_ABFE498B_4365D3A7=player
@@ -1305,6 +1308,7 @@ ParamDef/Name/lib_ABFE498B_BD06BE6F=player
 ParamDef/Name/lib_ABFE498B_BD261127=player
 ParamDef/Name/lib_ABFE498B_BE227290=player
 ParamDef/Name/lib_ABFE498B_BF182651=level
+ParamDef/Name/lib_ABFE498B_BF402B8E=player
 ParamDef/Name/lib_ABFE498B_BFE886F7=player
 ParamDef/Name/lib_ABFE498B_C0232BE3=player
 ParamDef/Name/lib_ABFE498B_C0871609=player