Skip to content

Commit

Permalink
Merge branch 'sc2-next' into outer-wilds-spoilers
Browse files Browse the repository at this point in the history
  • Loading branch information
EnvyDragon committed Nov 24, 2024
2 parents 4806c72 + 85e2f80 commit 0cde2af
Show file tree
Hide file tree
Showing 61 changed files with 20,595 additions and 12,266 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Components>
<Optimized/>
<DataComponent Type="gada">GameData</DataComponent>
<DataComponent Type="text" Locale="enUS">GameText</DataComponent>
<DataComponent Type="info">DocumentInfo</DataComponent>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ include "TriggerLibs/NativeLib"
include "TriggerLibs/LibertyLib"
include "TriggerLibs/SwarmLib"
include "LibA3DDD02B"
include "Lib15EF4C78"
include "Lib2F7F8645"
include "Lib5BD4895D"
include "LibABFE498B"
Expand All @@ -24,6 +25,7 @@ void InitLibs () {
libLbty_InitLib();
libHots_InitLib();
libA3DDD02B_InitLib();
lib15EF4C78_InitLib();
lib2F7F8645_InitLib();
lib5BD4895D_InitLib();
libABFE498B_InitLib();
Expand Down Expand Up @@ -142,6 +144,7 @@ void gf_AnimateVespeneDistributioncinematic (unitgroup lp_vespeneUnits);
//--------------------------------------------------------------------------------------------------
// Trigger Variables
//--------------------------------------------------------------------------------------------------
trigger gt_FactionSwapInit;
trigger gt_onDifficultyCasual;
trigger gt_onDifficultyNormal;
trigger gt_onDifficultyHard;
Expand Down Expand Up @@ -980,6 +983,45 @@ bool auto_gf_AnimateVespeneDistributioncinematic_TriggerFunc (bool testConds, bo
return true;
}

//--------------------------------------------------------------------------------------------------
// Trigger: Faction Swap Init
//--------------------------------------------------------------------------------------------------
bool gt_FactionSwapInit_Func (bool testConds, bool runActions) {
// Automatic Variable Declarations
// Actions
if (!runActions) {
return true;
}

if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut")) {
lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), "Prot", false);
}
else {
libABFE498B_gv_aP_Triggers_skipCutscenes = true;
lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace, 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);
}
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);
}

}
libLbty_gf_OrderWorkerstoGatherNearbyResources(RegionEntireMap(), gv_pLAYER_01_USER);
lib15EF4C78_gf_AP_Player_UtilTownHallAutoRally(gv_pLAYER_01_USER);
}
return true;
}

//--------------------------------------------------------------------------------------------------
void gt_FactionSwapInit_Init () {
gt_FactionSwapInit = TriggerCreate("gt_FactionSwapInit_Func");
TriggerAddEventGeneric(gt_FactionSwapInit, lib5BD4895D_gv_aP_Core_LOAD_FINISHED_EVENT);
}

//--------------------------------------------------------------------------------------------------
// Trigger: onDifficultyCasual
//--------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -4003,6 +4045,7 @@ void gt_VictoryCleanup_Init () {
// Trigger Initialization
//--------------------------------------------------------------------------------------------------
void InitTriggers () {
gt_FactionSwapInit_Init();
gt_onDifficultyCasual_Init();
gt_onDifficultyNormal_Init();
gt_onDifficultyHard_Init();
Expand Down
Binary file not shown.
11,234 changes: 5,522 additions & 5,712 deletions Maps/ArchipelagoCampaign/LotV/ap_ghosts_in_the_fog.SC2Map/Objects

Large diffs are not rendered by default.

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@
<Model id="PingSimple"/>
<Model id="PingCircle"/>
<Model id="NaturalGas"/>
<Race id="Terr"/>
<Race id="Zerg"/>
<Race id="Prot"/>
<Sound id="pMission_VoidPrologue02_Zeratul_001"/>
<Sound id="pMission_VoidPrologue02_Malash_002"/>
<Sound id="pMission_VoidPrologue02_Zeratul_003"/>
Expand Down Expand Up @@ -146,6 +149,15 @@
<Unit id="PrologueZeratul"/>
<Unit id="NaturalGasEX2"/>
<Unit id="XelNagaPyramidTempleDoor"/>
<Unit id="AP_Roach"/>
<Unit id="AP_Hydralisk"/>
<Unit id="AP_Liberator"/>
<Unit id="AP_SupplyDepot"/>
<Unit id="AP_Barracks"/>
<Unit id="AP_Factory"/>
<Unit id="AP_CreepTumorUsed"/>
<Unit id="AP_Goliath"/>
<Unit id="AP_Cyclone"/>
<Unit id="AP_VoidRayShakuras"/>
<Unit id="AP_Probe"/>
<Unit id="AP_ZealotAiur"/>
Expand All @@ -154,4 +166,12 @@
<Unit id="AP_Nexus"/>
<Unit id="AP_Pylon"/>
<Unit id="AP_CyberneticsCore"/>
<Unit id="AP_Overlord"/>
<Unit id="AP_ScienceVessel"/>
<Unit id="AP_MercCompound"/>
<Unit id="AP_Queen"/>
<Unit id="AP_SpawningPool"/>
<Unit id="AP_RoachWarren"/>
<Unit id="AP_ZergMercenaryCompound"/>
<Unit id="AP_GuardianSCBW"/>
</Preload>
246 changes: 246 additions & 0 deletions Maps/ArchipelagoCampaign/LotV/ap_ghosts_in_the_fog.SC2Map/Triggers
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,256 @@
<Item Type="Category" Id="F61CE4EF"/>
</Element>
<Element Type="Category" Id="E1AD26EF">
<Item Type="Trigger" Id="DDBBA146"/>
<Item Type="Category" Id="C580F5ED"/>
<Item Type="Category" Id="D8433A6F"/>
<Item Type="Trigger" Id="69909331"/>
</Element>
<Element Type="Trigger" Id="DDBBA146">
<Event Type="FunctionCall" Id="5A3A1428"/>
<Action Type="FunctionCall" Id="01943D7B"/>
</Element>
<Element Type="FunctionCall" Id="5A3A1428">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="B1A02C2E"/>
<Parameter Type="Param" Id="C2ACD09A"/>
</Element>
<Element Type="Param" Id="C2ACD09A">
<ParameterDef Type="ParamDef" Library="Ntve" Id="177B3837"/>
<Variable Type="Variable" Library="5BD4895D" Id="14B28730"/>
</Element>
<Element Type="FunctionCall" Id="01943D7B">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<FunctionCall Type="FunctionCall" Id="0DFC0621"/>
<FunctionCall Type="FunctionCall" Id="A29E84A7"/>
<FunctionCall Type="FunctionCall" Id="D8D69D9B"/>
<FunctionCall Type="FunctionCall" Id="2375D761"/>
<FunctionCall Type="FunctionCall" Id="A49215A6"/>
<FunctionCall Type="FunctionCall" Id="B13AAE01"/>
<FunctionCall Type="FunctionCall" Id="E1F88C15"/>
</Element>
<Element Type="FunctionCall" Id="0DFC0621">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<Parameter Type="Param" Id="A4DFF614"/>
<Parameter Type="Param" Id="B0995C81"/>
</Element>
<Element Type="Param" Id="A4DFF614">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
<Variable Type="Variable" Library="ABFE498B" Id="8CF8B2F6"/>
</Element>
<Element Type="Param" Id="B0995C81">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
<Value>true</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="FunctionCall" Id="A29E84A7">
<FunctionDef Type="FunctionDef" Library="15EF4C78" Id="3E0709E3"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<Parameter Type="Param" Id="B71A4818"/>
<Parameter Type="Param" Id="75EA9638"/>
<Parameter Type="Param" Id="ED9147AE"/>
</Element>
<Element Type="Param" Id="B71A4818">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="64EC5B75"/>
<Variable Type="Variable" Library="ABFE498B" Id="97D80BC5"/>
</Element>
<Element Type="Param" Id="75EA9638">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="F96C156B"/>
<Value>false</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="Param" Id="ED9147AE">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="EB8A7311"/>
<ValueType Type="unitgroup"/>
<ValueId Id="5"/>
</Element>
<Element Type="FunctionCall" Id="D8D69D9B">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<FunctionCall Type="FunctionCall" Id="33706227"/>
<FunctionCall Type="FunctionCall" Id="2892BCDC"/>
<FunctionCall Type="FunctionCall" Id="072B4682"/>
<FunctionCall Type="FunctionCall" Id="F0BFEE51"/>
</Element>
<Element Type="FunctionCall" Id="33706227">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<FunctionCall Type="FunctionCall" Id="A25C3CF2"/>
<FunctionCall Type="FunctionCall" Id="4505E147"/>
<FunctionCall Type="FunctionCall" Id="7E038D34"/>
</Element>
<Element Type="FunctionCall" Id="A25C3CF2">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="63385694"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="EC2D6E72"/>
<Parameter Type="Param" Id="05F1EA57"/>
</Element>
<Element Type="Param" Id="EC2D6E72">
<ParameterDef Type="ParamDef" Library="Ntve" Id="3ADD60A0"/>
<Value>Zerg</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Race"/>
</Element>
<Element Type="Param" Id="05F1EA57">
<ParameterDef Type="ParamDef" Library="Ntve" Id="A66AF510"/>
<Variable Type="Variable" Id="862D1E5F"/>
</Element>
<Element Type="FunctionCall" Id="4505E147">
<FunctionDef Type="FunctionDef" Library="5BD4895D" Id="61E1BF3C"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="35BEFBA8"/>
<Parameter Type="Param" Id="10E48595"/>
</Element>
<Element Type="Param" Id="35BEFBA8">
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="B9EB8763"/>
<Variable Type="Variable" Library="5BD4895D" Id="D46CE905"/>
</Element>
<Element Type="Param" Id="10E48595">
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="68A06A53"/>
<Variable Type="Variable" Id="862D1E5F"/>
</Element>
<Element Type="FunctionCall" Id="7E038D34">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="366CB7FB"/>
<Parameter Type="Param" Id="A4D5F94F"/>
<Parameter Type="Param" Id="2332D3ED"/>
</Element>
<Element Type="Param" Id="366CB7FB">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<Variable Type="Variable" Library="ABFE498B" Id="97D80BC5"/>
</Element>
<Element Type="Param" Id="A4D5F94F">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="2332D3ED">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>Zerg</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Race"/>
</Element>
<Element Type="FunctionCall" Id="2892BCDC">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="63385694"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="5DF7735D"/>
<Parameter Type="Param" Id="B6A00BF3"/>
</Element>
<Element Type="Param" Id="5DF7735D">
<ParameterDef Type="ParamDef" Library="Ntve" Id="3ADD60A0"/>
<Value>Terr</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Race"/>
</Element>
<Element Type="Param" Id="B6A00BF3">
<ParameterDef Type="ParamDef" Library="Ntve" Id="A66AF510"/>
<Variable Type="Variable" Id="862D1E5F"/>
</Element>
<Element Type="FunctionCall" Id="072B4682">
<FunctionDef Type="FunctionDef" Library="5BD4895D" Id="61E1BF3C"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="B44FFAF2"/>
<Parameter Type="Param" Id="B45851A2"/>
</Element>
<Element Type="Param" Id="B44FFAF2">
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="B9EB8763"/>
<Variable Type="Variable" Library="5BD4895D" Id="B4B3FF97"/>
</Element>
<Element Type="Param" Id="B45851A2">
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="68A06A53"/>
<Variable Type="Variable" Id="862D1E5F"/>
</Element>
<Element Type="FunctionCall" Id="F0BFEE51">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="B1444811"/>
<Parameter Type="Param" Id="9C493C0F"/>
<Parameter Type="Param" Id="6B201ECC"/>
</Element>
<Element Type="Param" Id="B1444811">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<Variable Type="Variable" Library="ABFE498B" Id="97D80BC5"/>
</Element>
<Element Type="Param" Id="9C493C0F">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="6B201ECC">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>Terr</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Race"/>
</Element>
<Element Type="FunctionCall" Id="2375D761">
<FunctionDef Type="FunctionDef" Library="Lbty" Id="05E197DE"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<Parameter Type="Param" Id="0C9E71F5"/>
<Parameter Type="Param" Id="AEA60D16"/>
</Element>
<Element Type="Param" Id="0C9E71F5">
<ParameterDef Type="ParamDef" Library="Lbty" Id="97BDB33A"/>
<FunctionCall Type="FunctionCall" Id="3B537193"/>
</Element>
<Element Type="FunctionCall" Id="3B537193">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
</Element>
<Element Type="Param" Id="AEA60D16">
<ParameterDef Type="ParamDef" Library="Lbty" Id="3F42FBCD"/>
<Variable Type="Variable" Id="862D1E5F"/>
</Element>
<Element Type="FunctionCall" Id="A49215A6">
<FunctionDef Type="FunctionDef" Library="15EF4C78" Id="84565F53"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<Parameter Type="Param" Id="1276DBFF"/>
</Element>
<Element Type="Param" Id="1276DBFF">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="CF70F2A6"/>
<Variable Type="Variable" Id="862D1E5F"/>
</Element>
<Element Type="FunctionCall" Id="B13AAE01">
<FunctionDef Type="FunctionDef" Library="15EF4C78" Id="3E0709E3"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="6BA736AC"/>
<Parameter Type="Param" Id="A895B26C"/>
<Parameter Type="Param" Id="0638DFB4"/>
</Element>
<Element Type="Param" Id="6BA736AC">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="64EC5B75"/>
<Value>Prot</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Race"/>
</Element>
<Element Type="Param" Id="A895B26C">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="F96C156B"/>
<Value>false</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="Param" Id="0638DFB4">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="EB8A7311"/>
<ValueType Type="unitgroup"/>
<ValueId Id="5"/>
</Element>
<Element Type="FunctionCall" Id="E1F88C15">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="3116B3C1"/>
<Parameter Type="Param" Id="6DF41F70"/>
<Parameter Type="Param" Id="9087351E"/>
</Element>
<Element Type="Param" Id="3116B3C1">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<Variable Type="Variable" Library="ABFE498B" Id="97D80BC5"/>
</Element>
<Element Type="Param" Id="6DF41F70">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="9087351E">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>Neut</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Race"/>
</Element>
<Element Type="Category" Id="C580F5ED">
<Item Type="Variable" Id="D1ECFBBD"/>
<Item Type="Variable" Id="E11B8FCA"/>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ Trigger/Name/D84D2AC3=Start Game Q
Trigger/Name/D890AE91=Init 05 Environment
Trigger/Name/D8C485AC=Intro End
Trigger/Name/DA2E3B01=Bonus Objective Rock Formations Create
Trigger/Name/DDBBA146=Faction Swap Init
Trigger/Name/E065AEC5=Stat - Gas Collection
Trigger/Name/E1FF8000=Core Cycle Toggle
Trigger/Name/E9B31605=Init Core Cycle Q
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Components>
<Optimized/>
<DataComponent Type="gada">GameData</DataComponent>
<DataComponent Type="text" Locale="enUS">GameText</DataComponent>
<DataComponent Type="info">DocumentInfo</DataComponent>
Expand Down
Binary file not shown.
Loading

0 comments on commit 0cde2af

Please sign in to comment.