Fix a bug that caused awarding Zerg Cleared in Devil's Playgorund by …

…victory cutscene
Ziktofel · Jun 20, 2024 · 29f8b2b · 29f8b2b
1 parent 75d7ef2
commit 29f8b2b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/MapScript.galaxy
@@ -4744,6 +4744,10 @@ bool gt_onZergBuildingDie_Func (bool testConds, bool runActions) {
     // Automatic Variable Declarations
     // Conditions
     if (testConds) {
+        if (!((gv_gameOver == false))) {
+            return false;
+        }
+
         if (!((UnitGroupCount(UnitGroup(null, gv_p02_ZERG, RegionEntireMap(), UnitFilter((1 << c_targetFilterStructure), 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) <= 0))) {
             return false;
         }

diff --git a/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/Triggers
@@ -36723,6 +36723,7 @@
     </Element>
     <Element Type="Trigger" Id="B898553E">
         <Event Type="FunctionCall" Id="8ED3D5EF"/>
+        <Condition Type="FunctionCall" Id="BABB7E78"/>
         <Condition Type="FunctionCall" Id="2A960B1D"/>
         <Condition Type="FunctionCall" Id="115987D9"/>
         <Action Type="FunctionCall" Id="B5BC6B43"/>
@@ -36738,6 +36739,25 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000159"/>
         <Preset Type="PresetValue" Library="Ntve" Id="C84C7A78"/>
     </Element>
+    <Element Type="FunctionCall" Id="BABB7E78">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <Parameter Type="Param" Id="77DCEBB2"/>
+        <Parameter Type="Param" Id="5D690162"/>
+        <Parameter Type="Param" Id="1C5F8A18"/>
+    </Element>
+    <Element Type="Param" Id="77DCEBB2">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <Variable Type="Variable" Id="00000029"/>
+    </Element>
+    <Element Type="Param" Id="5D690162">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+    </Element>
+    <Element Type="Param" Id="1C5F8A18">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
     <Element Type="FunctionCall" Id="2A960B1D">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
         <Parameter Type="Param" Id="D32115CD"/>

diff --git a/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/Triggers.version