triggers for zerg structure items

Ziktofel · Oct 26, 2024 · bd0ae62 · bd0ae62
1 parent 57e054f
commit bd0ae62
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 4 deletions.
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1232,8 +1232,8 @@ void libABFE498B_gf_AP_Triggers_unlockZergEvolutionPit (int lp_player, int lp_bi
         libABFE498B_gf_AP_Triggers_Zerg_OverlordPneumatizedCarapace, // 9
         libABFE498B_gf_AP_Triggers_Zerg_CreepStomach, // 10
         libABFE498B_gf_AP_Triggers_Zerg_ExcavatingClaws, // 11
-        ap_triggers_PlayerConsumer_sig, // 12
-        ap_triggers_PlayerConsumer_sig, // 13
+        libABFE498B_gf_AP_Triggers_Zerg_HiveClusterMaturation, // 12
+        libABFE498B_gf_AP_Triggers_Zerg_MacroscopicRecuperation, // 13
         ap_triggers_PlayerConsumer_sig, // 14
         ap_triggers_PlayerConsumer_sig, // 15
         ap_triggers_PlayerConsumer_sig, // 16
@@ -6761,6 +6761,18 @@ void libABFE498B_gf_AP_Triggers_Zerg_ExcavatingClaws (int lp_player) {
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ZergExcavatingClaws", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Zerg_HiveClusterMaturation (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_HiveClusterMaturation", 1);
+}
+
+void libABFE498B_gf_AP_Triggers_Zerg_MacroscopicRecuperation (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ZergStructureRapidRegen", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Zerg_KerriganKinteticBlast (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
@@ -687,6 +687,8 @@ void libABFE498B_gf_AP_Triggers_Zerg_VespeneEfficiency (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_MalignantCreep (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_CreepStomach (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_ExcavatingClaws (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_HiveClusterMaturation (int lp_player);
+void libABFE498B_gf_AP_Triggers_Zerg_MacroscopicRecuperation (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_KerriganKinteticBlast (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_KerriganHeroicFortitude (int lp_player);
 void libABFE498B_gf_AP_Triggers_Zerg_KerriganLeapingStrike (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
@@ -4009,8 +4009,8 @@
                     libABFE498B_gf_AP_Triggers_Zerg_OverlordPneumatizedCarapace, // 9
                     libABFE498B_gf_AP_Triggers_Zerg_CreepStomach, // 10
                     libABFE498B_gf_AP_Triggers_Zerg_ExcavatingClaws, // 11
-                    ap_triggers_PlayerConsumer_sig, // 12
-                    ap_triggers_PlayerConsumer_sig, // 13
+                    libABFE498B_gf_AP_Triggers_Zerg_HiveClusterMaturation, // 12
+                    libABFE498B_gf_AP_Triggers_Zerg_MacroscopicRecuperation, // 13
                     ap_triggers_PlayerConsumer_sig, // 14
                     ap_triggers_PlayerConsumer_sig, // 15
                     ap_triggers_PlayerConsumer_sig, // 16
@@ -54638,6 +54638,8 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="FA0C159C"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="6214A1C3"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="89082B8D"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="9CD24A02"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="F36C2964"/>
         </Element>
         <Element Type="FunctionDef" Id="D421BE14">
             <FlagAction/>
@@ -55146,6 +55148,78 @@
             <Value>1</Value>
             <ValueType Type="int"/>
         </Element>
+        <Element Type="FunctionDef" Id="9CD24A02">
+            <Identifier>AP_Triggers_Zerg_HiveClusterMaturation</Identifier>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="1F3F9DE8"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="6A196A8B"/>
+        </Element>
+        <Element Type="ParamDef" Id="1F3F9DE8">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="3E53DB9E"/>
+        </Element>
+        <Element Type="Param" Id="3E53DB9E">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="6A196A8B">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="77818397"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="9562E908"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="6DBA7955"/>
+        </Element>
+        <Element Type="Param" Id="77818397">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="1F3F9DE8"/>
+        </Element>
+        <Element Type="Param" Id="9562E908">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_HiveClusterMaturation</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="6DBA7955">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionDef" Id="F36C2964">
+            <Identifier>AP_Triggers_Zerg_MacroscopicRecuperation</Identifier>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="908BD5B9"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="F0EA16A8"/>
+        </Element>
+        <Element Type="ParamDef" Id="908BD5B9">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="3D6493D3"/>
+        </Element>
+        <Element Type="Param" Id="3D6493D3">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="F0EA16A8">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="E09F34C8"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="19EDD93B"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="9EE72BD1"/>
+        </Element>
+        <Element Type="Param" Id="E09F34C8">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="908BD5B9"/>
+        </Element>
+        <Element Type="Param" Id="19EDD93B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_ZergStructureRapidRegen</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="9EE72BD1">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="Category" Id="264418B4">
             <Item Type="FunctionDef" Library="ABFE498B" Id="D81959AC"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="17839D05"/>

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
@@ -621,6 +621,7 @@ FunctionDef/Name/lib_ABFE498B_9C290257=AP_Triggers_Protoss_unlockOracleStealthDr
 FunctionDef/Name/lib_ABFE498B_9C3FA6C1=AP_Triggers_Terran_unlockMedicAdvancedMedicFacilities
 FunctionDef/Name/lib_ABFE498B_9C5845F9=AP_Triggers_Protoss_unlockSolarBombardment
 FunctionDef/Name/lib_ABFE498B_9C94445C=AP_Triggers_Terran_unlockSonOfKorhal
+FunctionDef/Name/lib_ABFE498B_9CD24A02=AP_Triggers_Zerg_HiveClusterMaturation
 FunctionDef/Name/lib_ABFE498B_9CE17053=AP_Triggers_Terran_unlockBattlecruiserOptimizedLogistics
 FunctionDef/Name/lib_ABFE498B_9CF140DB=AP_Triggers_Terran_unlockReaperResorceEfficiency
 FunctionDef/Name/lib_ABFE498B_9D916EDC=AP_Triggers_Terran_unlockMarauderProgressiveStimpack
@@ -902,6 +903,7 @@ FunctionDef/Name/lib_ABFE498B_F1DB7DA2=AP_Triggers_Terran_unlockBattlecruiserInt
 FunctionDef/Name/lib_ABFE498B_F1EE5A2F=AP_Triggers_Terran_unlockReaperKineticFoam
 FunctionDef/Name/lib_ABFE498B_F2A42013=AP_Triggers_Terran_unlockDominionTrooper
 FunctionDef/Name/lib_ABFE498B_F2E889AB=AP_Triggers_Zerg_CorruptorMonstrousResilience
+FunctionDef/Name/lib_ABFE498B_F36C2964=AP_Triggers_Zerg_MacroscopicRecuperation
 FunctionDef/Name/lib_ABFE498B_F3C18F49=AP_Triggers_Protoss_unlockVanguardMatterDispersion
 FunctionDef/Name/lib_ABFE498B_F412BCCF=AP_Triggers_Zerg_ConcentratedSpew
 FunctionDef/Name/lib_ABFE498B_F42EFE8F=AP_Triggers_Terran_unlockHellionThermiteFilaments
@@ -1047,6 +1049,7 @@ ParamDef/Name/lib_ABFE498B_1D202509=player
 ParamDef/Name/lib_ABFE498B_1D4A8FBD=level
 ParamDef/Name/lib_ABFE498B_1D669BFE=player
 ParamDef/Name/lib_ABFE498B_1F3C75B2=player
+ParamDef/Name/lib_ABFE498B_1F3F9DE8=player
 ParamDef/Name/lib_ABFE498B_1F471C41=bitArrayValue
 ParamDef/Name/lib_ABFE498B_1FA9B7E1=player
 ParamDef/Name/lib_ABFE498B_1FAEEAF8=player
@@ -1465,6 +1468,7 @@ ParamDef/Name/lib_ABFE498B_8F1069F3=player
 ParamDef/Name/lib_ABFE498B_8F40B939=player
 ParamDef/Name/lib_ABFE498B_8F71D318=onHard
 ParamDef/Name/lib_ABFE498B_900CF381=player
+ParamDef/Name/lib_ABFE498B_908BD5B9=player
 ParamDef/Name/lib_ABFE498B_90B53627=player
 ParamDef/Name/lib_ABFE498B_91292E8B=player
 ParamDef/Name/lib_ABFE498B_912FF53C=player