fixing devil's playground CC replacement

Ziktofel · Nov 25, 2024 · 8cfb00e · 8cfb00e
1 parent 6b78458
commit 8cfb00e
Show file tree

Hide file tree

Showing 4 changed files with 52 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
@@ -2186,6 +2186,10 @@ bool gt_CommandCenterReplacement_Func (bool testConds, bool runActions) {
         if (!((UnitGroupCount(UnitGroup(null, gv_p01_USER, null, UnitFilter((1 << c_targetFilterPreventDefeat), 0, 0, (1 << (c_targetFilterDead - 32))), 0), c_unitCountAlive) != 0))) {
             return false;
         }
+
+        if (!(((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut") || (libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Terr")))) {
+            return false;
+        }
     }
 
     // Actions

diff --git a/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/Triggers
@@ -19457,6 +19457,7 @@
         <Condition Type="FunctionCall" Id="6DB52EB7"/>
         <Condition Type="FunctionCall" Id="BE5AEBC2"/>
         <Condition Type="FunctionCall" Id="1A2CB883"/>
+        <Condition Type="FunctionCall" Id="9FE4AF0F"/>
         <Action Type="FunctionCall" Id="14231415"/>
     </Element>
     <Element Type="Variable" Id="8233FA29">
@@ -19673,6 +19674,53 @@
         <Value>0</Value>
         <ValueType Type="int"/>
     </Element>
+    <Element Type="FunctionCall" Id="9FE4AF0F">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000133"/>
+        <FunctionCall Type="FunctionCall" Id="46A2C1E6"/>
+        <FunctionCall Type="FunctionCall" Id="01CDDB32"/>
+    </Element>
+    <Element Type="FunctionCall" Id="46A2C1E6">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000001"/>
+        <Parameter Type="Param" Id="496292F5"/>
+        <Parameter Type="Param" Id="C65512D6"/>
+        <Parameter Type="Param" Id="E819CA13"/>
+    </Element>
+    <Element Type="Param" Id="496292F5">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <Variable Type="Variable" Library="ABFE498B" Id="97D80BC5"/>
+    </Element>
+    <Element Type="Param" Id="C65512D6">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+    </Element>
+    <Element Type="Param" Id="E819CA13">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>Neut</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Race"/>
+    </Element>
+    <Element Type="FunctionCall" Id="01CDDB32">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000001"/>
+        <Parameter Type="Param" Id="859EBA82"/>
+        <Parameter Type="Param" Id="9E222222"/>
+        <Parameter Type="Param" Id="A70D8112"/>
+    </Element>
+    <Element Type="Param" Id="859EBA82">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <Variable Type="Variable" Library="ABFE498B" Id="97D80BC5"/>
+    </Element>
+    <Element Type="Param" Id="9E222222">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+    </Element>
+    <Element Type="Param" Id="A70D8112">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>Terr</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Race"/>
+    </Element>
     <Element Type="FunctionCall" Id="14231415">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
         <FunctionCall Type="FunctionCall" Id="BCECA03E"/>

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