From bf0f4646cd67cb6d9ca753d3a8f616543eabc634 Mon Sep 17 00:00:00 2001 From: Gemster312 Date: Thu, 1 Aug 2024 17:46:29 -0700 Subject: [PATCH] Various Objective Fixes --- .../DocumentHeader | Bin 10867 -> 10867 bytes .../MapScript.galaxy | 13 +- .../ap_harvest_of_screams.SC2Map/Triggers | 86 ++++-------- .../Triggers.version | Bin 44 -> 44 bytes .../LocalizedData/GameStrings.txt | 2 +- .../ap_the_reckoning.SC2Map/DocumentHeader | Bin 11838 -> 11838 bytes .../ap_the_reckoning.SC2Map/MapScript.galaxy | 2 +- .../HotS/ap_the_reckoning.SC2Map/Triggers | 19 +-- .../ap_the_reckoning.SC2Map/Triggers.version | Bin 44 -> 44 bytes .../DocumentHeader | Bin 7671 -> 7671 bytes .../MapScript.galaxy | 8 +- .../WoL/ap_the_moebius_factor.SC2Map/Triggers | 128 ++++++++++++++---- .../Triggers.version | Bin 44 -> 44 bytes 13 files changed, 150 insertions(+), 108 deletions(-) diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/DocumentHeader index bbd6fa19da27823875c542042d1dde626aa58a43..1d81fa4739071b8f2776397aae6d8649cbd68467 100644 GIT binary patch delta 19 Ycmewy@;PLJ3lsN$~$08Kjv(EtDd delta 19 Ycmewy@;PLJ497= 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 index 7e0211965..45dc2e3b3 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers @@ -46402,7 +46402,7 @@ - + @@ -46762,8 +46762,34 @@ + + + + + + + + + + + + + + + + + + + + + + + 2 + + + @@ -46796,8 +46822,6 @@ - - @@ -46836,62 +46860,6 @@ true - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers.version index cb6bfbea175d1ab5f2c0f4ef011283af489b1ea5..12b6a4c0144e29d9532d5c8c95a80676a8e54289 100644 GIT binary patch delta 17 XcmdPVnV`Uvz{tQLsJSK$NHG8a9K`~| delta 17 XcmdPVnV`TE&&a?~zI0X^kYWG;BH;s) diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt index 8e468ba1d..112e4a770 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Maps/ArchipelagoCampaign/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 index 739ba87e831261ea52902b9f57dfe5cb2c44d172..fd786bfece4f28053b19104a1940a46d45e5a4a0 100644 GIT binary patch delta 19 YcmdlNvoB_X3`eBbqec+ks3N5Y09H!~5&!@I delta 19 YcmdlNvoB_X499c!&<`NIQAJ7*09o${YybcN diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/MapScript.galaxy index 3a5983655..df8b8a873 100644 --- 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 index 35818b998..6e205869e 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers @@ -29578,7 +29578,6 @@ - @@ -29666,9 +29665,19 @@ + + + + + + + + + + @@ -29731,14 +29740,6 @@ - - - - - - - - diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers.version index c4edafbe379b6040004fd0f44fe319d0f858b432..671d8519e8ce4fceafbf8e05eb3bfdc036e6f84f 100644 GIT binary patch delta 17 XcmdPVnV`Tkm4SglPiIXUBaj9FATt9O delta 17 XcmdPVnV`Tkg@J+Loy6=kMj#CUB{c)F diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/DocumentHeader index 1eb4e6090e748b9f3b1ff2e4260bc82680943dc8..f0a788f12278a212c06c8c5776067d6cbe498740 100644 GIT binary patch delta 19 Ycmexv{oQ(k3`d;gqdy?LQRT8M0ABhDhyVZp delta 19 Ycmexv{oQ(k496ZbKT#0gsB&2r08)AfhyVZp diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapScript.galaxy index b703708ed..72504d71f 100644 --- 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); } diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Triggers index 284165e28..0fbd2a1b8 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Triggers @@ -28493,6 +28493,7 @@ + @@ -28837,6 +28838,25 @@ + + + + + + + + + + + + + 1 + + + + + + @@ -29536,6 +29556,7 @@ + @@ -29880,6 +29901,25 @@ + + + + + + + + + + + + + 1 + + + + + + @@ -30578,6 +30618,7 @@ + @@ -30922,6 +30963,25 @@ + + + + + + + + + + + + + 1 + + + + + + @@ -31717,6 +31777,7 @@ + @@ -32060,6 +32121,25 @@ + + + + + + + + + + + + + 1 + + + + + + @@ -32750,6 +32830,7 @@ + @@ -33096,6 +33177,25 @@ + + + + + + + + + + + + + 1 + + + + + + @@ -51089,8 +51189,6 @@ - - @@ -51124,30 +51222,6 @@ true - - - Displaying of informative message to most honorable player - - - - - - - - - - - - - - - 1 - - - - - - @@ -51199,7 +51273,7 @@ - + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Triggers.version index 435263ad9148ef81a1b76e133b2b602ce098beb6..4ebcf9962617f79e689c82283dc173c410938065 100644 GIT binary patch delta 17 XcmdPVnV`TE!@$7sR%=ZfBaj9FBXI+p delta 17 XcmdPVnV`TE#lXP8JGCW^5l9079##VU