Merge branch 'master' into sc2-next

Ziktofel · Jun 11, 2024 · 680dc09 · 680dc09
2 parents 7930626 + 04db57e
commit 680dc09
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/Maps/ArchipelagoCampaign/NCO/ap_in_the_enemy_s_shadow.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/NCO/ap_in_the_enemy_s_shadow.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/NCO/ap_in_the_enemy_s_shadow.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/NCO/ap_in_the_enemy_s_shadow.SC2Map/MapScript.galaxy
@@ -1118,6 +1118,7 @@ bool gt_ArchInit_Func (bool testConds, bool runActions) {
     TriggerExecute(libD62A7F54_gt_AP_Player_NCOConstructor, true, false);
     TriggerExecute(gt_Init02Players, true, false);
     TriggerExecute(gt_Init03Units, true, false);
+    libABFE498B_gf_AP_Triggers_MapConfig_setMissionBuild(false);
     lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_pLAYER_01_USER, lib5BD4895D_gv_aP_Core_Faction_NOVA);
     lib5BD4895D_gf_AP_Core_MapConfig_setMapInit(gt_Initialization);
     libABFE498B_gf_AP_Triggers_MapConfig_setDifficultySetup(gt_onDifficultyCasual, gt_onDifficultyNormal, gt_onDifficultyHard, gt_onDifficultyBrutal);

diff --git a/Maps/ArchipelagoCampaign/NCO/ap_in_the_enemy_s_shadow.SC2Map/Triggers b/Maps/ArchipelagoCampaign/NCO/ap_in_the_enemy_s_shadow.SC2Map/Triggers
@@ -371,6 +371,7 @@
         <Action Type="FunctionCall" Id="68E8F4A8"/>
         <Action Type="FunctionCall" Id="8D748991"/>
         <Action Type="FunctionCall" Id="895A1D43"/>
+        <Action Type="FunctionCall" Id="1608A924"/>
         <Action Type="FunctionCall" Id="1BE87B4D"/>
         <Action Type="FunctionCall" Id="BCF11881"/>
         <Action Type="FunctionCall" Id="73124EEF"/>
@@ -436,6 +437,15 @@
         <ValueType Type="trigger"/>
         <ValueElement Type="Trigger" Id="48BE6A97"/>
     </Element>
+    <Element Type="FunctionCall" Id="1608A924">
+        <FunctionDef Type="FunctionDef" Library="ABFE498B" Id="F7B91CC9"/>
+        <Parameter Type="Param" Id="1C768FD3"/>
+    </Element>
+    <Element Type="Param" Id="1C768FD3">
+        <ParameterDef Type="ParamDef" Library="ABFE498B" Id="3717DDB1"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
     <Element Type="FunctionCall" Id="1BE87B4D">
         <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="61E1BF3C"/>
         <Parameter Type="Param" Id="10FEE3A5"/>

diff --git a/Maps/ArchipelagoCampaign/NCO/ap_in_the_enemy_s_shadow.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/NCO/ap_in_the_enemy_s_shadow.SC2Map/Triggers.version