Fix a race condition for the intro cinematic in Lab Rat

Ziktofel · Oct 29, 2024 · 59e733b · 59e733b
1 parent c13306e
commit 59e733b
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 1 deletion.
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/MapScript.galaxy
@@ -8191,7 +8191,7 @@ bool gt_IntroQ_Func (bool testConds, bool runActions) {
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerQueueEnter();
     TriggerExecute(gt_IntroSetup, true, true);
-    if ((libABFE498B_gv_aP_Triggers_skipCutscenes == false)) {
+    if ((libABFE498B_gv_aP_Triggers_skipCutscenes == false) && (libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut")) {
         TriggerExecute(gt_IntroCinematic, true, true);
         TriggerExecute(gt_IntroCinematicEnd, true, true);
     }
@@ -8227,6 +8227,9 @@ bool gt_IntroSetup_Func (bool testConds, bool runActions) {
         return true;
     }
 
+    while (!((gv_workerUnitType != null))) {
+        Wait(0.1, c_timeGame);
+    }
     CinematicFade(false, 0.0, c_fadeStyleNormal, ColorWithAlpha(0.00, 0.00, 0.00, 0.00), 0.0, false);
     libSwaC_gf_CinematicModeSwarmCampaign(true, 0.0);
     libNtve_gf_GlobalCinematicSetting(true);

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/Triggers
@@ -59912,6 +59912,7 @@
         <FunctionCall Type="FunctionCall" Id="A931CCE0"/>
         <FunctionCall Type="FunctionCall" Id="72386C2E"/>
         <FunctionCall Type="FunctionCall" Id="9E88FC8D"/>
+        <FunctionCall Type="FunctionCall" Id="6251CA31"/>
     </Element>
     <Element Type="FunctionCall" Id="C9E6A8F7">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
@@ -59993,8 +59994,30 @@
         <Value>false</Value>
         <ValueType Type="bool"/>
     </Element>
+    <Element Type="FunctionCall" Id="6251CA31">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
+        <Parameter Type="Param" Id="3949DE47"/>
+        <Parameter Type="Param" Id="F8707602"/>
+        <Parameter Type="Param" Id="734FF04D"/>
+    </Element>
+    <Element Type="Param" Id="3949DE47">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <Variable Type="Variable" Library="ABFE498B" Id="97D80BC5"/>
+    </Element>
+    <Element Type="Param" Id="F8707602">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+    </Element>
+    <Element Type="Param" Id="734FF04D">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>Neut</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Race"/>
+    </Element>
     <Element Type="Trigger" Id="C36E734B">
         <Action Type="Comment" Id="8C4D4F73"/>
+        <Action Type="FunctionCall" Id="B0144C64"/>
         <Action Type="FunctionCall" Id="305D7EA8"/>
         <Action Type="FunctionCall" Id="2F63BBD9"/>
         <Action Type="FunctionCall" Id="509C9448"/>
@@ -60032,6 +60055,40 @@
             Fade out and start cinematic mode.
         </Comment>
     </Element>
+    <Element Type="FunctionCall" Id="B0144C64">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="E89F1335"/>
+        <Parameter Type="Param" Id="5E8758D2"/>
+        <Parameter Type="Param" Id="759E7414"/>
+        <FunctionCall Type="FunctionCall" Id="F953DA9A"/>
+    </Element>
+    <Element Type="Param" Id="5E8758D2">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="9C4402E6"/>
+        <Value>0.1</Value>
+        <ValueType Type="fixed"/>
+    </Element>
+    <Element Type="Param" Id="759E7414">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="353DD7DE"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000013"/>
+    </Element>
+    <Element Type="FunctionCall" Id="F953DA9A">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="C1E1D597"/>
+        <Parameter Type="Param" Id="E9E0BEF5"/>
+        <Parameter Type="Param" Id="0D1A3ACF"/>
+        <Parameter Type="Param" Id="F5D332FE"/>
+    </Element>
+    <Element Type="Param" Id="E9E0BEF5">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <Variable Type="Variable" Id="FD528A5F"/>
+    </Element>
+    <Element Type="Param" Id="0D1A3ACF">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="500677B2"/>
+    </Element>
+    <Element Type="Param" Id="F5D332FE">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="C9DCA6C0"/>
+    </Element>
     <Element Type="FunctionCall" Id="305D7EA8">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="D8A9F49F"/>
         <Parameter Type="Param" Id="149C5144"/>

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/Triggers.version