Skip to content

Commit

Permalink
Update The Growing Shadow race swaps
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ziktofel
Ziktofel committed Nov 24, 2024
1 parent 0aadc83 commit 11921d5
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 28 deletions.
Binary file modified Maps/ArchipelagoCampaign/LotV/ap_the_growing_shadow.SC2Map/DocumentHeader
View file
Binary file not shown.
30 changes: 8 additions & 22 deletions Maps/ArchipelagoCampaign/LotV/ap_the_growing_shadow.SC2Map/MapScript.galaxy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const int gv_pLAYER_08_ZERG_AMBUSH = 8;
//--------------------------------------------------------------------------------------------------
// Global Variables
//--------------------------------------------------------------------------------------------------
string gv_lastStageUnitType;
string gv_mapMusicTrack;
playergroup gv_enemyPlayers;
unit gv_zeratul;
Expand Down Expand Up @@ -713,19 +714,21 @@ bool gt_FactionSwapInit_Func (bool testConds, bool runActions) {
libNtve_gf_ShowHideUnit(UnitFromId(419), false);
libNtve_gf_ShowHideUnit(UnitFromId(243), false);
libNtve_gf_ShowHideUnit(UnitFromId(1874), false);
gv_lastStageUnitType = "AP_StalkerShakuras";
}
else {
libABFE498B_gv_aP_Triggers_skipCutscenes = true;
lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace, false);
UnitSetPosition(UnitFromId(1290), PointFromId(2102782487), false);
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Terr")) {
PlayerSetRace(gv_pLAYER_01_USER, "Terr");
lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_pLAYER_01_USER, lib5BD4895D_gv_aP_Core_Faction_RAYNORS_RAIDERS);
gv_lastStageUnitType = "AP_HERC";
}
else {
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) {
PlayerSetRace(gv_pLAYER_01_USER, "Zerg");
lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_pLAYER_01_USER, lib5BD4895D_gv_aP_Core_Faction_KERRIGAN_SWARM);
gv_lastStageUnitType = "AP_Hunterling";
}

}
Expand Down Expand Up @@ -4841,7 +4844,7 @@ bool gt_FindNerazimPylon01_Func (bool testConds, bool runActions) {
UnitIssueOrder(UnitFromId(1360), OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 1), PointFromId(1351)), c_orderQueueReplace);
}
else if (auto38E9833D_val == "Terr") {
libNtve_gf_CreateUnitsAtPoint2(1, "AP_Goliath", 0, gv_pLAYER_01_USER, PointFromId(1351));
libNtve_gf_CreateUnitsAtPoint2(1, "AP_SpartanCompany", 0, gv_pLAYER_01_USER, PointFromId(1351));
libVCMI_gf_CreateDropPod(libVCMI_ge_DropPodRace_Terran, PointFromId(1351), UnitLastCreatedGroup(), false, gv_pLAYER_01_USER);
}
else if (auto38E9833D_val == "Zerg") {
Expand All @@ -4863,7 +4866,7 @@ bool gt_FindNerazimPylon01_Func (bool testConds, bool runActions) {
UnitIssueOrder(UnitFromId(1360), OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 1), PointFromId(1352)), c_orderQueueReplace);
}
else if (autoC051EF36_val == "Terr") {
libNtve_gf_CreateUnitsAtPoint2(1, "AP_Goliath", 0, gv_pLAYER_01_USER, PointFromId(1352));
libNtve_gf_CreateUnitsAtPoint2(1, "AP_SpartanCompany", 0, gv_pLAYER_01_USER, PointFromId(1352));
libVCMI_gf_CreateDropPod(libVCMI_ge_DropPodRace_Terran, PointFromId(1352), UnitLastCreatedGroup(), false, gv_pLAYER_01_USER);
}
else if (autoC051EF36_val == "Zerg") {
Expand All @@ -4885,7 +4888,7 @@ bool gt_FindNerazimPylon01_Func (bool testConds, bool runActions) {
UnitIssueOrder(UnitFromId(1360), OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 1), PointFromId(1354)), c_orderQueueReplace);
}
else if (auto1B9F865A_val == "Terr") {
libNtve_gf_CreateUnitsAtPoint2(1, "AP_Goliath", 0, gv_pLAYER_01_USER, PointFromId(1354));
libNtve_gf_CreateUnitsAtPoint2(1, "AP_SpartanCompany", 0, gv_pLAYER_01_USER, PointFromId(1354));
libVCMI_gf_CreateDropPod(libVCMI_ge_DropPodRace_Terran, PointFromId(1354), UnitLastCreatedGroup(), false, gv_pLAYER_01_USER);
}
else if (auto1B9F865A_val == "Zerg") {
Expand Down Expand Up @@ -7975,7 +7978,7 @@ bool gt_MidUpperBaseSetup_Func (bool testConds, bool runActions) {
libNtve_gf_ChangeUnitDamage(gv_zeratul, libNtve_ge_UnitDamageTakenDealt_Damage_Take, libNtve_ge_UnitDamageChangeOption_No);
lv_i = 1;
for ( ; ( (auto42E5350E_ai >= 0 && lv_i <= auto42E5350E_ae) || (auto42E5350E_ai < 0 && lv_i >= auto42E5350E_ae) ) ; lv_i += auto42E5350E_ai ) {
libNtve_gf_CreateUnitsAtPoint2(1, "AP_StalkerShakuras", 0, gv_pLAYER_01_USER, PointFromName(("Mid Upper Stalker " + IntToString(lv_i))));
libNtve_gf_CreateUnitsAtPoint2(1, gv_lastStageUnitType, 0, gv_pLAYER_01_USER, PointFromName(("Mid Upper Stalker " + IntToString(lv_i))));
UnitGroupAdd(gv_midUpperStalkers, UnitLastCreated());
libNtve_gf_ChangeUnitDamage(UnitLastCreated(), libNtve_ge_UnitDamageTakenDealt_Damage_Take, libNtve_ge_UnitDamageChangeOption_No);
gv_midUpperStalkersArray[lv_i] = UnitLastCreated();
Expand Down Expand Up @@ -8180,8 +8183,6 @@ bool gt_MidUpperBaseCleanup_Func (bool testConds, bool runActions) {
unit autoFB3078F0_var;
const int autoBDE3F8BE_ae = 4;
int autoBDE3F8BE_var;
const int auto7FAC36AB_ae = 4;
const int auto7FAC36AB_ai = 1;

// Variable Initialization

Expand Down Expand Up @@ -8318,21 +8319,6 @@ bool gt_MidUpperBaseCleanup_Func (bool testConds, bool runActions) {
UISetFrameVisible(PlayerGroupAll(), c_syncFrameTypeSupply, false);
CinematicFade(true, lv_fadeDuration, c_fadeStyleNormal, ColorWithAlpha(0.00, 0.00, 0.00, 0.00), 0.0, true);
}
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace != "Neut")) {
CameraPan(gv_pLAYER_01_USER, PointFromId(1015616700), 0.0, -1, 10.0, false);
lv_i = 1;
for ( ; ( (auto7FAC36AB_ai >= 0 && lv_i <= auto7FAC36AB_ae) || (auto7FAC36AB_ai < 0 && lv_i >= auto7FAC36AB_ae) ) ; lv_i += auto7FAC36AB_ai ) {
UnitRemove(gv_midUpperStalkersArray[lv_i]);
}
UnitSetPosition(gv_zeratul, PointFromId(1015616700), false);
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Terr")) {
libNtve_gf_CreateUnitsWithDefaultFacing(4, "AP_SpartanCompany", 0, gv_pLAYER_01_USER, PointFromId(1015616700));
}
else {
libNtve_gf_CreateUnitsWithDefaultFacing(4, "AP_HunterKiller", 0, gv_pLAYER_01_USER, PointFromId(1015616700));
}
}

return true;
}

Expand Down
83 changes: 77 additions & 6 deletions Maps/ArchipelagoCampaign/LotV/ap_the_growing_shadow.SC2Map/Triggers
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,22 @@
<Item Type="Category" Id="1F212B90"/>
</Root>
<Element Type="Category" Id="A5DAC7E7">
<Item Type="Variable" Id="686FCC5C"/>
<Item Type="Trigger" Id="148A96FD"/>
<Item Type="Category" Id="28D6D9FA"/>
<Item Type="Category" Id="D14C59A3"/>
<Item Type="Trigger" Id="A5E9A03F"/>
</Element>
<Element Type="Variable" Id="686FCC5C">
<VariableType>
<Type Value="gamelink"/>
<GameType Value="Unit"/>
</VariableType>
<Value Type="Param" Id="19DE3D7E"/>
</Element>
<Element Type="Param" Id="19DE3D7E">
<Preset Type="PresetValue" Library="Ntve" Id="C9DCA6C0"/>
</Element>
<Element Type="Trigger" Id="148A96FD">
<Variable Type="Variable" Id="4861971C"/>
<Action Type="FunctionCall" Id="59DCE17F"/>
Expand Down Expand Up @@ -43,6 +54,7 @@
<FunctionCall Type="FunctionCall" Id="5E564FAA"/>
<FunctionCall Type="FunctionCall" Id="B3073CF4"/>
<FunctionCall Type="FunctionCall" Id="C56E9A5D"/>
<FunctionCall Type="FunctionCall" Id="49C198AC"/>
<FunctionCall Type="FunctionCall" Id="26E4399C"/>
</Element>
<Element Type="FunctionCall" Id="1F3A277B">
Expand Down Expand Up @@ -82,6 +94,7 @@
<ValueId Id="5"/>
</Element>
<Element Type="FunctionCall" Id="08389436">
<Disabled/>
<FunctionDef Type="FunctionDef" Library="Ntve" Id="0E8A5B30"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<Parameter Type="Param" Id="DB66BA00"/>
Expand All @@ -108,13 +121,15 @@
<FunctionCall Type="FunctionCall" Id="980509F1"/>
<FunctionCall Type="FunctionCall" Id="7102CF6E"/>
<FunctionCall Type="FunctionCall" Id="401A8927"/>
<FunctionCall Type="FunctionCall" Id="42AC3AC2"/>
<FunctionCall Type="FunctionCall" Id="316D2A3D"/>
</Element>
<Element Type="FunctionCall" Id="980509F1">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<FunctionCall Type="FunctionCall" Id="BBD913BC"/>
<FunctionCall Type="FunctionCall" Id="551121D4"/>
<FunctionCall Type="FunctionCall" Id="65F3BF86"/>
<FunctionCall Type="FunctionCall" Id="E5130E94"/>
</Element>
<Element Type="FunctionCall" Id="BBD913BC">
Expand Down Expand Up @@ -147,6 +162,22 @@
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="68A06A53"/>
<Variable Type="Variable" Id="320486BD"/>
</Element>
<Element Type="FunctionCall" Id="65F3BF86">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="76C11F89"/>
<Parameter Type="Param" Id="146E219D"/>
</Element>
<Element Type="Param" Id="76C11F89">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
<Value>AP_Hunterling</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="Param" Id="146E219D">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
<Variable Type="Variable" Id="686FCC5C"/>
</Element>
<Element Type="FunctionCall" Id="E5130E94">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
Expand Down Expand Up @@ -198,6 +229,22 @@
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="68A06A53"/>
<Variable Type="Variable" Id="320486BD"/>
</Element>
<Element Type="FunctionCall" Id="42AC3AC2">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="FFE11830"/>
<Parameter Type="Param" Id="2E30CF4B"/>
</Element>
<Element Type="Param" Id="FFE11830">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
<Value>AP_HERC</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="Param" Id="2E30CF4B">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
<Variable Type="Variable" Id="686FCC5C"/>
</Element>
<Element Type="FunctionCall" Id="316D2A3D">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
Expand Down Expand Up @@ -482,6 +529,22 @@
<ValueType Type="unit"/>
<ValueId Id="1874"/>
</Element>
<Element Type="FunctionCall" Id="49C198AC">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="0C7E99E9"/>
<Parameter Type="Param" Id="D932B72A"/>
</Element>
<Element Type="Param" Id="0C7E99E9">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
<Value>AP_StalkerShakuras</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="Param" Id="D932B72A">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
<Variable Type="Variable" Id="686FCC5C"/>
</Element>
<Element Type="FunctionCall" Id="26E4399C">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
Expand Down Expand Up @@ -35392,7 +35455,7 @@
</Element>
<Element Type="Param" Id="B083956A">
<ParameterDef Type="ParamDef" Library="Ntve" Id="99ECA820"/>
<Value>AP_Goliath</Value>
<Value>AP_SpartanCompany</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
Expand Down Expand Up @@ -35735,7 +35798,7 @@
</Element>
<Element Type="Param" Id="45C335B7">
<ParameterDef Type="ParamDef" Library="Ntve" Id="99ECA820"/>
<Value>AP_Goliath</Value>
<Value>AP_SpartanCompany</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
Expand Down Expand Up @@ -36078,7 +36141,7 @@
</Element>
<Element Type="Param" Id="7DDEFE79">
<ParameterDef Type="ParamDef" Library="Ntve" Id="99ECA820"/>
<Value>AP_Goliath</Value>
<Value>AP_SpartanCompany</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
Expand Down Expand Up @@ -59107,9 +59170,7 @@
</Element>
<Element Type="Param" Id="D955752C">
<ParameterDef Type="ParamDef" Library="Ntve" Id="99ECA820"/>
<Value>AP_StalkerShakuras</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
<Variable Type="Variable" Id="686FCC5C"/>
</Element>
<Element Type="Param" Id="D53FC911">
<ParameterDef Type="ParamDef" Library="Ntve" Id="8178E420"/>
Expand Down Expand Up @@ -63465,6 +63526,7 @@
<ValueType Type="bool"/>
</Element>
<Element Type="FunctionCall" Id="4AF431C1">
<Disabled/>
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<FunctionCall Type="FunctionCall" Id="C7297A5F"/>
<FunctionCall Type="FunctionCall" Id="7FAC36AB"/>
Expand All @@ -63473,6 +63535,7 @@
<FunctionCall Type="FunctionCall" Id="E733B117"/>
</Element>
<Element Type="FunctionCall" Id="C7297A5F">
<Disabled/>
<FunctionDef Type="FunctionDef" Library="Ntve" Id="DC635AEF"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="16827F6B"/>
Expand Down Expand Up @@ -63510,6 +63573,7 @@
<Preset Type="PresetValue" Library="Ntve" Id="00000072"/>
</Element>
<Element Type="FunctionCall" Id="7FAC36AB">
<Disabled/>
<FunctionDef Type="FunctionDef" Library="Ntve" Id="66474248"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="AAE98CFE"/>
Expand Down Expand Up @@ -63538,6 +63602,7 @@
<Variable Type="Variable" Id="4BD49273"/>
</Element>
<Element Type="FunctionCall" Id="B9A7D01F">
<Disabled/>
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000078"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="DAF49931"/>
<Parameter Type="Param" Id="641C6864"/>
Expand All @@ -63551,6 +63616,7 @@
<Variable Type="Variable" Id="4BD49273"/>
</Element>
<Element Type="FunctionCall" Id="E05E6733">
<Disabled/>
<FunctionDef Type="FunctionDef" Library="Ntve" Id="0E8A5B30"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="A4FD0563"/>
Expand All @@ -63571,13 +63637,15 @@
<ValueId Id="1015616700"/>
</Element>
<Element Type="FunctionCall" Id="C5ACE736">
<Disabled/>
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<FunctionCall Type="FunctionCall" Id="930EDC48"/>
<FunctionCall Type="FunctionCall" Id="1EE88E23"/>
<FunctionCall Type="FunctionCall" Id="93D44AFE"/>
</Element>
<Element Type="FunctionCall" Id="930EDC48">
<Disabled/>
<FunctionDef Type="FunctionDef" Library="Ntve" Id="F247156C"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<Parameter Type="Param" Id="08A16BF5"/>
Expand Down Expand Up @@ -63612,6 +63680,7 @@
<ValueId Id="1015616700"/>
</Element>
<Element Type="FunctionCall" Id="1EE88E23">
<Disabled/>
<FunctionDef Type="FunctionDef" Library="Ntve" Id="F247156C"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="33E4B68E"/>
Expand Down Expand Up @@ -63646,6 +63715,7 @@
<ValueId Id="1015616700"/>
</Element>
<Element Type="FunctionCall" Id="93D44AFE">
<Disabled/>
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="5F6188F8"/>
Expand All @@ -63667,6 +63737,7 @@
<ValueGameType Type="Race"/>
</Element>
<Element Type="FunctionCall" Id="E733B117">
<Disabled/>
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="87B9F6B4"/>
Expand Down
Binary file modified Maps/ArchipelagoCampaign/LotV/ap_the_growing_shadow.SC2Map/Triggers.version
View file
Binary file not shown.
1 change: 1 addition & 0 deletions ...oCampaign/LotV/ap_the_growing_shadow.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ Variable/Name/643F93B1=Objective_ZeratulMustSurvive
Variable/Name/659AF2DB=PLAYER_04_TEMPLAR
Variable/Name/66561EBA=RoachGroup
Variable/Name/68083A1C=T TrainMoreProbes Complete
Variable/Name/686FCC5C=lastStageUnitType
Variable/Name/77D3D2E5=validBuildOrder
Variable/Name/78A6FCC9=TextTagAnchorPoint
Variable/Name/7937F069=LOCATION_ID_TEMPLAR_BASE
Expand Down

0 comments on commit 11921d5

Please sign in to comment.