Add Scout resource efficiency

Ziktofel · Jun 15, 2024 · eefe601 · eefe601
1 parent f0ed6ec
commit eefe601
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 2 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -12278,4 +12278,10 @@
         <EffectArray Reference="Unit,AP_Overseer,Sight" Value="2.75"/>
     </CUpgrade>
     <CUpgrade id="AP_OverlordMorphOverseer"/>
+    <CUpgrade id="AP_ScoutResourceEfficiency">
+        <Flags index="UpgradeCheat" value="0"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_ScoutMP,CostResource[Minerals]" Value="125"/>
+        <EffectArray Operation="Subtract" Reference="Unit,AP_ScoutMP,CostResource[Vespene]" Value="25"/>
+        <EffectArray Reference="Unit,AP_ScoutMP,Food" Value="1"/>
+    </CUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1426,7 +1426,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossForge3 (int lp_player, int lp_bitAr
         libABFE498B_gf_AP_Triggers_Protoss_unlockZealotFamilyLegEnhancements, // 16
         libABFE498B_gf_AP_Triggers_Protoss_unlockZealotFamilyShieldCapacity, // 17
         libABFE498B_gf_AP_Triggers_Protoss_unlockOracleBosonicCore, // 18
-        ap_triggers_PlayerConsumer_sig, // 19
+        libABFE498B_gf_AP_Triggers_Protoss_unlockScoutResourceEfficency, // 19
         ap_triggers_PlayerConsumer_sig, // 20
         ap_triggers_PlayerConsumer_sig, // 21
         ap_triggers_PlayerConsumer_sig, //22
@@ -6487,6 +6487,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockScoutAdvancedPhotonBlasters (int l
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ScoutAdvancedPhotonBlasters", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Protoss_unlockScoutResourceEfficency (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ScoutResourceEfficiency", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Protoss_unlockTempestTectonicDestabilizers (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
@@ -651,6 +651,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockScoutCombatSensorArray (int lp_pla
 void libABFE498B_gf_AP_Triggers_Protoss_unlockScoutApialSensors (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockScoutGraviticThrusters (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockScoutAdvancedPhotonBlasters (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockScoutResourceEfficency (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockTempestTectonicDestabilizers (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockTempestQuanticReactor (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockTempestGravitySling (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
@@ -4198,7 +4198,7 @@
                     libABFE498B_gf_AP_Triggers_Protoss_unlockZealotFamilyLegEnhancements, // 16
                     libABFE498B_gf_AP_Triggers_Protoss_unlockZealotFamilyShieldCapacity, // 17
                     libABFE498B_gf_AP_Triggers_Protoss_unlockOracleBosonicCore, // 18
-                    ap_triggers_PlayerConsumer_sig, // 19
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockScoutResourceEfficency, // 19
                     ap_triggers_PlayerConsumer_sig, // 20
                     ap_triggers_PlayerConsumer_sig, // 21
                     ap_triggers_PlayerConsumer_sig, //22
@@ -55399,6 +55399,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="E049E260"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="4DF3B624"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="0A50E4AB"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="C7916C42"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="E066374C"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="DF43F911"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="9B930B10"/>
@@ -56039,6 +56040,42 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="C7916C42">
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="FF77CD36"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="E540ACA2"/>
+        </Element>
+        <Element Type="ParamDef" Id="FF77CD36">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="582332BD"/>
+        </Element>
+        <Element Type="Param" Id="582332BD">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="E540ACA2">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="36AA1CD4"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="3747DE99"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="E6243427"/>
+        </Element>
+        <Element Type="Param" Id="36AA1CD4">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="FF77CD36"/>
+        </Element>
+        <Element Type="Param" Id="3747DE99">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="Param" Id="E6243427">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_ScoutResourceEfficiency</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
         <Element Type="FunctionDef" Id="E066374C">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="DD9D8B65"/>

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
@@ -603,6 +603,7 @@ FunctionDef/Name/lib_ABFE498B_C65635D4=AP_Triggers_Zerg_UltraliskChitinousPlatin
 FunctionDef/Name/lib_ABFE498B_C6876757=AP_Triggers_Terran_unlockVultureAutoRepair
 FunctionDef/Name/lib_ABFE498B_C6B38A8C=AP_Triggers_Terran_unlockThorButtonWithASkullOnIt
 FunctionDef/Name/lib_ABFE498B_C74D3353=AP_Triggers_Terran_unlockThorLargeScaleFieldConstruction
+FunctionDef/Name/lib_ABFE498B_C7916C42=AP_Triggers_Protoss_unlockScoutResourceEfficency
 FunctionDef/Name/lib_ABFE498B_C7C892FE=AP_Triggers_Terran_unlockReaperAdvancedCloakingField
 FunctionDef/Name/lib_ABFE498B_C7F40A37=AP_Triggers_Terran_unlockGoliathInternalTechModule
 FunctionDef/Name/lib_ABFE498B_C84BAA15=AP_Triggers_Zerg_RoachAdaptivePlating
@@ -1479,6 +1480,7 @@ ParamDef/Name/lib_ABFE498B_FD615B79=player
 ParamDef/Name/lib_ABFE498B_FD83916B=player
 ParamDef/Name/lib_ABFE498B_FDA76D4F=player
 ParamDef/Name/lib_ABFE498B_FE9CCCE5=bitArrayValue
+ParamDef/Name/lib_ABFE498B_FF77CD36=player
 ParamDef/Name/lib_ABFE498B_FFC5A20B=player
 Trigger/Name/lib_ABFE498B_15BC943E=AP_Triggers_InitSoA
 Trigger/Name/lib_ABFE498B_251CB9EA=AP_Triggers_techTreeInit