Merge pull request #235 from Gemster312/sc2-next

Various Objective Fixes
Ziktofel · Aug 2, 2024 · db6c185 · db6c185
2 parents 2484339 + bf0f464
commit db6c185
Show file tree

Hide file tree

Showing 13 changed files with 150 additions and 108 deletions.
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy
@@ -7107,7 +7107,10 @@ bool gt_ObjectiveUrsadonMatriarchsUpdate_Func (bool testConds, bool runActions)
     TriggerExecute(gt_ObjectiveUrsadonMatriarchsCreate, true, false);
     libSwaC_gf_DisplayMissionObjectiveRewardFloatingText(UnitGetPosition(EventUnit()), "ZExpedition01Objective05", gv_pLAYER_01_USER);
     lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveKillUrsadonMatriarchs, gv_matriarchsKilled);
-    TriggerExecute(gt_ObjectiveUrsadonMatriarchsComplete, true, false);
+    if ((gv_matriarchsKilled >= 2)) {
+        TriggerExecute(gt_ObjectiveUrsadonMatriarchsComplete, true, false);
+    }
+
     Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -7131,14 +7134,6 @@ bool gt_ObjectiveUrsadonMatriarchsComplete_Func (bool testConds, bool runActions
         if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) {
             return false;
         }
-
-        if (!((UnitIsAlive(UnitFromId(595)) == false))) {
-            return false;
-        }
-
-        if (!((UnitIsAlive(UnitFromId(593)) == false))) {
-            return false;
-        }
     }
 
     // Actions

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers
@@ -46402,7 +46402,7 @@
         <Action Type="FunctionCall" Id="EC3B9CE1"/>
         <Action Type="Comment" Id="A1C79350"/>
         <Action Type="FunctionCall" Id="4C68BB3A"/>
-        <Action Type="FunctionCall" Id="99E10345"/>
+        <Action Type="FunctionCall" Id="4BD9833A"/>
         <Action Type="FunctionCall" Id="AC4112CE"/>
     </Element>
     <Element Type="FunctionCall" Id="93FA231D">
@@ -46762,8 +46762,34 @@
         <ParameterDef Type="ParamDef" Library="5BD4895D" Id="94108556"/>
         <Variable Type="Variable" Id="BCCE4DCF"/>
     </Element>
+    <Element Type="FunctionCall" Id="4BD9833A">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
+        <FunctionCall Type="FunctionCall" Id="5A25B5A4"/>
+        <FunctionCall Type="FunctionCall" Id="99E10345"/>
+    </Element>
+    <Element Type="FunctionCall" Id="5A25B5A4">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
+        <Parameter Type="Param" Id="E8FC1A0F"/>
+        <Parameter Type="Param" Id="EBEB51E4"/>
+        <Parameter Type="Param" Id="B0B882C8"/>
+    </Element>
+    <Element Type="Param" Id="E8FC1A0F">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <Variable Type="Variable" Id="BCCE4DCF"/>
+    </Element>
+    <Element Type="Param" Id="EBEB51E4">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="B128CB9A"/>
+    </Element>
+    <Element Type="Param" Id="B0B882C8">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>2</Value>
+        <ValueType Type="int"/>
+    </Element>
     <Element Type="FunctionCall" Id="99E10345">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
         <Parameter Type="Param" Id="EB1A062F"/>
         <Parameter Type="Param" Id="A30CE221"/>
         <Parameter Type="Param" Id="220EDB70"/>
@@ -46796,8 +46822,6 @@
     </Element>
     <Element Type="Trigger" Id="BB48C6AA">
         <Condition Type="FunctionCall" Id="DF3DD7AE"/>
-        <Condition Type="FunctionCall" Id="D548B4C0"/>
-        <Condition Type="FunctionCall" Id="0AB4A5D8"/>
         <Action Type="FunctionCall" Id="E0FCC372"/>
         <Action Type="Comment" Id="FC3C3BDC"/>
         <Action Type="FunctionCall" Id="EDA5F941"/>
@@ -46836,62 +46860,6 @@
         <Value>true</Value>
         <ValueType Type="bool"/>
     </Element>
-    <Element Type="FunctionCall" Id="D548B4C0">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
-        <Parameter Type="Param" Id="775D21F6"/>
-        <Parameter Type="Param" Id="0877006F"/>
-        <Parameter Type="Param" Id="61CE4F3F"/>
-    </Element>
-    <Element Type="Param" Id="775D21F6">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
-        <FunctionCall Type="FunctionCall" Id="D663A6BE"/>
-    </Element>
-    <Element Type="FunctionCall" Id="D663A6BE">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000216"/>
-        <Parameter Type="Param" Id="A47CF86F"/>
-    </Element>
-    <Element Type="Param" Id="A47CF86F">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000378"/>
-        <ValueType Type="unit"/>
-        <ValueId Id="595"/>
-    </Element>
-    <Element Type="Param" Id="0877006F">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
-    </Element>
-    <Element Type="Param" Id="61CE4F3F">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
-        <Value>false</Value>
-        <ValueType Type="bool"/>
-    </Element>
-    <Element Type="FunctionCall" Id="0AB4A5D8">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
-        <Parameter Type="Param" Id="FC91655E"/>
-        <Parameter Type="Param" Id="1339FC51"/>
-        <Parameter Type="Param" Id="4E11AD98"/>
-    </Element>
-    <Element Type="Param" Id="FC91655E">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
-        <FunctionCall Type="FunctionCall" Id="D5F7192A"/>
-    </Element>
-    <Element Type="FunctionCall" Id="D5F7192A">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000216"/>
-        <Parameter Type="Param" Id="EB0C8B1E"/>
-    </Element>
-    <Element Type="Param" Id="EB0C8B1E">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000378"/>
-        <ValueType Type="unit"/>
-        <ValueId Id="593"/>
-    </Element>
-    <Element Type="Param" Id="1339FC51">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
-    </Element>
-    <Element Type="Param" Id="4E11AD98">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
-        <Value>false</Value>
-        <ValueType Type="bool"/>
-    </Element>
     <Element Type="FunctionCall" Id="E0FCC372">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000111"/>
         <Parameter Type="Param" Id="68158B90"/>

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers.version
diff --git a/...lagoCampaign/HotS/ap_harvest_of_screams.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt b/...lagoCampaign/HotS/ap_harvest_of_screams.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -55,7 +55,7 @@ Param/Value/B835FE49=SNOWGO
 Param/Value/BCE26980=
 Param/Value/BE672C70=Essence
 Param/Value/C180FC79=Essence
-Param/Value/C5DC69B4=Find Nafash Corpse
+Param/Value/C5DC69B4=Find Nafash's Corpse
 Param/Value/CC9D514F=5 Days
 Param/Value/DF2E6FF8=Tips
 Param/Value/DF6CAE96=Ursadon Matriarch

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/MapScript.galaxy
@@ -4000,12 +4000,12 @@ bool gt_OdinDiesQ_Func (bool testConds, bool runActions) {
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveDefeatOdinComplete, true, false);
     if ((gv_odinSent == false)) {
+        lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_TRASH_THE_ODIN_EARLY);
         TriggerExecute(gt_ObjectiveTrashOdinEarlyComplete, true, false);
     }
 
     Wait(0.25, c_timeGame);
     lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_ODIN);
-    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_TRASH_THE_ODIN_EARLY);
     if ((libHots_gf_DifficultyValueInt2(0, 0, 1) == 1)) {
         TriggerExecute(gt_AchievementDestroytheOdinH, true, false);
     }

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers
@@ -29578,7 +29578,6 @@
         <Action Type="FunctionCall" Id="9AA56B5D"/>
         <Action Type="FunctionCall" Id="41D4528C"/>
         <Action Type="FunctionCall" Id="E53D1878"/>
-        <Action Type="FunctionCall" Id="B63931A0"/>
         <Action Type="FunctionCall" Id="57768B43"/>
         <Action Type="FunctionCall" Id="933A4E82"/>
     </Element>
@@ -29666,9 +29665,19 @@
     </Element>
     <Element Type="FunctionCall" Id="9AA56B5D">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
+        <FunctionCall Type="FunctionCall" Id="B63931A0"/>
         <FunctionCall Type="FunctionCall" Id="4006AC94"/>
         <FunctionCall Type="FunctionCall" Id="038C7DAB"/>
     </Element>
+    <Element Type="FunctionCall" Id="B63931A0">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+        <Parameter Type="Param" Id="63EB6D81"/>
+    </Element>
+    <Element Type="Param" Id="63EB6D81">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
+        <Variable Type="Variable" Id="3EB57993"/>
+    </Element>
     <Element Type="FunctionCall" Id="4006AC94">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
@@ -29731,14 +29740,6 @@
         <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
         <Variable Type="Variable" Id="5C2E42AA"/>
     </Element>
-    <Element Type="FunctionCall" Id="B63931A0">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
-        <Parameter Type="Param" Id="63EB6D81"/>
-    </Element>
-    <Element Type="Param" Id="63EB6D81">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
-        <Variable Type="Variable" Id="3EB57993"/>
-    </Element>
     <Element Type="FunctionCall" Id="57768B43">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
         <FunctionCall Type="FunctionCall" Id="54A9E1BF"/>

diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers.version
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapScript.galaxy
@@ -3349,6 +3349,7 @@ bool gt_Site1MilitiaRescued_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTH_RESCUE);
+    gv_rescuedCount += 1;
     TriggerExecute(gt_ObjectiveRescueUpdate, true, false);
     libNtve_gf_KillModel(gv_site1RescuableReticule);
     UIAlertPoint("Trigger", gv_p01_USER, StringExternal("Param/Value/21F868D2"), null, PointFromId(8));
@@ -3471,6 +3472,7 @@ bool gt_TheWallRescued_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_WALL_RESCUE);
+    gv_rescuedCount += 1;
     TriggerExecute(gt_ObjectiveRescueUpdate, true, false);
     libNtve_gf_KillModel(gv_wallRescuableReticule);
     UIAlertPoint("Trigger", gv_p01_USER, StringExternal("Param/Value/FCE35A41"), null, PointFromId(1308));
@@ -3593,6 +3595,7 @@ bool gt_Site2MilitiaRescued_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_MID_RESCUE);
+    gv_rescuedCount += 1;
     TriggerExecute(gt_ObjectiveRescueUpdate, true, false);
     libNtve_gf_KillModel(gv_site2RescuableReticule);
     UIAlertUnit("Trigger", gv_p01_USER, StringExternal("Param/Value/00FCDEE2"), null, gv_uNITSite2Speaker);
@@ -3720,6 +3723,7 @@ bool gt_AliveInsideRescued_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_ALIVE_INSIDE_RESCUE);
+    gv_rescuedCount += 1;
     TriggerExecute(gt_ObjectiveRescueUpdate, true, false);
     UIAlertPoint("Trigger", gv_p01_USER, StringExternal("Param/Value/0BF38237"), null, PointFromId(788));
     auto84FA099F_g = UnitGroup(null, gv_p06_MOEBIUS_SEC_FORCE, RegionFromId(62), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
@@ -3841,6 +3845,7 @@ bool gt_Site3MilitiaRescued_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NYDUS_ROOF_RESCUE);
+    gv_rescuedCount += 1;
     TriggerExecute(gt_ObjectiveRescueUpdate, true, false);
     libNtve_gf_KillModel(gv_site3RescuableReticule);
     UIAlertPoint("Trigger", gv_p01_USER, StringExternal("Param/Value/6E542FBC"), null, PointFromId(788));
@@ -6298,9 +6303,8 @@ bool gt_ObjectiveRescueUpdate_Func (bool testConds, bool runActions) {
         return true;
     }
 
-    gv_rescuedCount += 1;
     lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveRescue, gv_rescuedCount);
-    if ((gv_rescuedCount == 5)) {
+    if ((gv_rescuedCount >= 5)) {
         TriggerExecute(gt_ObjectiveRescueComplete, true, false);
     }