sc2: Adding unlock triggers for tempest disintegration and interplane…

…tary range
Ziktofel · Aug 10, 2024 · 3c2fb7d · 3c2fb7d
1 parent 27a5bc8
commit 3c2fb7d
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 4 deletions.
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1526,7 +1526,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossForge3 (int lp_player, int lp_bitAr
         ap_triggers_PlayerConsumer_sig, // 21
         ap_triggers_PlayerConsumer_sig, //22
         ap_triggers_PlayerConsumer_sig, //23
-        ap_triggers_PlayerConsumer_sig, //24
+        libABFE498B_gf_AP_Triggers_Protoss_unlockTempestInterplanetaryRange, //24
         ap_triggers_PlayerConsumer_sig, //25
         ap_triggers_PlayerConsumer_sig, //26
         ap_triggers_PlayerConsumer_sig, //27
@@ -1593,7 +1593,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil2 (int lp_player, int lp_
         ap_triggers_PlayerConsumer_sig, // 8
         ap_triggers_PlayerConsumer_sig, // 9
         ap_triggers_PlayerConsumer_sig, // 10
-        ap_triggers_PlayerConsumer_sig, // 11
+        libABFE498B_gf_AP_Triggers_Protoss_unlockTempestDisintegration, // 11
         ap_triggers_PlayerConsumer_sig, // 12
         ap_triggers_PlayerConsumer_sig, // 13
         ap_triggers_PlayerConsumer_sig, // 14
@@ -7069,6 +7069,18 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockTempestGravitySling (int lp_player
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_TempestGravitySling", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Protoss_unlockTempestInterplanetaryRange (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_TempestInterplanetaryRange", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Protoss_unlockTempestDisintegration (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_TempestDisintegration", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Protoss_unlockPhoenixMirageIonicWavelengthFlux (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
@@ -713,6 +713,8 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockScoutResourceEfficency (int lp_pla
 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);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockTempestInterplanetaryRange (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockTempestDisintegration (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockPhoenixMirageIonicWavelengthFlux (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockPhoenixMirageAnionPulseCrystals (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockPhoenixDoubleGravitonBeam (int lp_player);

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -4506,7 +4506,7 @@
                     ap_triggers_PlayerConsumer_sig, // 21
                     ap_triggers_PlayerConsumer_sig, //22
                     ap_triggers_PlayerConsumer_sig, //23
-                    ap_triggers_PlayerConsumer_sig, //24
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockTempestInterplanetaryRange, //24
                     ap_triggers_PlayerConsumer_sig, //25
                     ap_triggers_PlayerConsumer_sig, //26
                     ap_triggers_PlayerConsumer_sig, //27
@@ -4627,7 +4627,7 @@
                     ap_triggers_PlayerConsumer_sig, // 8
                     ap_triggers_PlayerConsumer_sig, // 9
                     ap_triggers_PlayerConsumer_sig, // 10
-                    ap_triggers_PlayerConsumer_sig, // 11
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockTempestDisintegration, // 11
                     ap_triggers_PlayerConsumer_sig, // 12
                     ap_triggers_PlayerConsumer_sig, // 13
                     ap_triggers_PlayerConsumer_sig, // 14
@@ -59339,6 +59339,8 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="E066374C"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="DF43F911"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="9B930B10"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="7679C5B9"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="CA858087"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="F16080F0"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="5718B540"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="ABCCCE41"/>
@@ -60259,6 +60261,80 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="7679C5B9">
+            <Identifier>AP_Triggers_Protoss_unlockTempestInterplanetaryRange</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="6278C89F"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="BA47EDC4"/>
+        </Element>
+        <Element Type="ParamDef" Id="6278C89F">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="65898E2F"/>
+        </Element>
+        <Element Type="Param" Id="65898E2F">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="BA47EDC4">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="6423611C"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="7CDAF72D"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="DE90E6FB"/>
+        </Element>
+        <Element Type="Param" Id="6423611C">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="6278C89F"/>
+        </Element>
+        <Element Type="Param" Id="7CDAF72D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_TempestInterplanetaryRange</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="DE90E6FB">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="CA858087">
+            <Identifier>AP_Triggers_Protoss_unlockTempestDisintegration</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="D683DA33"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="2A965BB8"/>
+        </Element>
+        <Element Type="ParamDef" Id="D683DA33">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="58325B4D"/>
+        </Element>
+        <Element Type="Param" Id="58325B4D">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="2A965BB8">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="6E2FE7D0"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="EAED8A03"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="2BC1981F"/>
+        </Element>
+        <Element Type="Param" Id="6E2FE7D0">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="D683DA33"/>
+        </Element>
+        <Element Type="Param" Id="EAED8A03">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_TempestDisintegration</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="2BC1981F">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="FunctionDef" Id="F16080F0">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="368283AA"/>

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -428,6 +428,7 @@ FunctionDef/Name/lib_ABFE498B_7510FA68=AP_Triggers_Zerg_unlockViper
 FunctionDef/Name/lib_ABFE498B_7615B279=AP_Triggers_Terran_unlockWraithResourceEfficiency
 FunctionDef/Name/lib_ABFE498B_76333F64=AP_Triggers_Terran_unlockHercules
 FunctionDef/Name/lib_ABFE498B_76614C81=AP_Triggers_unlockTerranProgressiveUpgrades
+FunctionDef/Name/lib_ABFE498B_7679C5B9=AP_Triggers_Protoss_unlockTempestInterplanetaryRange
 FunctionDef/Name/lib_ABFE498B_76872FAF=AP_Triggers_Terran_unlockPredatorCloak
 FunctionDef/Name/lib_ABFE498B_76A4A1A3=AP_Triggers_Terran_unlockMedivacExpandedHull
 FunctionDef/Name/lib_ABFE498B_76C0FF8C=AP_Triggers_isGenericUpgradeAutoUnlock
@@ -683,6 +684,7 @@ FunctionDef/Name/lib_ABFE498B_C9ED962C=AP_Triggers_Terran_unlockInfantryArmor
 FunctionDef/Name/lib_ABFE498B_C9EDD088=AP_Triggers_Terran_unlockDevastatorTurret
 FunctionDef/Name/lib_ABFE498B_CA0C43C5=AP_Triggers_Zerg_RoachVile
 FunctionDef/Name/lib_ABFE498B_CA1333E8=AP_Triggers_Zerg_BroodQueenFungalGrowth
+FunctionDef/Name/lib_ABFE498B_CA858087=AP_Triggers_Protoss_unlockTempestDisintegration
 FunctionDef/Name/lib_ABFE498B_CB89C797=AP_Triggers_Zerg_RoachGlialReconstitution
 FunctionDef/Name/lib_ABFE498B_CBD4471B=AP_Triggers_Zerg_unlockInfestedBunker
 FunctionDef/Name/lib_ABFE498B_CCA989E6=AP_Triggers_Terran_unlockDiamondbackBurstCapacitors
@@ -1164,6 +1166,7 @@ ParamDef/Name/lib_ABFE498B_60A5C544=player
 ParamDef/Name/lib_ABFE498B_6111C1EE=player
 ParamDef/Name/lib_ABFE498B_61BEAC29=player
 ParamDef/Name/lib_ABFE498B_624EB7E0=player
+ParamDef/Name/lib_ABFE498B_6278C89F=player
 ParamDef/Name/lib_ABFE498B_629383C7=player
 ParamDef/Name/lib_ABFE498B_629C056C=player
 ParamDef/Name/lib_ABFE498B_62D33F93=player
@@ -1518,6 +1521,7 @@ ParamDef/Name/lib_ABFE498B_D5D0AF9A=player
 ParamDef/Name/lib_ABFE498B_D5E64D13=player
 ParamDef/Name/lib_ABFE498B_D61453DA=player
 ParamDef/Name/lib_ABFE498B_D634E41B=level
+ParamDef/Name/lib_ABFE498B_D683DA33=player
 ParamDef/Name/lib_ABFE498B_D6BF6D50=player
 ParamDef/Name/lib_ABFE498B_D6F36BE7=player
 ParamDef/Name/lib_ABFE498B_D7303401=bitArrayValue