Skip to content

Commit

Permalink
Merge branch 'master' into sc2-next
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ziktofel
Ziktofel committed Jul 15, 2024
2 parents e1ac781 + 28e82c8 commit 3110b11
Show file tree
Hide file tree
Showing 2 changed files with 244 additions and 0 deletions.
15 changes: 15 additions & 0 deletions Maps/ArchipelagoCampaign/WoL/ap_safe_haven.SC2Map/MapScript.galaxy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1418,6 +1418,21 @@ bool gt_PURIFIERIntro_Func (bool testConds, bool runActions) {
TriggerExecute(gt_ShowPathtoAlphaBase, true, false);
UnitIssueOrder(gv_purifier, OrderTargetingPoint(AbilityCommand("move", 0), PointFromId(1065)), c_orderQueueReplace);
UnitIssueOrder(gv_purifier, OrderTargetingPoint(AbilityCommand("move", 0), RegionGetCenter(RegionFromId(13))), c_orderQueueAddToEnd);
if ((gv_nexusDestroyed == 3)) {
libNtve_gf_ShowHideBossBar(true, gv_purifierBossBar);
if ((lib15EF4C78_gf_AP_Player_isSoaEnabledForPlayer(gv_pLAYER01_USER) == true)) {
libNtve_gf_MoveBossBar(gv_purifierBossBar, c_anchorTopRight, 0, 40);
}
else {
libNtve_gf_MoveBossBar(gv_purifierBossBar, c_anchorTop, 0, 50);
}
UnitBehaviorRemove(gv_purifier, "InvulnerabilityShield", 1);
libNtve_gf_MakeUnitInvulnerable(gv_purifier, false);
UnitSetPropertyFixed(gv_purifier, c_unitPropShields, 1000.0);
UnitSetPropertyFixed(gv_purifier, c_unitPropShieldsPercent, 0.0);
UnitSetPropertyFixed(gv_purifier, c_unitPropShieldsRegen, -30.0);
}

return true;
}

Expand Down
229 changes: 229 additions & 0 deletions Maps/ArchipelagoCampaign/WoL/ap_safe_haven.SC2Map/Triggers
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7734,6 +7734,7 @@
<Action Type="FunctionCall" Id="87CBD014"/>
<Action Type="FunctionCall" Id="28BE6C9F"/>
<Action Type="FunctionCall" Id="D5D82573"/>
<Action Type="FunctionCall" Id="ED853C45"/>
</Element>
<Element Type="FunctionCall" Id="98CAD60D">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="9D67F076"/>
Expand Down Expand Up @@ -8321,6 +8322,234 @@
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000158"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000040"/>
</Element>
<Element Type="FunctionCall" Id="ED853C45">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<FunctionCall Type="FunctionCall" Id="B7EBCD0D"/>
<FunctionCall Type="FunctionCall" Id="327E5F25"/>
<FunctionCall Type="FunctionCall" Id="BBA9F697"/>
<FunctionCall Type="FunctionCall" Id="DE06A4DB"/>
<FunctionCall Type="FunctionCall" Id="3F3186D5"/>
<FunctionCall Type="FunctionCall" Id="C94F35FD"/>
<FunctionCall Type="FunctionCall" Id="604C8784"/>
<FunctionCall Type="FunctionCall" Id="D7506175"/>
</Element>
<Element Type="FunctionCall" Id="B7EBCD0D">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="8A208EC7"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="56A6A7A2"/>
<Parameter Type="Param" Id="302BC421"/>
</Element>
<Element Type="Param" Id="56A6A7A2">
<ParameterDef Type="ParamDef" Library="Ntve" Id="B82F1550"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
</Element>
<Element Type="Param" Id="302BC421">
<ParameterDef Type="ParamDef" Library="Ntve" Id="F0292628"/>
<Variable Type="Variable" Id="54576A15"/>
</Element>
<Element Type="FunctionCall" Id="327E5F25">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<FunctionCall Type="FunctionCall" Id="04E098E0"/>
<FunctionCall Type="FunctionCall" Id="BCA68B53"/>
<FunctionCall Type="FunctionCall" Id="DD24700B"/>
</Element>
<Element Type="FunctionCall" Id="04E098E0">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="01BD3A7C"/>
<Parameter Type="Param" Id="20B0A626"/>
<Parameter Type="Param" Id="64D78168"/>
</Element>
<Element Type="Param" Id="01BD3A7C">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<FunctionCall Type="FunctionCall" Id="00DF94DB"/>
</Element>
<Element Type="FunctionCall" Id="00DF94DB">
<FunctionDef Type="FunctionDef" Library="15EF4C78" Id="FE5973AE"/>
<Parameter Type="Param" Id="1BE7C52B"/>
</Element>
<Element Type="Param" Id="1BE7C52B">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="F4A67AFE"/>
<Variable Type="Variable" Id="41340C67"/>
</Element>
<Element Type="Param" Id="20B0A626">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="64D78168">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>true</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="FunctionCall" Id="BCA68B53">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="6B027921"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="CA21FDE8"/>
<Parameter Type="Param" Id="55B57D5D"/>
<Parameter Type="Param" Id="CABA49AA"/>
<Parameter Type="Param" Id="B2DA6E31"/>
</Element>
<Element Type="Param" Id="CA21FDE8">
<ParameterDef Type="ParamDef" Library="Ntve" Id="30BDD3FB"/>
<Variable Type="Variable" Id="54576A15"/>
</Element>
<Element Type="Param" Id="55B57D5D">
<ParameterDef Type="ParamDef" Library="Ntve" Id="9BE00FC2"/>
<Preset Type="PresetValue" Library="Ntve" Id="A216FAB4"/>
</Element>
<Element Type="Param" Id="CABA49AA">
<ParameterDef Type="ParamDef" Library="Ntve" Id="068EF0FD"/>
<Value>0</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Param" Id="B2DA6E31">
<ParameterDef Type="ParamDef" Library="Ntve" Id="9E26E268"/>
<Value>40</Value>
<ValueType Type="int"/>
</Element>
<Element Type="FunctionCall" Id="DD24700B">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="6B027921"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<Parameter Type="Param" Id="D061C784"/>
<Parameter Type="Param" Id="FA7E1EFA"/>
<Parameter Type="Param" Id="3EC08C26"/>
<Parameter Type="Param" Id="25E1350E"/>
</Element>
<Element Type="Param" Id="D061C784">
<ParameterDef Type="ParamDef" Library="Ntve" Id="30BDD3FB"/>
<Variable Type="Variable" Id="54576A15"/>
</Element>
<Element Type="Param" Id="FA7E1EFA">
<ParameterDef Type="ParamDef" Library="Ntve" Id="9BE00FC2"/>
<Preset Type="PresetValue" Library="Ntve" Id="64F5C4F9"/>
</Element>
<Element Type="Param" Id="3EC08C26">
<ParameterDef Type="ParamDef" Library="Ntve" Id="068EF0FD"/>
<Value>0</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Param" Id="25E1350E">
<ParameterDef Type="ParamDef" Library="Ntve" Id="9E26E268"/>
<Value>50</Value>
<ValueType Type="int"/>
</Element>
<Element Type="FunctionCall" Id="BBA9F697">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="09840835"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="DF5A8EA0"/>
<Parameter Type="Param" Id="07E07643"/>
<Parameter Type="Param" Id="6986EE8B"/>
</Element>
<Element Type="Param" Id="DF5A8EA0">
<ParameterDef Type="ParamDef" Library="Ntve" Id="A45406E1"/>
<Value>1</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Param" Id="07E07643">
<ParameterDef Type="ParamDef" Library="Ntve" Id="EB47C731"/>
<Value>InvulnerabilityShield</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Behavior"/>
</Element>
<Element Type="Param" Id="6986EE8B">
<ParameterDef Type="ParamDef" Library="Ntve" Id="A6600060"/>
<Variable Type="Variable" Id="BAC31D5E"/>
</Element>
<Element Type="FunctionCall" Id="DE06A4DB">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="50000000"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="D9F3E842"/>
<Parameter Type="Param" Id="9EF7111C"/>
</Element>
<Element Type="Param" Id="D9F3E842">
<ParameterDef Type="ParamDef" Library="Ntve" Id="31000000"/>
<Variable Type="Variable" Id="BAC31D5E"/>
</Element>
<Element Type="Param" Id="9EF7111C">
<ParameterDef Type="ParamDef" Library="Ntve" Id="41000000"/>
<Preset Type="PresetValue" Library="Ntve" Id="60000000"/>
</Element>
<Element Type="FunctionCall" Id="3F3186D5">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000087"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="32084398"/>
<Parameter Type="Param" Id="3691523D"/>
<Parameter Type="Param" Id="D06B877C"/>
</Element>
<Element Type="Param" Id="32084398">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000151"/>
<Variable Type="Variable" Id="BAC31D5E"/>
</Element>
<Element Type="Param" Id="3691523D">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000152"/>
<Preset Type="PresetValue" Library="Ntve" Id="0517AEC2"/>
</Element>
<Element Type="Param" Id="D06B877C">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000153"/>
<Value>1000.0</Value>
<ValueType Type="fixed"/>
</Element>
<Element Type="FunctionCall" Id="C94F35FD">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000087"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="B4794B71"/>
<Parameter Type="Param" Id="E7B59F62"/>
<Parameter Type="Param" Id="30AFD0A6"/>
</Element>
<Element Type="Param" Id="B4794B71">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000151"/>
<Variable Type="Variable" Id="BAC31D5E"/>
</Element>
<Element Type="Param" Id="E7B59F62">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000153"/>
<Value>0.0</Value>
<ValueType Type="fixed"/>
</Element>
<Element Type="Param" Id="30AFD0A6">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000152"/>
<Preset Type="PresetValue" Library="Ntve" Id="84EB1D0C"/>
</Element>
<Element Type="FunctionCall" Id="604C8784">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000087"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="BB5DDE89"/>
<Parameter Type="Param" Id="DAD2AE4D"/>
<Parameter Type="Param" Id="22C8DEF0"/>
</Element>
<Element Type="Param" Id="BB5DDE89">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000151"/>
<Variable Type="Variable" Id="BAC31D5E"/>
</Element>
<Element Type="Param" Id="DAD2AE4D">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000153"/>
<Value>-30.0</Value>
<ValueType Type="fixed"/>
</Element>
<Element Type="Param" Id="22C8DEF0">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000152"/>
<Preset Type="PresetValue" Library="Ntve" Id="F6FAB138"/>
</Element>
<Element Type="FunctionCall" Id="D7506175">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="39F66D3B"/>
<Parameter Type="Param" Id="A88D4EB9"/>
<Parameter Type="Param" Id="11F66975"/>
</Element>
<Element Type="Param" Id="39F66D3B">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<Variable Type="Variable" Id="8D6189CB"/>
</Element>
<Element Type="Param" Id="A88D4EB9">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="11F66975">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>3</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Trigger" Id="8F673271">
<Condition Type="FunctionCall" Id="15875704"/>
<Action Type="FunctionCall" Id="793E0FEA"/>
Expand Down

0 comments on commit 3110b11

Please sign in to comment.