Skip to content

Commit

Permalink
Fix a bug where the player started with mercs without starting cooldo…
Browse files Browse the repository at this point in the history 
…wn when shouldn't
  • Loading branch information
@Ziktofel
Ziktofel committed Jul 8, 2024
1 parent cb09838 commit 00c4afa
Show file tree
Hide file tree
Showing 21 changed files with 1,217 additions and 741 deletions.
1 change: 0 additions & 1 deletion Maps/ArchipelagoCampaign/WoL/ap_evacuation.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="info">DocumentInfo</DataComponent>
<DataComponent Type="mapi">MapInfo</DataComponent>
Expand Down
Binary file modified Maps/ArchipelagoCampaign/WoL/ap_evacuation.SC2Map/DocumentHeader
View file
Binary file not shown.
6 changes: 6 additions & 0 deletions Maps/ArchipelagoCampaign/WoL/ap_evacuation.SC2Map/MapScript.galaxy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1935,6 +1935,12 @@ bool gt_SwitchtoEscortPhase_Func (bool testConds, bool runActions) {
}
lib15EF4C78_gf_ZerglingRespawnSetPrimaryHatchery(gv_p1_USER, UnitFromId(236));
lib15EF4C78_gf_AP_Player_clearZerglingRespawnChargesFromPlayer(gv_p1_USER);
if ((TechTreeUpgradeCount(gv_p1_USER, "AP_FastDelivery", c_techCountCompleteOnly) >= 1)) {
lib15EF4C78_gf_AP_Player_ClearMercenaryCooldowns(gv_p1_USER);
}
else {
lib15EF4C78_gf_AP_Player_ResetMercenaryCooldowns(gv_p1_USER);
}
return true;
}

Expand Down
1 change: 0 additions & 1 deletion Maps/ArchipelagoCampaign/WoL/ap_evacuation.SC2Map/Preload.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@
<Terrain id="Agria"/>
<Unit id="Baneling"/>
<Unit id="Bunker"/>
<Unit id="MercCompound"/>
<Unit id="AutoTurret"/>
<Unit id="Marine"/>
<Unit id="Hatchery"/>
Expand Down
290 changes: 65 additions & 225 deletions Maps/ArchipelagoCampaign/WoL/ap_evacuation.SC2Map/Triggers
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11656,13 +11656,13 @@
<Action Type="FunctionCall" Id="67CDAA7E"/>
<Action Type="FunctionCall" Id="56817411"/>
<Action Type="FunctionCall" Id="EAEE2387"/>
<Action Type="FunctionCall" Id="DE9ABEF0"/>
<Action Type="FunctionCall" Id="955C90E9"/>
<Action Type="FunctionCall" Id="8AB3F9FF"/>
<Action Type="FunctionCall" Id="C6F3D52F"/>
<Action Type="FunctionCall" Id="338F5CC8"/>
<Action Type="FunctionCall" Id="C0340F72"/>
<Action Type="FunctionCall" Id="7612E2FB"/>
<Action Type="FunctionCall" Id="D44EB922"/>
</Element>
<Element Type="Variable" Id="2D3E232F">
<VariableType>
Expand Down Expand Up @@ -12437,230 +12437,6 @@
<ValueId Id="4294967295"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="FunctionCall" Id="DE9ABEF0">
<Disabled/>
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<FunctionCall Type="FunctionCall" Id="9DA2E38A"/>
<FunctionCall Type="FunctionCall" Id="6F3E6E31"/>
<FunctionCall Type="FunctionCall" Id="76A73A8E"/>
<FunctionCall Type="FunctionCall" Id="47830AE5"/>
<FunctionCall Type="FunctionCall" Id="59A4E407"/>
<FunctionCall Type="FunctionCall" Id="0FDAB1E5"/>
<FunctionCall Type="FunctionCall" Id="682C34F9"/>
</Element>
<Element Type="FunctionCall" Id="9DA2E38A">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<FunctionCall Type="FunctionCall" Id="17DDB63D"/>
<FunctionCall Type="FunctionCall" Id="7F57B901"/>
</Element>
<Element Type="FunctionCall" Id="17DDB63D">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="C95D9629"/>
<Parameter Type="Param" Id="231CB02E"/>
</Element>
<Element Type="Param" Id="C95D9629">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
<Variable Type="Variable" Id="1313E54D"/>
</Element>
<Element Type="Param" Id="231CB02E">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
<Value>true</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="FunctionCall" Id="7F57B901">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="BC406343"/>
<Parameter Type="Param" Id="9AFEED24"/>
<Parameter Type="Param" Id="C2827AAF"/>
</Element>
<Element Type="Param" Id="BC406343">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<FunctionCall Type="FunctionCall" Id="DB870A66"/>
</Element>
<Element Type="FunctionCall" Id="DB870A66">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000177"/>
<Parameter Type="Param" Id="235CC413"/>
<Parameter Type="Param" Id="FA9D1177"/>
</Element>
<Element Type="Param" Id="235CC413">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000293"/>
<ValueType Type="unit"/>
<ValueId Id="3245"/>
</Element>
<Element Type="Param" Id="FA9D1177">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000294"/>
<Variable Type="Variable" Id="00000017"/>
</Element>
<Element Type="Param" Id="9AFEED24">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="C2827AAF">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>true</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="FunctionCall" Id="6F3E6E31">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="30000000"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="E3C2BD24"/>
<Parameter Type="Param" Id="3EE8C73D"/>
</Element>
<Element Type="Param" Id="E3C2BD24">
<ParameterDef Type="ParamDef" Library="Ntve" Id="90000000"/>
<ValueType Type="unit"/>
<ValueId Id="3245"/>
</Element>
<Element Type="Param" Id="3EE8C73D">
<ParameterDef Type="ParamDef" Library="Ntve" Id="01000000"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000116"/>
</Element>
<Element Type="FunctionCall" Id="76A73A8E">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="34F27E12"/>
<Parameter Type="Param" Id="4C3B03AE"/>
</Element>
<Element Type="Param" Id="34F27E12">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
<Variable Type="Variable" Id="2D3E232F"/>
</Element>
<Element Type="Param" Id="4C3B03AE">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
<FunctionCall Type="FunctionCall" Id="D6EF066C"/>
</Element>
<Element Type="FunctionCall" Id="D6EF066C">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000083"/>
<Parameter Type="Param" Id="B55A690F"/>
</Element>
<Element Type="Param" Id="B55A690F">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000144"/>
<ValueType Type="unit"/>
<ValueId Id="3245"/>
</Element>
<Element Type="FunctionCall" Id="47830AE5">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000078"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="7A9A038C"/>
</Element>
<Element Type="Param" Id="7A9A038C">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000137"/>
<ValueType Type="unit"/>
<ValueId Id="3245"/>
</Element>
<Element Type="FunctionCall" Id="59A4E407">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="F247156C"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="51799C69"/>
<Parameter Type="Param" Id="39A25F23"/>
<Parameter Type="Param" Id="45FDCC6F"/>
<Parameter Type="Param" Id="D263956B"/>
<Parameter Type="Param" Id="EFCD79AD"/>
</Element>
<Element Type="Param" Id="51799C69">
<ParameterDef Type="ParamDef" Library="Ntve" Id="6A3CFF43"/>
<Value>1</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Param" Id="39A25F23">
<ParameterDef Type="ParamDef" Library="Ntve" Id="A927C67A"/>
<ValueType Type="preset"/>
</Element>
<Element Type="Param" Id="45FDCC6F">
<ParameterDef Type="ParamDef" Library="Ntve" Id="FF0C620E"/>
<Variable Type="Variable" Id="00000017"/>
</Element>
<Element Type="Param" Id="D263956B">
<ParameterDef Type="ParamDef" Library="Ntve" Id="D43CB595"/>
<Value>MercCompound</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="Param" Id="EFCD79AD">
<ParameterDef Type="ParamDef" Library="Ntve" Id="23D48FEC"/>
<Variable Type="Variable" Id="2D3E232F"/>
</Element>
<Element Type="FunctionCall" Id="0FDAB1E5">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<FunctionCall Type="FunctionCall" Id="E5B9361C"/>
<FunctionCall Type="FunctionCall" Id="68889490"/>
</Element>
<Element Type="FunctionCall" Id="E5B9361C">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000175"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="CECD07AD"/>
<Parameter Type="Param" Id="377BABE4"/>
<Parameter Type="Param" Id="3E8FAF0E"/>
</Element>
<Element Type="Param" Id="CECD07AD">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000289"/>
<FunctionCall Type="FunctionCall" Id="C5278955"/>
</Element>
<Element Type="FunctionCall" Id="C5278955">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000076"/>
</Element>
<Element Type="Param" Id="377BABE4">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000290"/>
<Value>1</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Param" Id="3E8FAF0E">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000291"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000108"/>
</Element>
<Element Type="FunctionCall" Id="68889490">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="83EB602C"/>
<Parameter Type="Param" Id="02759EDF"/>
<Parameter Type="Param" Id="2BA1AB58"/>
</Element>
<Element Type="Param" Id="83EB602C">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<Variable Type="Variable" Id="1313E54D"/>
</Element>
<Element Type="Param" Id="02759EDF">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="2BA1AB58">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>true</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="FunctionCall" Id="682C34F9">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="1F4D1187"/>
<Parameter Type="Param" Id="8DBA94B5"/>
<Parameter Type="Param" Id="16A87EF3"/>
</Element>
<Element Type="Param" Id="1F4D1187">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<FunctionCall Type="FunctionCall" Id="3941EF19"/>
</Element>
<Element Type="FunctionCall" Id="3941EF19">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000216"/>
<Parameter Type="Param" Id="3AFA175D"/>
</Element>
<Element Type="Param" Id="3AFA175D">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000378"/>
<ValueType Type="unit"/>
<ValueId Id="3245"/>
</Element>
<Element Type="Param" Id="8DBA94B5">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="16A87EF3">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>true</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="FunctionCall" Id="955C90E9">
<FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
<Parameter Type="Param" Id="016A878F"/>
Expand Down Expand Up @@ -12983,6 +12759,70 @@
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="5EE69450"/>
<Variable Type="Variable" Id="00000017"/>
</Element>
<Element Type="FunctionCall" Id="D44EB922">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<FunctionCall Type="FunctionCall" Id="2EF258A4"/>
<FunctionCall Type="FunctionCall" Id="8E5496BF"/>
<FunctionCall Type="FunctionCall" Id="7EE01257"/>
</Element>
<Element Type="FunctionCall" Id="2EF258A4">
<FunctionDef Type="FunctionDef" Library="15EF4C78" Id="61B3E6B1"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Id="33160373"/>
</Element>
<Element Type="Param" Id="33160373">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="B5416A0C"/>
<Variable Type="Variable" Id="00000017"/>
</Element>
<Element Type="FunctionCall" Id="8E5496BF">
<FunctionDef Type="FunctionDef" Library="15EF4C78" Id="86729ECF"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
<Parameter Type="Param" Id="CB7996F4"/>
</Element>
<Element Type="Param" Id="CB7996F4">
<ParameterDef Type="ParamDef" Library="15EF4C78" Id="99EB9E74"/>
<Variable Type="Variable" Id="00000017"/>
</Element>
<Element Type="FunctionCall" Id="7EE01257">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Id="C3109082"/>
<Parameter Type="Param" Id="8D89BCD8"/>
<Parameter Type="Param" Id="4032A337"/>
</Element>
<Element Type="Param" Id="C3109082">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<FunctionCall Type="FunctionCall" Id="7E0A0879"/>
</Element>
<Element Type="FunctionCall" Id="7E0A0879">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000255"/>
<Parameter Type="Param" Id="1ECECF9E"/>
<Parameter Type="Param" Id="4E8DAFB7"/>
<Parameter Type="Param" Id="1E024B8E"/>
</Element>
<Element Type="Param" Id="1ECECF9E">
<ParameterDef Type="ParamDef" Library="Ntve" Id="448F39DC"/>
<Preset Type="PresetValue" Library="Ntve" Id="D78D6018"/>
</Element>
<Element Type="Param" Id="4E8DAFB7">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000447"/>
<Value>AP_FastDelivery</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Upgrade"/>
</Element>
<Element Type="Param" Id="1E024B8E">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000446"/>
<Variable Type="Variable" Id="00000017"/>
</Element>
<Element Type="Param" Id="8D89BCD8">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="B128CB9A"/>
</Element>
<Element Type="Param" Id="4032A337">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>1</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Trigger" Id="017DBD0A">
<Condition Type="FunctionCall" Id="EF345197"/>
<Condition Type="FunctionCall" Id="B2F7A8D4"/>
Expand Down
Binary file modified Maps/ArchipelagoCampaign/WoL/ap_evacuation.SC2Map/Triggers.version
View file
Binary file not shown.
Loading

0 comments on commit 00c4afa

Please sign in to comment.