Skip to content

Commit

Permalink
Merge remote-tracking branch 'EnvyDragon/marsara-swaps' into sc2-next
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ziktofel
Ziktofel committed Jul 4, 2024
2 parents dfe1f9a + d4077d7 commit feb4c2b
Show file tree
Hide file tree
Showing 17 changed files with 2,164 additions and 417 deletions.
Binary file modified Maps/ArchipelagoCampaign/WoL/ap_smash_and_grab.SC2Map/DocumentHeader
View file
Binary file not shown.
13 changes: 11 additions & 2 deletions Maps/ArchipelagoCampaign/WoL/ap_smash_and_grab.SC2Map/MapScript.galaxy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3645,7 +3645,7 @@ bool gt_Victory_Func (bool testConds, bool runActions) {
VictoryPanelAddCustomStatisticLine(StringToText(""), StringToText(""));
VictoryPanelAddCustomStatisticLine(StringExternal("Param/Value/3F94A9B8"), (IntToText(gv_relicsFound) + StringExternal("Param/Value/1BB42988") + IntToText(gv_relicsNeeded)));
VictoryPanelAddCustomStatisticLine(StringExternal("Param/Value/9F2E56B5"), IntToText(gv_relicsFound));
libCamp_gf_EndCampaignMission(gv_p1_USER, c_gameOverVictory);
GameOver(gv_p1_USER, c_gameOverVictory, false, false);
return true;
}

Expand Down Expand Up @@ -5212,6 +5212,7 @@ bool gt_ArchInit_Func (bool testConds, bool runActions) {
TriggerExecute(gt_Init02Players, true, false);
lib5BD4895D_gf_AP_Core_MapConfig_setMapInit(gt_Initialization);
libABFE498B_gf_AP_Triggers_MapConfig_setDifficultySetup(gt_onDifficultyCasual, gt_onDifficultyNormal, gt_onDifficultyHard, gt_onDifficultyBrutal);
lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p1_USER, lib5BD4895D_gv_aP_Core_Faction_RAYNORS_RAIDERS);
lib5BD4895D_gf_AP_Core_initObjectivePanel();
return true;
}
Expand All @@ -5234,9 +5235,9 @@ bool gt_FactionSwapInit_Func (bool testConds, bool runActions) {

if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut")) {
lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), "Terr");
lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p1_USER, lib5BD4895D_gv_aP_Core_Faction_RAYNORS_RAIDERS);
}
else {
libABFE498B_gv_aP_Triggers_skipCutscenes = true;
lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace);
libLbty_gf_OrderWorkerstoGatherNearbyResources(RegionEntireMap(), 1);
lib15EF4C78_gf_AP_Player_UtilTownHallAutoRally(1);
Expand All @@ -5248,6 +5249,14 @@ bool gt_FactionSwapInit_Func (bool testConds, bool runActions) {
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
PlayerSetRace(1, "Prot");
lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p1_USER, lib5BD4895D_gv_aP_Core_Faction_DAELAAM);
if ((libABFE498B_gv_aP_Triggers_Option_SoAPresence == 2)) {
lib15EF4C78_gf_AP_Player_CreateSoAUnit(1);
}

if ((libABFE498B_gv_aP_Triggers_Option_SoAPresenceAutocasts == 2)) {
lib15EF4C78_gf_AP_Player_CreateSoAAutonomousCasterUnit(1);
}

}

}
Expand Down
158 changes: 143 additions & 15 deletions Maps/ArchipelagoCampaign/WoL/ap_smash_and_grab.SC2Map/Triggers
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33169,6 +33169,7 @@
<Action Type="FunctionCall" Id="7B8FA2F7"/>
<Action Type="FunctionCall" Id="760D738E"/>
<Action Type="Comment" Id="37475070"/>
<Action Type="FunctionCall" Id="5EAD4DC7"/>
<Action Type="FunctionCall" Id="ACA508B8"/>
</Element>
<Element Type="Comment" Id="BD931768">
Expand Down Expand Up @@ -33688,7 +33689,31 @@
End mission
</Comment>
</Element>
<Element Type="FunctionCall" Id="5EAD4DC7">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000198"/>
<Parameter Type="Param" Id="065F8B7B"/>
<Parameter Type="Param" Id="E6E82A7A"/>
<Parameter Type="Param" Id="7450445C"/>
<Parameter Type="Param" Id="C2AB6D98"/>
</Element>
<Element Type="Param" Id="065F8B7B">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000334"/>
<Variable Type="Variable" Id="A72065A3"/>
</Element>
<Element Type="Param" Id="E6E82A7A">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000335"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000117"/>
</Element>
<Element Type="Param" Id="7450445C">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000336"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
</Element>
<Element Type="Param" Id="C2AB6D98">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000337"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
</Element>
<Element Type="FunctionCall" Id="ACA508B8">
<Disabled/>
<FunctionDef Type="FunctionDef" Library="Camp" Id="5B7607F2"/>
<Parameter Type="Param" Id="1D5120EA"/>
<Parameter Type="Param" Id="8E7E3B27"/>
Expand Down Expand Up @@ -44496,6 +44521,7 @@
<Action Type="FunctionCall" Id="9754153A"/>
<Action Type="FunctionCall" Id="B1508960"/>
<Action Type="FunctionCall" Id="37A6CBE8"/>
<Action Type="FunctionCall" Id="CBD4E591"/>
<Action Type="FunctionCall" Id="7F397D1A"/>
</Element>
<Element Type="Variable" Id="2F827A41">
Expand Down Expand Up @@ -44585,6 +44611,19 @@
<ValueType Type="trigger"/>
<ValueElement Type="Trigger" Id="E4CA9040"/>
</Element>
<Element Type="FunctionCall" Id="CBD4E591">
<FunctionDef Type="FunctionDef" Library="5BD4895D" Id="61E1BF3C"/>
<Parameter Type="Param" Id="2E5EA152"/>
<Parameter Type="Param" Id="F2ED0FA4"/>
</Element>
<Element Type="Param" Id="2E5EA152">
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="68A06A53"/>
<Variable Type="Variable" Id="A72065A3"/>
</Element>
<Element Type="Param" Id="F2ED0FA4">
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="B9EB8763"/>
<Variable Type="Variable" Library="5BD4895D" Id="B4B3FF97"/>
</Element>
<Element Type="FunctionCall" Id="7F397D1A">
<FunctionDef Type="FunctionDef" Library="5BD4895D" Id="58737B0B"/>
</Element>
Expand All @@ -44602,16 +44641,31 @@
</Element>
<Element Type="FunctionCall" Id="A22E7F38">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<FunctionCall Type="FunctionCall" Id="54397C82"/>
<FunctionCall Type="FunctionCall" Id="0159D1BC"/>
<FunctionCall Type="Comment" Id="C4FAA5CB"/>
<FunctionCall Type="FunctionCall" Id="8E25DB88"/>
<FunctionCall Type="FunctionCall" Id="9DACDFF7"/>
<FunctionCall Type="FunctionCall" Id="01AF798D"/>
<FunctionCall Type="FunctionCall" Id="459676F0"/>
<FunctionCall Type="FunctionCall" Id="823067E8"/>
<FunctionCall Type="Comment" Id="606C054E"/>
<FunctionCall Type="FunctionCall" Id="81BDD7D1"/>
</Element>
<Element Type="FunctionCall" Id="54397C82">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<Parameter Type="Param" Id="1CFBDBDA"/>
<Parameter Type="Param" Id="8BC5A12A"/>
</Element>
<Element Type="Param" Id="1CFBDBDA">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
<Variable Type="Variable" Library="ABFE498B" Id="8CF8B2F6"/>
</Element>
<Element Type="Param" Id="8BC5A12A">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
<Value>true</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="FunctionCall" Id="0159D1BC">
<FunctionDef Type="FunctionDef" Library="15EF4C78" Id="3E0709E3"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
Expand Down Expand Up @@ -44674,6 +44728,10 @@
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<FunctionCall Type="FunctionCall" Id="D1F2BC2A"/>
<FunctionCall Type="FunctionCall" Id="5A0D6D57"/>
<FunctionCall Type="Comment" Id="B4DBD7F1"/>
<FunctionCall Type="FunctionCall" Id="4FFC9E59"/>
<FunctionCall Type="Comment" Id="0644DBF6"/>
<FunctionCall Type="FunctionCall" Id="05EB9B83"/>
<FunctionCall Type="FunctionCall" Id="F5684964"/>
</Element>
<Element Type="FunctionCall" Id="D1F2BC2A">
Expand Down Expand Up @@ -44707,6 +44765,90 @@
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="B9EB8763"/>
<Variable Type="Variable" Library="5BD4895D" Id="0BFEA9C4"/>
</Element>
<Element Type="Comment" Id="B4DBD7F1">
<Comment>
if SoA presence = &quot;protoss&quot;, create SoA (otherwise it either doesn&apos;t belong or already exists)
</Comment>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
</Element>
<Element Type="FunctionCall" Id="4FFC9E59">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<FunctionCall Type="FunctionCall" Id="4E95E6E2"/>
<FunctionCall Type="FunctionCall" Id="D7A1C723"/>
</Element>
<Element Type="FunctionCall" Id="4E95E6E2">
<FunctionDef Type="FunctionDef" Library="15EF4C78" Id="E572E998"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="2EA0AEEC"/>
</Element>
<Element Type="Param" Id="2EA0AEEC">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="5C912655"/>
<Value>1</Value>
<ValueType Type="int"/>
</Element>
<Element Type="FunctionCall" Id="D7A1C723">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="6A198FC3"/>
<Parameter Type="Param" Id="836517B8"/>
<Parameter Type="Param" Id="062CE87C"/>
</Element>
<Element Type="Param" Id="6A198FC3">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<Variable Type="Variable" Library="ABFE498B" Id="BD0EB0FB"/>
</Element>
<Element Type="Param" Id="836517B8">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="062CE87C">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>2</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Comment" Id="0644DBF6">
<Comment>
if SoA autocast presence = &quot;protoss&quot;, create SoA autocaster (otherwise it either doesn&apos;t belong or already exists)
</Comment>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
</Element>
<Element Type="FunctionCall" Id="05EB9B83">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<FunctionCall Type="FunctionCall" Id="0C7CCD07"/>
<FunctionCall Type="FunctionCall" Id="E900AAE9"/>
</Element>
<Element Type="FunctionCall" Id="0C7CCD07">
<FunctionDef Type="FunctionDef" Library="15EF4C78" Id="60D7553A"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="A04CD085"/>
</Element>
<Element Type="Param" Id="A04CD085">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="14D29BA1"/>
<Value>1</Value>
<ValueType Type="int"/>
</Element>
<Element Type="FunctionCall" Id="E900AAE9">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="E782A300"/>
<Parameter Type="Param" Id="31DEC412"/>
<Parameter Type="Param" Id="5B40BE1E"/>
</Element>
<Element Type="Param" Id="E782A300">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<Variable Type="Variable" Library="ABFE498B" Id="50E9FC36"/>
</Element>
<Element Type="Param" Id="31DEC412">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="5B40BE1E">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>2</Value>
<ValueType Type="int"/>
</Element>
<Element Type="FunctionCall" Id="F5684964">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
Expand Down Expand Up @@ -44797,20 +44939,6 @@
<ValueType Type="gamelink"/>
<ValueGameType Type="Race"/>
</Element>
<Element Type="FunctionCall" Id="823067E8">
<FunctionDef Type="FunctionDef" Library="5BD4895D" Id="61E1BF3C"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="62A6EE08"/>
<Parameter Type="Param" Id="0A91EDF1"/>
</Element>
<Element Type="Param" Id="62A6EE08">
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="68A06A53"/>
<Variable Type="Variable" Id="A72065A3"/>
</Element>
<Element Type="Param" Id="0A91EDF1">
<ParameterDef Type="ParamDef" Library="5BD4895D" Id="B9EB8763"/>
<Variable Type="Variable" Library="5BD4895D" Id="B4B3FF97"/>
</Element>
<Element Type="Comment" Id="606C054E">
<Comment>
If neutral, no override has been requested
Expand Down
Binary file modified Maps/ArchipelagoCampaign/WoL/ap_smash_and_grab.SC2Map/Triggers.version
View file
Binary file not shown.
Loading

0 comments on commit feb4c2b

Please sign in to comment.