Skip to content

Commit

Permalink
Add Brothers in Arms race swaps
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ziktofel
Ziktofel committed Nov 25, 2024
1 parent e8de9cf commit 203ae11
Show file tree
Hide file tree
Showing 9 changed files with 2,100 additions and 1,809 deletions.
1 change: 0 additions & 1 deletion Maps/ArchipelagoCampaign/LotV/ap_brothers_in_arms.SC2Map/ComponentList.SC2Components
View file
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 modified Maps/ArchipelagoCampaign/LotV/ap_brothers_in_arms.SC2Map/DocumentHeader
View file
Binary file not shown.
41 changes: 41 additions & 0 deletions Maps/ArchipelagoCampaign/LotV/ap_brothers_in_arms.SC2Map/MapScript.galaxy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ void gf_WarpInHybridCinematic (point lp_point, string lp_hybridUnitType, int lp_
//--------------------------------------------------------------------------------------------------
// Trigger Variables
//--------------------------------------------------------------------------------------------------
trigger gt_FactionSwapInit;
trigger gt_onDifficultyCasual;
trigger gt_onDifficultyNormal;
trigger gt_onDifficultyHard;
Expand Down Expand Up @@ -654,6 +655,45 @@ bool auto_gf_WarpInHybridCinematic_TriggerFunc (bool testConds, bool runActions)
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(6), "Prot", false);
}
else {
libABFE498B_gv_aP_Triggers_skipCutscenes = true;
lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(6), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace, true);
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 @@ -6482,6 +6522,7 @@ void gt_VictoryCleanup_Init () {
// Trigger Initialization
//--------------------------------------------------------------------------------------------------
void InitTriggers () {
gt_FactionSwapInit_Init();
gt_onDifficultyCasual_Init();
gt_onDifficultyNormal_Init();
gt_onDifficultyHard_Init();
Expand Down
3,606 changes: 1,798 additions & 1,808 deletions Maps/ArchipelagoCampaign/LotV/ap_brothers_in_arms.SC2Map/Objects
View file

Large diffs are not rendered by default.

Binary file modified Maps/ArchipelagoCampaign/LotV/ap_brothers_in_arms.SC2Map/Objects.version
View file
Binary file not shown.
14 changes: 14 additions & 0 deletions Maps/ArchipelagoCampaign/LotV/ap_brothers_in_arms.SC2Map/Preload.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@
<Behavior id="Queue2x"/>
<Model id="PingSimple"/>
<Model id="Korhal_Keystone_Energy_Charge"/>
<Race id="Terr"/>
<Race id="Zerg"/>
<Race id="Prot"/>
<Sound id="WarpGate_TrainFinish"/>
<Sound id="UI_ResourcePickup"/>
<Sound id="Hybrid_WarpIn"/>
Expand Down Expand Up @@ -235,12 +238,23 @@
<Unit id="KorhalArtifactContainmentField"/>
<Unit id="KorhalKeystone"/>
<Unit id="RawSolarite"/>
<Unit id="AP_Liberator"/>
<Unit id="AP_SupplyDepot"/>
<Unit id="AP_Marine"/>
<Unit id="AP_Barracks"/>
<Unit id="AP_Assimilator"/>
<Unit id="AP_Ultralisk"/>
<Unit id="AP_Starport"/>
<Unit id="AP_RoboticsFacility"/>
<Unit id="AP_ImmortalAiur"/>
<Unit id="AP_Probe"/>
<Unit id="AP_Gateway"/>
<Unit id="AP_Nexus"/>
<Unit id="AP_Pylon"/>
<Unit id="AP_Overlord"/>
<Unit id="AP_MercCompound"/>
<Unit id="AP_Queen"/>
<Unit id="AP_SpawningPool"/>
<Unit id="AP_UltraliskCavern"/>
<Unit id="AP_ZergMercenaryCompound"/>
</Preload>
246 changes: 246 additions & 0 deletions Maps/ArchipelagoCampaign/LotV/ap_brothers_in_arms.SC2Map/Triggers
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,257 @@
<Item Type="Category" Id="978A2EE3"/>
</Root>
<Element Type="Category" Id="14FD6564">
<Item Type="Trigger" Id="A5A37298"/>
<Item Type="Category" Id="284EC67B"/>
<Item Type="Category" Id="E50A56C1"/>
<Item Type="Trigger" Id="7E14A037"/>
<Item Type="Trigger" Id="F08C81D5"/>
</Element>
<Element Type="Trigger" Id="A5A37298">
<Event Type="FunctionCall" Id="12BF0DA2"/>
<Action Type="FunctionCall" Id="E81A7D36"/>
</Element>
<Element Type="FunctionCall" Id="12BF0DA2">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="B1A02C2E"/>
<Parameter Type="Param" Id="41505BEC"/>
</Element>
<Element Type="Param" Id="41505BEC">
<ParameterDef Type="ParamDef" Library="Ntve" Id="177B3837"/>
<Variable Type="Variable" Library="5BD4895D" Id="14B28730"/>
</Element>
<Element Type="FunctionCall" Id="E81A7D36">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<FunctionCall Type="FunctionCall" Id="1031BFFB"/>
<FunctionCall Type="FunctionCall" Id="E65AC91F"/>
<FunctionCall Type="FunctionCall" Id="D2741AA5"/>
<FunctionCall Type="FunctionCall" Id="0A269886"/>
<FunctionCall Type="FunctionCall" Id="511B0D37"/>
<FunctionCall Type="FunctionCall" Id="AA576384"/>
<FunctionCall Type="FunctionCall" Id="E1BBD328"/>
</Element>
<Element Type="FunctionCall" Id="1031BFFB">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<Parameter Type="Param" Id="3BA89BB9"/>
<Parameter Type="Param" Id="0AAD7B9F"/>
</Element>
<Element Type="Param" Id="3BA89BB9">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
<Variable Type="Variable" Library="ABFE498B" Id="8CF8B2F6"/>
</Element>
<Element Type="Param" Id="0AAD7B9F">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
<Value>true</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="FunctionCall" Id="E65AC91F">
<FunctionDef Type="FunctionDef" Library="15EF4C78" Id="3E0709E3"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<Parameter Type="Param" Id="0BF4E62E"/>
<Parameter Type="Param" Id="3C1F2FD8"/>
<Parameter Type="Param" Id="BDC70EC8"/>
</Element>
<Element Type="Param" Id="0BF4E62E">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="64EC5B75"/>
<Variable Type="Variable" Library="ABFE498B" Id="97D80BC5"/>
</Element>
<Element Type="Param" Id="3C1F2FD8">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="F96C156B"/>
<Value>true</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="Param" Id="BDC70EC8">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="EB8A7311"/>
<ValueType Type="unitgroup"/>
<ValueId Id="6"/>
</Element>
<Element Type="FunctionCall" Id="D2741AA5">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<FunctionCall Type="FunctionCall" Id="675222D0"/>
<FunctionCall Type="FunctionCall" Id="9AEAAA41"/>
<FunctionCall Type="FunctionCall" Id="100DE82D"/>
<FunctionCall Type="FunctionCall" Id="627E8E2B"/>
</Element>
<Element Type="FunctionCall" Id="675222D0">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<FunctionCall Type="FunctionCall" Id="454555FD"/>
<FunctionCall Type="FunctionCall" Id="EBE2F584"/>
<FunctionCall Type="FunctionCall" Id="57B22741"/>
</Element>
<Element Type="FunctionCall" Id="454555FD">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="63385694"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="CF240843"/>
<Parameter Type="Param" Id="047AD2A3"/>
</Element>
<Element Type="Param" Id="CF240843">
<ParameterDef Type="ParamDef" Library="Ntve" Id="3ADD60A0"/>
<Value>Zerg</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Race"/>
</Element>
<Element Type="Param" Id="047AD2A3">
<ParameterDef Type="ParamDef" Library="Ntve" Id="A66AF510"/>
<Variable Type="Variable" Id="7E8C363A"/>
</Element>
<Element Type="FunctionCall" Id="EBE2F584">
<FunctionDef Type="FunctionDef" Library="5BD4895D" Id="61E1BF3C"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="C220A21B"/>
<Parameter Type="Param" Id="3C4C49BE"/>
</Element>
<Element Type="Param" Id="C220A21B">
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="B9EB8763"/>
<Variable Type="Variable" Library="5BD4895D" Id="D46CE905"/>
</Element>
<Element Type="Param" Id="3C4C49BE">
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="68A06A53"/>
<Variable Type="Variable" Id="7E8C363A"/>
</Element>
<Element Type="FunctionCall" Id="57B22741">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="96F00950"/>
<Parameter Type="Param" Id="81C4BEE3"/>
<Parameter Type="Param" Id="9A021A03"/>
</Element>
<Element Type="Param" Id="96F00950">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<Variable Type="Variable" Library="ABFE498B" Id="97D80BC5"/>
</Element>
<Element Type="Param" Id="81C4BEE3">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="9A021A03">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>Zerg</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Race"/>
</Element>
<Element Type="FunctionCall" Id="9AEAAA41">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="63385694"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="79DB8ECB"/>
<Parameter Type="Param" Id="98E92856"/>
</Element>
<Element Type="Param" Id="79DB8ECB">
<ParameterDef Type="ParamDef" Library="Ntve" Id="3ADD60A0"/>
<Value>Terr</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Race"/>
</Element>
<Element Type="Param" Id="98E92856">
<ParameterDef Type="ParamDef" Library="Ntve" Id="A66AF510"/>
<Variable Type="Variable" Id="7E8C363A"/>
</Element>
<Element Type="FunctionCall" Id="100DE82D">
<FunctionDef Type="FunctionDef" Library="5BD4895D" Id="61E1BF3C"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="E83E4147"/>
<Parameter Type="Param" Id="33DF1B95"/>
</Element>
<Element Type="Param" Id="E83E4147">
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="B9EB8763"/>
<Variable Type="Variable" Library="5BD4895D" Id="B4B3FF97"/>
</Element>
<Element Type="Param" Id="33DF1B95">
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="68A06A53"/>
<Variable Type="Variable" Id="7E8C363A"/>
</Element>
<Element Type="FunctionCall" Id="627E8E2B">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="AFDB42C7"/>
<Parameter Type="Param" Id="D1E29E09"/>
<Parameter Type="Param" Id="9CE905F4"/>
</Element>
<Element Type="Param" Id="AFDB42C7">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<Variable Type="Variable" Library="ABFE498B" Id="97D80BC5"/>
</Element>
<Element Type="Param" Id="D1E29E09">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="9CE905F4">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>Terr</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Race"/>
</Element>
<Element Type="FunctionCall" Id="0A269886">
<FunctionDef Type="FunctionDef" Library="Lbty" Id="05E197DE"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<Parameter Type="Param" Id="06F286CB"/>
<Parameter Type="Param" Id="81CCD803"/>
</Element>
<Element Type="Param" Id="06F286CB">
<ParameterDef Type="ParamDef" Library="Lbty" Id="97BDB33A"/>
<FunctionCall Type="FunctionCall" Id="1D6796F4"/>
</Element>
<Element Type="FunctionCall" Id="1D6796F4">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
</Element>
<Element Type="Param" Id="81CCD803">
<ParameterDef Type="ParamDef" Library="Lbty" Id="3F42FBCD"/>
<Variable Type="Variable" Id="7E8C363A"/>
</Element>
<Element Type="FunctionCall" Id="511B0D37">
<FunctionDef Type="FunctionDef" Library="15EF4C78" Id="84565F53"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<Parameter Type="Param" Id="61AC5255"/>
</Element>
<Element Type="Param" Id="61AC5255">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="CF70F2A6"/>
<Variable Type="Variable" Id="7E8C363A"/>
</Element>
<Element Type="FunctionCall" Id="AA576384">
<FunctionDef Type="FunctionDef" Library="15EF4C78" Id="3E0709E3"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="6DEA9DBF"/>
<Parameter Type="Param" Id="EBE47461"/>
<Parameter Type="Param" Id="3EAEDC8D"/>
</Element>
<Element Type="Param" Id="6DEA9DBF">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="64EC5B75"/>
<Value>Prot</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Race"/>
</Element>
<Element Type="Param" Id="EBE47461">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="F96C156B"/>
<Value>false</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="Param" Id="3EAEDC8D">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="EB8A7311"/>
<ValueType Type="unitgroup"/>
<ValueId Id="6"/>
</Element>
<Element Type="FunctionCall" Id="E1BBD328">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="1B3A2B98"/>
<Parameter Type="Param" Id="8286FF36"/>
<Parameter Type="Param" Id="102AB239"/>
</Element>
<Element Type="Param" Id="1B3A2B98">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<Variable Type="Variable" Library="ABFE498B" Id="97D80BC5"/>
</Element>
<Element Type="Param" Id="8286FF36">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="102AB239">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>Neut</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Race"/>
</Element>
<Element Type="Category" Id="284EC67B">
<Item Type="Variable" Id="5CADABAC"/>
<Item Type="Variable" Id="60F3DA0B"/>
Expand Down
Binary file modified Maps/ArchipelagoCampaign/LotV/ap_brothers_in_arms.SC2Map/Triggers.version
View file
Binary file not shown.
1 change: 1 addition & 0 deletions ...agoCampaign/LotV/ap_brothers_in_arms.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ Trigger/Name/A0D7CE71=Victory Cleanup
Trigger/Name/A2FEFBBF=Enemy Camp Init
Trigger/Name/A36916EF=Update Bully Status
Trigger/Name/A4B5BD1D=Dude's Car Destroyed Again! Q
Trigger/Name/A5A37298=Faction Swap Init
Trigger/Name/A73317E9=Init 06 Difficulties
Trigger/Name/AB721DD1=Moebius Corps Attacks Artanis Q
Trigger/Name/ABF36265=Victory Recover the Keystone Completed
Expand Down

0 comments on commit 203ae11

Please sign in to comment.