Add Mechanical Know-how and Mercenary Munitions

Ziktofel · Jun 30, 2024 · be652ed · be652ed
1 parent 4100bd1
commit be652ed
Show file tree

Hide file tree

Showing 9 changed files with 344 additions and 4 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
diff --git 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>
diff --git 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
@@ -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
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version
diff --git 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
diff --git 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