Skip to content

Commit

Permalink
Patch some bugs in Infested race-swaps
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ziktofel
Ziktofel committed Nov 12, 2024
1 parent 7a20d01 commit 30ca5f0
Show file tree
Hide file tree
Showing 9 changed files with 214 additions and 2 deletions.
Binary file modified Maps/ArchipelagoCampaign/HotS/ap_infested.SC2Map/DocumentHeader
View file
Binary file not shown.
Binary file modified Maps/ArchipelagoCampaign/HotS/ap_infested.SC2Map/MapInfo
View file
Binary file not shown.
Binary file modified Maps/ArchipelagoCampaign/HotS/ap_infested.SC2Map/MapInfo.version
View file
Binary file not shown.
9 changes: 7 additions & 2 deletions Maps/ArchipelagoCampaign/HotS/ap_infested.SC2Map/MapScript.galaxy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3838,7 +3838,7 @@ bool gt_BonusObjectiveCreepTumorPlaced_Func (bool testConds, bool runActions) {
return false;
}

if (!(((UnitGetType(EventUnitProgressUnit()) == "CreepTumor") || (UnitGetType(EventUnitProgressUnit()) == "CreepTumorQueen") || (UnitGetType(EventUnitProgressUnit()) == "AP_CreepTumor") || (UnitGetType(EventUnitProgressUnit()) == "AP_CreepTumorQueen") || (UnitGetType(EventUnitProgressUnit()) == "AP_Pylon") || (UnitGetType(EventUnitProgressUnit()) == "AP_SupplyDepot")))) {
if (!(((UnitGetType(EventUnitProgressUnit()) == "CreepTumor") || (UnitGetType(EventUnitProgressUnit()) == "CreepTumorQueen") || (UnitGetType(EventUnitProgressUnit()) == "AP_CreepTumor") || (UnitGetType(EventUnitProgressUnit()) == "AP_CreepTumorQueen") || (UnitGetType(EventUnitProgressUnit()) == "AP_Pylon") || (UnitGetType(EventUnitProgressUnit()) == "AP_SupplyDepot") || (UnitGetType(EventUnitProgressUnit()) == "AP_SupplyDepotDrop")))) {
return false;
}
}
Expand Down Expand Up @@ -3874,7 +3874,9 @@ bool gt_BonusObjectiveCreepTumorPlaced_Func (bool testConds, bool runActions) {
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut")) {
UnitBehaviorAddPlayer(gv_objective_ScienceFacilities[lv_i], "ColonyInfestation", gv_pLAYER_01_USER, 1);
}

else {
UnitBehaviorAddPlayer(gv_objective_ScienceFacilities[lv_i], "MindControl", gv_pLAYER_01_USER, 1);
}
auto6377AF60_val = lv_i;
if (auto6377AF60_val == 1) {
if ((gv_aPSent1 == false)) {
Expand Down Expand Up @@ -8276,6 +8278,9 @@ bool gt_FactionSwapInit_Func (bool testConds, bool runActions) {
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
PlayerSetRace(gv_pLAYER_01_USER, "Prot");
lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_pLAYER_01_USER, lib5BD4895D_gv_aP_Core_Faction_DAELAAM);
gv_objective_TumorRegion[1] = RegionCircle(UnitGetPosition(gv_objective_ScienceFacilities[1]), 6.0);
gv_objective_TumorRegion[2] = RegionCircle(UnitGetPosition(gv_objective_ScienceFacilities[2]), 6.0);
gv_objective_TumorRegion[3] = RegionCircle(UnitGetPosition(gv_objective_ScienceFacilities[3]), 6.0);
}

}
Expand Down
Binary file modified Maps/ArchipelagoCampaign/HotS/ap_infested.SC2Map/Minimap.tga
View file
Binary file not shown.
1 change: 1 addition & 0 deletions Maps/ArchipelagoCampaign/HotS/ap_infested.SC2Map/Preload.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<Actor id="InstallationRoof" Variations="0,3,5,6"/>
<Actor id="TRaynor01RadarDish"/>
<Behavior id="KerriganWalk"/>
<Behavior id="MindControl"/>
<Behavior id="Harmless"/>
<Behavior id="CivilianEnableWeapon"/>
<Behavior id="FastBuild"/>
Expand Down
Binary file modified Maps/ArchipelagoCampaign/HotS/ap_infested.SC2Map/Regions.version
View file
Binary file not shown.
206 changes: 206 additions & 0 deletions Maps/ArchipelagoCampaign/HotS/ap_infested.SC2Map/Triggers
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28567,6 +28567,7 @@
<FunctionCall Type="FunctionCall" Id="D0C8225A"/>
<FunctionCall Type="FunctionCall" Id="6C1AA052"/>
<FunctionCall Type="FunctionCall" Id="4DE3DAC3"/>
<FunctionCall Type="FunctionCall" Id="AF87C338"/>
</Element>
<Element Type="Comment" Id="B1EE8161">
<Comment>
Expand Down Expand Up @@ -28766,6 +28767,38 @@
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="FunctionCall" Id="AF87C338">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000001"/>
<Parameter Type="Param" Id="3D109A99"/>
<Parameter Type="Param" Id="5C2C86D4"/>
<Parameter Type="Param" Id="2C0390F2"/>
</Element>
<Element Type="Param" Id="3D109A99">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<FunctionCall Type="FunctionCall" Id="2E37FF7A"/>
</Element>
<Element Type="FunctionCall" Id="2E37FF7A">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000079"/>
<Parameter Type="Param" Id="BDE992A6"/>
</Element>
<Element Type="Param" Id="BDE992A6">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000138"/>
<FunctionCall Type="FunctionCall" Id="11E3DC62"/>
</Element>
<Element Type="FunctionCall" Id="11E3DC62">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000419"/>
</Element>
<Element Type="Param" Id="5C2C86D4">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="2C0390F2">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>AP_SupplyDepotDrop</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="FunctionCall" Id="A3B9F15B">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
<Parameter Type="Param" Id="F094F838"/>
Expand Down Expand Up @@ -29335,9 +29368,41 @@
<Element Type="FunctionCall" Id="08BD1D60">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<FunctionCall Type="FunctionCall" Id="B73DEB5B"/>
<FunctionCall Type="FunctionCall" Id="742E0D2A"/>
<FunctionCall Type="FunctionCall" Id="8AAD022A"/>
</Element>
<Element Type="FunctionCall" Id="B73DEB5B">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="CB774E72"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<Parameter Type="Param" Id="122AC458"/>
<Parameter Type="Param" Id="A0CCC7E0"/>
<Parameter Type="Param" Id="5997DF1A"/>
<Parameter Type="Param" Id="145CCE14"/>
</Element>
<Element Type="Param" Id="122AC458">
<ParameterDef Type="ParamDef" Library="Ntve" Id="8B9F7B61"/>
<Variable Type="Variable" Id="A2A8B760"/>
</Element>
<Element Type="Param" Id="A0CCC7E0">
<ParameterDef Type="ParamDef" Library="Ntve" Id="E463F943"/>
<Value>1</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Param" Id="5997DF1A">
<ParameterDef Type="ParamDef" Library="Ntve" Id="E39E14DF"/>
<Value>MindControl</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Behavior"/>
</Element>
<Element Type="Param" Id="145CCE14">
<ParameterDef Type="ParamDef" Library="Ntve" Id="10968B1B"/>
<Variable Type="Variable" Id="C039C2E5"/>
<Array Type="Param" Id="FD0404FF"/>
</Element>
<Element Type="Param" Id="FD0404FF">
<Variable Type="Variable" Id="70FF6EBF"/>
</Element>
<Element Type="FunctionCall" Id="742E0D2A">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
Expand Down Expand Up @@ -64466,6 +64531,9 @@
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<FunctionCall Type="FunctionCall" Id="846184FF"/>
<FunctionCall Type="FunctionCall" Id="00827647"/>
<FunctionCall Type="FunctionCall" Id="89485698"/>
<FunctionCall Type="FunctionCall" Id="0EC933F9"/>
<FunctionCall Type="FunctionCall" Id="9833F011"/>
<FunctionCall Type="FunctionCall" Id="C06104B5"/>
</Element>
<Element Type="FunctionCall" Id="846184FF">
Expand Down Expand Up @@ -64498,6 +64566,144 @@
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="68A06A53"/>
<Variable Type="Variable" Id="A2A8B760"/>
</Element>
<Element Type="FunctionCall" Id="89485698">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="7614FB69"/>
<Parameter Type="Param" Id="4A87FF05"/>
</Element>
<Element Type="Param" Id="7614FB69">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
<Variable Type="Variable" Id="AE9A7FAA"/>
<Array Type="Param" Id="A779CA20"/>
</Element>
<Element Type="Param" Id="A779CA20">
<Value>1</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Param" Id="4A87FF05">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
<FunctionCall Type="FunctionCall" Id="2AC68F76"/>
</Element>
<Element Type="FunctionCall" Id="2AC68F76">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000030"/>
<Parameter Type="Param" Id="A1D5DDA0"/>
<Parameter Type="Param" Id="BB9849E2"/>
</Element>
<Element Type="Param" Id="A1D5DDA0">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000049"/>
<FunctionCall Type="FunctionCall" Id="20856D34"/>
</Element>
<Element Type="FunctionCall" Id="20856D34">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000083"/>
<Parameter Type="Param" Id="2DD55A8F"/>
</Element>
<Element Type="Param" Id="2DD55A8F">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000144"/>
<Variable Type="Variable" Id="C039C2E5"/>
<Array Type="Param" Id="5A3BEF54"/>
</Element>
<Element Type="Param" Id="5A3BEF54">
<Value>1</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Param" Id="BB9849E2">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000050"/>
<Value>6.0</Value>
<ValueType Type="fixed"/>
</Element>
<Element Type="FunctionCall" Id="0EC933F9">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="F359C12B"/>
<Parameter Type="Param" Id="011886F5"/>
</Element>
<Element Type="Param" Id="F359C12B">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
<Variable Type="Variable" Id="AE9A7FAA"/>
<Array Type="Param" Id="43046E11"/>
</Element>
<Element Type="Param" Id="43046E11">
<Value>2</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Param" Id="011886F5">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
<FunctionCall Type="FunctionCall" Id="96E7C10D"/>
</Element>
<Element Type="FunctionCall" Id="96E7C10D">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000030"/>
<Parameter Type="Param" Id="ABC829AA"/>
<Parameter Type="Param" Id="3EB7E488"/>
</Element>
<Element Type="Param" Id="ABC829AA">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000049"/>
<FunctionCall Type="FunctionCall" Id="1DCC9690"/>
</Element>
<Element Type="FunctionCall" Id="1DCC9690">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000083"/>
<Parameter Type="Param" Id="E90546B6"/>
</Element>
<Element Type="Param" Id="E90546B6">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000144"/>
<Variable Type="Variable" Id="C039C2E5"/>
<Array Type="Param" Id="7DF2792E"/>
</Element>
<Element Type="Param" Id="7DF2792E">
<Value>2</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Param" Id="3EB7E488">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000050"/>
<Value>6.0</Value>
<ValueType Type="fixed"/>
</Element>
<Element Type="FunctionCall" Id="9833F011">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="FEA83E45"/>
<Parameter Type="Param" Id="2F21E678"/>
</Element>
<Element Type="Param" Id="FEA83E45">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
<Variable Type="Variable" Id="AE9A7FAA"/>
<Array Type="Param" Id="A7FBA3ED"/>
</Element>
<Element Type="Param" Id="A7FBA3ED">
<Value>3</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Param" Id="2F21E678">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
<FunctionCall Type="FunctionCall" Id="B0172D86"/>
</Element>
<Element Type="FunctionCall" Id="B0172D86">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000030"/>
<Parameter Type="Param" Id="FA303FBF"/>
<Parameter Type="Param" Id="516DDCDA"/>
</Element>
<Element Type="Param" Id="FA303FBF">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000049"/>
<FunctionCall Type="FunctionCall" Id="D7EE2DA8"/>
</Element>
<Element Type="FunctionCall" Id="D7EE2DA8">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000083"/>
<Parameter Type="Param" Id="B8A9E12F"/>
</Element>
<Element Type="Param" Id="B8A9E12F">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000144"/>
<Variable Type="Variable" Id="C039C2E5"/>
<Array Type="Param" Id="81F93AFE"/>
</Element>
<Element Type="Param" Id="81F93AFE">
<Value>3</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Param" Id="516DDCDA">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000050"/>
<Value>6.0</Value>
<ValueType Type="fixed"/>
</Element>
<Element Type="FunctionCall" Id="C06104B5">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
Expand Down
Binary file modified Maps/ArchipelagoCampaign/HotS/ap_infested.SC2Map/Triggers.version
View file
Binary file not shown.

0 comments on commit 30ca5f0

Please sign in to comment.