From 98002932b6494c43e7e16779d8b6ab901b273ec2 Mon Sep 17 00:00:00 2001 From: Gemster312 Date: Fri, 5 Jul 2024 21:49:26 -0700 Subject: [PATCH 1/2] Objective Categorization Update for the Prophecy Storyline --- .../ComponentList.SC2Components | 1 + .../ap_a_sinister_turn.SC2Map/DocumentHeader | Bin 8189 -> 8189 bytes .../MapScript.galaxy | 257 ++- .../WoL/ap_a_sinister_turn.SC2Map/Triggers | 1548 ++++++++++++----- .../Triggers.version | Bin 44 -> 44 bytes .../LocalizedData/GameStrings.txt | 6 +- .../LocalizedData/TriggerStrings.txt | 28 +- .../ComponentList.SC2Components | 1 + .../DocumentHeader | Bin 6807 -> 6807 bytes .../MapScript.galaxy | 75 +- .../ap_echoes_of_the_future.SC2Map/Triggers | 746 +++++--- .../Triggers.version | Bin 44 -> 44 bytes .../LocalizedData/TriggerStrings.txt | 9 + .../ComponentList.SC2Components | 1 + .../DocumentHeader | Bin 6816 -> 6816 bytes .../MapScript.galaxy | 93 +- .../WoL/ap_in_utter_darkness.SC2Map/Triggers | 705 ++++++-- .../Triggers.version | Bin 44 -> 44 bytes .../LocalizedData/TriggerStrings.txt | 9 + .../ComponentList.SC2Components | 1 + .../ap_whispers_of_doom.SC2Map/DocumentHeader | Bin 5677 -> 5677 bytes .../MapScript.galaxy | 57 +- .../WoL/ap_whispers_of_doom.SC2Map/Triggers | 598 +++++-- .../Triggers.version | Bin 44 -> 44 bytes .../LocalizedData/TriggerStrings.txt | 8 + 25 files changed, 3066 insertions(+), 1077 deletions(-) diff --git a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/ComponentList.SC2Components index 010746340..e6bcfc267 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData DocumentInfo MapInfo diff --git a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/DocumentHeader index 69978a9efcc9f030ba6312db4cc0ab99279b48f1..6ab6e556aa4800eefeb73014e569913903a50a3e 100644 GIT binary patch delta 45 tcmexs|JPo{!^k<9gMop;D42nPk(Gg0B9oB;gh9Zye*O~>-l%d@9suoh3#yiw(*JOB!g3_}0_ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/MapScript.galaxy index 03ebc26b7..d43a221dd 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/MapScript.galaxy @@ -29,6 +29,15 @@ void InitLibs () { //-------------------------------------------------------------------------------------------------- // Constants //-------------------------------------------------------------------------------------------------- +const int gv_LOCATION_ID_ROBOTICS_FACILITY = 1; +const int gv_LOCATION_ID_DARK_SHRINE = 2; +const int gv_LOCATION_ID_TEMPLAR_ARCHIVES = 3; +const int gv_LOCATION_ID_NORTHEAST_BASE = 4; +const int gv_LOCATION_ID_SOUTHWEST_BASE = 5; +const int gv_LOCATION_ID_MAAR = 6; +const int gv_LOCATION_ID_NORTHWEST_PRESERVER = 7; +const int gv_LOCATION_ID_SOUTHWEST_PRESERVER = 8; +const int gv_LOCATION_ID_EAST_PRESERVER = 9; const int gv_p1_USER = 1; const int gv_p2_PROTOSS_STALKER = 2; const int gv_p3_PROTOSS_ENEMY = 3; @@ -42,8 +51,9 @@ const int gv_p10_HYBRID_MANIFESTATIONS = 10; //-------------------------------------------------------------------------------------------------- // Global Variables //-------------------------------------------------------------------------------------------------- -int gv_objectiveDestroySupportBases; -int gv_supportBasesDestroyed; +int gv_objectiveDestroyNortheast; +int gv_objectiveDestroySouthwest; +int gv_objectiveDefeatMaar; bool gv_gameOver; bool gv_inCinematic; unit gv_superWarpGate_Neutral; @@ -166,7 +176,9 @@ unitgroup gv_victoryHiddenUnitGroup; unit gv_zeratul; void InitGlobals () { - gv_objectiveDestroySupportBases = c_invalidObjectiveId; + gv_objectiveDestroyNortheast = c_invalidObjectiveId; + gv_objectiveDestroySouthwest = c_invalidObjectiveId; + gv_objectiveDefeatMaar = c_invalidObjectiveId; gv_libraryHybrid = DoodadFromId(83); gv_prisonGroup = UnitGroupEmpty(); gv_achievementHardTimer = TimerCreate(); @@ -221,11 +233,14 @@ unitgroup gf_EnemiesWithinRange (unit lp_unit, fixed lp_range, unitfilter lp_fil //-------------------------------------------------------------------------------------------------- // Trigger Variables //-------------------------------------------------------------------------------------------------- -trigger gt_ObjectiveDestroySupportBasesCreateQ; -trigger gt_ObjectiveDestroySupportBasesComplete; -trigger gt_ObjectiveDestroySupportBasesUpdate; +trigger gt_ObjectiveDestroyNortheastCreateQ; +trigger gt_ObjectiveDestroyNortheastComplete; +trigger gt_ObjectiveDestroySouthwestCreateQ; +trigger gt_ObjectiveDestroySouthwestComplete; trigger gt_NortheastNexus; trigger gt_SouthwestNexus; +trigger gt_ObjectiveDefeatMaarCreateQ; +trigger gt_ObjectiveDefeatMaarComplete; trigger gt_Maardiesforfirsttime; trigger gt_MaargetsMindContolled; trigger gt_onDifficultyCasual; @@ -490,10 +505,16 @@ unitgroup gf_EnemiesWithinRange (unit lp_unit, fixed lp_range, unitfilter lp_fil } //-------------------------------------------------------------------------------------------------- -// Trigger: Objective Destroy Support Bases Create Q +// Trigger: Objective Destroy Northeast Create Q //-------------------------------------------------------------------------------------------------- -bool gt_ObjectiveDestroySupportBasesCreateQ_Func (bool testConds, bool runActions) { +bool gt_ObjectiveDestroyNortheastCreateQ_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Extra; + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -508,23 +529,25 @@ bool gt_ObjectiveDestroySupportBasesCreateQ_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/ACA4539D"), StringExternal("Param/Value/3F1C3961"), c_objectiveStateActive, false); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "checks", (2 - gv_supportBasesDestroyed), 0); - gv_objectiveDestroySupportBases = ObjectiveLastCreated(); + ObjectiveCreate(StringExternal("Param/Value/ACA4539D"), StringExternal("Param/Value/3F1C3961"), c_objectiveStateHidden, false); + gv_objectiveDestroyNortheast = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveDestroyNortheast, lv_category, true); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyNortheast, gv_LOCATION_ID_NORTHEAST_BASE); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyNortheast, true); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); return true; } //-------------------------------------------------------------------------------------------------- -void gt_ObjectiveDestroySupportBasesCreateQ_Init () { - gt_ObjectiveDestroySupportBasesCreateQ = TriggerCreate("gt_ObjectiveDestroySupportBasesCreateQ_Func"); +void gt_ObjectiveDestroyNortheastCreateQ_Init () { + gt_ObjectiveDestroyNortheastCreateQ = TriggerCreate("gt_ObjectiveDestroyNortheastCreateQ_Func"); } //-------------------------------------------------------------------------------------------------- -// Trigger: Objective Destroy Support Bases Complete +// Trigger: Objective Destroy Northeast Complete //-------------------------------------------------------------------------------------------------- -bool gt_ObjectiveDestroySupportBasesComplete_Func (bool testConds, bool runActions) { +bool gt_ObjectiveDestroyNortheastComplete_Func (bool testConds, bool runActions) { // Automatic Variable Declarations // Conditions if (testConds) { @@ -539,27 +562,63 @@ bool gt_ObjectiveDestroySupportBasesComplete_Func (bool testConds, bool runActio } TriggerEnable(TriggerGetCurrent(), false); - TriggerExecute(gt_ObjectiveDestroySupportBasesCreateQ, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroySupportBases); + TriggerExecute(gt_ObjectiveDestroyNortheastCreateQ, true, false); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyNortheast); return true; } //-------------------------------------------------------------------------------------------------- -void gt_ObjectiveDestroySupportBasesComplete_Init () { - gt_ObjectiveDestroySupportBasesComplete = TriggerCreate("gt_ObjectiveDestroySupportBasesComplete_Func"); +void gt_ObjectiveDestroyNortheastComplete_Init () { + gt_ObjectiveDestroyNortheastComplete = TriggerCreate("gt_ObjectiveDestroyNortheastComplete_Func"); } //-------------------------------------------------------------------------------------------------- -// Trigger: Objective Destroy Support Bases Update +// Trigger: Objective Destroy Southwest Create Q //-------------------------------------------------------------------------------------------------- -bool gt_ObjectiveDestroySupportBasesUpdate_Func (bool testConds, bool runActions) { +bool gt_ObjectiveDestroySouthwestCreateQ_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Challenge; + // Conditions if (testConds) { - if (!((gv_gameOver == false))) { + if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { return false; } + } + + // Actions + if (!runActions) { + return true; + } + + TriggerEnable(TriggerGetCurrent(), false); + TriggerQueueEnter(); + ObjectiveCreate(StringExternal("Param/Value/D1BECFB0"), StringExternal("Param/Value/FA4823DA"), c_objectiveStateHidden, false); + gv_objectiveDestroySouthwest = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveDestroySouthwest, lv_category, true); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroySouthwest, gv_LOCATION_ID_SOUTHWEST_BASE); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroySouthwest, true); + Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); + TriggerQueueExit(); + return true; +} +//-------------------------------------------------------------------------------------------------- +void gt_ObjectiveDestroySouthwestCreateQ_Init () { + gt_ObjectiveDestroySouthwestCreateQ = TriggerCreate("gt_ObjectiveDestroySouthwestCreateQ_Func"); +} + +//-------------------------------------------------------------------------------------------------- +// Trigger: Objective Destroy Southwest Complete +//-------------------------------------------------------------------------------------------------- +bool gt_ObjectiveDestroySouthwestComplete_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + // Conditions + if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { return false; } @@ -570,20 +629,15 @@ bool gt_ObjectiveDestroySupportBasesUpdate_Func (bool testConds, bool runActions return true; } - TriggerExecute(gt_ObjectiveDestroySupportBasesCreateQ, true, false); - gv_supportBasesDestroyed += 1; - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroySupportBases, (2 - gv_supportBasesDestroyed)); - if ((gv_supportBasesDestroyed == 2)) { - TriggerEnable(TriggerGetCurrent(), false); - TriggerExecute(gt_ObjectiveDestroySupportBasesComplete, true, false); - } - + TriggerEnable(TriggerGetCurrent(), false); + TriggerExecute(gt_ObjectiveDestroySouthwestCreateQ, true, false); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroySouthwest); return true; } //-------------------------------------------------------------------------------------------------- -void gt_ObjectiveDestroySupportBasesUpdate_Init () { - gt_ObjectiveDestroySupportBasesUpdate = TriggerCreate("gt_ObjectiveDestroySupportBasesUpdate_Func"); +void gt_ObjectiveDestroySouthwestComplete_Init () { + gt_ObjectiveDestroySouthwestComplete = TriggerCreate("gt_ObjectiveDestroySouthwestComplete_Func"); } //-------------------------------------------------------------------------------------------------- @@ -596,8 +650,9 @@ bool gt_NortheastNexus_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); - TriggerExecute(gt_ObjectiveDestroySupportBasesUpdate, true, false); + TriggerEnable(TriggerGetCurrent(), false); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTHEAST_BASE); + TriggerExecute(gt_ObjectiveDestroyNortheastComplete, true, false); return true; } @@ -617,8 +672,9 @@ bool gt_SouthwestNexus_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); - TriggerExecute(gt_ObjectiveDestroySupportBasesUpdate, true, false); + TriggerEnable(TriggerGetCurrent(), false); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHWEST_BASE); + TriggerExecute(gt_ObjectiveDestroySouthwestComplete, true, false); return true; } @@ -628,6 +684,74 @@ void gt_SouthwestNexus_Init () { TriggerAddEventUnitDied(gt_SouthwestNexus, UnitRefFromUnit(UnitFromId(165))); } +//-------------------------------------------------------------------------------------------------- +// Trigger: Objective DefeatMaar Create Q +//-------------------------------------------------------------------------------------------------- +bool gt_ObjectiveDefeatMaarCreateQ_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Extra; + + // Conditions + if (testConds) { + if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { + return false; + } + } + + // Actions + if (!runActions) { + return true; + } + + TriggerEnable(TriggerGetCurrent(), false); + TriggerQueueEnter(); + ObjectiveCreate(StringExternal("Param/Value/BB1448D3"), StringToText(""), c_objectiveStateHidden, false); + gv_objectiveDefeatMaar = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveDefeatMaar, lv_category, true); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDefeatMaar, gv_LOCATION_ID_MAAR); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDefeatMaar, true); + Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); + TriggerQueueExit(); + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_ObjectiveDefeatMaarCreateQ_Init () { + gt_ObjectiveDefeatMaarCreateQ = TriggerCreate("gt_ObjectiveDefeatMaarCreateQ_Func"); +} + +//-------------------------------------------------------------------------------------------------- +// Trigger: Objective DefeatMaar Complete +//-------------------------------------------------------------------------------------------------- +bool gt_ObjectiveDefeatMaarComplete_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + // Conditions + if (testConds) { + if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { + return false; + } + } + + // Actions + if (!runActions) { + return true; + } + + TriggerEnable(TriggerGetCurrent(), false); + TriggerExecute(gt_ObjectiveDefeatMaarCreateQ, true, false); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDefeatMaar); + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_ObjectiveDefeatMaarComplete_Init () { + gt_ObjectiveDefeatMaarComplete = TriggerCreate("gt_ObjectiveDefeatMaarComplete_Func"); +} + //-------------------------------------------------------------------------------------------------- // Trigger: Maar dies for first time //-------------------------------------------------------------------------------------------------- @@ -646,7 +770,8 @@ bool gt_Maardiesforfirsttime_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(6); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_MAAR); + TriggerExecute(gt_ObjectiveDefeatMaarComplete, true, false); return true; } @@ -3378,7 +3503,7 @@ bool gt_TemplarArchivesPowered_Func (bool testConds, bool runActions) { if ((PowerLevel(gv_p1_USER, UnitGetPosition(UnitFromId(43)), "PowerSource") > 0)) { TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_TEMPLAR_ARCHIVES); UnitSetState(UnitFromId(43), c_unitStateTargetable, true); gv_pylonPlayerCreatedHighTemplar = EventUnitProgressUnit(); libNtve_gf_RescueUnit(UnitFromId(43), gv_p1_USER, true); @@ -3421,7 +3546,7 @@ bool gt_RoboticsFacilityPowered_Func (bool testConds, bool runActions) { if ((PowerLevel(gv_p1_USER, UnitGetPosition(UnitFromId(563)), "PowerSource") > 0)) { TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_ROBOTICS_FACILITY); UnitSetState(UnitFromId(563), c_unitStateTargetable, true); gv_pylonPlayerCreatedRobotics = EventUnitProgressUnit(); libNtve_gf_RescueUnit(UnitFromId(563), gv_p1_USER, true); @@ -3464,7 +3589,7 @@ bool gt_DarkShrinePowered_Func (bool testConds, bool runActions) { if ((PowerLevel(gv_p1_USER, UnitGetPosition(UnitFromId(179)), "PowerSource") > 0)) { TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_DARK_SHRINE); UnitSetState(UnitFromId(179), c_unitStateTargetable, true); gv_pylonPlayerCreatedDT = EventUnitProgressUnit(); libNtve_gf_RescueUnit(UnitFromId(179), gv_p1_USER, true); @@ -4569,7 +4694,9 @@ bool gt_StalkerBecomesEnemyNearBase_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libNtve_gf_SetAlliance(gv_p1_USER, gv_p2_PROTOSS_STALKER, libNtve_ge_AllianceSetting_Enemy); - TriggerExecute(gt_ObjectiveDestroySupportBasesCreateQ, true, false); + TriggerExecute(gt_ObjectiveDestroyNortheastCreateQ, true, false); + Wait(3.0, c_timeGame); + TriggerExecute(gt_ObjectiveDestroySouthwestCreateQ, true, false); return true; } @@ -5690,7 +5817,7 @@ bool gt_VictoryPrisonObjectiveComplete_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory); gv_gameOver = true; TriggerEnable(gt_HybridPingandSound, false); auto6BC92896_g = UnitGroup(null, gv_p3_PROTOSS_ENEMY, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); @@ -5886,9 +6013,10 @@ bool gt_ObjectivePowerBaseCreateQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/0529E638"), StringExternal("Param/Value/A20EA9E8"), c_objectiveStateActive, true); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "", gv_obejctivePowerBaseUpdate, gv_obejctivePowerBaseTotal); + ObjectiveCreate(StringExternal("Param/Value/0529E638"), StringExternal("Param/Value/A20EA9E8"), c_objectiveStateHidden, true); gv_objectivePowerBase = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectivePowerBase, lib5BD4895D_ge_APObjectiveCategory_Primary, "", gv_obejctivePowerBaseUpdate, gv_obejctivePowerBaseTotal, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectivePowerBase, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TZeratul02Objective1, ObjectiveLastCreated(), StringExternal("Param/Value/F78FFBD4")); TriggerExecute(gt_PylonPlaceStartQ, true, false); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); @@ -5989,9 +6117,14 @@ bool gt_ObjectiveDestroyPrisonsCreateQ_Func (bool testConds, bool runActions) { return true; } - ObjectiveCreate(StringExternal("Param/Value/3EB10506"), StringExternal("Param/Value/BF6654F6"), c_objectiveStateActive, true); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "", gv_objectivesAllPrisonsDestroyedUpdate, gv_obejctivePrisonsTotal); + ObjectiveCreate(StringExternal("Param/Value/3EB10506"), StringExternal("Param/Value/BF6654F6"), c_objectiveStateHidden, true); gv_objectiveDestroyPrisons = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveDestroyPrisons, lib5BD4895D_ge_APObjectiveCategory_Primary, "", gv_objectivesAllPrisonsDestroyedUpdate, gv_obejctivePrisonsTotal, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyPrisons, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyPrisons, gv_LOCATION_ID_NORTHWEST_PRESERVER); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyPrisons, gv_LOCATION_ID_SOUTHWEST_PRESERVER); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyPrisons, gv_LOCATION_ID_EAST_PRESERVER); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyPrisons, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TZeratul02Objective2, ObjectiveLastCreated(), StringExternal("Param/Value/FC23C1AF")); TriggerExecute(gt_ObjectiveDestroyPrisonsCreateQ, true, false); Wait(3.0, c_timeReal); @@ -6120,7 +6253,7 @@ bool gt_Prison01Destroyed_Func (bool testConds, bool runActions) { UnitSetState(gv_archTemplar01, c_unitStateTargetable, false); libNtve_gf_MakeUnitInvulnerable(gv_archTemplar01, true); PingDestroy(gv_pingPrison01); - lib5BD4895D_gf_AP_Core_sendLocationLocal(7); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTHWEST_PRESERVER); UnitSetScale(gv_archTemplar01, 120.0, 120.0, 120.0); libCamp_gf_DisplayResearchPointsGiventoPlayer(libCamp_ge_StoryResearchObject_ResearchObjectDestroythePreserverPrisons, gv_archTemplar01, gv_p1_USER); return true; @@ -6156,7 +6289,7 @@ bool gt_Prison02Destroyed_Func (bool testConds, bool runActions) { UnitSetState(gv_archTemplar02, c_unitStateTargetable, false); libNtve_gf_MakeUnitInvulnerable(gv_archTemplar02, true); PingDestroy(gv_pingPrison02); - lib5BD4895D_gf_AP_Core_sendLocationLocal(9); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_EAST_PRESERVER); UnitSetScale(gv_archTemplar02, 120.0, 120.0, 120.0); libCamp_gf_DisplayResearchPointsGiventoPlayer(libCamp_ge_StoryResearchObject_ResearchObjectDestroythePreserverPrisons, gv_archTemplar02, gv_p1_USER); return true; @@ -6192,7 +6325,7 @@ bool gt_Prison03Destroyed_Func (bool testConds, bool runActions) { UnitSetState(gv_archTemplar03, c_unitStateTargetable, false); libNtve_gf_MakeUnitInvulnerable(gv_archTemplar03, true); PingDestroy(gv_pingPrison03); - lib5BD4895D_gf_AP_Core_sendLocationLocal(8); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHWEST_PRESERVER); UnitSetScale(gv_archTemplar03, 120.0, 120.0, 120.0); libCamp_gf_DisplayResearchPointsGiventoPlayer(libCamp_ge_StoryResearchObject_ResearchObjectDestroythePreserverPrisons, gv_archTemplar03, gv_p1_USER); return true; @@ -6208,7 +6341,13 @@ void gt_Prison03Destroyed_Init () { // Trigger: Objective Power Secondary Create Q //-------------------------------------------------------------------------------------------------- bool gt_ObjectivePowerSecondaryCreateQ_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Secondary; + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -6223,9 +6362,13 @@ bool gt_ObjectivePowerSecondaryCreateQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/693D0B04"), StringExternal("Param/Value/F974BE83"), c_objectiveStateActive, false); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "checks", (gv_obejctivePrisonsTotal - gv_obejctivePowerSecondaryBaseUpdate), 0); + ObjectiveCreate(StringExternal("Param/Value/693D0B04"), StringExternal("Param/Value/F974BE83"), c_objectiveStateHidden, false); gv_objectivePowerSecondaryBase = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectivePowerSecondaryBase, lv_category, "", gv_obejctivePowerSecondaryBaseUpdate, gv_obejctivePowerSecondaryBaseTotal, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectivePowerSecondaryBase, gv_LOCATION_ID_ROBOTICS_FACILITY); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectivePowerSecondaryBase, gv_LOCATION_ID_DARK_SHRINE); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectivePowerSecondaryBase, gv_LOCATION_ID_TEMPLAR_ARCHIVES); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectivePowerSecondaryBase, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TZeratul02Objective1, ObjectiveLastCreated(), StringExternal("Param/Value/79D9949C")); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); TriggerExecute(gt_ObjectivePings, true, false); @@ -6348,7 +6491,7 @@ bool gt_ObjectivePowerupSecondaryUpdate_Func (bool testConds, bool runActions) { TriggerExecute(gt_ObjectivePowerSecondaryCreateQ, true, false); gv_obejctivePowerSecondaryBaseUpdate += 1; - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectivePowerSecondaryBase, (gv_obejctivePrisonsTotal - gv_obejctivePowerSecondaryBaseUpdate)); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectivePowerSecondaryBase, gv_obejctivePowerSecondaryBaseUpdate); if ((gv_obejctivePowerSecondaryBaseUpdate == gv_obejctivePowerSecondaryBaseTotal)) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectivePowerSecondaryComplete, true, false); @@ -7288,6 +7431,7 @@ bool gt_MidPrisonCleanup_Func (bool testConds, bool runActions) { UnitIssueOrder(gv_libraryAtBridge04, Order(AbilityCommand("LibraryDown", 0)), c_orderQueueReplace); UnitIssueOrder(gv_libraryAtBridge05, Order(AbilityCommand("LibraryDown", 0)), c_orderQueueReplace); libNtve_gf_CreateUnitsAtPoint2(1, "Maar", 0, gv_p8_PRISON_STRUCTURE, PointFromId(181)); + TriggerExecute(gt_ObjectiveDefeatMaarCreateQ, true, false); gv_hybridNeutral = UnitLastCreated(); UnitIssueOrder(gv_hybridNeutral, Order(AbilityCommand("move", 2)), c_orderQueueReplace); UnitSetState(gv_hybridNeutral, c_unitStateInvulnerable, true); @@ -7615,11 +7759,14 @@ void gt_VictoryCleanup_Init () { // Trigger Initialization //-------------------------------------------------------------------------------------------------- void InitTriggers () { - gt_ObjectiveDestroySupportBasesCreateQ_Init(); - gt_ObjectiveDestroySupportBasesComplete_Init(); - gt_ObjectiveDestroySupportBasesUpdate_Init(); + gt_ObjectiveDestroyNortheastCreateQ_Init(); + gt_ObjectiveDestroyNortheastComplete_Init(); + gt_ObjectiveDestroySouthwestCreateQ_Init(); + gt_ObjectiveDestroySouthwestComplete_Init(); gt_NortheastNexus_Init(); gt_SouthwestNexus_Init(); + gt_ObjectiveDefeatMaarCreateQ_Init(); + gt_ObjectiveDefeatMaarComplete_Init(); gt_Maardiesforfirsttime_Init(); gt_MaargetsMindContolled_Init(); gt_onDifficultyCasual_Init(); diff --git a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/Triggers index 3a1f7bf80..5bce636ab 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/Triggers @@ -13,18 +13,142 @@ + + + + + + + + + + + + + + LOCATION_ID_ROBOTICS_FACILITY + + + + + + + + 1 + + + + LOCATION_ID_DARK_SHRINE + + + + + + + + 2 + + + + LOCATION_ID_TEMPLAR_ARCHIVES + + + + + + + + 3 + + + + LOCATION_ID_NORTHEAST_BASE + + + + + + + + 4 + + + + LOCATION_ID_SOUTHWEST_BASE + + + + + + + + 5 + + + + LOCATION_ID_MAAR + + + + + + + + 6 + + + + LOCATION_ID_NORTHWEST_PRESERVER + + + + + + + + 7 + + + + LOCATION_ID_SOUTHWEST_PRESERVER + + + + + + + + 8 + + + + LOCATION_ID_EAST_PRESERVER + + + + + + + + 9 + + - - + + + + + + @@ -37,22 +161,23 @@ - - - - - - - - 0 - - + + + + + + + + + + + @@ -107,8 +232,10 @@ - + + + @@ -125,7 +252,7 @@ - + @@ -135,54 +262,6 @@ - - - - - - - - - - - - - - - - - - checks - - - - - - - - - - - - - - - - - - - - - - - 2 - - - - - 0 - - @@ -200,6 +279,54 @@ + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -305,199 +432,290 @@ - - - - - - - + + + + + - - - - - + + - - - + + + + + + - - - + + + + + + - - - false - + + - + - - - + + + - + - + - + - + - + - + - + - + - + true - - - - - + + + + - - - + + + - - - + + - - - - + + + - - - - - + + + Create the objective + - - - + + + + + + + + + + + + + + + + - - - 1 - + + + - - - + + + - - - - + + + - - - + + + - - - + + + + + - - - - - + + + - - - + + + - - - + + - - - 2 - + + + + + + - - - - - + + + + + + + true + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + - - - + + - + - + - + - + - + + + Ensure that the objective exists + + + - - - - + + + - + - + - + - - - - - - - - + - - - + + + Update the objective + - - - + + + - - - 2 - + + + - + + @@ -509,14 +727,29 @@ - - - + + + + - - - 4 - + + + + + + + + + + + + + + + + + + @@ -535,12 +768,13 @@ - + - - + + + @@ -551,38 +785,334 @@ - - - + + + + - - - 5 - + + + + + + + + + + - + + + + + + + + + - - - + + + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + Create the objective + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + Ensure that the objective exists + + + + + + + + + + + + + + + + + + + + + + + + Update the objective + + + + + + + + + - + + @@ -630,14 +1160,32 @@ - - - + + + - - - 6 - + + + + + + + + + + + + + + + + + + + + + + @@ -23941,7 +24489,7 @@ - + @@ -23969,15 +24517,14 @@ - - + + - + - - - 3 - + + + @@ -24249,7 +24796,7 @@ - + @@ -24279,15 +24826,14 @@ - - + + - + - - - 1 - + + + @@ -24571,7 +25117,7 @@ - + @@ -24600,15 +25146,14 @@ - - + + - + - - - 2 - + + + @@ -31584,6 +32129,8 @@ + + @@ -31768,6 +32315,39 @@ + + + + + + + + 3.0 + + + + + + + + + + + + + + + + + + + + + + + + + Rescuable Structures @@ -38070,7 +38650,7 @@ - + @@ -38155,12 +38735,12 @@ - - - + + + - - + + @@ -39406,8 +39986,9 @@ - + + @@ -39426,7 +40007,7 @@ - + @@ -39436,33 +40017,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -39480,6 +40034,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + @@ -39935,8 +40538,13 @@ - + + + + + + @@ -39993,7 +40601,7 @@ - + @@ -40003,33 +40611,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -40047,6 +40628,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -40974,7 +41660,7 @@ - + @@ -41127,14 +41813,13 @@ - - - + + + - - - 7 - + + + @@ -41195,7 +41880,7 @@ - + @@ -41348,14 +42033,13 @@ - - - + + + - - - 9 - + + + @@ -41416,7 +42100,7 @@ - + @@ -41569,14 +42253,13 @@ - - - + + + - - - 8 - + + + @@ -41667,11 +42350,22 @@ + + + + + + + + + + + @@ -41726,8 +42420,12 @@ - + + + + + @@ -41748,7 +42446,7 @@ - + @@ -41758,69 +42456,113 @@ - - + + - - - - + + + + + + - - - + + + - + - - - checks + + + + + + + + + + + + + + + + - - - + + + - - - - - + + + - - - + + + false + - - - + + + - - - + + + + + - - - 0 - + + + - - + + + + + + - - + + - - + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -42819,26 +43561,8 @@ - - - - - - - - - - - - - - - - - - @@ -50712,6 +51436,7 @@ + @@ -51196,6 +51921,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/Triggers.version index c8dde5d4dde839e8f5d0c59c7988c571905a8ef9..f7b668b6c6ecad49ee4618f06f6a010ba752e765 100644 GIT binary patch literal 44 ocmYdJNi9y#EGl7QU|^8QWMp6k(jdSK#325EARVpMmc|IA0kt{?-v9sr literal 44 pcmYdJNi9y#EGl7QU|@Ki%*enBq(OiOh(Y|nK)SB=Tq+}w1_0p72|EA) diff --git a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt index 05f59455c..94c0808fd 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -38,6 +38,7 @@ Param/Value/558C3EE5=Power-up Abandoned Struct Param/Value/560D13C5=Hybrid Wave Set to Param/Value/59DEBB2A=Preserver Prison Param/Value/5ADEAA3E=Mission start +Param/Value/603F8E8E= Param/Value/627CD3C4=Hybrid Wave = Param/Value/693D0B04=Power-up Abandoned Structures Param/Value/7489F48B= @@ -51,16 +52,19 @@ Param/Value/9860ACE5=Immortal ally Param/Value/A20EA9E8=Pylons must be warped in to provide power to the abandoned protoss base. Use the marked locations. Param/Value/A425FBF3=Hybrid unleashed. Param/Value/A7E49313= -Param/Value/ACA4539D=Destroy Enemy Support Bases +Param/Value/ACA4539D=Destroy Northeast Nexus Param/Value/B16AD9F3=Dark Templar allies +Param/Value/BB1448D3=Defeat Maar Param/Value/BF6654F6=The preservers have vital information about the Overmind and the origin of the zerg. Free them from their prisons before the knowledge is lost forever. Param/Value/CB554689=Hybrid Wave Set to 4 Param/Value/D0E36002=checks left +Param/Value/D1BECFB0=Destroy Southwest Nexus Param/Value/D46EC28D=Abandoned Structures Powered Param/Value/DFFB989D=Dark Shrine Param/Value/F2B82ED1=3 Param/Value/F78FFBD4=Power-up the Abandoned Base Param/Value/F974BE83=Power-up the abandoned protoss structures by warping in pylons near them. This will reveal lost technologies. +Param/Value/FA4823DA=Destroy the enemy support bases in order to provide more resources for our cause Param/Value/FA59974F=Hybrid Param/Value/FC23C1AF=Destroy the Three Preserver Prisons Unit/Name/ShieldBattery=PH - Psi Dominator diff --git a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index cbaa7d2cb..6ff353e80 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -1,4 +1,5 @@ Category/Name/09801232=Utility +Category/Name/121282A3=Location IDs Category/Name/14EB4AEF=Victory/Defeat Category/Name/2195D0B8=Leaderboard Category/Name/24412C6D=Briefing Cinematic @@ -69,7 +70,7 @@ ParamDef/Name/9E4CB16B=Player ParamDef/Name/B5C55A5C=Player ParamDef/Name/CA992992=Player ParamDef/Name/D79F5184=MaxLife -Trigger/Name/00D296DE=Objective Destroy Support Bases Create Q +Trigger/Name/00D296DE=Objective Destroy Northeast Create Q Trigger/Name/01EDF8BF=Intro Setup Trigger/Name/03626603=Tip Gateway Q Trigger/Name/03BE333C=Init 05 Environment @@ -107,6 +108,7 @@ Trigger/Name/3949B97F=Defeat Base Dead Trigger/Name/39AB2975=Pylon Place 02 Trigger/Name/3C956BD7=Dialogue Robotics Facility Q Trigger/Name/3D2CFCA5=Initialization +Trigger/Name/3DBE0A13=Objective Destroy Southwest Create Q Trigger/Name/41659D08=Mid Prison Cinematic End Trigger/Name/4395ED54=Init 06 Difficulties Trigger/Name/43BDBF59=Hybrid Leaves his area @@ -114,8 +116,10 @@ Trigger/Name/4463547E=Dialogue Templar Archives Found Q Trigger/Name/459CE088=Hybrid Prep for Wave Trigger/Name/45D0B256=Manifestation01 Resume Wave Trigger/Name/46381BAF=Dialogue Templar Archives Q +Trigger/Name/4697719E=Objective DefeatMaar Create Q Trigger/Name/46B8B4BE=Victory Prison Objective Complete Trigger/Name/4874614C=Dialogue Hybrid Pissed Manifestation Dead 01 Q +Trigger/Name/49993E50=Objective DefeatMaar Complete Trigger/Name/4B965950=Intro Cinematic Trigger/Name/4BD11B5A=Dialogue at Archivist Q Trigger/Name/4C28AEB3=Hybrid Waves @@ -132,7 +136,7 @@ Trigger/Name/6185EAA6=Hybrid Enters his area Trigger/Name/61ED402F=Player Building Unit Activates Activates Stalker Hard/Brutal Trigger/Name/62D599D2=Dialogue Halt at Player Base 01 Q Trigger/Name/6335A8D7=Player Gathering Cash Activates Stalker -Trigger/Name/66E5E003=Objective Destroy Support Bases Complete +Trigger/Name/66E5E003=Objective Destroy Northeast Complete Trigger/Name/67AEE987=Flash Button Pylon On Trigger/Name/68AD0AC2=Library06 Trigger/Name/699E46A3=Hybrid Attacks @@ -187,6 +191,7 @@ Trigger/Name/AE842887=P4 Right Base Attack Waves Trigger/Name/AE901476=Psionic Shockwave - Third (Insane) Trigger/Name/B0BEF1CD=onDifficultyHard Trigger/Name/B0D2BD09=New Unit: Immortal Tip Q +Trigger/Name/B1B953D1=Objective Destroy Southwest Complete Trigger/Name/B3DD1D4B=Hybrid Dies from player Trigger/Name/B40A45E4=Player selects pylon button Trigger/Name/B463E5C7=Library07 @@ -227,7 +232,6 @@ Trigger/Name/E3F771DA=Dialogue Hybrid Pissed 06 Q Trigger/Name/E4F77BDE=Energy Timer Trigger/Name/E57719B7=DEBUG - P6 Attack Wave Trigger/Name/E654196A=Northeast Nexus -Trigger/Name/E832E09F=Objective Destroy Support Bases Update Trigger/Name/EA223C85=HI Upgrades Trigger/Name/EA291DF3=Hybrid Dies Trigger/Name/EA8F4A16=Dark Templar Attackers @@ -261,7 +265,7 @@ Variable/Name/14290977=PylonPlayerCreatedHighTemplar Variable/Name/14429422=ActorVault01Spawn Variable/Name/1A34AE87=PylonInvisibleHighTemplar Variable/Name/1B8E0026=ArchTemplar03 -Variable/Name/1CE84C85=SupportBasesDestroyed +Variable/Name/1C0DE31D=LOCATION_ID_TEMPLAR_ARCHIVES Variable/Name/1E206364=PingPrison02 Variable/Name/1EAAC5F8=Zeratul Variable/Name/1F154E94=MineralsCollectedToActivateStalker @@ -283,9 +287,11 @@ Variable/Name/3AF23B60=PingTwilightCouncil Variable/Name/3CB4FE9E=HealthPercent Variable/Name/3E32FA0F=Gateway01Placed Variable/Name/3EFCE279=LibraryDown02 +Variable/Name/420A1BD0=category Variable/Name/433F0AD2=ActorHybridDeathEffect Variable/Name/44D8E8D0=ForceStartHybridCinTimer Variable/Name/44EBDD59=P8_PRISON_STRUCTURE +Variable/Name/44F779F0=LOCATION_ID_SOUTHWEST_BASE Variable/Name/45775EFE=LibraryAtBridge04 Variable/Name/47700224=ObejctivePowerSecondaryBaseUpdate Variable/Name/4D321626=PickedUnit @@ -303,7 +309,7 @@ Variable/Name/5E003F11=HybridReturnsToPrisons Variable/Name/5FB72573=HybridBossPing Variable/Name/603782E4=LibraryHybrid Variable/Name/60A3452B=HybridSoulAlive -Variable/Name/6133E5F9=ObjectiveDestroySupportBases +Variable/Name/6133E5F9=ObjectiveDestroyNortheast Variable/Name/6138E8F5=PylonPlayerCreatedDT Variable/Name/61DC76BB=LibraryDown01 Variable/Name/620A41B4=GameOver @@ -316,6 +322,7 @@ Variable/Name/694099A5=IntroHiddenUnitGroup Variable/Name/6969871F=HybridBusy Variable/Name/69857C28=PingPrison03 Variable/Name/6A8E22B6=PingHybridBoss +Variable/Name/6D75897A=category Variable/Name/70908557=LibraryAtBridge03 Variable/Name/70FE9100=VisbilityPrisonWholeArea Variable/Name/74F03363=ActorAssimilator @@ -329,12 +336,15 @@ Variable/Name/7F7DBD7B=ObjectivesAllPrisonsDestroyedUpdate Variable/Name/806F6F61=ActorPlace01 Variable/Name/81922872=StalkerDialogue Variable/Name/82FAE156=IntroProbe01 +Variable/Name/871ECEAA=category Variable/Name/87DD3574=ActorGatewayPlace01 Variable/Name/8985787B=currentUnit Variable/Name/8C180709=ObejctivePowerSecondaryBaseTotal +Variable/Name/8CC31466=LOCATION_ID_DARK_SHRINE Variable/Name/8D919C85=IntroVoidSeeker Variable/Name/8F1E45DE=TimerTip Variable/Name/9001B905=TargetCount +Variable/Name/90DAA02A=ObjectiveDestroySouthwest Variable/Name/9115686C=Target Variable/Name/93FA6C04=P1_USER Variable/Name/9451E465=HybridDeathsTracking @@ -343,7 +353,9 @@ Variable/Name/95DDF03D=TargetCount Variable/Name/972C3F17=PylonPlayerCreatedRobotics Variable/Name/9844CABA=ActorVortexEffect Variable/Name/9D3BF5C6=FadeDuration +Variable/Name/9D8967B7=ObjectiveDefeatMaar Variable/Name/9E9BDFA0=ActorVault02Spawn +Variable/Name/9EFA7F7C=LOCATION_ID_MAAR Variable/Name/A0BB99FC=HybridMaxShields Variable/Name/A1DD4E00=ObejctivePowerBaseUpdate Variable/Name/A2BD8C2C=InCinematic @@ -352,6 +364,7 @@ Variable/Name/A3DE3382=FadeDuration Variable/Name/A658885D=AttackTimer Variable/Name/A9BE4D72=ObejctivePowerBaseTotal Variable/Name/AC350C55=PrisonsObjStarted +Variable/Name/AD278473=LOCATION_ID_NORTHWEST_PRESERVER Variable/Name/B2319966=MidPrisonCinematicCompleted Variable/Name/B2A1355E=ActorPlace02 Variable/Name/B343912D=FadeDuration @@ -371,6 +384,7 @@ Variable/Name/D261E0B2=FadeDuration Variable/Name/D36CA002=GravitonTargets Variable/Name/D4370CAB=IntroCinematicCompleted Variable/Name/D4A90F5C=Gateway01Done +Variable/Name/D4BE5E1C=LOCATION_ID_SOUTHWEST_PRESERVER Variable/Name/D61A1E34=currentUnit Variable/Name/D6653D11=LibraryAtBridge01 Variable/Name/D8AA51AA=ActorGateway @@ -384,12 +398,15 @@ Variable/Name/E29DE2CA=LibraryDown03 Variable/Name/E31DAB40=HybridPrisonsAllAlive Variable/Name/E3588114=Achievement-HardTimer Variable/Name/E8933673=IntroShuttleProbes +Variable/Name/E9DE0BAA=LOCATION_ID_EAST_PRESERVER Variable/Name/EA7D856A=currentUnit Variable/Name/EAD8C0EB=PingTemplarArchives +Variable/Name/EAE103F4=category Variable/Name/EB0F32F8=PrisonGroup Variable/Name/EBC088E4=InCombatIndicator Variable/Name/EC1433B2=currentUnit Variable/Name/EF880BA7=HybridKillsTracking +Variable/Name/F143006D=LOCATION_ID_ROBOTICS_FACILITY Variable/Name/F160FF72=ActorHybridSpawn Variable/Name/F1CF3317=Plasma Targets Variable/Name/F1DCAAC4=HybridDeathsForDialogue @@ -401,4 +418,5 @@ Variable/Name/FB4C542C=Target Variable/Name/FBD99B22=RevealerDTArea Variable/Name/FCB9B589=ArchTemplar02 Variable/Name/FD098D9E=VictoryHiddenUnitGroup +Variable/Name/FE003A42=LOCATION_ID_NORTHEAST_BASE Variable/Name/FEDD3E4B=SuperWarpGate_Neutral diff --git a/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/ComponentList.SC2Components index 1943363eb..83f8457b5 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData DocumentInfo MapInfo diff --git a/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/DocumentHeader index 98e3fcc29290ecf3b11033e574b5f812e0fac6ca..5973d43f6b2bc832ec345c384396fe657cd32b22 100644 GIT binary patch delta 45 tcmbPkI^9&o!^k<9gMop;D42nPk(Gg0B9oB;ghAkP{!2*^-l$S61pvvl3R?gG delta 45 tcmbPkI^9&o!^k<9gMop;D42nPk(GhxbuuFZ2!p_c?8aCS-l$S61pwrj3myOf diff --git a/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/MapScript.galaxy index 0fc7ecf03..4087bd32a 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/MapScript.galaxy @@ -29,6 +29,13 @@ void InitLibs () { //-------------------------------------------------------------------------------------------------- // Constants //-------------------------------------------------------------------------------------------------- +const int gv_LOCATION_ID_CLOSE_OBELISK = 1; +const int gv_LOCATION_ID_WEST_OBELISK = 2; +const int gv_LOCATION_ID_BASE = 3; +const int gv_LOCATION_ID_SOUTHWEST_TENDRIL = 4; +const int gv_LOCATION_ID_SOUTHEAST_TENDRIL = 5; +const int gv_LOCATION_ID_NORTHEAST_TENDRIL = 6; +const int gv_LOCATION_ID_NORTHWEST_TENDRIL = 7; const int gv_p01_USER = 1; const int gv_p02_ZERG_LOW_GROUND_AI = 2; const int gv_p03_ZERG_NORTH = 3; @@ -1159,7 +1166,7 @@ bool gt_ZeratulReachesNexus_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); PingDestroy(gv_beaconPingNexus); - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_BASE); TriggerExecute(gt_ObjectiveReachtheNexusComplete, true, false); if ((libABFE498B_gv_aP_Triggers_disableForcedCamera == false)) { CameraLockInput(gv_p01_USER, true); @@ -1482,7 +1489,7 @@ bool gt_ObeliskNorthPowered_Func (bool testConds, bool runActions) { if ((PowerLevel(gv_p01_USER, UnitGetPosition(UnitFromId(287)), "PowerSource") > 0)) { TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_WEST_OBELISK); gv_obelisksPowered += 1; lv_obelisk = UnitFromId(287); libNtve_gf_RescueUnit(lv_obelisk, gv_p01_USER, true); @@ -1532,7 +1539,7 @@ bool gt_ObeliskSouthPowered_Func (bool testConds, bool runActions) { if ((PowerLevel(gv_p01_USER, UnitGetPosition(UnitFromId(285)), "PowerSource") > 0)) { TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_CLOSE_OBELISK); gv_obelisksPowered += 1; lv_obelisk = UnitFromId(285); libNtve_gf_RescueUnit(lv_obelisk, gv_p01_USER, true); @@ -3003,7 +3010,7 @@ bool gt_OvermindTendrilBeaconZerglingsSW_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); lv_beacon = UnitFromId(36); UIAlertUnit("Trigger", gv_p01_USER, StringExternal("Param/Value/24EE165C"), null, gv_zeratul); - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHWEST_TENDRIL); libCamp_gf_DisplayResearchPointsGiventoPlayer(libCamp_ge_StoryResearchObject_ResearchObjectOvermindTendrils, lv_beacon, gv_p01_USER); TriggerExecute(gt_TransmissionZeratulReachesTendrilsQ, true, false); UnitBehaviorAdd(gv_zeratul, "SuppressCloak", gv_zeratul, 1); @@ -3074,7 +3081,7 @@ bool gt_OvermindTendrilBeaconMutalisksNW_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); lv_beacon = UnitFromId(929); UIAlertUnit("Trigger", gv_p01_USER, StringExternal("Param/Value/40839C6C"), null, gv_zeratul); - lib5BD4895D_gf_AP_Core_sendLocationLocal(7); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTHWEST_TENDRIL); libCamp_gf_DisplayResearchPointsGiventoPlayer(libCamp_ge_StoryResearchObject_ResearchObjectOvermindTendrils, lv_beacon, gv_p01_USER); TriggerExecute(gt_TransmissionZeratulReachesTendrilsQ, true, false); UnitBehaviorAdd(gv_zeratul, "SuppressCloak", gv_zeratul, 1); @@ -3145,7 +3152,7 @@ bool gt_OvermindTendrilBeaconLurkersSE_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); lv_beacon = UnitFromId(46); UIAlertUnit("Trigger", gv_p01_USER, StringExternal("Param/Value/57A961AD"), null, gv_zeratul); - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHEAST_TENDRIL); libCamp_gf_DisplayResearchPointsGiventoPlayer(libCamp_ge_StoryResearchObject_ResearchObjectOvermindTendrils, lv_beacon, gv_p01_USER); TriggerExecute(gt_TransmissionZeratulReachesTendrilsQ, true, false); UnitBehaviorAdd(gv_zeratul, "SuppressCloak", gv_zeratul, 1); @@ -3216,7 +3223,7 @@ bool gt_OvermindTendrilBeaconBanelingsNE_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); lv_beacon = UnitFromId(38); UIAlertUnit("Trigger", gv_p01_USER, StringExternal("Param/Value/0FA47BA1"), null, gv_zeratul); - lib5BD4895D_gf_AP_Core_sendLocationLocal(6); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTHEAST_TENDRIL); libCamp_gf_DisplayResearchPointsGiventoPlayer(libCamp_ge_StoryResearchObject_ResearchObjectOvermindTendrils, lv_beacon, gv_p01_USER); TriggerExecute(gt_TransmissionZeratulReachesTendrilsQ, true, false); UnitBehaviorAdd(gv_zeratul, "SuppressCloak", gv_zeratul, 1); @@ -3792,7 +3799,7 @@ bool gt_VictoryOvermindTendrilsCompleted_Func (bool testConds, bool runActions) } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory); gv_gameOver = true; Wait(2.0, c_timeGame); TriggerExecute(gt_ObjectiveOvermindTendrilsComplete, true, false); @@ -4138,9 +4145,11 @@ bool gt_ObjectiveReachtheNexusCreateQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/23EF9A8D"), StringExternal("Param/Value/FF2D6A5A"), c_objectiveStateActive, true); - lib5BD4895D_gf_AP_Core_addObjectiveSimple(ObjectiveLastCreated()); + ObjectiveCreate(StringExternal("Param/Value/23EF9A8D"), StringExternal("Param/Value/FF2D6A5A"), c_objectiveStateHidden, true); gv_objectiveReachNexus = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveReachNexus, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveReachNexus, gv_LOCATION_ID_BASE); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveReachNexus, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TZeratul03Objective1, ObjectiveLastCreated(), StringExternal("Param/Value/87592C22")); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); @@ -4228,12 +4237,18 @@ bool gt_ObjectiveOvermindTendrilsCreateHidden_Func (bool testConds, bool runActi TriggerEnable(TriggerGetCurrent(), false); ObjectiveCreate(StringExternal("Param/Value/99827D41"), StringExternal("Param/Value/A28B7D22"), c_objectiveStateHidden, true); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "", gv_overmindTendrilsVisited, 4); gv_objectiveOvermindTendrils = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveOvermindTendrils, lib5BD4895D_ge_APObjectiveCategory_Primary, "", gv_overmindTendrilsVisited, 4, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveOvermindTendrils, gv_LOCATION_ID_NORTHEAST_TENDRIL); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveOvermindTendrils, gv_LOCATION_ID_NORTHWEST_TENDRIL); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveOvermindTendrils, gv_LOCATION_ID_SOUTHEAST_TENDRIL); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveOvermindTendrils, gv_LOCATION_ID_SOUTHWEST_TENDRIL); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveOvermindTendrils, lib5BD4895D_gv_aP_Core_locationVictory); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TZeratul03Objective2, ObjectiveLastCreated(), StringExternal("Param/Value/51A16B0B")); - ObjectiveCreate(StringExternal("Param/Value/062D6BA5"), StringExternal("Param/Value/873AE416"), c_objectiveStateActive, true); - lib5BD4895D_gf_AP_Core_addObjectiveSimple(ObjectiveLastCreated()); + ObjectiveCreate(StringExternal("Param/Value/062D6BA5"), StringExternal("Param/Value/873AE416"), c_objectiveStateHidden, true); gv_objectiveZeratulMustSurvive = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveZeratulMustSurvive, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveZeratulMustSurvive, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TZeratul03Objective4, ObjectiveLastCreated(), StringExternal("Param/Value/383549AC")); return true; } @@ -4262,8 +4277,7 @@ bool gt_ObjectiveOvermindTendrilsShowQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveShow(gv_objectiveOvermindTendrils, PlayerGroupAll(), true); - lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveOvermindTendrils); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveOvermindTendrils, true); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); VisRevealArea(gv_p01_USER, RegionCircle(UnitGetPosition(UnitFromId(46)), 5.0), 6.0, false); @@ -4319,10 +4333,10 @@ bool gt_ObjectiveOvermindTendrilsUpdateQ_Func (bool testConds, bool runActions) TriggerQueueExit(); } + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveOvermindTendrils, gv_overmindTendrilsVisited); if ((gv_overmindTendrilsVisited < 4)) { TriggerQueueEnter(); SoundPlay(SoundLink("UI_TerranRescueUnit", 0), PlayerGroupAll(), 100.0, 0.0); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveOvermindTendrils, gv_overmindTendrilsVisited); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); if ((libABFE498B_gv_aP_Triggers_skipCutscenes == false)) { TriggerExecute(gt_ReleaseControlofZeratul, true, true); @@ -4334,7 +4348,6 @@ bool gt_ObjectiveOvermindTendrilsUpdateQ_Func (bool testConds, bool runActions) else { TriggerEnable(TriggerGetCurrent(), false); libNtve_gf_MakeUnitInvulnerable(gv_zeratul, true); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveOvermindTendrils, gv_overmindTendrilsVisited); TriggerExecute(gt_VictoryOvermindTendrilsCompleted, true, true); } return true; @@ -4408,7 +4421,13 @@ void gt_ObjectiveOvermindTendrilsFailed_Init () { // Trigger: Objective Power The Obelisks Create Q //-------------------------------------------------------------------------------------------------- bool gt_ObjectivePowerTheObelisksCreateQ_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Secondary; + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -4423,9 +4442,12 @@ bool gt_ObjectivePowerTheObelisksCreateQ_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/F9857D86"), StringExternal("Param/Value/24C2D047"), c_objectiveStateActive, false); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "", gv_obelisksPowered, 2); + ObjectiveCreate(StringExternal("Param/Value/F9857D86"), StringExternal("Param/Value/24C2D047"), c_objectiveStateHidden, false); gv_objectivePowerTheObelisks = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectivePowerTheObelisks, lv_category, "", gv_obelisksPowered, 2, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectivePowerTheObelisks, gv_LOCATION_ID_CLOSE_OBELISK); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectivePowerTheObelisks, gv_LOCATION_ID_WEST_OBELISK); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectivePowerTheObelisks, true); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); return true; @@ -4441,8 +4463,6 @@ void gt_ObjectivePowerTheObelisksCreateQ_Init () { //-------------------------------------------------------------------------------------------------- bool gt_ObjectivePowerTheObelisksUpdateQ_Func (bool testConds, bool runActions) { // Automatic Variable Declarations - int auto746D6D18_val; - // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -4459,20 +4479,13 @@ bool gt_ObjectivePowerTheObelisksUpdateQ_Func (bool testConds, bool runActions) return true; } - auto746D6D18_val = gv_obelisksPowered; - if (auto746D6D18_val == 1) { - TriggerQueueEnter(); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectivePowerTheObelisks, gv_obelisksPowered); - Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); - TriggerQueueExit(); - } - else if (auto746D6D18_val == 2) { + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectivePowerTheObelisks, gv_obelisksPowered); + if ((gv_obelisksPowered == 2)) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectivePowerTheObelisksComplete, true, false); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); } - else { - } + return true; } diff --git a/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/Triggers index f352e57f2..af0f5a3df 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/Triggers @@ -12,9 +12,103 @@ + + + + + + + + + + + + LOCATION_ID_CLOSE_OBELISK + + + + + + + + 1 + + + + LOCATION_ID_WEST_OBELISK + + + + + + + + 2 + + + + LOCATION_ID_BASE + + + + + + + + 3 + + + + LOCATION_ID_SOUTHWEST_TENDRIL + + + + + + + + 4 + + + + LOCATION_ID_SOUTHEAST_TENDRIL + + + + + + + + 5 + + + + LOCATION_ID_NORTHEAST_TENDRIL + + + + + + + + 6 + + + + LOCATION_ID_NORTHWEST_TENDRIL + + + + + + + + 7 + + @@ -7003,7 +7097,7 @@ - + @@ -7162,14 +7256,13 @@ - - - + + + - - - 3 - + + + @@ -9115,7 +9208,7 @@ - + @@ -9143,15 +9236,14 @@ - - + + - + - - - 2 - + + + @@ -9422,7 +9514,7 @@ - + @@ -9450,15 +9542,14 @@ - - + + - + - - - 1 - + + + @@ -25273,7 +25364,7 @@ - + @@ -25512,14 +25603,13 @@ Update Lab Research Points - - - + + + - - - 4 - + + + @@ -25923,7 +26013,7 @@ - + @@ -26162,14 +26252,13 @@ Update Lab Research Points - - - + + + - - - 7 - + + + @@ -26573,7 +26662,7 @@ - + @@ -26812,14 +26901,13 @@ Update Lab Research Points - - - + + + - - - 5 - + + + @@ -27223,7 +27311,7 @@ - + @@ -27462,14 +27550,13 @@ Update Lab Research Points - - - + + + - - - 6 - + + + @@ -30918,7 +31005,7 @@ - + @@ -30959,12 +31046,12 @@ - - - + + + - - + + @@ -32589,8 +32676,10 @@ - + + + @@ -32608,7 +32697,7 @@ - + @@ -32618,18 +32707,6 @@ - - - - - - - - - - - - @@ -32647,6 +32724,54 @@ + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -32917,12 +33042,18 @@ - + + + + + + - + + @@ -32999,33 +33130,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - 4 - - @@ -33042,6 +33146,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + 4 + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -33076,7 +33280,7 @@ - + @@ -33086,17 +33290,6 @@ - - - - - - - - - - - @@ -33113,6 +33306,38 @@ + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + @@ -33213,40 +33438,22 @@ - - + - - + + - - - - - - - - - - + + - - - - - - + + - - - - - - - - + + + @@ -33788,6 +33995,7 @@ + @@ -34001,11 +34209,23 @@ Display an objective message + + + + + + + + + + + + + - @@ -34041,20 +34261,6 @@ - - - - - - - - - - - - - - @@ -34079,7 +34285,6 @@ - @@ -34116,20 +34321,6 @@ - - - - - - - - - - - - - - @@ -34477,11 +34668,22 @@ + + + + + + + + + + + @@ -34536,8 +34738,11 @@ - + + + + @@ -34554,7 +34759,7 @@ - + @@ -34564,50 +34769,100 @@ - - + + - - - - + + + + + + - - - + + + - + - - + + + + + + + + + + + + + + + + - - + + - - + + 2 - - + + + false + + + + + + + + - - + + - - + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -34627,7 +34882,8 @@ - + + @@ -34683,36 +34939,8 @@ Display an objective message - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - @@ -34724,36 +34952,16 @@ - - - - - - - - - - - - - - - - - - + + - - - - 2 - + - + @@ -34770,7 +34978,7 @@ - + @@ -34790,7 +34998,7 @@ - + @@ -34802,6 +35010,26 @@ + + + + + + + + + + + + + + + + + + 2 + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/Triggers.version index 983ffbb32d1829ad39bc274b1c7739b71ff76d22..e2493331319eba319c446b69ba72b94c6dc8498a 100644 GIT binary patch literal 44 qcmYdJNi9y#EGl7QU|^8QWMp6k(jdSK#2~&63j;&HZd)27kPiT@_Xbx0 literal 44 qcmYdJNi9y#EGl7QU|@Ki%*enBq(OiOh(UZy76yidj&rGuKt2H0>j+=~ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index f2dfce639..93026fbb5 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_echoes_of_the_future.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -1,5 +1,6 @@ Category/Name/0FCD41E7=Lab Research - Power the Obelisks Category/Name/2694D44C======== CINEMATIC ======= +Category/Name/27848076=Location IDs Category/Name/2EF94A07=Primary Objective - Reach the Nexus Category/Name/3252609C======== MAIN ======= Category/Name/383EBD9E=Victory Cinematic - Final Tendril @@ -177,6 +178,7 @@ Variable/Name/08AF1674=FadeDuration Variable/Name/0A1CE249=FadeDuration Variable/Name/0A20CA72=Beacon Variable/Name/0F043721=Egg +Variable/Name/15E8C073=LOCATION_ID_BASE Variable/Name/1695FFC7=Obelisk Variable/Name/176B1962=Overlord 2 Variable/Name/17F0C795=BeaconPingBanelings @@ -184,6 +186,7 @@ Variable/Name/1A696844=Larva Variable/Name/1FC387FB=SouthGatePingModel Variable/Name/1FF520DA=Overlord 5 Variable/Name/20843CBD=Overlord 3 +Variable/Name/21DCD285=LOCATION_ID_SOUTHWEST_TENDRIL Variable/Name/21FC2A64=NydusWormP04 Variable/Name/223B779F=VictoryLarvaS2 Variable/Name/2559BCBD=VictoryCurrentTransmission @@ -198,10 +201,13 @@ Variable/Name/39E67D98=ProtossProbeGroup Variable/Name/3F20EDC0=ObjectiveOvermindTendrils Variable/Name/403C0C60=HardInsaneIgnoreWaypoints Variable/Name/41EBDCA0=PingNydusWormP04 +Variable/Name/45BC3BE2=LOCATION_ID_CLOSE_OBELISK Variable/Name/47EB0687=PathingBlockerGroup +Variable/Name/48BE1E30=category Variable/Name/498A6094=NydusWormP03 Variable/Name/4B90F480=P10_ABANDONED_STRUCTURES Variable/Name/4BC0194D=MidColossusCinematicCompleted +Variable/Name/5238367C=LOCATION_ID_WEST_OBELISK Variable/Name/53FB76A3=ObserverPingModel Variable/Name/5C63BD63=Achievement-HardTimer Variable/Name/5F79B5A6=Obelisk @@ -228,11 +234,14 @@ Variable/Name/9D0F8A57=InvisiblePylon Variable/Name/A0CBC4A6=BriefingUltra1 Variable/Name/A1195E8F=ZergFrenzyWarningTimer Variable/Name/A16DDC10=Music +Variable/Name/A24BCD26=LOCATION_ID_SOUTHEAST_TENDRIL Variable/Name/A2D0C5A4=P08_OVERMIND_REMAINS Variable/Name/A7B7646B=Kerrigan Variable/Name/A8F46110=P05_ZERG_LOW_GROUND_NOAI +Variable/Name/AC2F6A81=LOCATION_ID_NORTHWEST_TENDRIL Variable/Name/AEA409DF=NydusWormHP Variable/Name/AEB689E7=ZerglingRush +Variable/Name/B11CAE6B=LOCATION_ID_NORTHEAST_TENDRIL Variable/Name/B2388A63=ObjectiveReachNexus Variable/Name/B30C5177=currentUnit Variable/Name/B5E673DC=OvermindTendrilsVisited diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/ComponentList.SC2Components index 786240269..8fbed77a5 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData DocumentInfo MapInfo diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/DocumentHeader index d391500747b57b071bab9c7726128c34e52ea5e7..ba489aa9feb58620003d3ef6debc3265119fcfd3 100644 GIT binary patch delta 45 tcmZ2ry1-P$!^k<9gMop;D42nPk(Gg0B9oB;gh61x-yJy+-l$R|1pvr%3H$&6 delta 45 tcmZ2ry1-P$!^k<9gMop;D42nPk(GhxbuuFZ2!p_~rqJ~uyiuh_3IOcX3*P_$ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/MapScript.galaxy index 1b057bf31..a24aff02d 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/MapScript.galaxy @@ -29,6 +29,12 @@ void InitLibs () { //-------------------------------------------------------------------------------------------------- // Constants //-------------------------------------------------------------------------------------------------- +const int gv_LOCATION_ID_PROTOSS_ARCHIVE = 1; +const int gv_LOCATION_ID_KILLS = 2; +const int gv_LOCATION_ID_URUN = 3; +const int gv_LOCATION_ID_MOHANDAR = 4; +const int gv_LOCATION_ID_SELENDIS = 5; +const int gv_LOCATION_ID_ARTANIS = 6; const int gv_p01_PLAYER = 1; const int gv_p02_ALLIED_PROTOSS = 2; const int gv_p04_ZERG_NW = 4; @@ -230,6 +236,7 @@ trigger gt_ObjectiveProtectArchiveCreateQ; trigger gt_ObjectiveProtectArchiveUpdate; trigger gt_ObjectiveProtectArchiveComplete; trigger gt_ObjectiveProtectArchiveFailed; +trigger gt_ObjectiveProtectArchiveDisable; trigger gt_BriefingQ; trigger gt_BriefingScene00; trigger gt_BriefingScene01; @@ -1248,7 +1255,7 @@ bool gt_NewTech01PhoenixQ_Func (bool testConds, bool runActions) { UIAlertPoint("Trigger", gv_p01_PLAYER, StringExternal("Param/Value/8403F3B6"), null, UnitGetPosition(UnitFromId(639))); // Transmission - SoundLink("TZeratul04Urun00002", -1) libCamp_gf_SendTransmissionCampaign(gv_heroPhoenix, SoundLink("TZeratul04Urun00002", 0), c_transmissionDurationAdd, 1.0, true); - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_URUN); if ((UnitIsAlive(gv_zeratul) == true)) { // Transmission - SoundLink("TZeratul04Zeratul00003", -1) libCamp_gf_SendTransmissionCampaign(gv_zeratul, SoundLink("TZeratul04Zeratul00003", 0), c_transmissionDurationAdd, 1.0, true); @@ -1309,7 +1316,7 @@ bool gt_NewTech02VoidRayQ_Func (bool testConds, bool runActions) { UIAlertPoint("Trigger", gv_p01_PLAYER, StringExternal("Param/Value/5DAFE246"), null, UnitGetPosition(UnitFromId(639))); // Transmission - SoundLink("TZeratul04Mohandar00004", -1) libCamp_gf_SendTransmissionCampaign(gv_heroVoidRay, SoundLink("TZeratul04Mohandar00004", 0), c_transmissionDurationAdd, 1.0, true); - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_MOHANDAR); if ((UnitIsAlive(gv_zeratul) == true)) { // Transmission - SoundLink("TZeratul04Zeratul00005", -1) libCamp_gf_SendTransmissionCampaign(gv_zeratul, SoundLink("TZeratul04Zeratul00005", 0), c_transmissionDurationAdd, 1.0, true); @@ -1371,7 +1378,7 @@ bool gt_NewTech03CarriersQ_Func (bool testConds, bool runActions) { UIAlertPoint("Trigger", gv_p01_PLAYER, StringExternal("Param/Value/7D557C0A"), null, UnitGetPosition(UnitFromId(639))); // Transmission - SoundLink("TZeratul04Selendis00006", -1) libCamp_gf_SendTransmissionCampaign(gv_heroCarrier, SoundLink("TZeratul04Selendis00006", 0), c_transmissionDurationAdd, 1.0, true); - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SELENDIS); if ((UnitIsAlive(gv_zeratul) == true)) { // Transmission - SoundLink("TZeratul04Zeratul00007", -1) libCamp_gf_SendTransmissionCampaign(gv_zeratul, SoundLink("TZeratul04Zeratul00007", 0), c_transmissionDurationAdd, 1.0, true); @@ -1440,7 +1447,7 @@ bool gt_NewTech04MothershipQ_Func (bool testConds, bool runActions) { UIAlertPoint("Trigger", gv_p01_PLAYER, StringExternal("Param/Value/718CB62A"), null, UnitGetPosition(UnitFromId(639))); // Transmission - SoundLink("TZeratul04Artanis00009", -1) libCamp_gf_SendTransmissionCampaign(gv_heroMothership, SoundLink("TZeratul04Artanis00009", 0), c_transmissionDurationAdd, 1.0, true); - lib5BD4895D_gf_AP_Core_sendLocationLocal(6); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_ARTANIS); gv_mothershipHeroBorn = true; libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game); ActorSend(ActorFromDoodad(DoodadFromId(482)), "AnimGroupRemove Work"); @@ -4802,6 +4809,10 @@ bool gt_TransmissionTemplarsStoreKnowledgeQ_Func (bool testConds, bool runAction if (!((gv_inCinematic == false))) { return false; } + + if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { + return false; + } } // Actions @@ -5277,13 +5288,13 @@ bool gt_VictoryDefeatforPlayer_Func (bool testConds, bool runActions) { UnitGroupRemoveUnitGroup(lv_unitGroup, UnitGroup("AP_ZerglingRespawnControllerUnit", gv_p01_PLAYER, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0)); if (((UnitGroupCount(lv_unitGroup, c_unitCountAlive) == 0) || (gv_pretendPlayerIsDead == true))) { TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory); gv_gameOver = true; lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveSurviveUntilYouDie); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); if ((gv_killCount >= gv_sTAGE_01_KILL_QUOTA)) { - if ((lib5BD4895D_gf_AP_Core_isLocationSent(6) == false)) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(6); + if ((lib5BD4895D_gf_AP_Core_isLocationSent(gv_LOCATION_ID_ARTANIS) == false)) { + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_ARTANIS); } libCamp_gf_RunMissionVictorySequence(gt_VictoryQ); @@ -5465,13 +5476,21 @@ bool gt_ObjectiveSurviveCreateQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(TextReplaceWord(StringExternal("Param/Value/127508A0"), StringExternal("Param/Value/65D79CE4"), IntToText(gv_sTAGE_01_KILL_QUOTA), c_stringReplaceAll, c_stringCase), StringExternal("Param/Value/1F2F72F6"), c_objectiveStateActive, true); - lib5BD4895D_gf_AP_Core_addObjectiveSimple(ObjectiveLastCreated()); + ObjectiveCreate(TextReplaceWord(StringExternal("Param/Value/127508A0"), StringExternal("Param/Value/65D79CE4"), IntToText(gv_sTAGE_01_KILL_QUOTA), c_stringReplaceAll, c_stringCase), StringExternal("Param/Value/1F2F72F6"), c_objectiveStateHidden, true); gv_objectiveKillPrimary = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveKillPrimary, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveKillPrimary, gv_LOCATION_ID_KILLS); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveKillPrimary, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TZeratul04Objective1, ObjectiveLastCreated(), StringExternal("Param/Value/09C0A593")); - ObjectiveCreate(StringExternal("Param/Value/D6B7F35F"), StringExternal("Param/Value/97923284"), c_objectiveStateActive, true); - lib5BD4895D_gf_AP_Core_addObjectiveSimple(ObjectiveLastCreated()); + ObjectiveCreate(StringExternal("Param/Value/D6B7F35F"), StringExternal("Param/Value/97923284"), c_objectiveStateHidden, true); gv_objectiveSurviveUntilYouDie = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveSurviveUntilYouDie, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveSurviveUntilYouDie, gv_LOCATION_ID_URUN); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveSurviveUntilYouDie, gv_LOCATION_ID_MOHANDAR); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveSurviveUntilYouDie, gv_LOCATION_ID_SELENDIS); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveSurviveUntilYouDie, gv_LOCATION_ID_ARTANIS); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveSurviveUntilYouDie, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveSurviveUntilYouDie, true); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); return true; @@ -5500,7 +5519,7 @@ bool gt_ObjectiveSurvivePrimaryComplete_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_KILLS); TriggerExecute(gt_ObjectiveSurviveCreateQ, true, false); lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveKillPrimary); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); @@ -5516,7 +5535,13 @@ void gt_ObjectiveSurvivePrimaryComplete_Init () { // Trigger: Objective Protect Archive Create Q //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveProtectArchiveCreateQ_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Secondary; + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -5531,9 +5556,11 @@ bool gt_ObjectiveProtectArchiveCreateQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/4DA1EAE9"), StringExternal("Param/Value/6FBB3F20"), c_objectiveStateActive, false); - lib5BD4895D_gf_AP_Core_addObjectiveWithTimer(ObjectiveLastCreated(), gv_protectArchiveTimer); + ObjectiveCreate(StringExternal("Param/Value/4DA1EAE9"), StringExternal("Param/Value/6FBB3F20"), c_objectiveStateHidden, false); gv_objectiveProtectArchive = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithTimer(gv_objectiveProtectArchive, lv_category, gv_protectArchiveTimer, true); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveProtectArchive, gv_LOCATION_ID_PROTOSS_ARCHIVE); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveProtectArchive, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TZeratul04Objective3, ObjectiveLastCreated(), StringExternal("Param/Value/691FF230")); Wait(4.0, c_timeReal); TriggerEnable(gt_ObjectiveProtectArchiveUpdate, true); @@ -5613,7 +5640,7 @@ bool gt_ObjectiveProtectArchiveComplete_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_PROTOSS_ARCHIVE); if ((UnitIsAlive(UnitFromId(716)) == true)) { gv_statArchiveResearchPoints = libCamp_gf_StoryResearchObjectReward(libCamp_ge_StoryResearchObject_ResearchObjectProtecttheArchive, libCamp_ge_StoryResearchCategory_ResearchCategoryProtoss); libNtve_gf_MakeUnitInvulnerable(UnitFromId(716), true); @@ -5680,6 +5707,41 @@ void gt_ObjectiveProtectArchiveFailed_Init () { TriggerAddEventUnitDied(gt_ObjectiveProtectArchiveFailed, null); } +//-------------------------------------------------------------------------------------------------- +// Trigger: Objective Protect Archive Disable +//-------------------------------------------------------------------------------------------------- +bool gt_ObjectiveProtectArchiveDisable_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + // Conditions + if (testConds) { + if (!((lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_PROTOSS_ARCHIVE] == false))) { + return false; + } + } + + // Actions + if (!runActions) { + return true; + } + + TriggerEnable(gt_ObjectiveProtectArchiveCreateQ, false); + TriggerEnable(gt_TransmissionTemplarsStoreKnowledgeQ, false); + TriggerEnable(gt_ObjectiveProtectArchiveFailed, false); + TriggerEnable(gt_ObjectiveProtectArchiveUpdate, false); + if ((UnitIsAlive(UnitFromId(716)) == true)) { + libNtve_gf_MakeUnitInvulnerable(UnitFromId(716), true); + libNtve_gf_PlayAnimation(libNtve_gf_MainActorofUnit(UnitFromId(716)), c_animNameDefault, "Stand Work Start", c_animFlagPlayForever | c_animFlagNonLooping, c_animTimeDefault); + } + + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_ObjectiveProtectArchiveDisable_Init () { + gt_ObjectiveProtectArchiveDisable = TriggerCreate("gt_ObjectiveProtectArchiveDisable_Func"); + TriggerAddEventTimeElapsed(gt_ObjectiveProtectArchiveDisable, 2.0, c_timeGame); +} + //-------------------------------------------------------------------------------------------------- // Trigger: Briefing Q //-------------------------------------------------------------------------------------------------- @@ -7205,6 +7267,7 @@ void InitTriggers () { gt_ObjectiveProtectArchiveUpdate_Init(); gt_ObjectiveProtectArchiveComplete_Init(); gt_ObjectiveProtectArchiveFailed_Init(); + gt_ObjectiveProtectArchiveDisable_Init(); gt_BriefingQ_Init(); gt_BriefingScene00_Init(); gt_BriefingScene01_Init(); diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Triggers index 49303f948..0c1318aad 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Triggers @@ -12,9 +12,90 @@ + + + + + + + + + + + LOCATION_ID_PROTOSS_ARCHIVE + + + + + + + + 1 + + + + LOCATION_ID_KILLS + + + + + + + + 2 + + + + LOCATION_ID_URUN + + + + + + + + 3 + + + + LOCATION_ID_MOHANDAR + + + + + + + + 4 + + + + LOCATION_ID_SELENDIS + + + + + + + + 5 + + + + LOCATION_ID_ARTANIS + + + + + + + + 6 + + @@ -9855,7 +9936,7 @@ - + @@ -10387,15 +10468,14 @@ - - + + - + - - - 3 - + + + @@ -10682,7 +10762,7 @@ - + @@ -11161,15 +11241,14 @@ - - + + - + - - - 4 - + + + @@ -11457,7 +11536,7 @@ - + @@ -11973,15 +12052,14 @@ - - + + - + - - - 5 - + + + @@ -12316,7 +12394,7 @@ - + @@ -12983,15 +13061,14 @@ - - + + - + - - - 6 - + + + @@ -61617,6 +61694,7 @@ + @@ -61666,6 +61744,36 @@ false + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + @@ -64188,7 +64296,7 @@ - + @@ -64272,13 +64380,13 @@ - - + + - + - - + + @@ -64348,19 +64456,18 @@ - + - - + + - + - - - 6 - + + + @@ -64385,8 +64492,7 @@ - 6 - + @@ -65507,12 +65613,20 @@ - + + + - + + + + + + + @@ -65529,7 +65643,7 @@ - + @@ -65575,18 +65689,6 @@ - - - - - - - - - - - - @@ -65604,6 +65706,54 @@ + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -65640,7 +65790,7 @@ - + @@ -65650,18 +65800,6 @@ - - - - - - - - - - - - @@ -65679,6 +65817,110 @@ + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -65696,7 +65938,7 @@ - + @@ -65749,14 +65991,13 @@ - - - + + + - - - 2 - + + + @@ -65814,6 +66055,7 @@ + @@ -65825,11 +66067,22 @@ + + + + + + + + + + + @@ -65884,8 +66137,10 @@ - + + + @@ -65905,7 +66160,7 @@ - + @@ -65915,23 +66170,6 @@ - - - - - - - - - - - - - - - - - @@ -65949,6 +66187,59 @@ + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -66214,7 +66505,7 @@ - + @@ -66316,14 +66607,13 @@ - - - + + + - - - 1 - + + + @@ -66780,6 +67070,199 @@ + + + + + + + + + + + + + + + + + 2.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "Stand Work Start" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Triggers.version index 4e58eb6fd5588a98707ccf1b49cb6f7d46273536..1ef3820172e92208d6f13dde98e5b1722adf8f52 100644 GIT binary patch literal 44 ocmYdJNi9y#EGl7QU|^8QWMp6k(jdSK#324OAgyWKmc|IA0j~W9O#lD@ literal 44 pcmYdJNi9y#EGl7QU|@Ki%*enBq(OiOh(Y`*KstOsYZ@bv1_0NK2ps?b diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 5a982f2ea..efc841056 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -22,6 +22,7 @@ Category/Name/C1B081FB=Scripted Events Category/Name/CD498FC3=Create Leaderboard Category/Name/DB4A60E5=AI Category/Name/E06A382B=Stats and Achievements +Category/Name/E55B8282=Location IDs Category/Name/FC550856=Midgame Cinematic FunctionDef/Grammar/A4C18A21=~a~ or ~b~ FunctionDef/Hint/A4C18A21=Returns the first value if player's kill count is not greater than the tier 2 achievement. Returns the second value if he has. Works on Casual difficulty even if player does not get achievement credit. @@ -138,6 +139,7 @@ Trigger/Name/C01527FA=Briefing Q Trigger/Name/C13958E3=Mid Cinematic Trigger/Name/C558413C=Stat -Stargate Unit Built Trigger/Name/C70FBE79=Swarm Wave B3 P05 NE +Trigger/Name/CAB9134C=Objective Protect Archive Disable Trigger/Name/CB1B9D3F=DEBUG - Set Protect Archive Timer Trigger/Name/CBC73627=Nydus Worm Attack 1 Trigger/Name/CDFE80B9=Attack Waves - Stage 2 - P05 NE @@ -181,6 +183,7 @@ Variable/Name/294BA441=ObjectiveKillPrimary Variable/Name/2C87B564=ThisAIPlayer Variable/Name/2E8CB9A5=ArtanisKills Variable/Name/33ED08EE=VictoryPortrait +Variable/Name/365E6404=LOCATION_ID_URUN Variable/Name/3823DE13=ReinforcementAutoMove Variable/Name/3A41F758=SPAWN Variable/Name/3C9515DB=ThisAIPlayer @@ -188,6 +191,7 @@ Variable/Name/3DCBA75C=ObjectiveProtectArchive Variable/Name/3DD12039=IntroCinematicCompleted Variable/Name/43A9E0F0=WAIT Time Variable/Name/453A5F6D=ThisAISpawn +Variable/Name/47313365=LOCATION_ID_SELENDIS Variable/Name/47FA6AF7=Colossus_East Variable/Name/48A556C8=Leaderboard Variable/Name/49F0B465=ZergPlayers @@ -226,6 +230,8 @@ Variable/Name/95B9DC7F=unitGroup Variable/Name/975005FF=Achievement Tier 2 kills Variable/Name/98995F46=ThisAISpawn Variable/Name/9BEA823B=HeroCarrier +Variable/Name/9C253C99=category +Variable/Name/9C294372=LOCATION_ID_MOHANDAR Variable/Name/9F04A2E0=ThisAIPlayer Variable/Name/A3054C1D=ThisAIPlayer Variable/Name/A314CCF3=MothershipHeroBorn @@ -242,6 +248,7 @@ Variable/Name/B6CF6BCA=ThisAIPlayer Variable/Name/B7A4544C=Omegalisk3 Variable/Name/B8F51421=STAGE_01_KILL_QUOTA Variable/Name/BAE36384=SuperWarpGate_P08 +Variable/Name/BB52609B=LOCATION_ID_PROTOSS_ARCHIVE Variable/Name/BCC1202D=FadeDuration Variable/Name/BD6C6D7A=Hybrid 3 Variable/Name/BDE3951B=ThisAISpawn @@ -250,6 +257,7 @@ Variable/Name/BF62429C=GameOver Variable/Name/BFA3AC53=NydusSpawnRegion Variable/Name/C0031B73=Pylon Variable/Name/C089D077=WAIT Time +Variable/Name/C318E4AD=LOCATION_ID_ARTANIS Variable/Name/C43928C8=LOC Variable/Name/C48E2E34=WAIT Time Variable/Name/C5D477B8=P05_ZERG_NE @@ -266,6 +274,7 @@ Variable/Name/E10DD4AC=Confirm Text Variable/Name/E2CA1196=P02_ALLIED_PROTOSS Variable/Name/E333726F=ThisAIPlayer Variable/Name/E37B6258=ThisAIPlayer +Variable/Name/E3B3107B=LOCATION_ID_KILLS Variable/Name/E5E97FCA=Region Variable/Name/E6E6F022=IntroCinematicColossusEast Variable/Name/E8858A25=VictoryCinematicCompleted diff --git a/Maps/ArchipelagoCampaign/WoL/ap_whispers_of_doom.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_whispers_of_doom.SC2Map/ComponentList.SC2Components index 12eb423e3..d38560b98 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_whispers_of_doom.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/WoL/ap_whispers_of_doom.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData DocumentInfo MapInfo diff --git a/Maps/ArchipelagoCampaign/WoL/ap_whispers_of_doom.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_whispers_of_doom.SC2Map/DocumentHeader index d3fd5e4aa257a978299b1199d9c1c2a4c067c4d2..6c06339dfbfe7d64fa0e8d1c415852d338b19126 100644 GIT binary patch delta 45 tcmZ3hvsOpN!^k<9gMop;D42nPk(Gg0B9oB;gh9a3tHTzAH>z-o0RX#A2p<3d delta 45 tcmZ3hvsOpN!^k<9gMop;D42nPk(Gg4B7u + @@ -28,6 +29,86 @@ + + + + + + + + + + LOCATION_ID_FIRST_HATCHERY + + + + + + + + 1 + + + + LOCATION_ID_SECOND_HATCHERY + + + + + + + + 2 + + + + LOCATION_ID_THIRD_HATCHERY + + + + + + + + 3 + + + + LOCATION_ID_FIRST_PROPHECY_FRAGMENT + + + + + + + + 4 + + + + LOCATION_ID_SECOND_PROPHECY_FRAGMENT + + + + + + + + 5 + + + + LOCATION_ID_THIRD_PROPHECY_FRAGMENT + + + + + + + + 6 + + @@ -66856,7 +66937,7 @@ - + @@ -66880,13 +66961,13 @@ - - + + - + - - + + @@ -69042,7 +69123,7 @@ - + @@ -69121,14 +69202,13 @@ - - - + + + - - - 1 - + + + @@ -69156,7 +69236,7 @@ - + @@ -69235,14 +69315,13 @@ - - - + + + - - - 2 - + + + @@ -69270,7 +69349,7 @@ - + @@ -69349,14 +69428,13 @@ - - - + + + - - - 3 - + + + @@ -69382,7 +69460,7 @@ - + @@ -69431,14 +69509,13 @@ - - - + + + - - - 4 - + + + @@ -69462,7 +69539,7 @@ - + @@ -69511,14 +69588,13 @@ - - - + + + - - - 5 - + + + @@ -69542,7 +69618,7 @@ - + @@ -69591,14 +69667,13 @@ - - - + + + - - - 6 - + + + @@ -69679,9 +69754,13 @@ - - + + + + + + @@ -69742,7 +69821,7 @@ - + @@ -69752,32 +69831,108 @@ - - - - - - + + + + - - - + + + - + + + + + - - + + + + + + + + + + + + + + + - - + + - - + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -69799,22 +69954,6 @@ - - - - - - - - - - - - - - - - @@ -70644,8 +70783,9 @@ - + + @@ -70707,7 +70847,7 @@ - + @@ -70717,17 +70857,6 @@ - - - - - - - - - - - @@ -70744,6 +70873,38 @@ + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + @@ -70928,16 +71089,31 @@ + - + + + + + + + + + + + + + + + @@ -71088,7 +71264,7 @@ - + @@ -71098,67 +71274,107 @@ - - - - - - + + + + + + + + - - - + + + - + - - - checks + + + + + + + + + + + + + + + - - - + + + - - - - - + + + - - - + + + true + - - - + + + - - - + + + + - - - 0 - + + + - - - - + + + - - + + + + + + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -71419,26 +71635,8 @@ - - - - - - - - - - - - - - - - - - @@ -71576,8 +71774,10 @@ - + + + @@ -71596,7 +71796,7 @@ - + @@ -71606,18 +71806,6 @@ - - - - - - - - - - - - @@ -71635,6 +71823,54 @@ + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_whispers_of_doom.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_whispers_of_doom.SC2Map/Triggers.version index 129497e6da12da53f14cb8e19d52903b574442ec..af37ff28d215f2ffaefcc496b149480fd4b7e1b0 100644 GIT binary patch literal 44 pcmYdJNi9y#EGl7QU|^8QWMp6k(jdSK#2~&4P~x6)TN)#f4*;-p2BH7} literal 44 pcmYdJNi9y#EGl7QU|@Ki%*enBq(OiOh(UZOpajd#&QwMq9{|)E2loH~ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_whispers_of_doom.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_whispers_of_doom.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 838c5cd69..3987ed76b 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_whispers_of_doom.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_whispers_of_doom.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -24,6 +24,7 @@ Category/Name/BB16361B=Debug Category/Name/C2139EF5=Section 1 - Zeratul Solo Category/Name/C91FFD71=Storymode Tip Category/Name/CDA070D9=Stats and Achievements +Category/Name/DC316AE9=Location IDs Category/Name/E45862F3=Research Points Category/Name/E6C090E9=Victory Cinematic Category/Name/ED3CA623======== CINEMATIC ======= @@ -284,6 +285,7 @@ Variable/Name/0DA635E4=NydusWormFlee Variable/Name/0E8A910E=ObjectiveShrinesZeratulMustSurvive Variable/Name/1162F45E=ScourgeAmbience3 Variable/Name/13C3F727=StalkerIntroOverseer2 +Variable/Name/14CFB6B8=LOCATION_ID_SECOND_HATCHERY Variable/Name/159877D6=THEONEKERRIGAN Variable/Name/1622CEC9=rockactor Variable/Name/167411BF=VictoryCinematicCompleted @@ -307,6 +309,7 @@ Variable/Name/21E6BE4C=FadeDuration Variable/Name/28A05303=CinematicKarassPrism2 Variable/Name/298DD350=NydusSpawnRumble Variable/Name/2A1F5BA1=currentUnit +Variable/Name/2A204C14=LOCATION_ID_FIRST_PROPHECY_FRAGMENT Variable/Name/2A3EC4B9=Unit Variable/Name/2F05E62B=InterruptableTransmission Variable/Name/2F1B5E58=NydusUnit @@ -347,6 +350,8 @@ Variable/Name/56EFA634=GameOver Variable/Name/5B62E02F=StalkerIntroOverseer1 Variable/Name/5B828B0A=MinSpeed Variable/Name/5BC6FB70=KarassZealots +Variable/Name/6207B41F=LOCATION_ID_FIRST_HATCHERY +Variable/Name/6279DF86=LOCATION_ID_SECOND_PROPHECY_FRAGMENT Variable/Name/648A72CF=P1_USER Variable/Name/6538CB9E=Region Variable/Name/68117068=THEONEPING @@ -383,10 +388,12 @@ Variable/Name/8C217DD1=AirAssaultEncircleRally Variable/Name/8EE9B42C=CinematicKarassMidHiddenUnitGroup Variable/Name/8F5844BF=CinematicKerriganIntroHiddenPlayerUnits Variable/Name/924093D8=ScourgeAmbience2 +Variable/Name/96824F7D=LOCATION_ID_THIRD_HATCHERY Variable/Name/9684C529=BlinkTeach2 Variable/Name/98D8FE41=angle Variable/Name/99967F6F=InCinematic Variable/Name/9AB75373=ObejctiveShrinesUpdate +Variable/Name/9B54D717=LOCATION_ID_THIRD_PROPHECY_FRAGMENT Variable/Name/9D68DFE6=CinematicKarassMidCinematicCompleted Variable/Name/A014B530=MinSpeed Variable/Name/A53E8521=MaxSpeed @@ -419,6 +426,7 @@ Variable/Name/C69E51C8=UnitGroup Variable/Name/CB00379C=RunoutRespawnThreat Variable/Name/CB632A65=PanickedUnit Variable/Name/CE085219=ActorImpactShield +Variable/Name/CE0AC2C0=category Variable/Name/CEF1B99B=Timer Variable/Name/CFF2DA07=CinematicKerriganIntroActors Variable/Name/D1BE1DF0=MinWrap From b2b6e89f7f0780d7da545799e8d72e9ec8d4169f Mon Sep 17 00:00:00 2001 From: Gemster312 Date: Fri, 5 Jul 2024 21:51:20 -0700 Subject: [PATCH 2/2] Objective Categorization Update for the WoL Final Storyline --- .../ComponentList.SC2Components | 1 + .../WoL/ap_all_in.SC2Map/DocumentHeader | Bin 7093 -> 7093 bytes .../WoL/ap_all_in.SC2Map/MapScript.galaxy | 30 +- .../WoL/ap_all_in.SC2Map/Triggers | 308 ++++++-- .../WoL/ap_all_in.SC2Map/Triggers.version | Bin 44 -> 44 bytes .../LocalizedData/TriggerStrings.txt | 6 + .../ComponentList.SC2Components | 1 + .../DocumentHeader | Bin 5580 -> 5580 bytes .../MapScript.galaxy | 76 +- .../WoL/ap_belly_of_the_beast.SC2Map/Triggers | 677 ++++++++++------- .../Triggers.version | Bin 44 -> 44 bytes .../LocalizedData/TriggerStrings.txt | 10 +- .../ComponentList.SC2Components | 1 + .../ap_shatter_the_sky.SC2Map/DocumentHeader | Bin 8187 -> 8187 bytes .../MapScript.galaxy | 66 +- .../WoL/ap_shatter_the_sky.SC2Map/Triggers | 699 ++++++++++++------ .../Triggers.version | Bin 44 -> 44 bytes .../LocalizedData/GameStrings.txt | 2 +- .../LocalizedData/TriggerStrings.txt | 11 + 19 files changed, 1277 insertions(+), 611 deletions(-) diff --git a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/ComponentList.SC2Components index 1943363eb..83f8457b5 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData DocumentInfo MapInfo diff --git a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/DocumentHeader index 78c4c323cb68e42892c25151ec7356bab1468356..7975e2c9f37706200dc2218ab40361d184ab4ca1 100644 GIT binary patch delta 45 tcmdmLzSUgC!^k<9gMop;D42nPk(Gg0B9oB;gh8O{jll;H-l#HB8UWVz3qAk< delta 45 tcmdmLzSUgC!^k<9gMop;D42nPk(GhxbuuFZ2!p`84GXt`@J5x1(f|U~4Y2?K diff --git a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/MapScript.galaxy index 048f1a4fc..1ce38172e 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/MapScript.galaxy @@ -29,6 +29,11 @@ void InitLibs () { //-------------------------------------------------------------------------------------------------- // Constants //-------------------------------------------------------------------------------------------------- +const int gv_LOCATION_ID_FIRST_KERRIGAN_ATTACK = 1; +const int gv_LOCATION_ID_SECOND_KERRIGAN_ATTACK = 2; +const int gv_LOCATION_ID_THIRD_KERRIGAN_ATTACK = 3; +const int gv_LOCATION_ID_FOURTH_KERRIGAN_ATTACK = 4; +const int gv_LOCATION_ID_FIFTH_KERRIGAN_ATTACK = 5; const int gv_pLAYER_USER = 1; const int gv_pLAYER_ZERG_MAIN = 2; const int gv_pLAYER_ZERG_SPECIAL = 3; @@ -3889,7 +3894,7 @@ bool gt_KerriganDeepTunnelQ_Func (bool testConds, bool runActions) { libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); auto5D28AA2D_val = gv_kerriganAttackCount; if (auto5D28AA2D_val == 1) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIRST_KERRIGAN_ATTACK); // Transmission - SoundLink("TValerian03Kerrigan00058", -1) libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Kerrigan00058", -1), c_transmissionDurationAdd, 0.0, true); // Transmission - SoundLink("TValerian03Raynor00020", -1) @@ -3898,28 +3903,28 @@ bool gt_KerriganDeepTunnelQ_Func (bool testConds, bool runActions) { libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/001EB8FC") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/40499C88"))); } else if (auto5D28AA2D_val == 2) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SECOND_KERRIGAN_ATTACK); // Transmission - SoundLink("TValerian03Warfield00025", -1) libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Warfield00025", -1), c_transmissionDurationAdd, 0.0, true); Wait(2.0, c_timeReal); libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/EAB5D976") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/8F6AFC37"))); } else if (auto5D28AA2D_val == 3) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_THIRD_KERRIGAN_ATTACK); // Transmission - SoundLink("TValerian03Raynor00028", -1) libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Raynor00028", -1), c_transmissionDurationAdd, 0.0, true); Wait(2.0, c_timeReal); libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/E75186CD") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/CDE6292E"))); } else if (auto5D28AA2D_val == 4) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FOURTH_KERRIGAN_ATTACK); // Transmission - SoundLink("TValerian03Tychus00032", -1) libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Tychus00032", -1), c_transmissionDurationAdd, 0.0, true); Wait(2.0, c_timeReal); libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/1AD4E910") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/A6904814"))); } else if (auto5D28AA2D_val == 5) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIFTH_KERRIGAN_ATTACK); // Transmission - SoundLink("TValerian03Queen00033", -1) libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Queen00033", -1), c_transmissionDurationAdd, 0.0, true); // Transmission - SoundLink("TValerian03Sarah00034", -1) @@ -4633,11 +4638,11 @@ bool gt_VictoryArtifactCharged_Func (bool testConds, bool runActions) { lv_location = 1; for ( ; ( (auto9F5F09C8_ai >= 0 && lv_location <= auto9F5F09C8_ae) || (auto9F5F09C8_ai < 0 && lv_location >= auto9F5F09C8_ae) ) ; lv_location += auto9F5F09C8_ai ) { if ((lib5BD4895D_gf_AP_Core_isLocationSent(lv_location) == false)) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(lv_location); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lv_location); } } - lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory); libNtve_gf_ChangeUnitDamage(gv_artifact, libNtve_ge_UnitDamageTakenDealt_Damage_Take, libNtve_ge_UnitDamageChangeOption_No); TriggerQueueClear(c_triggerQueueRetain); TriggerExecute(gt_ObjectiveArtifactComplete, true, false); @@ -4867,9 +4872,16 @@ bool gt_ObjectiveArtifactCreateQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/CA604703"), StringExternal("Param/Value/BFB1AA45"), c_objectiveStateActive, true); - lib5BD4895D_gf_AP_Core_addObjectiveSimple(ObjectiveLastCreated()); + ObjectiveCreate(StringExternal("Param/Value/CA604703"), StringExternal("Param/Value/BFB1AA45"), c_objectiveStateHidden, true); gv_objective_Artifact = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objective_Artifact, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_FIRST_KERRIGAN_ATTACK); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_SECOND_KERRIGAN_ATTACK); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_THIRD_KERRIGAN_ATTACK); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_FOURTH_KERRIGAN_ATTACK); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_FIFTH_KERRIGAN_ATTACK); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_Artifact, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TValerian03Objective1, ObjectiveLastCreated(), StringExternal("Param/Value/BCFF1976")); libNtve_gf_CreatePingFacingAngle(PlayerGroupSingle(gv_pLAYER_USER), "PingObjective", UnitGetPosition(gv_artifact), ColorWithAlpha(0.00, 100.00, 100.00, 0.00), 0.0, 135.0); PingSetTooltip(PingLastCreated(), StringExternal("Param/Value/0140CB99")); diff --git a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/Triggers index 73c505bf1..de205bd0b 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/Triggers @@ -11,12 +11,80 @@ + + + + + + + + + + LOCATION_ID_FIRST_KERRIGAN_ATTACK + + + + + + + + 1 + + + + LOCATION_ID_SECOND_KERRIGAN_ATTACK + + + + + + + + 2 + + + + LOCATION_ID_THIRD_KERRIGAN_ATTACK + + + + + + + + 3 + + + + LOCATION_ID_FOURTH_KERRIGAN_ATTACK + + + + + + + + 4 + + + + LOCATION_ID_FIFTH_KERRIGAN_ATTACK + + + + + + + + 5 + + @@ -40103,7 +40171,7 @@ - + @@ -40116,15 +40184,14 @@ 1 - - + + - + - - - 1 - + + + @@ -40271,7 +40338,7 @@ - + @@ -40282,15 +40349,14 @@ 2 - - + + - + - - - 2 - + + + @@ -40396,7 +40462,7 @@ - + @@ -40407,15 +40473,14 @@ 3 - - + + - + - - - 3 - + + + @@ -40521,7 +40586,7 @@ - + @@ -40532,15 +40597,14 @@ 4 - - + + - + - - - 4 - + + + @@ -40646,7 +40710,7 @@ - + @@ -40661,15 +40725,14 @@ 5 - - + + - + - - - 5 - + + + @@ -48486,7 +48549,7 @@ - + @@ -48591,16 +48654,16 @@ - + - - + + - + - - + + @@ -48631,12 +48694,12 @@ false - - - + + + - - + + @@ -49879,8 +49942,15 @@ - + + + + + + + + @@ -49901,7 +49971,7 @@ - + @@ -49911,18 +49981,6 @@ - - - - - - - - - - - - @@ -49940,6 +49998,124 @@ + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/Triggers.version index 95a4828b26607432611e270f0eedb53679ea6373..f4322c070d3404c8bf04ace2ae9303d7c16aa227 100644 GIT binary patch literal 44 qcmYdJNi9y#EGl7QU|^8QWMp6k(jdSK#2|h$BLl;f7cFT(iU9z$;|Dna literal 44 qcmYdJNi9y#EGl7QU|@Ki%*enBq(OiOh(Y{BMh1rBWkzX0iU9!DaR?g# diff --git a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 90c4d181b..2a0636b4c 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -21,6 +21,7 @@ Category/Name/DC8AAE34=Zerg Outer Defenses Category/Name/DEFC277E=Victory/Defeat Category/Name/E575F3F5=Global Variables Category/Name/E7DC9647=Nydus Worms +Category/Name/EB32E18A=Location IDs Category/Name/F6464BC8=Crashing Debris Category/Name/FA05B1C2======== ARCHIPELAGO ======= FunctionDef/Grammar/17C3CF2D=Spawn a light attack wave from ~nydus~ (and wait) @@ -228,6 +229,7 @@ Variable/Name/12FE9BE0=TempSpot Variable/Name/1322361A=AmbientOverlordsSize Variable/Name/15F57EA3=location Variable/Name/16D9836B=i +Variable/Name/18CE01B9=LOCATION_ID_THIRD_KERRIGAN_ATTACK Variable/Name/1D52FF36=ArtifactBoard Variable/Name/1F3D186E=AmbientOverlords Variable/Name/1FF3112B=ArtifactPosition @@ -256,6 +258,7 @@ Variable/Name/48EF4DAD=Destination Variable/Name/4B3AC9C5=EnergyNovasUsed Variable/Name/4CDA752E=SpawnRegion Variable/Name/4CEB3458=RecentBuildingDeaths +Variable/Name/4D0E5BE1=LOCATION_ID_FOURTH_KERRIGAN_ATTACK Variable/Name/5198F5D7=i Variable/Name/52586B14=FirstAirTransmission Variable/Name/550AAA5C=i @@ -276,6 +279,7 @@ Variable/Name/6C2A5957=Unit Variable/Name/72177A17=PickedUnit Variable/Name/725B7204=MainSpawnRegions Variable/Name/73D68420=RecentBuildingDeathHistory +Variable/Name/75E7DA4A=LOCATION_ID_FIFTH_KERRIGAN_ATTACK Variable/Name/77EFAC0F=i Variable/Name/79D8EF48=KerriganHasRetreated Variable/Name/7F9B575C=ArtifactChargeCurrent @@ -317,6 +321,7 @@ Variable/Name/CD30EAD3=CurrentRegion Variable/Name/CF5F81CC=FadeDuratioin Variable/Name/D007B9DB=SpawnNydusWormRegion Variable/Name/D0100249=NydusSpitPeriod +Variable/Name/D24013DE=LOCATION_ID_FIRST_KERRIGAN_ATTACK Variable/Name/D6E1593A=KerriganMaxHP Variable/Name/DC3BDAC6=ZergPlayers Variable/Name/DD8D923A=Position @@ -332,6 +337,7 @@ Variable/Name/E700F056=IntroHiddenUnitGroup Variable/Name/EA94AA17=currentUnit Variable/Name/F4528EAA=currentUnit Variable/Name/F4593442=PLAYER_ZERG_EAST +Variable/Name/F72CE420=LOCATION_ID_SECOND_KERRIGAN_ATTACK Variable/Name/F76C570A=DropPodSpot Variable/Name/FACF0076=Msg Variable/Name/FEA0764B=AirPingBehind diff --git a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/ComponentList.SC2Components index 971c50088..101b91b67 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData DocumentInfo MapInfo diff --git a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/DocumentHeader index aca0ab919179c795c47e3162133b42ea68c37714..85388101ad1ce8f3aee9314871cef78313d8a010 100644 GIT binary patch delta 45 tcmX@3eMVcw!^k<9gMop;D42nPk(Gg0B9oB;ghAkvfuSM@Z&X}2A delta 45 tcmX@3eMVcw!^k<9gMop;D42nPk(GhxbuuFZ2!p^o*2ruS-l(!d6aex`3t#{M diff --git a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/MapScript.galaxy index be10247ce..19f70741c 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/MapScript.galaxy @@ -27,6 +27,12 @@ void InitLibs () { //-------------------------------------------------------------------------------------------------- // Constants //-------------------------------------------------------------------------------------------------- +const int gv_LOCATION_ID_FIRST_CHARGE = 1; +const int gv_LOCATION_ID_SECOND_CHARGE = 2; +const int gv_LOCATION_ID_THIRD_CHARGE = 3; +const int gv_LOCATION_ID_FIRST_GROUP_RESCUED = 4; +const int gv_LOCATION_ID_SECOND_GROUP_RESCUED = 5; +const int gv_LOCATION_ID_THIRD_GROUP_RESCUED = 6; const int gv_p1_USER = 1; const int gv_p2_ZERG = 2; const int gv_p4_DOMINIONALLIES = 4; @@ -35,7 +41,7 @@ const int gv_p5_EGGS = 5; //-------------------------------------------------------------------------------------------------- // Global Variables //-------------------------------------------------------------------------------------------------- -int gv_objectiveRescudeDominionTeams; +int gv_objectiveRescueDominionTeams; int gv_dominionTeamsRescued; bool gv_gameOver; bool gv_inCinematic; @@ -159,7 +165,7 @@ doodad gv_cinematicFissureDoodad; bool gv_briefingActionMercDismissed; void InitGlobals () { - gv_objectiveRescudeDominionTeams = c_invalidObjectiveId; + gv_objectiveRescueDominionTeams = c_invalidObjectiveId; gv_tHEONEBROODMOTHER = UnitFromId(2318); gv_nonHeroicDudes = UnitGroupEmpty(); gv__1BroodchamberAllUnits = UnitGroupEmpty(); @@ -678,22 +684,22 @@ void gf_ResetHeroCooldowns () { void gf_ObjectivePlantSeismicChargesUpdate (int lp_nukesPlanted) { // Automatic Variable Declarations + int auto10F18FEE_val; + // Implementation - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_oBJPlantSeismicCharges, (3 - lp_nukesPlanted)); - if ((lp_nukesPlanted >= 3)) { + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_oBJPlantSeismicCharges, lp_nukesPlanted); + auto10F18FEE_val = lp_nukesPlanted; + if (auto10F18FEE_val == 1) { + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIRST_CHARGE); + } + else if (auto10F18FEE_val == 2) { + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SECOND_CHARGE); + } + else if (auto10F18FEE_val == 3) { + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_THIRD_CHARGE); lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_oBJPlantSeismicCharges); - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); } else { - if ((lp_nukesPlanted == 1)) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); - } - else { - if ((lp_nukesPlanted == 2)) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); - } - - } } } @@ -708,7 +714,13 @@ void gf_CinematicDeployNukeWrapper (unit lp_unit) { // Trigger: Objective Rescue Dominion Teams Create Q //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveRescueDominionTeamsCreateQ_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Secondary; + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -723,9 +735,13 @@ bool gt_ObjectiveRescueDominionTeamsCreateQ_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/21224AA7"), StringExternal("Param/Value/83FD56F1"), c_objectiveStateActive, false); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "checks", (3 - gv_dominionTeamsRescued), 0); - gv_objectiveRescudeDominionTeams = ObjectiveLastCreated(); + ObjectiveCreate(StringExternal("Param/Value/21224AA7"), StringExternal("Param/Value/83FD56F1"), c_objectiveStateHidden, false); + gv_objectiveRescueDominionTeams = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveRescueDominionTeams, lv_category, "", 0, 3, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveRescueDominionTeams, gv_LOCATION_ID_FIRST_GROUP_RESCUED); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveRescueDominionTeams, gv_LOCATION_ID_SECOND_GROUP_RESCUED); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveRescueDominionTeams, gv_LOCATION_ID_THIRD_GROUP_RESCUED); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveRescueDominionTeams, true); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); return true; @@ -755,7 +771,7 @@ bool gt_ObjectiveRescueDominionTeamsComplete_Func (bool testConds, bool runActio TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveRescueDominionTeamsCreateQ, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveRescudeDominionTeams); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveRescueDominionTeams); return true; } @@ -787,7 +803,7 @@ bool gt_ObjectiveRescueDominionTeamsUpdate_Func (bool testConds, bool runActions TriggerExecute(gt_ObjectiveRescueDominionTeamsCreateQ, true, false); gv_dominionTeamsRescued += 1; - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveRescudeDominionTeams, (3 - gv_dominionTeamsRescued)); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveRescueDominionTeams, gv_dominionTeamsRescued); if ((gv_dominionTeamsRescued == 3)) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveRescueDominionTeamsComplete, true, false); @@ -3062,7 +3078,7 @@ bool gt__1SaveDominionQ_Func (bool testConds, bool runActions) { PingDestroy(gv__1RescueDominionPing); TriggerEnable(gt__1CallforHelpSNUFFED, false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIRST_GROUP_RESCUED); TriggerExecute(gt_ObjectiveRescueDominionTeamsUpdate, true, false); autoFEEFD5BB_g = gv__1RescuableDominionGroup; autoFEEFD5BB_u = UnitGroupCount(autoFEEFD5BB_g, c_unitCountAll); @@ -5120,7 +5136,7 @@ bool gt__2SaveDominionQ_Func (bool testConds, bool runActions) { PingDestroy(gv__2RescueDominionPing); TriggerEnable(gt__2CallforHelpSNUFFED, false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SECOND_GROUP_RESCUED); TriggerExecute(gt_ObjectiveRescueDominionTeamsUpdate, true, false); autoA409A568_g = gv__2RescuableDominionGroup; autoA409A568_u = UnitGroupCount(autoA409A568_g, c_unitCountAll); @@ -7151,7 +7167,7 @@ bool gt__3SaveDominionQ_Func (bool testConds, bool runActions) { PingDestroy(gv__3RescueDominionPing); TriggerEnable(gt__3CallforHelpSNUFFED, false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(6); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_THIRD_GROUP_RESCUED); TriggerExecute(gt_ObjectiveRescueDominionTeamsUpdate, true, false); auto70C592E4_g = gv__3RescuableDominionGroup; auto70C592E4_u = UnitGroupCount(auto70C592E4_g, c_unitCountAll); @@ -8507,7 +8523,7 @@ bool gt__4Extraction_Func (bool testConds, bool runActions) { } if ((gv__4HeroesSaved == 4)) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory); gv__4HeroesSaved += 1; SoundPlay(SoundLink("Terran_Veterancy", -1), PlayerGroupAll(), 100.0, 0.0); UnitKill(UnitFromId(2406)); @@ -9532,9 +9548,13 @@ bool gt_ObjectivePlantSeismicChargesCreateQ_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/70CCCF96"), StringExternal("Param/Value/45096F8B"), c_objectiveStateActive, true); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "checks", 3, 0); + ObjectiveCreate(StringExternal("Param/Value/70CCCF96"), StringExternal("Param/Value/45096F8B"), c_objectiveStateHidden, true); gv_oBJPlantSeismicCharges = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_oBJPlantSeismicCharges, lib5BD4895D_ge_APObjectiveCategory_Primary, "", 0, 3, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_oBJPlantSeismicCharges, gv_LOCATION_ID_FIRST_CHARGE); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_oBJPlantSeismicCharges, gv_LOCATION_ID_SECOND_CHARGE); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_oBJPlantSeismicCharges, gv_LOCATION_ID_THIRD_CHARGE); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_oBJPlantSeismicCharges, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TValerian02AObjective1, ObjectiveLastCreated(), StringExternal("Param/Value/9E819C5A")); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); @@ -9595,9 +9615,11 @@ bool gt_ObjectiveExfiltrationCreateQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/2364874E"), StringExternal("Param/Value/DD330B9F"), c_objectiveStateActive, true); - lib5BD4895D_gf_AP_Core_addObjectiveSimple(ObjectiveLastCreated()); + ObjectiveCreate(StringExternal("Param/Value/2364874E"), StringExternal("Param/Value/DD330B9F"), c_objectiveStateHidden, true); gv_oBJExfiltrate = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_oBJExfiltrate, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_oBJExfiltrate, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_oBJExfiltrate, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TValerian02AObjective2, ObjectiveLastCreated(), StringExternal("Param/Value/2864B30D")); TriggerQueueExit(); return true; diff --git a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/Triggers index c1f3ed8d2..4ce806973 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/Triggers @@ -16,11 +16,92 @@ + + + + + + + + + + + LOCATION_ID_FIRST_CHARGE + + + + + + + + 1 + + + + LOCATION_ID_SECOND_CHARGE + + + + + + + + 2 + + + + LOCATION_ID_THIRD_CHARGE + + + + + + + + 3 + + + + LOCATION_ID_FIRST_GROUP_RESCUED + + + + + + + + 4 + + + + LOCATION_ID_SECOND_GROUP_RESCUED + + + + + + + + 5 + + + + LOCATION_ID_THIRD_GROUP_RESCUED + + + + + + + + 6 + + @@ -48,11 +129,22 @@ + + + + + + + + + + + @@ -107,8 +199,12 @@ - + + + + + @@ -125,7 +221,7 @@ - + @@ -135,71 +231,116 @@ - - + + - - - - + + - - - + + + - + - - - checks - + + + - - - + + + + + + + + + + + + + - - - - - + + + - - - + + + 0 + - - + + 3 - - - + + + false + - - - 0 - + + + - - + + - - + + - - - + + + - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -411,25 +552,6 @@ - - - - - - - - - - - - - - - 3 - - - - @@ -17456,7 +17578,7 @@ - + @@ -17676,14 +17798,13 @@ - - - + + + - - - 4 - + + + @@ -31740,7 +31861,7 @@ - + @@ -31958,14 +32079,13 @@ - - - + + + - - - 5 - + + + @@ -47037,7 +47157,7 @@ - + @@ -47094,14 +47214,13 @@ - - - + + + - - - 6 - + + + @@ -58521,7 +58640,7 @@ - + @@ -58537,13 +58656,13 @@ - - + + - + - - + + @@ -68820,8 +68939,12 @@ - + + + + + @@ -68839,7 +68962,7 @@ - + @@ -68849,36 +68972,6 @@ - - - - - - - - - - - - - - - - - - checks - - - - - 3 - - - - - 0 - - @@ -68896,6 +68989,99 @@ + + + + + + + + + + + + + + + + + + + + + 0 + + + + + 3 + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -68936,7 +69122,7 @@ - + @@ -68959,146 +69145,89 @@ - - - - - - - - - - - - - - - - - 3 - - - - - - - - + + + + + + - - - - - - + + + - - - - + + + + + - - + + 1 - - - - - + + + + - - - - + + + + + + + + + - - + + 2 - - - - - - + + + + - - - + + + - - - + + + + + + - - - 2 + + + 3 - - - - - - - - - - + + + + - - - - - - - 1 - + + + - + - - - - - - - - 3 - - - - - - - - - - - - - - - - - - - - 3 - - @@ -69286,8 +69415,10 @@ - + + + @@ -69304,7 +69435,7 @@ - + @@ -69314,18 +69445,6 @@ - - - - - - - - - - - - @@ -69343,6 +69462,54 @@ + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/Triggers.version index 77e9ab2489bdb698d7756681c362ad1a7c0ce69e..c177b31af1a1535bae55706da0d7f3a724730eae 100644 GIT binary patch literal 44 ocmYdJNi9y#EGl7QU|^8QWMp6k(jdSK#2|hbkoJGplEw(60kn1p7ytkO literal 44 pcmYdJNi9y#EGl7QU|@Ki%*enBq(OiOh(Y`gAbr3_CXEqD0|3`J2o3-M diff --git a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 4f0232265..7a16c7a52 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -30,6 +30,7 @@ Category/Name/A5E951E1======== CINEMATIC ======= Category/Name/A756A79A=Objective - Plant Seismic Charges Category/Name/AE7FC9BD=Global Variables Category/Name/B49DFEB8=Incapacitation +Category/Name/BB4417EC=Location IDs Category/Name/C17E7AB9=Map Triggers Category/Name/C5123994=Intro Cinematic Category/Name/C601506C=Global Variables @@ -376,6 +377,7 @@ Variable/Name/0483FEA9=FadeDuration Variable/Name/0580ACA7=FadeDuration Variable/Name/05E7DBB4=3BroodchamberAllUnits Variable/Name/0617E3F6=FadeDuration +Variable/Name/07379698=LOCATION_ID_FIRST_GROUP_RESCUED Variable/Name/0ADEF379=InCinematic Variable/Name/0B3B7A15=InCinematic Variable/Name/0B579E15=GasGroup @@ -388,6 +390,7 @@ Variable/Name/10EDC11F=ChosenUnit Variable/Name/119E2C32=VictoryCinematicCompleted Variable/Name/15C492E7=FadeDuration Variable/Name/17CCDAF0=FadeDuration +Variable/Name/17E74BF4=LOCATION_ID_FIRST_CHARGE Variable/Name/190888BD=unittype Variable/Name/1A5D9E0D=FadeDuration Variable/Name/1B7B4AEC=FadeDuration @@ -398,6 +401,7 @@ Variable/Name/23998836=PickedUnit Variable/Name/24723F62=4HeroesExtracted Variable/Name/26D175BC=2BroodchamberLocPing Variable/Name/29044B51=P2_ZERG +Variable/Name/2B0748AA=category Variable/Name/2C516644=CinematicFissureDoodad Variable/Name/2D241443=1BroodchamberLocPing Variable/Name/2D456197=ChosenUnit @@ -405,6 +409,7 @@ Variable/Name/2DC5B6C4=3RescueDominionPing Variable/Name/2F485A93=FadeDuration Variable/Name/2FF4C56A=IntroHiddenUnitGroup Variable/Name/3046E95A=PoppedEggPoint +Variable/Name/30A149FF=LOCATION_ID_SECOND_CHARGE Variable/Name/31879156=CinematicStartHoldout1Ping1a Variable/Name/329B3BB3=1SEZergBulliesEast Variable/Name/3379AF49=FadeDuration @@ -419,6 +424,7 @@ Variable/Name/39CF4AEF=rallypoint Variable/Name/3A280E10=RaynorSnipeKillsBest Variable/Name/3A7B7692=currentUnit Variable/Name/3B476E41=3RescuableDominionGroup +Variable/Name/3D153322=LOCATION_ID_SECOND_GROUP_RESCUED Variable/Name/4089072A=ChosenUnit Variable/Name/43067237=AIThinkGroup Variable/Name/4324FC57=rallypoint @@ -450,7 +456,7 @@ Variable/Name/6253B730=4LavaDoodadPositions Variable/Name/6293E02B=targets Variable/Name/62C08CBC=reaper2 Variable/Name/633A3AF3=HoldoutTimerWindow -Variable/Name/6423E590=ObjectiveRescudeDominionTeams +Variable/Name/6423E590=ObjectiveRescueDominionTeams Variable/Name/6492896D=3QueenEggPopLimit Variable/Name/64B3A813=HoldoutTimer Variable/Name/68E5CB78=1TeachNadesAgainBullies @@ -471,6 +477,7 @@ Variable/Name/7689E23A=CINEMATIC_NukeUnit Variable/Name/79A0F639=3QueenBossBarIndex Variable/Name/79ABFBDC=CinematicCompleted Variable/Name/7AC3CB55=ping +Variable/Name/7B0C42B8=LOCATION_ID_THIRD_GROUP_RESCUED Variable/Name/7B4A678C=1TeachSnipeAgainBullies Variable/Name/7B863929=CinematicZergStrays Variable/Name/7BF707E1=currentUnit @@ -554,6 +561,7 @@ Variable/Name/D5413304=VictoryHiddenUnitGroup Variable/Name/D5C8D835=2BroodchamberNuke Variable/Name/D6835E89=NydusWormHP Variable/Name/D9E8ADE3=1SnipeHereActor +Variable/Name/DB62DE9C=LOCATION_ID_THIRD_CHARGE Variable/Name/DBD1317C=FadeDuration Variable/Name/DC92C29C=2HiddenZergUnits Variable/Name/DDF63E30=4CurrentExtractionUnit diff --git a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/ComponentList.SC2Components index 010746340..e6bcfc267 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData DocumentInfo MapInfo diff --git a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/DocumentHeader index 76dfa29205544bd08475ed0efd99a1e7df1bc225..6d3feae5e675df585dc3807dfebfcb96faac0554 100644 GIT binary patch delta 45 tcmexu|Jz>0!^k<9gMop;D42nPk(Gg0B9oB;ghAl-hp%xUyiw)4JOKZ;4Rini delta 45 tcmexu|Jz>0!^k<9gMop;D42nPk(GhxbuuFZ2!p^Xt5segyiw)4JOB$!3}FBO diff --git a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/MapScript.galaxy index 5adc477c7..86a48ce0c 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/MapScript.galaxy @@ -29,6 +29,14 @@ void InitLibs () { //-------------------------------------------------------------------------------------------------- // Constants //-------------------------------------------------------------------------------------------------- +const int gv_LOCATION_ID_CLOSE_COOLANT_TOWER = 1; +const int gv_LOCATION_ID_NORTHWEST_COOLANT_TOWER = 2; +const int gv_LOCATION_ID_SOUTHEAST_COOLANT_TOWER = 3; +const int gv_LOCATION_ID_SOUTHWEST_COOLANT_TOWER = 4; +const int gv_LOCATION_ID_LEVIATHAN = 5; +const int gv_LOCATION_ID_EAST_HATCHERY = 6; +const int gv_LOCATION_ID_NORTH_HATCHERY = 7; +const int gv_LOCATION_ID_MID_HATCHERY = 8; const int gv_pLAYER_P01_USER = 1; const int gv_pLAYER_P02_COOLANT_TOWERS = 2; const int gv_pLAYER_P03_ZERG_BR = 3; @@ -593,7 +601,13 @@ void gf_AddUpgradeLevelforZergPlayerGroup (string lp_upgrade) { // Trigger: Objective Destroy Hatcheries Create Q //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveDestroyHatcheriesCreateQ_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Extra; + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -608,9 +622,13 @@ bool gt_ObjectiveDestroyHatcheriesCreateQ_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/DF10FD2C"), StringExternal("Param/Value/F7A0C2B9"), c_objectiveStateActive, false); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "checks", (3 - gv_hatcheriesDestroyed), 0); + ObjectiveCreate(StringExternal("Param/Value/DF10FD2C"), StringExternal("Param/Value/F7A0C2B9"), c_objectiveStateHidden, false); gv_objectiveDestroyHatcheries = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveDestroyHatcheries, lv_category, "", gv_hatcheriesDestroyed, 3, true); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyHatcheries, gv_LOCATION_ID_EAST_HATCHERY); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyHatcheries, gv_LOCATION_ID_NORTH_HATCHERY); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyHatcheries, gv_LOCATION_ID_MID_HATCHERY); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyHatcheries, true); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); return true; @@ -672,7 +690,7 @@ bool gt_ObjectiveDestroyHatcheriesUpdate_Func (bool testConds, bool runActions) TriggerExecute(gt_ObjectiveDestroyHatcheriesCreateQ, true, false); gv_hatcheriesDestroyed += 1; - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyHatcheries, (3 - gv_hatcheriesDestroyed)); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyHatcheries, gv_hatcheriesDestroyed); if ((gv_hatcheriesDestroyed == 3)) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveDestroyHatcheriesComplete, true, false); @@ -696,7 +714,7 @@ bool gt_EastHatchery_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(6); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_EAST_HATCHERY); TriggerExecute(gt_ObjectiveDestroyHatcheriesUpdate, true, false); return true; } @@ -717,7 +735,7 @@ bool gt_NorthHatchery_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(7); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTH_HATCHERY); TriggerExecute(gt_ObjectiveDestroyHatcheriesUpdate, true, false); return true; } @@ -738,7 +756,7 @@ bool gt_MidHatchery_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(8); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_MID_HATCHERY); TriggerExecute(gt_ObjectiveDestroyHatcheriesUpdate, true, false); return true; } @@ -898,7 +916,7 @@ bool gt_CloseTower_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_CLOSE_COOLANT_TOWER); return true; } @@ -925,7 +943,7 @@ bool gt_NorthwestTower_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTHWEST_COOLANT_TOWER); return true; } @@ -952,7 +970,7 @@ bool gt_SoutheastTower_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHEAST_COOLANT_TOWER); return true; } @@ -979,7 +997,7 @@ bool gt_SouthwestTower_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHWEST_COOLANT_TOWER); return true; } @@ -5388,7 +5406,7 @@ bool gt_VictoryDestroySpacePlatformsCompleted_Func (bool testConds, bool runActi } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory); gv_gameOver = true; TriggerExecute(gt_ObjectiveDestroyCoolantTowersComplete, true, false); libCamp_gf_RunMissionVictorySequence(gt_VictoryQ); @@ -5580,9 +5598,15 @@ bool gt_ObjectiveDestroyCoolantTowersCreateQ_Func (bool testConds, bool runActio TriggerEnable(TriggerGetCurrent(), false); gv_objectiveDestroyCoolantTowersTotal = 4; TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/FDB17885"), StringExternal("Param/Value/06F1D37B"), c_objectiveStateActive, true); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "checks", (4 - gv_objectiveDestroyCoolantTowerProgress), 0); + ObjectiveCreate(StringExternal("Param/Value/FDB17885"), StringExternal("Param/Value/06F1D37B"), c_objectiveStateHidden, true); gv_objectiveDestroyCoolantTowers = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveDestroyCoolantTowers, lib5BD4895D_ge_APObjectiveCategory_Primary, "", gv_objectiveDestroyCoolantTowerProgress, 4, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyCoolantTowers, gv_LOCATION_ID_CLOSE_COOLANT_TOWER); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyCoolantTowers, gv_LOCATION_ID_NORTHWEST_COOLANT_TOWER); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyCoolantTowers, gv_LOCATION_ID_SOUTHEAST_COOLANT_TOWER); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyCoolantTowers, gv_LOCATION_ID_SOUTHWEST_COOLANT_TOWER); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyCoolantTowers, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyCoolantTowers, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TValerian02BObjective1, ObjectiveLastCreated(), StringExternal("Param/Value/09462CD7")); Wait(libCamp_gv_campaignObjectiveDelay, c_timeGame); TriggerQueueExit(); @@ -5616,7 +5640,7 @@ bool gt_ObjectiveDestroyCoolantTowersUpdate_Func (bool testConds, bool runAction } gv_objectiveDestroyCoolantTowerProgress += 1; - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyCoolantTowers, (4 - gv_objectiveDestroyCoolantTowerProgress)); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyCoolantTowers, gv_objectiveDestroyCoolantTowerProgress); if ((gv_objectiveDestroyCoolantTowerProgress == 1)) { TriggerExecute(gt_PlatformLinesFirstTowerQ, true, false); } @@ -5689,7 +5713,13 @@ void gt_ObjectiveDestroyCoolantTowersFailed_Init () { // Trigger: Objective Kill Leviathan Create Q //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveKillLeviathanCreateQ_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Secondary; + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -5704,9 +5734,11 @@ bool gt_ObjectiveKillLeviathanCreateQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate((StringExternal("Param/Value/739C328F")), StringExternal("Param/Value/0BCA1AE6"), c_objectiveStateActive, false); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "check", 1, 0); + ObjectiveCreate((StringExternal("Param/Value/739C328F")), StringExternal("Param/Value/0BCA1AE6"), c_objectiveStateHidden, false); gv_objectiveKillLeviathan = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveKillLeviathan, lv_category, true); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveKillLeviathan, gv_LOCATION_ID_LEVIATHAN); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveKillLeviathan, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TValerian02BObjective2, ObjectiveLastCreated(), StringExternal("Param/Value/B8769560")); Wait(libCamp_gv_campaignObjectiveDelay, c_timeGame); TriggerQueueExit(); @@ -5736,7 +5768,7 @@ bool gt_ObjectiveKillLeviathanComplete_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_LEVIATHAN); TriggerExecute(gt_ObjectiveKillLeviathanCreateQ, true, false); lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveKillLeviathan); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); diff --git a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/Triggers index d074a3ac4..8e04709d1 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/Triggers @@ -11,11 +11,118 @@ + + + + + + + + + + + + + LOCATION_ID_CLOSE_COOLANT_TOWER + + + + + + + + 1 + + + + LOCATION_ID_NORTHWEST_COOLANT_TOWER + + + + + + + + 2 + + + + LOCATION_ID_SOUTHEAST_COOLANT_TOWER + + + + + + + + 3 + + + + LOCATION_ID_SOUTHWEST_COOLANT_TOWER + + + + + + + + 4 + + + + LOCATION_ID_LEVIATHAN + + + + + + + + 5 + + + + LOCATION_ID_EAST_HATCHERY + + + + + + + + 6 + + + + LOCATION_ID_NORTH_HATCHERY + + + + + + + + 7 + + + + LOCATION_ID_MID_HATCHERY + + + + + + + + 8 + + @@ -46,11 +153,22 @@ + + + + + + + + + + + @@ -105,8 +223,12 @@ - + + + + + @@ -123,7 +245,7 @@ - + @@ -133,71 +255,115 @@ - - + + - - - - + + - - - + + + - + - - - checks - + + + - - - + + + + + + + + + + + + + - - - - - + + + - - - + + + - - + + 3 - - - + + + true + - - - 0 - + + + - - + + - - + + - - - + + + - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -409,25 +575,6 @@ - - - - - - - - - - - - - - - 3 - - - - @@ -495,7 +642,7 @@ - + @@ -507,14 +654,13 @@ - - - + + + - - - 6 - + + + @@ -537,7 +683,7 @@ - + @@ -549,14 +695,13 @@ - - - + + + - - - 7 - + + + @@ -579,7 +724,7 @@ - + @@ -591,14 +736,13 @@ - - - + + + - - - 8 - + + + @@ -782,7 +926,7 @@ - + @@ -814,19 +958,18 @@ - - - + + + - - - 1 - + + + - + @@ -858,19 +1001,18 @@ - - - + + + - - - 2 - + + + - + @@ -902,19 +1044,18 @@ - - - + + + - - - 3 - + + + - + @@ -946,14 +1087,13 @@ - - - + + + - - - 4 - + + + @@ -41703,7 +41843,7 @@ - + @@ -41763,12 +41903,12 @@ - - - + + + - - + + @@ -42896,8 +43036,14 @@ - + + + + + + + @@ -42915,7 +43061,7 @@ - + @@ -42925,70 +43071,142 @@ - - + + - - - - - - - - + + - - + + + - - - checks - + + + - - - + + - - - - - + + + + + + + + + + + + + - - - + + + - - + + - - + + 4 - - - 0 - + + + false + - - + + + + + + - - + + - - + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -43112,27 +43330,8 @@ - - - - - - - - - - - - - - - - - 4 - - @@ -43366,10 +43565,21 @@ + + + + + + + + + + + @@ -43419,8 +43629,10 @@ - + + + @@ -43438,7 +43650,7 @@ - + @@ -43456,36 +43668,6 @@ - - - - - - - - - - - - - - - - - - check - - - - - 1 - - - - - 0 - - @@ -43503,6 +43685,54 @@ + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -43542,7 +43772,7 @@ - + @@ -43596,14 +43826,13 @@ - - - + + + - - - 5 - + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/Triggers.version index 14774385fef76cd421dd4e1b1b7830e6fc0f6b24..413df0b29a2ecd04e9f8a719e21c0bc829c39cfd 100644 GIT binary patch literal 44 ocmYdJNi9y#EGl7QU|^8QWMp6k(jdSK#2~&Mkmi$XOJfAm0I6~X#Q*>R literal 44 pcmYdJNi9y#EGl7QU|@Ki%*enBq(OiOh(Ua7AiZnhxl~3V4FK9!2+;rl diff --git a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt index 6c6eee157..439c098d7 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -69,7 +69,7 @@ Param/Value/CDAD72B4= Param/Value/D09C0E7C=Anniversary_TValerian_02B granted Param/Value/D25FAA3E=>> P6 cannot attack Param/Value/D3234E71=First Platform Gone -Param/Value/DF10FD2C=Destroy Hatcheries at Resouce Nodes +Param/Value/DF10FD2C=Destroy Hatcheries at Resource Nodes Param/Value/E7BF8BDE=All of your structures have been destroyed. Param/Value/EA5459E5=>> P6 can attack Param/Value/EBA46453=Mutalisks will come out of thistunnel entrance. diff --git a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index c4c293616..d9f880f12 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -3,6 +3,7 @@ Category/Name/021289C9=AI Category/Name/036FC2A2=Victory/Defeat Category/Name/19ACF57A=Midgame Leviathan Cinematic Category/Name/1D219AF4=Stats & Achievements +Category/Name/1E95FDFE=Location IDs Category/Name/2A82763F======== GAMEPLAY ======= Category/Name/49025870=Debug Category/Name/58128BAF=Variables @@ -214,6 +215,8 @@ Variable/Name/03F2E6FB=ZergPlayers Variable/Name/068AEAD0=Revealer Variable/Name/07E170DB=i Variable/Name/089B5EA3=VictoryRevealer +Variable/Name/0A5A1260=LOCATION_ID_NORTH_HATCHERY +Variable/Name/0B3AB082=LOCATION_ID_LEVIATHAN Variable/Name/0B3B7A15=InCinematic Variable/Name/0D12A7DF=Facing Variable/Name/0D179B8C=ObjectivePlatformsActor01 @@ -248,6 +251,7 @@ Variable/Name/37033D23=PickedArea Variable/Name/38ACD40F=Position Variable/Name/39E62D35=ObjectiveDestroyCoolant Towers Variable/Name/3A20EF01=PickedArea +Variable/Name/3A8CB4B2=category Variable/Name/3C35F17B=NumberOfUnitsArea03 Variable/Name/3D6555BC=HiddenCommandCenter Variable/Name/3E37D591=Merc @@ -279,6 +283,7 @@ Variable/Name/6AA47504=cycle Variable/Name/6E55DAFB=Facing Variable/Name/6EFC94EA=VictoryHiddenUnitGroup Variable/Name/705ED84B=Leviathan +Variable/Name/71A77F97=LOCATION_ID_EAST_HATCHERY Variable/Name/72A11FB2=i Variable/Name/74111C05=Attacker Variable/Name/751E1583=LeviathanMutaGroup @@ -304,16 +309,19 @@ Variable/Name/9A106E07=UnitType Variable/Name/9BB6106E=FleetLinesGiven Variable/Name/9DE56CEF=InCombatIndicator Variable/Name/9E344CA6=PLAYER_P01_USER +Variable/Name/A00131FA=LOCATION_ID_CLOSE_COOLANT_TOWER Variable/Name/A015EC71=cMutaRadiusCheckSlow Variable/Name/A1FBB107=GameOver Variable/Name/A2A94725=Achievement-HardTimer Variable/Name/A54001D0=MidPlatformsRevealer Variable/Name/A7CF71A1=UnitType +Variable/Name/A7E8A169=LOCATION_ID_SOUTHWEST_COOLANT_TOWER Variable/Name/A8CE6620=Attacker Variable/Name/AAF54A14=UnitsArea04 Variable/Name/AD30624D=Revealer Variable/Name/AD8D0B99=cMutaSpewSizeSlow Variable/Name/ADFFDF9B=ChosenUnit +Variable/Name/AE99CA1A=LOCATION_ID_MID_HATCHERY Variable/Name/AFE92F38=ObjectivePlatformsPing01 Variable/Name/B078254A=currentUnit Variable/Name/B09098AD=MidPlatformsCinematicCompleted @@ -322,10 +330,12 @@ Variable/Name/B25D27A3=Timer Ready to Blow Area 01 Variable/Name/B337A727=MidLeviathanHiddenUnitGroup Variable/Name/B5729D56=Platform Blows Timer Area 04 Variable/Name/B7B3E26C=First Muta Spawner +Variable/Name/BA62CC5D=LOCATION_ID_NORTHWEST_COOLANT_TOWER Variable/Name/BC76E600=LeviathanMaxLife Variable/Name/BD77D7C4=PATHING BLOCKER AREA04 Variable/Name/C54E2A27=MutaDefenders Variable/Name/C5EA0E59=Position +Variable/Name/C6127DE2=LOCATION_ID_SOUTHEAST_COOLANT_TOWER Variable/Name/C63CC948=Facing Variable/Name/C6C86850=PLAYER_P07_ZERG_EXP Variable/Name/C78A17B3=ObjectiveDestroyCoolantTowerProgress @@ -366,3 +376,4 @@ Variable/Name/FA4D15DD=Ground - 5 Variable/Name/FBF97B32=PLAYER_P11_PLATFORM_PIECES Variable/Name/FCA2B08F=LeviathanSpawnRegion Variable/Name/FD9031C0=currentUnit +Variable/Name/FE033C9B=category