Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing devil's playground CC replacement #319

Merged
merged 1 commit into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
48 changes: 48 additions & 0 deletions Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/Triggers
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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"/>
Expand Down
Binary file not shown.