Attempt to fix broken starting merc cooldowns in Media Blitz

Ziktofel · Jul 8, 2024 · 851ea0d · 851ea0d
1 parent 9c1d943
commit 851ea0d
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 1 deletion.
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/ComponentList.SC2Components
@@ -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>

diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/MapScript.galaxy
@@ -6982,6 +6982,12 @@ bool gt_MidCleanup_Func (bool testConds, bool runActions) {
     gv_inCinematic = false;
     libCamp_gf_CreateMissionAutosavePoint(StringExternal("Param/Value/3DF4DD57"));
     lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SURPRISE_ATTACK_ENDS);
+    if ((TechTreeUpgradeCount(gv_p01_USER, "AP_FastDelivery", c_techCountCompleteOnly) >= 1)) {
+        lib15EF4C78_gf_AP_Player_ClearMercenaryCooldowns(gv_p01_USER);
+    }
+    else {
+        lib15EF4C78_gf_AP_Player_ResetMercenaryCooldowns(gv_p01_USER);
+    }
     Wait(2.0, c_timeReal);
     TriggerExecute(gt_StartGameStage2, true, false);
     return true;

diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers
@@ -62624,6 +62624,7 @@
         <Action Type="Comment" Id="731D53AB"/>
         <Action Type="FunctionCall" Id="15417137"/>
         <Action Type="FunctionCall" Id="5F667112"/>
+        <Action Type="FunctionCall" Id="A2333FF9"/>
         <Action Type="FunctionCall" Id="FEA41C6F"/>
         <Action Type="FunctionCall" Id="9B399A06"/>
     </Element>
@@ -64261,6 +64262,70 @@
         <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
         <Variable Type="Variable" Id="22EB3D96"/>
     </Element>
+    <Element Type="FunctionCall" Id="A2333FF9">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
+        <FunctionCall Type="FunctionCall" Id="AD5A9428"/>
+        <FunctionCall Type="FunctionCall" Id="4A1D88BB"/>
+        <FunctionCall Type="FunctionCall" Id="BB6DFE0C"/>
+    </Element>
+    <Element Type="FunctionCall" Id="AD5A9428">
+        <FunctionDef Type="FunctionDef" Library="15EF4C78" Id="86729ECF"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
+        <Parameter Type="Param" Id="56E87484"/>
+    </Element>
+    <Element Type="Param" Id="56E87484">
+        <ParameterDef Type="ParamDef" Library="15EF4C78" Id="99EB9E74"/>
+        <Variable Type="Variable" Id="AAAE269C"/>
+    </Element>
+    <Element Type="FunctionCall" Id="4A1D88BB">
+        <FunctionDef Type="FunctionDef" Library="15EF4C78" Id="61B3E6B1"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+        <Parameter Type="Param" Id="ACD1DC0F"/>
+    </Element>
+    <Element Type="Param" Id="ACD1DC0F">
+        <ParameterDef Type="ParamDef" Library="15EF4C78" Id="B5416A0C"/>
+        <Variable Type="Variable" Id="AAAE269C"/>
+    </Element>
+    <Element Type="FunctionCall" Id="BB6DFE0C">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
+        <Parameter Type="Param" Id="2AFC5E2A"/>
+        <Parameter Type="Param" Id="8719D7DB"/>
+        <Parameter Type="Param" Id="ACFCBF9A"/>
+    </Element>
+    <Element Type="Param" Id="2AFC5E2A">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <FunctionCall Type="FunctionCall" Id="272303C0"/>
+    </Element>
+    <Element Type="FunctionCall" Id="272303C0">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000255"/>
+        <Parameter Type="Param" Id="75525253"/>
+        <Parameter Type="Param" Id="3F018761"/>
+        <Parameter Type="Param" Id="80FB8A4A"/>
+    </Element>
+    <Element Type="Param" Id="75525253">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="448F39DC"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="D78D6018"/>
+    </Element>
+    <Element Type="Param" Id="3F018761">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000447"/>
+        <Value>AP_FastDelivery</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Upgrade"/>
+    </Element>
+    <Element Type="Param" Id="80FB8A4A">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000446"/>
+        <Variable Type="Variable" Id="AAAE269C"/>
+    </Element>
+    <Element Type="Param" Id="8719D7DB">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="B128CB9A"/>
+    </Element>
+    <Element Type="Param" Id="ACFCBF9A">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>1</Value>
+        <ValueType Type="int"/>
+    </Element>
     <Element Type="FunctionCall" Id="FEA41C6F">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
         <Parameter Type="Param" Id="7D37EDDD"/>

diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers.version