From 64c3686aa0d724dec8da012bb1aefc72d841709e Mon Sep 17 00:00:00 2001
From: Ziktofel <ziktofel@gmail.com>
Date: Fri, 15 Nov 2024 23:03:20 +0100
Subject: [PATCH] Add timer for trashing odin early so the player know when it
 happens

---
 .../ap_the_reckoning.SC2Map/DocumentHeader    | Bin 11838 -> 11838 bytes
 .../ap_the_reckoning.SC2Map/MapScript.galaxy  |   6 +-
 .../HotS/ap_the_reckoning.SC2Map/Triggers     |  94 +++++++++++++++---
 .../ap_the_reckoning.SC2Map/Triggers.version  | Bin 44 -> 44 bytes
 .../LocalizedData/TriggerStrings.txt          |   1 +
 5 files changed, 88 insertions(+), 13 deletions(-)

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/DocumentHeader
index 0d019a6014b99b5db38b68d464146b394318fe17..99f5b77fea5ddf9a2abbdcf9bb91cb29fed42df9 100644
GIT binary patch
delta 19
YcmdlNvoB_X496|wIYl76QAJ7*09lU+JOBUy

delta 19
YcmdlNvoB_X49Abxw+lgdql%Os0BpGmWB>pF

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/MapScript.galaxy
index 8a9534262..654ff9dfd 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/MapScript.galaxy
+++ b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/MapScript.galaxy
@@ -118,6 +118,7 @@ sound gv_victoryZergSound1;
 sound gv_victoryZergSound2;
 sound gv_victoryZergSound3;
 int gv_objectiveDefeatOdin;
+timer gv_objectiveTrashOdinEarlyTimer;
 int gv_objectiveTrashOdinEarly;
 point gv_cCLocation;
 
@@ -150,6 +151,7 @@ void InitGlobals () {
     gv_cinematicHiddenUnits = UnitGroupEmpty();
     gv_cinematicTempUnits = UnitGroupEmpty();
     gv_objectiveDefeatOdin = c_invalidObjectiveId;
+    gv_objectiveTrashOdinEarlyTimer = TimerCreate();
     gv_objectiveTrashOdinEarly = c_invalidObjectiveId;
 }
 
@@ -3938,9 +3940,11 @@ bool gt_HyperionBigAttack3Q_Func (bool testConds, bool runActions) {
     }
 
     if (((libABFE498B_gv_aP_Triggers_Option_KerriganPresence == 0) || (libABFE498B_gv_aP_Triggers_Option_overridePlayerRace != "Neut") || (libABFE498B_gv_aP_Triggers_Option_takeOverAIAllies == true))) {
+        TimerStart(gv_objectiveTrashOdinEarlyTimer, 2700.0, false, c_timeAI);
         Wait(2700.0, c_timeAI);
     }
     else {
+        TimerStart(gv_objectiveTrashOdinEarlyTimer, 1350.0, false, c_timeAI);
         Wait(1350.0, c_timeAI);
     }
     while (true) {
@@ -6380,7 +6384,7 @@ bool gt_ObjectiveTrashOdinEarlyCreate_Func (bool testConds, bool runActions) {
     TriggerEnable(TriggerGetCurrent(), false);
     ObjectiveCreate(StringExternal("Param/Value/55A6BA50"), StringToText(""), c_objectiveStateHidden, false);
     gv_objectiveTrashOdinEarly = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveTrashOdinEarly, lv_category, true);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithTimer(gv_objectiveTrashOdinEarly, lv_category, gv_objectiveTrashOdinEarlyTimer, true);
     lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveTrashOdinEarly, gv_LOCATION_ID_TRASH_THE_ODIN_EARLY);
     lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveTrashOdinEarly, true);
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers
index b346e9739..6420844ab 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers
+++ b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers
@@ -29076,7 +29076,9 @@
     <Element Type="FunctionCall" Id="2D99E08B">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
         <FunctionCall Type="Comment" Id="58920AC5"/>
+        <FunctionCall Type="FunctionCall" Id="486F99AF"/>
         <FunctionCall Type="Comment" Id="4A2AD56A"/>
+        <FunctionCall Type="FunctionCall" Id="403B556C"/>
         <FunctionCall Type="FunctionCall" Id="A41FA989"/>
         <FunctionCall Type="FunctionCall" Id="39C06A7A"/>
         <FunctionCall Type="FunctionCall" Id="3FA6E0CD"/>
@@ -29087,12 +29089,62 @@
         </Comment>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
     </Element>
+    <Element Type="FunctionCall" Id="486F99AF">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000042"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000005"/>
+        <Parameter Type="Param" Id="700CE6A4"/>
+        <Parameter Type="Param" Id="9300AF9D"/>
+        <Parameter Type="Param" Id="C4281E4D"/>
+        <Parameter Type="Param" Id="ADA8E435"/>
+    </Element>
+    <Element Type="Param" Id="700CE6A4">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000074"/>
+        <Value>1350.0</Value>
+        <ValueType Type="fixed"/>
+    </Element>
+    <Element Type="Param" Id="9300AF9D">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000075"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000010"/>
+    </Element>
+    <Element Type="Param" Id="C4281E4D">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000076"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="EC544EA4"/>
+    </Element>
+    <Element Type="Param" Id="ADA8E435">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000073"/>
+        <Variable Type="Variable" Id="3F29292C"/>
+    </Element>
     <Element Type="Comment" Id="4A2AD56A">
         <Comment>
             Delayed
         </Comment>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
     </Element>
+    <Element Type="FunctionCall" Id="403B556C">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000042"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+        <Parameter Type="Param" Id="2F144A4B"/>
+        <Parameter Type="Param" Id="648BB1AA"/>
+        <Parameter Type="Param" Id="7D7CB8A1"/>
+        <Parameter Type="Param" Id="D226E982"/>
+    </Element>
+    <Element Type="Param" Id="2F144A4B">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000074"/>
+        <Value>2700.0</Value>
+        <ValueType Type="fixed"/>
+    </Element>
+    <Element Type="Param" Id="648BB1AA">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000075"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000010"/>
+    </Element>
+    <Element Type="Param" Id="7D7CB8A1">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000076"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="EC544EA4"/>
+    </Element>
+    <Element Type="Param" Id="D226E982">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000073"/>
+        <Variable Type="Variable" Id="3F29292C"/>
+    </Element>
     <Element Type="FunctionCall" Id="A41FA989">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
@@ -49084,11 +49136,24 @@
         <Variable Type="Variable" Library="SwaC" Id="DBF95DBE"/>
     </Element>
     <Element Type="Category" Id="91F3ADE7">
+        <Item Type="Variable" Id="3F29292C"/>
         <Item Type="Variable" Id="ACF94C02"/>
         <Item Type="Trigger" Id="FBC9ED08"/>
         <Item Type="Trigger" Id="207B9977"/>
         <Item Type="Trigger" Id="29B0A532"/>
     </Element>
+    <Element Type="Variable" Id="3F29292C">
+        <VariableType>
+            <Type Value="timer"/>
+        </VariableType>
+        <Value Type="Param" Id="99E70294"/>
+    </Element>
+    <Element Type="Param" Id="99E70294">
+        <FunctionCall Type="FunctionCall" Id="FC08C88A"/>
+    </Element>
+    <Element Type="FunctionCall" Id="FC08C88A">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000193"/>
+    </Element>
     <Element Type="Variable" Id="ACF94C02">
         <VariableType>
             <Type Value="objective"/>
@@ -49105,7 +49170,7 @@
         <Action Type="Comment" Id="F2027EE5"/>
         <Action Type="FunctionCall" Id="69303873"/>
         <Action Type="FunctionCall" Id="BBB5943F"/>
-        <Action Type="FunctionCall" Id="DFFCC6EB"/>
+        <Action Type="FunctionCall" Id="12E8732F"/>
         <Action Type="FunctionCall" Id="781F66D2"/>
         <Action Type="FunctionCall" Id="6060F129"/>
         <Action Type="FunctionCall" Id="2474012F"/>
@@ -49210,25 +49275,30 @@
     <Element Type="FunctionCall" Id="205AF6BC">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="DFFCC6EB">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="0C305801"/>
-        <Parameter Type="Param" Id="8A1F4CAD"/>
-        <Parameter Type="Param" Id="9F7B906A"/>
-        <Parameter Type="Param" Id="741EA433"/>
+    <Element Type="FunctionCall" Id="12E8732F">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="CF82A573"/>
+        <Parameter Type="Param" Id="7D7E67A8"/>
+        <Parameter Type="Param" Id="A83FD4E6"/>
+        <Parameter Type="Param" Id="3B66D26E"/>
+        <Parameter Type="Param" Id="E51FCEB1"/>
     </Element>
-    <Element Type="Param" Id="8A1F4CAD">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6AE8CB85"/>
+    <Element Type="Param" Id="7D7E67A8">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="4F66FF45"/>
         <Variable Type="Variable" Id="ACF94C02"/>
     </Element>
-    <Element Type="Param" Id="9F7B906A">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="831F0838"/>
+    <Element Type="Param" Id="A83FD4E6">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="81B4875D"/>
         <Value>true</Value>
         <ValueType Type="bool"/>
     </Element>
-    <Element Type="Param" Id="741EA433">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="78F14EB9"/>
+    <Element Type="Param" Id="3B66D26E">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="D0BCD049"/>
         <Variable Type="Variable" Id="7C2D5C67"/>
     </Element>
+    <Element Type="Param" Id="E51FCEB1">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="BA551873"/>
+        <Variable Type="Variable" Id="3F29292C"/>
+    </Element>
     <Element Type="FunctionCall" Id="781F66D2">
         <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
         <Parameter Type="Param" Id="A794FB03"/>
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers.version
index b29156004f479ba57213be30f28768f86b7c3747..412c5b3eb82fb9ab9fb45bf11a610267d1185056 100644
GIT binary patch
delta 17
XcmdPVnV`V4f`NhI-Y)ZWMj#CUC%^;r

delta 17
XcmdPVnV`V4jDdkcZKruUBaj9FA>ji#

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
index 0c932993e..77dee4969 100644
--- a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
+++ b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -208,6 +208,7 @@ Variable/Name/2F2E36CC=PLAYER_14_ZAGARA
 Variable/Name/30601208=YellowEnd
 Variable/Name/3D7F9D3D=currentUnit
 Variable/Name/3EB57993=LOCATION_ID_TRASH_THE_ODIN_EARLY
+Variable/Name/3F29292C=ObjectiveTrashOdinEarlyTimer
 Variable/Name/3F62F8D4=BlueEnd
 Variable/Name/440AB586=Soundtrack
 Variable/Name/4652EE01=Enemies