diff --git a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/ComponentList.SC2Components index 23f74ebae..18a1705c5 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData GameText DocumentInfo diff --git a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/DocumentHeader index b05f5fe53..2183b38e3 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/DocumentHeader differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/MapScript.galaxy index 74820169b..59941e4d0 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/MapScript.galaxy @@ -40,6 +40,13 @@ const int gv_pLAYER_02_DOMINION22 = 4; const int gv_pLAYER_02_DOMINION222 = 5; const int gv_pLAYER_02_DOMINION2222 = 6; const int gv_sPORE_RAY_MAX_COUNT = 2; +const int gv_LOCATION_ID_FIRST_RELIC = 1; +const int gv_LOCATION_ID_SECOND_RELIC = 2; +const int gv_LOCATION_ID_THIRD_RELIC = 3; +const int gv_LOCATION_ID_FOURTH_RELIC = 4; +const int gv_LOCATION_ID_YAGDRA = 5; +const int gv_LOCATION_ID_KRAITH = 6; +const int gv_LOCATION_ID_SLIVAN = 7; //-------------------------------------------------------------------------------------------------- // Global Structures @@ -130,10 +137,10 @@ int gv_zurvanBanterTimers; timer gv_zurvanTimer; fixed gv_kerriganLowestLife; timer gv_achievementTimedRunTimer; -int gv_objectiveDestroyDominionBase; -int gv_objectiveDestroyDominionBase2; -int gv_objectiveDestroyDominionBase3; -int gv_objectiveDestroyDominionBase22; +int gv_objectiveSlayPrimarchs; +int gv_objectiveSurvive; +int gv_objectiveSlayZurvan; +int gv_objectiveRelics; unitgroup gv_cinematicTempUnits; bool gv_introCinematicCompleted; sound gv_cinematicStinger; @@ -199,10 +206,10 @@ void InitGlobals () { gv_zurvanTimer = TimerCreate(); gv_kerriganLowestLife = 5000.0; gv_achievementTimedRunTimer = TimerCreate(); - gv_objectiveDestroyDominionBase = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase2 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase3 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase22 = c_invalidObjectiveId; + gv_objectiveSlayPrimarchs = c_invalidObjectiveId; + gv_objectiveSurvive = c_invalidObjectiveId; + gv_objectiveSlayZurvan = c_invalidObjectiveId; + gv_objectiveRelics = c_invalidObjectiveId; gv_cinematicTempUnits = UnitGroupEmpty(); } @@ -373,6 +380,7 @@ trigger gt_ObjectiveSlayZurvanCreate; trigger gt_ObjectiveSlayZurvanComplete; trigger gt_ObjectiveXelNagaRelicsCreate; trigger gt_ObjectiveXelNagaRelicsComplete; +trigger gt_ObjectiveXelNagaRelicsRemove; trigger gt_TipMissionHelpQ; trigger gt_YagdraVictoryShot; trigger gt_KraithVictoryShot; @@ -3129,16 +3137,16 @@ bool gt_XelNagaRelicPickups_Func (bool testConds, bool runActions) { gv_relicsFound += 1; gv_relicsRemainingInArea -= 1; TriggerExecute(gt_ObjectiveXelNagaRelicsCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase22, gv_relicsFound); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveRelics, gv_relicsFound); if ((gv_relicsRemainingInArea == 0)) { - lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveDestroyDominionBase22, ") (None remain in this Area"); + lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveRelics, ") (None remain in this Area"); } else { if ((gv_relicsRemainingInArea == 1)) { - lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveDestroyDominionBase22, StringReplaceWord(") (RelicsRemaining Remains in this Area", "RelicsRemaining", IntToString(gv_relicsRemainingInArea), c_stringReplaceAll, c_stringCase)); + lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveRelics, StringReplaceWord(") (RelicsRemaining Remains in this Area", "RelicsRemaining", IntToString(gv_relicsRemainingInArea), c_stringReplaceAll, c_stringCase)); } else { - lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveDestroyDominionBase22, StringReplaceWord(") (RelicsRemaining Remain in this Area", "RelicsRemaining", IntToString(gv_relicsRemainingInArea), c_stringReplaceAll, c_stringCase)); + lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveRelics, StringReplaceWord(") (RelicsRemaining Remain in this Area", "RelicsRemaining", IntToString(gv_relicsRemainingInArea), c_stringReplaceAll, c_stringCase)); } } if ((gv_relicsFound >= 4)) { @@ -4801,7 +4809,7 @@ bool gt_YagdraDies_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_YAGDRA); UISetAlertTypeVisible(PlayerGroupAll(), "AttackUnit_Zerg", true); UnitRemove(gv_yagdraHelperUnit); TriggerEnable(gt_YagdraIdle, false); @@ -4847,7 +4855,7 @@ bool gt_YagdraDies_Func (bool testConds, bool runActions) { } } TriggerExecute(gt_ObjectiveSlayPrimarchsCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase, 1); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveSlayPrimarchs, 1); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); SoundPlay(SoundLink("UI_ObjectiveDiscoveredStinger", -1), PlayerGroupAll(), 100.0, 0.0); TriggerExecute(gt_KraithInitQ, true, false); @@ -4887,7 +4895,7 @@ bool gt_KraithInitQ_Func (bool testConds, bool runActions) { RegionPlayableMapSet(RegionFromId(24)); gv_relicsRemainingInArea = 1; if ((gv_relicsFound >= 1)) { - lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveDestroyDominionBase22, StringReplaceWord(") (RelicsRemaining Remains in this Area", "RelicsRemaining", IntToString(gv_relicsRemainingInArea), c_stringReplaceAll, c_stringCase)); + lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveRelics, StringReplaceWord(") (RelicsRemaining Remains in this Area", "RelicsRemaining", IntToString(gv_relicsRemainingInArea), c_stringReplaceAll, c_stringCase)); } TriggerExecute(gt_KraithReinforcements1, true, false); @@ -6592,7 +6600,7 @@ bool gt_KraithDies_Func (bool testConds, bool runActions) { gv_channelLocation = PointWithOffsetPolar(gv_bossLocation, 4.5, AngleBetweenPoints(gv_bossLocation, RegionGetCenter(RegionFromId(54)))); } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(6); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_KRAITH); UISetAlertTypeVisible(PlayerGroupAll(), "AttackUnit_Zerg", true); TriggerEnable(gt_KraithIdle, false); TriggerEnable(gt_UnitTakesDamage, false); @@ -6650,7 +6658,7 @@ bool gt_KraithDies_Func (bool testConds, bool runActions) { } TriggerExecute(gt_ObjectiveSlayPrimarchsCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase, 2); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveSlayPrimarchs, 2); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); SoundPlay(SoundLink("UI_ObjectiveDiscoveredStinger", -1), PlayerGroupAll(), 100.0, 0.0); TriggerExecute(gt_SlivanInitQ, true, false); @@ -6703,7 +6711,7 @@ bool gt_SlivanInitQ_Func (bool testConds, bool runActions) { VisRevealArea(gv_pLAYER_01_USER, RegionFromId(74), 10.0, false); gv_relicsRemainingInArea = 1; if ((gv_relicsFound >= 1)) { - lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveDestroyDominionBase22, StringReplaceWord(") (RelicsRemaining Remains in this Area", "RelicsRemaining", IntToString(gv_relicsRemainingInArea), c_stringReplaceAll, c_stringCase)); + lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveRelics, StringReplaceWord(") (RelicsRemaining Remains in this Area", "RelicsRemaining", IntToString(gv_relicsRemainingInArea), c_stringReplaceAll, c_stringCase)); } Wait(1.0, c_timeReal); @@ -8350,7 +8358,7 @@ bool gt_SlivanDies_Func (bool testConds, bool runActions) { gv_bossLocation = UnitGetPosition(EventUnit()); gv_channelLocation = PointWithOffsetPolar(gv_bossLocation, 4.5, AngleBetweenPoints(gv_bossLocation, UnitGetPosition(gv_kerrigan))); TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(7); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SLIVAN); UISetAlertTypeVisible(PlayerGroupAll(), "AttackUnit_Zerg", true); TriggerEnable(gt_UnitTakesDamage, false); TriggerStop(gt_SlivanBossFightController); @@ -8383,7 +8391,7 @@ bool gt_SlivanDies_Func (bool testConds, bool runActions) { TriggerExecute(gt_ObjectiveSlayPrimarchsCreate, true, false); SoundPlay(SoundLink("UI_ObjectiveDiscoveredStinger", -1), PlayerGroupAll(), 100.0, 0.0); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase, 3); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveSlayPrimarchs, 3); TriggerExecute(gt_ObjectiveSlayPrimarchsComplete, true, false); Wait(2.0, c_timeReal); TriggerExecute(gt_ZurvanIntroQ, true, false); @@ -8910,7 +8918,7 @@ bool gt_ZurvanDies_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); TimerPause(gv_zurvanTimer, true); TimerPause(gv_achievementTimedRunTimer, true); gv_bossLocation = libNtve_gf_PointWithZOffset(UnitGetPosition(EventUnit()), 12.0); @@ -9067,7 +9075,7 @@ bool gt_Victory_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - if ((ObjectiveGetState(gv_objectiveDestroyDominionBase2) == c_objectiveStateCompleted) && (ObjectiveGetState(gv_objectiveDestroyDominionBase3) == c_objectiveStateCompleted)) { + if ((ObjectiveGetState(gv_objectiveSurvive) == c_objectiveStateCompleted) && (ObjectiveGetState(gv_objectiveSlayZurvan) == c_objectiveStateCompleted)) { libSwaC_gf_CampaignAwardAchievement("ZZerus03_1", gv_pLAYER_01_USER); } @@ -9338,8 +9346,13 @@ bool gt_ObjectiveSlayPrimarchsCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZZerus03Objective01"); - gv_objectiveDestroyDominionBase = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZZerus03Objective01", "", 0); + gv_objectiveSlayPrimarchs = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveSlayPrimarchs, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveSlayPrimarchs, lib5BD4895D_ge_APObjectiveCategory_Primary, "", 0, libSwaC_gf_MissionObjectiveItemCount("ZZerus03Objective01"), false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveSlayPrimarchs, gv_LOCATION_ID_YAGDRA); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveSlayPrimarchs, gv_LOCATION_ID_KRAITH); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveSlayPrimarchs, gv_LOCATION_ID_SLIVAN); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveSlayPrimarchs, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -9368,7 +9381,7 @@ bool gt_ObjectiveSlayPrimarchsComplete_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveSlayPrimarchsCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveSlayPrimarchs); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -9397,8 +9410,10 @@ bool gt_ObjectiveSurviveCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZZerus03Objective02"); - gv_objectiveDestroyDominionBase2 = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZZerus03Objective02", "", 0); + gv_objectiveSurvive = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveSurvive, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveSurvive, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveSurvive, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -9427,7 +9442,7 @@ bool gt_ObjectiveSurviveComplete_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveSurviveCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase2); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveSurvive); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -9456,7 +9471,7 @@ bool gt_ObjectiveSurviveFailed_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveSurviveCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase2); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveSurvive); return true; } @@ -9484,8 +9499,11 @@ bool gt_ObjectiveSlayZurvanCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZZerus03Objective04"); - gv_objectiveDestroyDominionBase3 = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZZerus03Objective04", "", 0); + gv_objectiveSlayZurvan = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveSlayZurvan, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveSlayZurvan, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveSlayZurvan, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveSlayZurvan, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeGame); return true; } @@ -9514,7 +9532,7 @@ bool gt_ObjectiveSlayZurvanComplete_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveSlayZurvanCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase3); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveSlayZurvan); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -9528,7 +9546,13 @@ void gt_ObjectiveSlayZurvanComplete_Init () { // Trigger: Objective - Xel'Naga Relics - Create //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveXelNagaRelicsCreate_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))) { @@ -9543,21 +9567,26 @@ bool gt_ObjectiveXelNagaRelicsCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZZerus03Objective03"); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZZerus03Objective03", "", gv_relicsFound); - lib5BD4895D_gf_AP_Core_addObjectiveExtraLine(ObjectiveLastCreated()); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(ObjectiveLastCreated(), gv_relicsFound); + gv_objectiveRelics = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveRelics, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveRelics, lv_category, "", gv_relicsFound, libSwaC_gf_MissionObjectiveItemCount("ZZerus03Objective03"), true); + lib5BD4895D_gf_AP_Core_addObjectiveExtraLine(gv_objectiveRelics); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveRelics, gv_LOCATION_ID_FIRST_RELIC); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveRelics, gv_LOCATION_ID_SECOND_RELIC); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveRelics, gv_LOCATION_ID_THIRD_RELIC); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveRelics, gv_LOCATION_ID_FOURTH_RELIC); if ((gv_relicsRemainingInArea == 0)) { - lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveDestroyDominionBase22, ") (None remain in this Area"); + lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveRelics, ") (None remain in this Area"); } else { if ((gv_relicsRemainingInArea == 1)) { - lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveDestroyDominionBase22, StringReplaceWord(") (RelicsRemaining Remains in this Area", "RelicsRemaining", IntToString(gv_relicsRemainingInArea), c_stringReplaceAll, c_stringCase)); + lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveRelics, StringReplaceWord(") (RelicsRemaining Remains in this Area", "RelicsRemaining", IntToString(gv_relicsRemainingInArea), c_stringReplaceAll, c_stringCase)); } else { - lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveDestroyDominionBase22, StringReplaceWord(") (RelicsRemaining Remain in this Area", "RelicsRemaining", IntToString(gv_relicsRemainingInArea), c_stringReplaceAll, c_stringCase)); + lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveRelics, StringReplaceWord(") (RelicsRemaining Remain in this Area", "RelicsRemaining", IntToString(gv_relicsRemainingInArea), c_stringReplaceAll, c_stringCase)); } } - gv_objectiveDestroyDominionBase22 = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveRelics, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -9586,7 +9615,7 @@ bool gt_ObjectiveXelNagaRelicsComplete_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveXelNagaRelicsCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase22); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveRelics); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -9596,6 +9625,43 @@ void gt_ObjectiveXelNagaRelicsComplete_Init () { gt_ObjectiveXelNagaRelicsComplete = TriggerCreate("gt_ObjectiveXelNagaRelicsComplete_Func"); } +//-------------------------------------------------------------------------------------------------- +// Trigger: Objective - Xel'Naga Relics - Remove +//-------------------------------------------------------------------------------------------------- +bool gt_ObjectiveXelNagaRelicsRemove_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + // Conditions + if (testConds) { + if (!(((lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_FIRST_RELIC] == false) && (lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_SECOND_RELIC] == false) && (lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_THIRD_RELIC] == false) && (lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_FOURTH_RELIC] == false)))) { + return false; + } + } + + // Actions + if (!runActions) { + return true; + } + + UnitRemove(UnitFromId(534)); + UnitRemove(UnitFromId(1648)); + UnitRemove(UnitFromId(1280)); + UnitRemove(UnitFromId(2603)); + TriggerEnable(gt_XelNagaRelicIntroQ, false); + TriggerEnable(gt_XelNagaRelicPickups, false); + TriggerEnable(gt_XelNagaRelicPickupsFirst, false); + TriggerEnable(gt_XelNagaRelicPickupsSecond, false); + TriggerEnable(gt_XelNagaRelicPickupsThird, false); + TriggerEnable(gt_XelNagaRelicPickupsFourth, false); + TriggerEnable(gt_ObjectiveXelNagaRelicsCreate, false); + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_ObjectiveXelNagaRelicsRemove_Init () { + gt_ObjectiveXelNagaRelicsRemove = TriggerCreate("gt_ObjectiveXelNagaRelicsRemove_Func"); + TriggerAddEventTimeElapsed(gt_ObjectiveXelNagaRelicsRemove, 2.0, c_timeGame); +} + //-------------------------------------------------------------------------------------------------- // Trigger: Tip Mission Help Q //-------------------------------------------------------------------------------------------------- @@ -12935,7 +13001,7 @@ bool gt_XelNagaRelicPickupsFirst_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIRST_RELIC); return true; } @@ -12971,7 +13037,7 @@ bool gt_XelNagaRelicPickupsSecond_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SECOND_RELIC); return true; } @@ -13007,7 +13073,7 @@ bool gt_XelNagaRelicPickupsThird_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_THIRD_RELIC); return true; } @@ -13043,7 +13109,7 @@ bool gt_XelNagaRelicPickupsFourth_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FOURTH_RELIC); return true; } @@ -13188,6 +13254,7 @@ void InitTriggers () { gt_ObjectiveSlayZurvanComplete_Init(); gt_ObjectiveXelNagaRelicsCreate_Init(); gt_ObjectiveXelNagaRelicsComplete_Init(); + gt_ObjectiveXelNagaRelicsRemove_Init(); gt_TipMissionHelpQ_Init(); gt_YagdraVictoryShot_Init(); gt_KraithVictoryShot_Init(); diff --git a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Preload.xml index 69c066f3a..086ef455c 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Preload.xml +++ b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Preload.xml @@ -114,10 +114,6 @@ - - - - diff --git a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers index bb4c1546b..507df9bc7 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers @@ -15908,87 +15908,16 @@ - - - - - - - - - - - - - - - - ZZerus03Objective03 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16041,74 +15970,6 @@ - - - - - - - - - - - - - ZZerus03Objective03 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16181,74 +16042,6 @@ 1 - - - - - - - - - - - - - ZZerus03Objective03 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16286,42 +16079,9 @@ - - - - - - - - - - - - - - ZZerus03Objective03 - - - - - - - - - - - - - - - - - - - @@ -30711,7 +30471,7 @@ - + @@ -30728,7 +30488,6 @@ - @@ -31235,14 +30994,13 @@ - - - + + + - - - 5 - + + + @@ -31716,38 +31474,6 @@ - - - - - - - - - - - - ZZerus03Objective01 - - - - - - 1 - - - - - - - - - - - - - - @@ -35334,78 +35060,9 @@ - - - - - - - - - - - - - - ZZerus03Objective03 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -51043,7 +50700,7 @@ - + @@ -51063,7 +50720,6 @@ - @@ -51404,14 +51060,13 @@ - - - + + + - - - 6 - + + + @@ -51987,38 +51642,6 @@ - - - - - - - - - - - - ZZerus03Objective01 - - - - - - 2 - - - - - - - - - - - - - - @@ -53052,78 +52675,9 @@ - - - - - - - - - - - - - - ZZerus03Objective03 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -67351,7 +66905,7 @@ - + @@ -67365,7 +66919,6 @@ - @@ -67520,14 +67073,13 @@ - - - + + + - - - 7 - + + + @@ -67890,38 +67442,6 @@ UI_ObjectiveDiscoveredStinger - - - - - - - - - - - - ZZerus03Objective01 - - - - - - 3 - - - - - - - - - - - - - - @@ -76460,7 +75980,7 @@ - + @@ -76581,12 +76101,12 @@ - - - + + + - - + + @@ -79089,7 +78609,6 @@ - objectiveDestroyDominionBase @@ -79103,9 +78622,13 @@ - - + + + + + + @@ -79169,38 +78692,6 @@ - - - - - - - - - - - - ZZerus03Objective01 - - - - - - 0 - - - - - - - - - - - - - - @@ -79217,35 +78708,124 @@ - - - - - - + + + + + - - - + + + - - + + - - - ZZerus03Objective01 - - + + + + + + + - - + + + + + + + + + + + + + + + - - + + 0 + + + + + + + + + + + ZZerus03Objective01 + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79371,7 +78951,6 @@ - objectiveDestroyDominionBase2 @@ -79386,7 +78965,9 @@ - + + + @@ -79466,34 +79047,58 @@ - - - - - - + + + + + - - - + + + - - + + - - - ZZerus03Objective02 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + @@ -79710,7 +79315,6 @@ - objectiveDestroyDominionBase3 @@ -79725,7 +79329,10 @@ - + + + + @@ -79805,34 +79412,71 @@ - - - - - - + + + + + - - - + + + - - + + - - - ZZerus03Objective04 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79956,9 +79600,9 @@ + - objectiveDestroyDominionBase22 @@ -79968,17 +79612,33 @@ + - + + + - + + + + - + + + + + + + + + + + @@ -80040,33 +79700,86 @@ - - - - - - + + + + + + + + - - - + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ZZerus03Objective03 - - - + + + true + - - - + + + @@ -80074,111 +79787,73 @@ - + - - + + + + - - - - + + + - - - + + + - - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - ZZerus03Objective03 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -80231,74 +79906,6 @@ - - - - - - - - - - - - - ZZerus03Objective03 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -80371,74 +79978,6 @@ 1 - - - - - - - - - - - - - ZZerus03Objective03 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -80474,21 +80013,18 @@ 0 - - - - + + + + - - + + - - - - - - + + + @@ -80608,6 +80144,272 @@ + + + + + + + + + + + + + + + + + + + + + + + 2.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -117096,6 +116898,7 @@ + @@ -117104,6 +116907,99 @@ + + + + + + + + + + + LOCATION_ID_FIRST_RELIC + + + + + + + + 1 + + + + LOCATION_ID_SECOND_RELIC + + + + + + + + 2 + + + + LOCATION_ID_THIRD_RELIC + + + + + + + + 3 + + + + LOCATION_ID_FOURTH_RELIC + + + + + + + + 4 + + + + LOCATION_ID_YAGDRA + + + + + + + + 5 + + + + LOCATION_ID_KRAITH + + + + + + + + 6 + + + + LOCATION_ID_SLIVAN + + + + + + + + 7 + + @@ -117478,7 +117374,7 @@ - + @@ -117602,21 +117498,20 @@ true - - - + + + - - - 1 - + + + - + @@ -117740,21 +117635,20 @@ true - - - + + + - - - 2 - + + + - + @@ -117878,21 +117772,20 @@ true - - - + + + - - - 3 - + + + - + @@ -118016,13 +117909,12 @@ true - - - + + + - - - 4 - + + + \ No newline at end of file diff --git a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers.version index 62dec1424..8d365833e 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers.version differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt index 8c5685094..dad9355d4 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -14,13 +14,10 @@ Param/Value/03688D93=Kraith Param/Value/0C09E048= Param/Value/0FC1641B=Kraith Fight Param/Value/115B533F=Kraith -Param/Value/11FFDDB0=)(RelicsRemaining Remains in this Area Param/Value/152FD787=Pack Leader Param/Value/1ACF8EA7=Kraith Defeated Param/Value/1B488576=Kerrigan Kills -Param/Value/22436B2C=RelicsRemaining Param/Value/284CB2FA=Yagdra Fight -Param/Value/2CB3963C=RelicsRemaining Param/Value/2E9E303E=Time to Kill Yagdra Param/Value/364DA5E3=Kerrigan has died. Param/Value/36FDD762=Time to Kill Kraith @@ -33,34 +30,21 @@ Param/Value/47A48363=Zurvan Param/Value/4D454772=Slivan Fight Param/Value/4D6617C0=Kraith Param/Value/5F0279A7=Yagdra -Param/Value/623B89F8=RelicsRemaining Param/Value/7720B73D=Yagdra Defeated Param/Value/7A62DF68=Pack Leader -Param/Value/7AD0F53F=)(RelicsRemaining Remains in this Area Param/Value/7F6CCA53=Slivan Param/Value/8601DC6F=Anniversary_ZZerus03 granted Param/Value/96A66F42=Zurvan Param/Value/9AF4770E=Dehaka's Right Arm -Param/Value/A2E9EC88=)(None Remain in this Area -Param/Value/AF3506AA=)(RelicsRemaining Remains in this Area -Param/Value/B2C9F5A1=RelicsRemaining -Param/Value/B4B53686=RelicsRemaining Param/Value/B4FEC3EF=Tips -Param/Value/B7019BCF=)(RelicsRemaining Remains in this Area Param/Value/C1432651=Yagdra Param/Value/CE1DA88B=Slivan -Param/Value/CEF3FA31=RelicsRemaining -Param/Value/D0251AF1=)(RelicsRemaining Remain in this Area Param/Value/D234859F=Slivan -Param/Value/D4110535=RelicsRemaining -Param/Value/DAEB6E65=RelicsRemaining Param/Value/DB7020E3=It's still bleeding profusely. -Param/Value/DCC1D3D5=)(None remain in this Area Param/Value/E19A4E6D=Dehaka's Pack Param/Value/E4B5AD80=Xel'Naga Relic Param/Value/E534D60D=Time to Kill Slivan Param/Value/E76E14FD=Yagdra -Param/Value/E7C4511D=)(RelicsRemaining Remain in this Area Param/Value/EEE3D065=Zurvan Fight Param/Value/F92D94B7=Fulmic Highlands Param/Value/F9AF7107=Slivan diff --git a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index b718c13d4..f3cccdc0a 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -1,4 +1,5 @@ Category/Name/13E49E8C=Victory Cinematic +Category/Name/168FF51E=Location IDs Category/Name/1AB07245=Achievements Category/Name/23EA4265=Main Objective - Kerrigan Must Survive Category/Name/24CB189D=Slivan Intro Cinematic @@ -216,6 +217,7 @@ Trigger/Name/80349885=Slivan Music Trigger/Name/809C93E8=Intro Kraith Effects Trigger/Name/81759F85=Objective - Slay Zurvan - Create Trigger/Name/81D6ED60=Yagdra Music +Trigger/Name/8687799B=Objective - Xel'Naga Relics - Remove Trigger/Name/8767E08B=Init 04 Music/Sound Trigger/Name/87F33BD8=onDifficultyHard Trigger/Name/884DA06F=Objective - Xel'Naga Relics - Create @@ -354,6 +356,7 @@ Variable/Name/291C340E=CinematicCompleted Variable/Name/296CC0E5=SlivanMeleeGroup2 Variable/Name/29B9859F=YagdraFirstTunnel Variable/Name/2A910379=HelperUnit +Variable/Name/2CD6C89A=LOCATION_ID_SLIVAN Variable/Name/2FE3FA53=FadeDuration Variable/Name/30441EDD=FriendlyRoaches Variable/Name/320F655B=BossLocation @@ -383,6 +386,7 @@ Variable/Name/41D4A7A0=YagdraEngaged Variable/Name/42E0D530=TargetLightningRegion Variable/Name/44C2620E=FadeDuration Variable/Name/45CEA301=i +Variable/Name/462CA373=LOCATION_ID_FOURTH_RELIC Variable/Name/479DB0A6=Soundtrack Variable/Name/47B20140=FadeDuration Variable/Name/47D421F6=Yagdra @@ -390,6 +394,7 @@ Variable/Name/47E68B7D=RockKilled Variable/Name/48721CB4=BossFacing Variable/Name/4B567529=PlayerUnits Variable/Name/4BB2A796=FadeDuration +Variable/Name/4BE51F90=category Variable/Name/4C6C9E2F=PondSiegePoints Variable/Name/4C6CF1E5=TargetTunnelPoint Variable/Name/4D201CBD=Soundtrack @@ -411,6 +416,8 @@ Variable/Name/5B696CBB=FriendlyHydras Variable/Name/5BD71377=CritterGroup Variable/Name/5BED40AA=PatrolPointCount Variable/Name/5F55BE49=ZurvanHelper +Variable/Name/5F8CADC5=LOCATION_ID_THIRD_RELIC +Variable/Name/6064EE1E=LOCATION_ID_YAGDRA Variable/Name/62622522=ZurvanQuakeSound2 Variable/Name/65DE3AB9=ZurvanTenctaclesActive Variable/Name/65F7A36D=PLAYER_06_RESCUE @@ -466,6 +473,7 @@ Variable/Name/90F15106=VictoryShotChanneling Variable/Name/92E53A1B=TargetActor Variable/Name/9303B511=b Variable/Name/932AC576=BarrageTarget +Variable/Name/9442479D=LOCATION_ID_FIRST_RELIC Variable/Name/94CDAE8B=TempUnit Variable/Name/95AD740F=FriendlyHydras Variable/Name/964E1D65=ObjectiveSlayPrimarchs @@ -492,6 +500,7 @@ Variable/Name/A26FBEAC=PLAYER_04_SLIVAN Variable/Name/A2DD722A=FriendlyRoaches Variable/Name/A3472693=FriendlyHydras Variable/Name/A437B68C=KraithEngaged +Variable/Name/A4E7934A=LOCATION_ID_KRAITH Variable/Name/A52A2AF5=ZurvanPing Variable/Name/A56EDDBA=SlivanMeleeGroup1 Variable/Name/A6ACC054=CinematicTempUnits @@ -574,6 +583,7 @@ Variable/Name/E92AF303=YagdraRescueKill Variable/Name/E97DCCDA=Distance Variable/Name/EA625FB0=Indicator Variable/Name/EAB0FE6B=RespawnTimer +Variable/Name/EC3FA872=LOCATION_ID_SECOND_RELIC Variable/Name/ECA4C11E=PondSiegeUnits Variable/Name/ED8CDFFF=YagdraAbilityUsed Variable/Name/EDA3D851=HelperUnit diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/ComponentList.SC2Components index af7e6008f..bc82a4d6c 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData GameText DocumentInfo diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/DocumentHeader index d05b22bdc..b7b0f5b76 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/DocumentHeader differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/MapScript.galaxy index a47a730fd..7b810eb5c 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/MapScript.galaxy @@ -40,6 +40,12 @@ const int gv_pLAYER_06_LOCUSTS = 6; const int gv_pLAYER_07_DEHAKA = 7; const int gv_sPORE_RAY_MAX_COUNT = 5; const fixed gv_tyrannozorAchievementTime = 60.0; +const int gv_LOCATION_ID_TYRANNOZOR = 1; +const int gv_LOCATION_ID_REACH_THE_POOL = 2; +const int gv_LOCATION_ID_15_MINUTES_REMAINING = 3; +const int gv_LOCATION_ID_5_MINUTES_REMAINING = 4; +const int gv_LOCATION_ID_PINCER_ATTACK = 5; +const int gv_LOCATION_ID_YAGDRA_CLAIMS_BRAKKS_PACK = 6; //-------------------------------------------------------------------------------------------------- // Global Structures @@ -98,10 +104,10 @@ fixed gv_totalChrysalisDamageTaken; int gv_largestForce; timer gv_achievementTimedTyrannozorKillTimer; fixed gv_victoryStatTyrannozorLifeTimer; -int gv_objectiveDestroyDominionBase3; -int gv_objectiveDestroyDominionBase2; -int gv_objectiveDestroyDominionBase4; -int gv_objectiveDestroyDominionBase5; +int gv_objective_ProceedToPool; +int gv_objective_ChrysalisMustSurvive; +int gv_objective_KerriganMustSurvive; +int gv_objective_KillTyrannozor; unitgroup gv_cinematicTempUnits; bool gv_cinematicCompleted; bool gv_introMusicCompleted; @@ -143,10 +149,10 @@ void InitGlobals () { gv_primalPlayerGroup = PlayerGroupEmpty(); gv_airAttackGroup = UnitGroupEmpty(); gv_achievementTimedTyrannozorKillTimer = TimerCreate(); - gv_objectiveDestroyDominionBase3 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase2 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase4 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase5 = c_invalidObjectiveId; + gv_objective_ProceedToPool = c_invalidObjectiveId; + gv_objective_ChrysalisMustSurvive = c_invalidObjectiveId; + gv_objective_KerriganMustSurvive = c_invalidObjectiveId; + gv_objective_KillTyrannozor = c_invalidObjectiveId; gv_cinematicTempUnits = UnitGroupEmpty(); } @@ -261,6 +267,7 @@ trigger gt_ObjectiveKerriganMustSurviveComplete; trigger gt_ObjectiveKerriganMustSurviveFailed; trigger gt_ObjectiveKillTyrannozorCreate; trigger gt_ObjectiveKillTyrannozorComplete; +trigger gt_ObjectiveKillTyrannozorRemove; trigger gt_IntroQ; trigger gt_IntroSetup; trigger gt_IntroCinematic; @@ -1559,7 +1566,7 @@ bool gt_KerriganReachesPool_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_REACH_THE_POOL); VisRevealerDestroy(gv_poolBeaconRevealer); TriggerEnable(gt_PrimalForcesKilledQ, false); libNtve_gf_MakeUnitInvulnerable(gv_kerrigan, true); @@ -1772,9 +1779,9 @@ bool gt_APEvents_Func (bool testConds, bool runActions) { } libNtve_gf_WaitForTimer(gv_holdoutTimer, 900.0, false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_15_MINUTES_REMAINING); libNtve_gf_WaitForTimer(gv_holdoutTimer, 300.0, false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_5_MINUTES_REMAINING); return true; } @@ -2363,7 +2370,7 @@ bool gt_PincerAttackQ_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_PINCER_ATTACK); Wait(5.0, c_timeAI); TriggerQueueEnter(); UIAlertPoint("Trigger", gv_pLAYER_01_USER, StringExternal("Param/Value/63CDBF90"), null, PointFromId(1827)); @@ -2515,7 +2522,7 @@ bool gt_BrakkIsDeadQ_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(6); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_YAGDRA_CLAIMS_BRAKKS_PACK); TriggerQueueEnter(); libSwaC_gf_SetAllSoundChannelVolumesCampaign(libSwaC_ge_VolumeChannelModeCampaign_Speech); libSwaC_gf_SendTransmissionCampaign(null, "zMission_Zerus02|Line00154", c_transmissionDurationAdd, 0.0, true, libSwaC_ge_CampaignTransmissionPortraitOptioins_HidePortraitAfter, libSwaC_ge_CampaignTransmissionCueSoundOptions_DefaultCueSoundBehavior); @@ -3524,7 +3531,7 @@ bool gt_TyrannozorDiesQ_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_TYRANNOZOR); TriggerEnable(gt_TyrannozorLifesteal, false); PingDestroy(gv_tyrannozorPing); VisRevealerDestroy(gv_tyrannozorRevealer); @@ -4627,7 +4634,7 @@ bool gt_VictoryHoldoutCompleted_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); TriggerExecute(gt_VictorySequence, true, false); return true; } @@ -4678,7 +4685,7 @@ bool gt_Victory_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - if ((ObjectiveGetState(gv_objectiveDestroyDominionBase2) == c_objectiveStateCompleted)) { + if ((ObjectiveGetState(gv_objective_ChrysalisMustSurvive) == c_objectiveStateCompleted)) { libSwaC_gf_CampaignAwardAchievement("ZZerus02_1", gv_pLAYER_01_USER); } @@ -4947,9 +4954,12 @@ bool gt_ObjectiveProceedToPoolCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZZerus02Objective01"); - gv_objectiveDestroyDominionBase3 = ObjectiveLastCreated(); - ObjectiveSetPriority(ObjectiveLastCreated(), 2); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZZerus02Objective01", "", 0); + gv_objective_ProceedToPool = ObjectiveLastCreated(); + ObjectiveSetPriority(gv_objective_ProceedToPool, 2); + ObjectiveShow(gv_objective_ProceedToPool, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objective_ProceedToPool, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_ProceedToPool, gv_LOCATION_ID_REACH_THE_POOL); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_ProceedToPool, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -4978,7 +4988,7 @@ bool gt_ObjectiveProceedToPoolComplete_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveProceedToPoolCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase3); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objective_ProceedToPool); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -5007,9 +5017,16 @@ bool gt_ObjectiveChrysalisMustSurviveCreate_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZZerus02Objective3"); - gv_objectiveDestroyDominionBase2 = ObjectiveLastCreated(); - ObjectiveSetPriority(ObjectiveLastCreated(), 3); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZZerus02Objective3", "", 0); + gv_objective_ChrysalisMustSurvive = ObjectiveLastCreated(); + ObjectiveSetPriority(gv_objective_ChrysalisMustSurvive, 3); + ObjectiveShow(gv_objective_ChrysalisMustSurvive, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objective_ChrysalisMustSurvive, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_ChrysalisMustSurvive, gv_LOCATION_ID_15_MINUTES_REMAINING); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_ChrysalisMustSurvive, gv_LOCATION_ID_5_MINUTES_REMAINING); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_ChrysalisMustSurvive, gv_LOCATION_ID_PINCER_ATTACK); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_ChrysalisMustSurvive, gv_LOCATION_ID_YAGDRA_CLAIMS_BRAKKS_PACK); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_ChrysalisMustSurvive, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_ChrysalisMustSurvive, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -5038,7 +5055,7 @@ bool gt_ObjectiveChrysalisMustSurviveComplete_Func (bool testConds, bool runActi TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveChrysalisMustSurviveCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase2); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objective_ChrysalisMustSurvive); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -5067,7 +5084,7 @@ bool gt_ObjectiveChrysalisMustSurviveFailed_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveChrysalisMustSurviveCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase2); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objective_ChrysalisMustSurvive); return true; } @@ -5095,9 +5112,11 @@ bool gt_ObjectiveKerriganMustSurviveCreate_Func (bool testConds, bool runActions TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZZerus02Objective04"); - gv_objectiveDestroyDominionBase4 = ObjectiveLastCreated(); - ObjectiveSetPriority(ObjectiveLastCreated(), 1); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZZerus02Objective04", "", 0); + gv_objective_KerriganMustSurvive = ObjectiveLastCreated(); + ObjectiveSetPriority(gv_objective_KerriganMustSurvive, 1); + ObjectiveShow(gv_objective_KerriganMustSurvive, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objective_KerriganMustSurvive, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_KerriganMustSurvive, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -5126,7 +5145,7 @@ bool gt_ObjectiveKerriganMustSurviveComplete_Func (bool testConds, bool runActio TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveKerriganMustSurviveCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase4); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objective_KerriganMustSurvive); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -5155,7 +5174,7 @@ bool gt_ObjectiveKerriganMustSurviveFailed_Func (bool testConds, bool runActions TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveKerriganMustSurviveCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase4); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objective_KerriganMustSurvive); return true; } @@ -5168,7 +5187,13 @@ void gt_ObjectiveKerriganMustSurviveFailed_Init () { // Trigger: Objective - Kill Tyrannozor - Create //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveKillTyrannozorCreate_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))) { @@ -5183,8 +5208,11 @@ bool gt_ObjectiveKillTyrannozorCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZZerus02Objective02"); - gv_objectiveDestroyDominionBase5 = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZZerus02Objective02", "", 0); + gv_objective_KillTyrannozor = ObjectiveLastCreated(); + ObjectiveShow(gv_objective_KillTyrannozor, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objective_KillTyrannozor, lv_category, true); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_KillTyrannozor, gv_LOCATION_ID_TYRANNOZOR); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_KillTyrannozor, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -5213,7 +5241,7 @@ bool gt_ObjectiveKillTyrannozorComplete_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveKillTyrannozorCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase5); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objective_KillTyrannozor); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -5223,6 +5251,35 @@ void gt_ObjectiveKillTyrannozorComplete_Init () { gt_ObjectiveKillTyrannozorComplete = TriggerCreate("gt_ObjectiveKillTyrannozorComplete_Func"); } +//-------------------------------------------------------------------------------------------------- +// Trigger: Objective - Kill Tyrannozor - Remove +//-------------------------------------------------------------------------------------------------- +bool gt_ObjectiveKillTyrannozorRemove_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + // Conditions + if (testConds) { + if (!((lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_TYRANNOZOR] == false))) { + return false; + } + } + + // Actions + if (!runActions) { + return true; + } + + TriggerEnable(gt_ObjectiveKillTyrannozorCreate, false); + TriggerEnable(gt_ObjectiveKillTyrannozorComplete, false); + TriggerEnable(gt_SpawnTyrannozorQ, false); + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_ObjectiveKillTyrannozorRemove_Init () { + gt_ObjectiveKillTyrannozorRemove = TriggerCreate("gt_ObjectiveKillTyrannozorRemove_Func"); + TriggerAddEventTimeElapsed(gt_ObjectiveKillTyrannozorRemove, 2.0, c_timeGame); +} + //-------------------------------------------------------------------------------------------------- // Trigger: Intro Q //-------------------------------------------------------------------------------------------------- @@ -5812,10 +5869,8 @@ bool gt_MidSetup_Func (bool testConds, bool runActions) { TriggerEnable(gt_DEBUGMidCinematic, false); UnitClearSelection(gv_pLAYER_01_USER); RegionPlayableMapSet(RegionFromId(23)); - ObjectiveShow(gv_objectiveDestroyDominionBase4, PlayerGroupAll(), false); - lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase4); - ObjectiveShow(gv_objectiveDestroyDominionBase3, PlayerGroupAll(), false); - lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase3); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_KerriganMustSurvive, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_ProceedToPool, false); UnitRemove(gv_kerrigan); auto2094D6DE_g = UnitGroup(null, c_playerAny, RegionPlayableMap(), UnitFilter(0, (1 << (c_targetFilterSummoned - 32)), (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); auto2094D6DE_u = UnitGroupCount(auto2094D6DE_g, c_unitCountAll); @@ -6520,6 +6575,7 @@ void InitTriggers () { gt_ObjectiveKerriganMustSurviveFailed_Init(); gt_ObjectiveKillTyrannozorCreate_Init(); gt_ObjectiveKillTyrannozorComplete_Init(); + gt_ObjectiveKillTyrannozorRemove_Init(); gt_IntroQ_Init(); gt_IntroSetup_Init(); gt_IntroCinematic_Init(); diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/Preload.xml index c00e136fb..50539a800 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/Preload.xml +++ b/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/Preload.xml @@ -64,10 +64,6 @@ - - - - diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/Triggers index 2ff42c5f2..c335f72a8 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/Triggers @@ -5717,7 +5717,7 @@ - + @@ -5968,14 +5968,13 @@ - - - + + + - - - 2 - + + + @@ -7670,9 +7669,9 @@ - + - + @@ -7693,14 +7692,13 @@ - - - + + + - - - 3 - + + + @@ -7721,14 +7719,13 @@ - - - + + + - - - 4 - + + + @@ -13217,7 +13214,7 @@ - + @@ -13305,14 +13302,13 @@ - - - + + + - - - 5 - + + + @@ -14150,7 +14146,7 @@ - + @@ -14237,14 +14233,13 @@ - - - + + + - - - 6 - + + + @@ -23324,7 +23319,7 @@ - + @@ -23429,14 +23424,13 @@ - - - + + + - - - 1 - + + + @@ -42758,7 +42752,7 @@ - + @@ -42853,12 +42847,12 @@ - - - + + + - - + + @@ -44335,7 +44329,6 @@ - objectiveDestroyDominionBase3 @@ -44351,7 +44344,10 @@ - + + + + @@ -44438,44 +44434,78 @@ - - - - + 2 - - - - - - + + + + + - - - + + + - - + + - - - ZZerus02Objective01 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44602,7 +44632,6 @@ - objectiveDestroyDominionBase2 @@ -44618,7 +44647,14 @@ - + + + + + + + + @@ -44705,44 +44741,130 @@ - - - - + 3 - - - - - - + + + + + - - - + + + - - + + - - - ZZerus02Objective3 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44960,7 +45082,6 @@ - objectiveDestroyDominionBase4 @@ -44976,7 +45097,9 @@ - + + + @@ -45063,44 +45186,65 @@ - - - - + 1 - - - - - - + + + + + - - - + + + - - + + - - - ZZerus02Objective04 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + @@ -45315,9 +45459,9 @@ + - objectiveDestroyDominionBase5 @@ -45327,14 +45471,28 @@ + - + + + + + + + + + + + + + + @@ -45412,34 +45570,71 @@ - - - - - - + + + + + - - - + + + - - + + - - - ZZerus02Objective02 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45559,6 +45754,92 @@ + + + + + + + + + + + + + + + 2.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -51352,10 +51633,8 @@ - - - - + + @@ -51575,64 +51854,32 @@ - - - - - - - - - - - - + + + + - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - + + + + - - + + + + + + Pause and hide units. @@ -57023,11 +57270,92 @@ + + + + + + + + + + + LOCATION_ID_TYRANNOZOR + + + + + + + + 1 + + + + LOCATION_ID_REACH_THE_POOL + + + + + + + + 2 + + + + LOCATION_ID_15_MINUTES_REMAINING + + + + + + + + 3 + + + + LOCATION_ID_5_MINUTES_REMAINING + + + + + + + + 4 + + + + LOCATION_ID_PINCER_ATTACK + + + + + + + + 5 + + + + LOCATION_ID_YAGDRA_CLAIMS_BRAKKS_PACK + + + + + + + + 6 + + diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/Triggers.version index 23487f6e1..bc3c613dc 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/Triggers.version differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index e10cb116b..24320db41 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/HotS/ap_the_crucible.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -14,6 +14,7 @@ Category/Name/6C897BD2=Main Holdout Category/Name/75EC494C======== CINEMATIC ======= Category/Name/7762923D=Tyrannozor Category/Name/78650CC6=Achievements/Stats +Category/Name/987B6611=Location IDs Category/Name/A6614A23======== MAIN ======= Category/Name/BC5E2C4E======== GAMEPLAY ======= Category/Name/CA8B4B7F=Intro Cinematic @@ -94,6 +95,7 @@ Trigger/Name/2B6533B7=Swarm Host Q Trigger/Name/2DF81888=Spawn Locusts Q Trigger/Name/2F55A096=Chrysalis Ping Trigger/Name/30D31799=Defeat Base Dead +Trigger/Name/315C41CA=Objective - Kill Tyrannozor - Remove Trigger/Name/341964FB=Victory Sequence Trigger/Name/43D8F888=Start AI Holdout Trigger/Name/446C5366=Objective - Chrysalis Must Survive - Create @@ -185,6 +187,7 @@ Trigger/Name/F9E05ED5=Intro Zerg Trigger/Name/FA6E421C=Chrysalis Under Attack Q Trigger/Name/FB7AEB96=Pool Bubbles Trigger/Name/FC0C1F67=Mid Cinematic +Variable/Name/00E0FBD6=LOCATION_ID_PINCER_ATTACK Variable/Name/039CDDF7=AirAttackGroup Variable/Name/0883BC48=NumberOfUnits Variable/Name/0AC38771=TempPoint @@ -196,6 +199,7 @@ Variable/Name/1A16D644=NumberOfUnits Variable/Name/1CF08657=PLAYER_02_BRAKK Variable/Name/1DD0500E=AttackGroup Variable/Name/1DF20314=ChrysalisDamaged +Variable/Name/20EB8541=LOCATION_ID_REACH_THE_POOL Variable/Name/210277E0=BrakkAttackGroup Variable/Name/21E8E813=ZerglingAmount Variable/Name/22DDB65C=RandomBounds @@ -206,6 +210,7 @@ Variable/Name/252AC92F=PLAYER_07_DEHAKA Variable/Name/26ADE226=Chrysalis Variable/Name/2863E7E2=PoolPing Variable/Name/2C0A6044=currentUnit +Variable/Name/2E0746D2=LOCATION_ID_5_MINUTES_REMAINING Variable/Name/2EA39973=SwarmHostPoints Variable/Name/2EB2109B=PrimalGroup Variable/Name/2F3AC961=PLAYER_03_YAGDRA @@ -214,6 +219,7 @@ Variable/Name/31B48BA2=CinematicCompleted Variable/Name/336A1747=HydraRoachAmount Variable/Name/3670AD35=RockAttackGroup Variable/Name/3B5F8FAF=TyrannozorRevealer +Variable/Name/3B9580B9=category Variable/Name/3C84E84A=Objective_KillTyrannozor Variable/Name/3CA23335=EndBrakkSpawns Variable/Name/3DC59D15=IntroZerg @@ -231,6 +237,7 @@ Variable/Name/526CF2A2=i Variable/Name/52B0044E=MidQuakeAmbience Variable/Name/52CAC705=MidKerrigan Variable/Name/530BA2A9=HoldoutTimer +Variable/Name/549CB2FA=LOCATION_ID_YAGDRA_CLAIMS_BRAKKS_PACK Variable/Name/55C610B6=PlayerUnitGroupNearby Variable/Name/55D41BFC=IntroSwarmHostsRooted Variable/Name/56CE3712=InCinematic @@ -267,6 +274,7 @@ Variable/Name/7D57D35C=PLAYER_06_LOCUSTS Variable/Name/83B2F505=StopCeremonialFight Variable/Name/850BC632=Tyrannozor Variable/Name/8833C30C=SwarmHostCount +Variable/Name/895A7FA7=LOCATION_ID_TYRANNOZOR Variable/Name/8A9FCDA5=PoolBeaconRevealer Variable/Name/8B482A49=IntroImpactSound2 Variable/Name/8C35C13B=IntroSteamSound @@ -314,6 +322,7 @@ Variable/Name/C65A3358=Index Variable/Name/C7737148=Player Variable/Name/C880BA34=CurrentIndex Variable/Name/CE38D256=MidFlashback +Variable/Name/CF0BDEB8=LOCATION_ID_15_MINUTES_REMAINING Variable/Name/CF3B1BCC=ValidEnemies Variable/Name/D05D7374=IntroMusicCompleted Variable/Name/D1327B6D=IntroImpactSound1 diff --git a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/ComponentList.SC2Components index 564ec1ad6..6d6306fc1 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData GameText DocumentInfo diff --git a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/DocumentHeader index 36cea4506..8ef40aa30 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/DocumentHeader differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/MapScript.galaxy index b3ff64375..3f518e460 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/MapScript.galaxy @@ -47,6 +47,14 @@ const int gv_score_Quota_Enemy = 7; const int gv_sPORE_RAY_MAX_COUNT = 5; const int gv_qUILLGORCAMPCOUNT_MAX = 15; const fixed gv_c_CORPSE_LIFEMAX = 60.0; +const int gv_LOCATION_ID_CENTER_ESSENCE_POOL = 1; +const int gv_LOCATION_ID_EAST_ESSENCE_POOL = 2; +const int gv_LOCATION_ID_SOUTH_ESSENCE_POOL = 3; +const int gv_LOCATION_ID_FINISH_FEEDING = 4; +const int gv_LOCATION_ID_SOUTH_PROXY_PRIMAL_HIVE = 5; +const int gv_LOCATION_ID_EAST_PROXY_PRIMAL_HIVE = 6; +const int gv_LOCATION_ID_SOUTH_MAIN_PRIMAL_HIVE = 7; +const int gv_LOCATION_ID_EAST_MAIN_PRIMAL_HIVE = 8; //-------------------------------------------------------------------------------------------------- // Global Structures @@ -149,12 +157,12 @@ int gv_dronesLostCount; int gv_kerriganKills; int gv_primalHivesKilled; int gv_largestZergForce; -int gv_objectiveDestroyDominionBase; -int gv_objectiveDestroyDominionBase2; -int gv_objectiveDestroyDominionBase3; -int gv_objectiveDestroyDominionBase4; -int gv_objectiveDestroyDominionBase5; -int gv_objectiveDestroyDominionBase6; +int gv_objective_HarvestMeat; +int gv_objective_MeatEatenByEnemy; +int gv_objective_KillBrakk; +int gv_objective_CollectEssence; +int gv_essenceCollected; +int gv_objective_DestroyPrimalHives; unitgroup gv_cinematicHiddenUnits; unitgroup gv_cinematicHiddenUnits2; unitgroup gv_cinematicTempUnits; @@ -229,11 +237,11 @@ void InitGlobals () { gv_harvesterLeashingGroup = UnitGroupEmpty(); gv_brakk_Ping = c_invalidPingId; gv_achievementMutaliskForce = UnitGroupEmpty(); - gv_objectiveDestroyDominionBase = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase2 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase3 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase4 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase6 = c_invalidObjectiveId; + gv_objective_HarvestMeat = c_invalidObjectiveId; + gv_objective_MeatEatenByEnemy = c_invalidObjectiveId; + gv_objective_KillBrakk = c_invalidObjectiveId; + gv_objective_CollectEssence = c_invalidObjectiveId; + gv_objective_DestroyPrimalHives = c_invalidObjectiveId; gv_cinematicHiddenUnits = UnitGroupEmpty(); gv_cinematicHiddenUnits2 = UnitGroupEmpty(); gv_cinematicTempUnits = UnitGroupEmpty(); @@ -396,6 +404,7 @@ trigger gt_ObjectiveKillBrakkFailed; trigger gt_ObjectiveCollectEssenceCreate; trigger gt_ObjectiveCollectEssenceUpdate; trigger gt_ObjectiveCollectEssenceComplete; +trigger gt_ObjectiveCollectEssenceRemove; trigger gt_ObjectiveDestroyPrimalHivesCreate; trigger gt_ObjectiveDestroyPrimalHivesUpdate; trigger gt_ObjectiveDestroyPrimalHivesComplete; @@ -2872,7 +2881,7 @@ bool gt_CorpseEatenPlayer_Func (bool testConds, bool runActions) { UnitCreateEffectPoint(EventUnit(), "FeedZurvan", PointFromId(2020)); libNtve_gf_SendActorMessageToUnit(UnitFromId(1062), "Signal Feed"); - if ((ObjectiveGetState(gv_objectiveDestroyDominionBase) == c_objectiveStateCompleted)) { + if ((ObjectiveGetState(gv_objective_HarvestMeat) == c_objectiveStateCompleted)) { return true; } @@ -2882,7 +2891,7 @@ bool gt_CorpseEatenPlayer_Func (bool testConds, bool runActions) { gv_score_Player += 1; TriggerExecute(gt_ObjectiveHarvestMeatUpdate, true, false); if ((gv_score_Player >= gv_score_Quota_Player)) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FINISH_FEEDING); PingDestroy(gv_feedingPointPing); TriggerExecute(gt_ObjectiveHarvestMeatComplete, true, true); if ((gv_score_Player >= gv_score_Quota_Player) && (gv_aPBrakkKilled == true)) { @@ -3899,11 +3908,11 @@ bool gt_EssencePoolAbsorbedQ_Func (bool testConds, bool runActions) { else { } SoundPlayAtPoint(SoundLink("FX_Zerus01_DNAPoolShrinkage", -1), PlayerGroupAll(), lv_location, 0.0, 100.0, 0.0); - gv_objectiveDestroyDominionBase5 += 1; + gv_essenceCollected += 1; libSwaC_gf_DisplayMissionObjectiveRewardFloatingText(UnitGetPosition(gv_kerrigan), "ZZerus01Objective03", gv_pLAYER_01_USER); Wait(1.0, c_timeReal); TriggerExecute(gt_ObjectiveCollectEssenceUpdate, true, false); - autoCBA2755F_val = gv_objectiveDestroyDominionBase5; + autoCBA2755F_val = gv_essenceCollected; if (autoCBA2755F_val == 1) { TriggerQueueEnter(); libSwaC_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); @@ -6021,7 +6030,7 @@ bool gt_VictorySequence_Func (bool testConds, bool runActions) { } gv_gameOver = true; - lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory); Wait(2.0, c_timeReal); libSwaC_gf_RunMissionVictorySequence(gt_VictoryQ); return true; @@ -6050,7 +6059,7 @@ bool gt_Victory_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - if ((ObjectiveGetState(gv_objectiveDestroyDominionBase) == c_objectiveStateCompleted) && (ObjectiveGetState(gv_objectiveDestroyDominionBase2) == c_objectiveStateCompleted) && (ObjectiveGetState(gv_objectiveDestroyDominionBase3) == c_objectiveStateCompleted)) { + if ((ObjectiveGetState(gv_objective_HarvestMeat) == c_objectiveStateCompleted) && (ObjectiveGetState(gv_objective_MeatEatenByEnemy) == c_objectiveStateCompleted) && (ObjectiveGetState(gv_objective_KillBrakk) == c_objectiveStateCompleted)) { libSwaC_gf_CampaignAwardAchievement("ZZerus01_1", gv_pLAYER_01_USER); } @@ -6482,8 +6491,11 @@ bool gt_ObjectiveHarvestMeatCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZZerus01Objective01"); - gv_objectiveDestroyDominionBase = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZZerus01Objective01", "", 0); + gv_objective_HarvestMeat = ObjectiveLastCreated(); + ObjectiveShow(gv_objective_HarvestMeat, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objective_HarvestMeat, lib5BD4895D_ge_APObjectiveCategory_Primary, "", gv_score_Player, libSwaC_gf_MissionObjectiveItemCount("ZZerus01Objective01"), false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_HarvestMeat, gv_LOCATION_ID_FINISH_FEEDING); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_HarvestMeat, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); libSwaC_gf_CreateObjectivePing(true, UnitGetPosition(UnitFromId(1062)), StringExternal("Param/Value/90BE5D7F")); gv_feedingPointPing = PingLastCreated(); @@ -6513,7 +6525,7 @@ bool gt_ObjectiveHarvestMeatUpdate_Func (bool testConds, bool runActions) { } TriggerExecute(gt_ObjectiveHarvestMeatCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase, gv_score_Player); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objective_HarvestMeat, gv_score_Player); return true; } @@ -6540,8 +6552,8 @@ bool gt_ObjectiveHarvestMeatComplete_Func (bool testConds, bool runActions) { } TriggerExecute(gt_ObjectiveHarvestMeatCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase2); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objective_HarvestMeat); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objective_MeatEatenByEnemy); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6570,7 +6582,7 @@ bool gt_ObjectiveHarvestMeatFailed_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveHarvestMeatCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objective_HarvestMeat); return true; } @@ -6598,8 +6610,10 @@ bool gt_ObjectiveQuillgorMeatEnemyCreate_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZZerus01Objective02"); - gv_objectiveDestroyDominionBase2 = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZZerus01Objective02", "", 0); + gv_objective_MeatEatenByEnemy = ObjectiveLastCreated(); + ObjectiveShow(gv_objective_MeatEatenByEnemy, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objective_MeatEatenByEnemy, lib5BD4895D_ge_APObjectiveCategory_Primary, "", gv_score_Enemy, libSwaC_gf_MissionObjectiveItemCount("ZZerus01Objective02"), false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_MeatEatenByEnemy, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6627,7 +6641,7 @@ bool gt_ObjectiveQuillgorMeatEnemyUpdate_Func (bool testConds, bool runActions) } TriggerExecute(gt_ObjectiveQuillgorMeatEnemyCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase2, gv_score_Enemy); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objective_MeatEatenByEnemy, gv_score_Enemy); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6655,7 +6669,7 @@ bool gt_ObjectiveQuillgorMeatEnemyComplete_Func (bool testConds, bool runActions } TriggerExecute(gt_ObjectiveQuillgorMeatEnemyCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase2); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objective_MeatEatenByEnemy); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6684,7 +6698,7 @@ bool gt_ObjectiveQuillgorMeatEnemyFailed_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveQuillgorMeatEnemyCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase2); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objective_MeatEatenByEnemy); return true; } @@ -6712,8 +6726,11 @@ bool gt_ObjectiveKillBrakkCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZZerus01Objective012"); - gv_objectiveDestroyDominionBase3 = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZZerus01Objective012", "", 0); + gv_objective_KillBrakk = ObjectiveLastCreated(); + ObjectiveShow(gv_objective_KillBrakk, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objective_KillBrakk, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_KillBrakk, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_KillBrakk, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6741,7 +6758,7 @@ bool gt_ObjectiveKillBrakkComplete_Func (bool testConds, bool runActions) { } TriggerExecute(gt_ObjectiveKillBrakkCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase3); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objective_KillBrakk); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6770,7 +6787,7 @@ bool gt_ObjectiveKillBrakkFailed_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveKillBrakkCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase3); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objective_KillBrakk); return true; } @@ -6783,7 +6800,13 @@ void gt_ObjectiveKillBrakkFailed_Init () { // Trigger: Objective Collect Essence Create //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveCollectEssenceCreate_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))) { @@ -6798,8 +6821,13 @@ bool gt_ObjectiveCollectEssenceCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZZerus01Objective03"); - gv_objectiveDestroyDominionBase4 = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZZerus01Objective03", "", gv_objectiveDestroyDominionBase5); + gv_objective_CollectEssence = ObjectiveLastCreated(); + ObjectiveShow(gv_objective_CollectEssence, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objective_CollectEssence, lv_category, "", gv_essenceCollected, libSwaC_gf_MissionObjectiveItemCount("ZZerus01Objective03"), true); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_CollectEssence, gv_LOCATION_ID_CENTER_ESSENCE_POOL); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_CollectEssence, gv_LOCATION_ID_EAST_ESSENCE_POOL); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_CollectEssence, gv_LOCATION_ID_SOUTH_ESSENCE_POOL); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_CollectEssence, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6827,8 +6855,8 @@ bool gt_ObjectiveCollectEssenceUpdate_Func (bool testConds, bool runActions) { } TriggerExecute(gt_ObjectiveCollectEssenceCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase4, gv_objectiveDestroyDominionBase5); - if ((gv_objectiveDestroyDominionBase5 == 3)) { + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objective_CollectEssence, gv_essenceCollected); + if ((gv_essenceCollected == 3)) { TriggerExecute(gt_ObjectiveCollectEssenceComplete, true, false); } @@ -6858,7 +6886,7 @@ bool gt_ObjectiveCollectEssenceComplete_Func (bool testConds, bool runActions) { } TriggerExecute(gt_ObjectiveCollectEssenceCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase4); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objective_CollectEssence); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6868,11 +6896,55 @@ void gt_ObjectiveCollectEssenceComplete_Init () { gt_ObjectiveCollectEssenceComplete = TriggerCreate("gt_ObjectiveCollectEssenceComplete_Func"); } +//-------------------------------------------------------------------------------------------------- +// Trigger: Objective Collect Essence Remove +//-------------------------------------------------------------------------------------------------- +bool gt_ObjectiveCollectEssenceRemove_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + // Conditions + if (testConds) { + if (!(((lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_CENTER_ESSENCE_POOL] == false) && (lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_EAST_ESSENCE_POOL] == false) && (lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_SOUTH_ESSENCE_POOL] == false)))) { + return false; + } + } + + // Actions + if (!runActions) { + return true; + } + + UnitRemove(UnitFromId(154)); + UnitRemove(UnitFromId(2060)); + UnitRemove(UnitFromId(1346)); + TriggerEnable(gt_ObjectiveCollectEssenceCreate, false); + TriggerEnable(gt_ObjectiveCollectEssenceUpdate, false); + TriggerEnable(gt_EssencePoolAbsorbedCenter, false); + TriggerEnable(gt_EssencePoolAbsorbedEast, false); + TriggerEnable(gt_EssencePoolAbsorbedSouth, false); + TriggerEnable(gt_EssencePoolAbsorbedQ, false); + TriggerEnable(gt_EssencePoolApproached, false); + TriggerEnable(gt_EssencePoolIntroQ, false); + TriggerEnable(gt_EssencePoolPing, false); + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_ObjectiveCollectEssenceRemove_Init () { + gt_ObjectiveCollectEssenceRemove = TriggerCreate("gt_ObjectiveCollectEssenceRemove_Func"); + TriggerAddEventTimeElapsed(gt_ObjectiveCollectEssenceRemove, 2.0, c_timeGame); +} + //-------------------------------------------------------------------------------------------------- // Trigger: Objective Destroy Primal Hives Create //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveDestroyPrimalHivesCreate_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 (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -6886,9 +6958,14 @@ bool gt_ObjectiveDestroyPrimalHivesCreate_Func (bool testConds, bool runActions) } TriggerEnable(TriggerGetCurrent(), false); - ObjectiveCreate(StringExternal("Param/Value/55CE045C"), StringToText(""), c_objectiveStateActive, false); - gv_objectiveDestroyDominionBase6 = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(gv_objectiveDestroyDominionBase6, "", gv_primalHivesKilled, 4); + ObjectiveCreate(StringExternal("Param/Value/55CE045C"), StringToText(""), c_objectiveStateHidden, false); + gv_objective_DestroyPrimalHives = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objective_DestroyPrimalHives, lv_category, "", gv_primalHivesKilled, 4, true); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_DestroyPrimalHives, gv_LOCATION_ID_EAST_PROXY_PRIMAL_HIVE); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_DestroyPrimalHives, gv_LOCATION_ID_EAST_MAIN_PRIMAL_HIVE); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_DestroyPrimalHives, gv_LOCATION_ID_SOUTH_PROXY_PRIMAL_HIVE); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_DestroyPrimalHives, gv_LOCATION_ID_SOUTH_MAIN_PRIMAL_HIVE); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_DestroyPrimalHives, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6916,7 +6993,7 @@ bool gt_ObjectiveDestroyPrimalHivesUpdate_Func (bool testConds, bool runActions) } TriggerExecute(gt_ObjectiveDestroyPrimalHivesCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase6, gv_primalHivesKilled); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objective_DestroyPrimalHives, gv_primalHivesKilled); if ((gv_primalHivesKilled == 4)) { TriggerExecute(gt_ObjectiveDestroyPrimalHivesComplete, true, false); } @@ -6947,7 +7024,7 @@ bool gt_ObjectiveDestroyPrimalHivesComplete_Func (bool testConds, bool runAction } TriggerExecute(gt_ObjectiveDestroyPrimalHivesCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase6); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objective_DestroyPrimalHives); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8186,7 +8263,7 @@ bool gt_EssencePoolAbsorbedCenter_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_CENTER_ESSENCE_POOL); return true; } @@ -8226,7 +8303,7 @@ bool gt_EssencePoolAbsorbedEast_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_EAST_ESSENCE_POOL); return true; } @@ -8266,7 +8343,7 @@ bool gt_EssencePoolAbsorbedSouth_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTH_ESSENCE_POOL); return true; } @@ -8301,7 +8378,7 @@ bool gt_SouthProxyHive_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTH_PROXY_PRIMAL_HIVE); return true; } @@ -8336,7 +8413,7 @@ bool gt_EastProxyHive_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(6); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_EAST_PROXY_PRIMAL_HIVE); return true; } @@ -8371,7 +8448,7 @@ bool gt_SouthMainHive_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(7); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTH_MAIN_PRIMAL_HIVE); return true; } @@ -8406,7 +8483,7 @@ bool gt_EastMainHive_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(8); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_EAST_MAIN_PRIMAL_HIVE); return true; } @@ -8525,6 +8602,7 @@ void InitTriggers () { gt_ObjectiveCollectEssenceCreate_Init(); gt_ObjectiveCollectEssenceUpdate_Init(); gt_ObjectiveCollectEssenceComplete_Init(); + gt_ObjectiveCollectEssenceRemove_Init(); gt_ObjectiveDestroyPrimalHivesCreate_Init(); gt_ObjectiveDestroyPrimalHivesUpdate_Init(); gt_ObjectiveDestroyPrimalHivesComplete_Init(); diff --git a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/Preload.xml index 0f98bbda5..915c08d82 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/Preload.xml +++ b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/Preload.xml @@ -46,10 +46,6 @@ - - - - diff --git a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/Triggers index 215c8a2e1..9c2fb8590 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/Triggers @@ -7833,22 +7833,21 @@ - + - - + + - + - - - 4 - + + + @@ -47772,7 +47771,7 @@ - + @@ -47791,12 +47790,12 @@ true - - - + + + - - + + @@ -50235,7 +50234,6 @@ - objectiveDestroyDominionBase @@ -50250,8 +50248,10 @@ - - + + + + @@ -50334,66 +50334,96 @@ - - - - - - - - - - - - ZZerus01Objective01 - - + + + + + - - - 0 - + + + - - - + + - - - + + + - - - + + + + + + + + + + + + + + + + - - - - - - + + + - - - + + + - - + + + - - + + + + + + ZZerus01Objective01 - - - + + + false + - - - 0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -50461,7 +50491,6 @@ - @@ -50523,37 +50552,6 @@ Update - - - - - - - - - - - - ZZerus01Objective01 - - - - - - - - - - - - - - - - - - - @@ -50572,8 +50570,6 @@ - - @@ -50637,38 +50633,6 @@ Update the objective - - - - - - - - - - - - - ZZerus01Objective01 - - - - - - - - - - - - - - - - ZZerus01Objective02 - - - @@ -50704,7 +50668,6 @@ - @@ -50782,22 +50745,6 @@ Update the objective - - - - - - - - - - - - - ZZerus01Objective01 - - - @@ -50814,7 +50761,6 @@ - objectiveDestroyDominionBase2 @@ -50829,7 +50775,9 @@ - + + + @@ -50909,34 +50857,83 @@ - - - - - - + + + + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + ZZerus01Objective02 - - - + + + false + - - - 0 - + + + + + + + + + + + + + + + + @@ -50956,7 +50953,6 @@ - @@ -51019,42 +51015,6 @@ Update - - - - - - - - - - - - - ZZerus01Objective02 - - - - - - - - - - - - - - - - - - - - - - - @@ -51086,7 +51046,6 @@ - @@ -51149,22 +51108,6 @@ Update the objective - - - - - - - - - - - - - ZZerus01Objective02 - - - @@ -51192,7 +51135,6 @@ - @@ -51270,22 +51212,6 @@ Update the objective - - - - - - - - - - - - - ZZerus01Objective02 - - - @@ -51301,7 +51227,6 @@ - objectiveDestroyDominionBase3 @@ -51316,7 +51241,10 @@ - + + + + @@ -51396,34 +51324,71 @@ - - - - - - + + + + + - - - + + + - - + + - - - ZZerus01Objective012 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -51443,7 +51408,6 @@ - @@ -51506,22 +51470,6 @@ Update the objective - - - - - - - - - - - - - ZZerus01Objective012 - - - @@ -51549,7 +51497,6 @@ - @@ -51627,22 +51574,6 @@ Update the objective - - - - - - - - - - - - - ZZerus01Objective012 - - - @@ -51657,9 +51588,9 @@ + - objectiveDestroyDominionBase4 @@ -51669,7 +51600,6 @@ - objectiveDestroyDominionBase5 @@ -51680,15 +51610,30 @@ + - - + + + + + + + + + + + + + + + + @@ -51766,65 +51711,122 @@ - - - - - - - - - - - - ZZerus01Objective03 - - + + + + + - - - 0 - + + + - - - + + - - - + + + - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + + - - - + + + - - + + + - - + + ZZerus01Objective03 - - - + + + true + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -51844,7 +51846,6 @@ - @@ -51907,37 +51908,6 @@ Update - - - - - - - - - - - - ZZerus01Objective03 - - - - - - - - - - - - - - - - - - - @@ -52001,7 +51971,6 @@ - @@ -52064,22 +52033,6 @@ Update the objective - - - - - - - - - - - - - ZZerus01Objective03 - - - @@ -52101,6 +52054,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + 2.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -52108,7 +52322,6 @@ - objectiveDestroyDominionBase6 @@ -52118,14 +52331,30 @@ + - + + + + + + + + + + + + + + + + @@ -52190,7 +52419,7 @@ - + @@ -52216,30 +52445,106 @@ - - - - - - - - - + + + + + + + + + + + - - + + - - + + - - + + 4 + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -63808,6 +64113,7 @@ + @@ -63821,6 +64127,112 @@ + + + + + + + + + + + + LOCATION_ID_CENTER_ESSENCE_POOL + + + + + + + + 1 + + + + LOCATION_ID_EAST_ESSENCE_POOL + + + + + + + + 2 + + + + LOCATION_ID_SOUTH_ESSENCE_POOL + + + + + + + + 3 + + + + LOCATION_ID_FINISH_FEEDING + + + + + + + + 4 + + + + LOCATION_ID_SOUTH_PROXY_PRIMAL_HIVE + + + + + + + + 5 + + + + LOCATION_ID_EAST_PROXY_PRIMAL_HIVE + + + + + + + + 6 + + + + LOCATION_ID_SOUTH_MAIN_PRIMAL_HIVE + + + + + + + + 7 + + + + LOCATION_ID_EAST_MAIN_PRIMAL_HIVE + + + + + + + + 8 + + @@ -64196,7 +64608,7 @@ - + @@ -64416,14 +64828,13 @@ - - - + + + - - - 1 - + + + @@ -64432,7 +64843,7 @@ - + @@ -64652,14 +65063,13 @@ - - - + + + - - - 2 - + + + @@ -64668,7 +65078,7 @@ - + @@ -64888,21 +65298,20 @@ - - - + + + - - - 3 - + + + - + @@ -64981,21 +65390,20 @@ true - - - + + + - - - 5 - + + + - + @@ -65074,21 +65482,20 @@ true - - - + + + - - - 6 - + + + - + @@ -65167,21 +65574,20 @@ true - - - + + + - - - 7 - + + + - + @@ -65260,13 +65666,12 @@ true - - - + + + - - - 8 - + + + \ No newline at end of file diff --git a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/Triggers.version index a2ddfab7b..8226ce5ee 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/Triggers.version differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt index 16964abfa..17e0e6053 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -56,7 +56,6 @@ Param/Value/C4DBB38E=Brakk Param/Value/C9E9A6D5=Hive Cluster Param/Value/CAFE30AC=Strange Creature Param/Value/CBBE2AC9=Spire -Param/Value/CEB0D364= Destroyed Param/Value/DBA07935=Quillgor Biomass Param/Value/DCBCB90F=Enables air units and upgrades. Param/Value/DF2D61EA=Quillgor Corpse diff --git a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 3ed3c8a03..ac6d7a3f7 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/HotS/ap_waking_the_ancient.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -3,6 +3,7 @@ Category/Name/112E6769======== ARCHIPELAGO ======= Category/Name/13E49E8C=Victory Cinematic Category/Name/15E4A2A9=Progress Bar UI Category/Name/2AC6F93A=Custom Revealers +Category/Name/379071B2=Location IDs Category/Name/420BA6AA=Primary Objective - Meat Eaten by Enemy Category/Name/4C220BE4=Dehaka Category/Name/508DA2A6=Debug @@ -209,6 +210,7 @@ Trigger/Name/5CA39118=Init 03b Respawn Order Trigger/Name/5E445AED=Achievement: Kill Primal Hives N/H Trigger/Name/5EAF96AD=Spawn Quillgor Camps Trigger/Name/5EF7EC68=Objective Quillgor Meat Enemy Complete +Trigger/Name/5F823A21=Objective Collect Essence Remove Trigger/Name/5FDCE4D3=First Quillgor Attacked Trigger/Name/62C870F4=Objective Quillgor Meat Enemy Update Trigger/Name/6404A9A0=Objective Harvest Meat Update @@ -297,6 +299,7 @@ Variable/Name/0866828C=Dehaka Encounter Count Variable/Name/08BC4986=QuillgorCampCorpseHarvestedByDrone Variable/Name/09757A57=CampIndex Variable/Name/097FF5C7=CampIndex +Variable/Name/0A1720BA=LOCATION_ID_FINISH_FEEDING Variable/Name/0AA60DA0=SPORE_RAY_MAX_COUNT Variable/Name/0C30374D=QuillgorCampSpawned Variable/Name/0D58531A=MidMusicCompleted @@ -352,6 +355,7 @@ Variable/Name/3E120835=Corpse_PerCamp Variable/Name/3E5CC42D=Location Variable/Name/3FD0AA20=CampIndex Variable/Name/40E46619=Defending Unit +Variable/Name/421DF10D=LOCATION_ID_SOUTH_PROXY_PRIMAL_HIVE Variable/Name/4267E15F=Player Units Variable/Name/42FB7810=SpawnLocation Variable/Name/43FC7E96=IntroMutalisks @@ -359,6 +363,7 @@ Variable/Name/4437DCC3=MapMusicTrack Variable/Name/46FAA7E8=AllVisible Variable/Name/47D27DBA=CinematicStinger1 Variable/Name/49317728=CampLevel +Variable/Name/4AFCF866=category Variable/Name/4C7C8140=VictoryZurvanSound Variable/Name/506694A5=AIReactionaryGroups Variable/Name/509BAB65=IndexUnit @@ -377,6 +382,7 @@ Variable/Name/5A4FCAA2=currentUnit Variable/Name/5B90AE9C=MeatMovedByPlayer Variable/Name/5C3AD4DF=THE_ONE_DEHAKA Variable/Name/600AAE7C=CampIndex +Variable/Name/601D7474=LOCATION_ID_EAST_PROXY_PRIMAL_HIVE Variable/Name/61BE84E2=currentUnit Variable/Name/61C9C3D5=CorpseCamps Variable/Name/63E1C3FB=CampsInLevel @@ -390,6 +396,7 @@ Variable/Name/6987AB54=Objective_Collect Essence Variable/Name/6A313F63=C_Height Variable/Name/6B8BE065=Distance Variable/Name/6BFD465C=IntroQuillgor +Variable/Name/6C67ABFA=LOCATION_ID_SOUTH_ESSENCE_POOL Variable/Name/6C708A53=BrakkStartedDestroyingMeat Variable/Name/6E4D423A=QuillgorCampRevealer Variable/Name/6EC017BE=MeatDialogProgressBar @@ -502,12 +509,15 @@ Variable/Name/D8198808=P04_ZERG_REACTIONARY Variable/Name/D85B1D11=IntroDrone Variable/Name/D932FEC1=Enemies Variable/Name/DA1DF8D5=CinematicHiddenUnits +Variable/Name/DA3A1EE9=category Variable/Name/DAAA21C2=PrimalCritterAttackers Variable/Name/DB21651B=CinematicPausedUnits +Variable/Name/DB8B344E=LOCATION_ID_SOUTH_MAIN_PRIMAL_HIVE Variable/Name/DC00FE9D=targetUnit Variable/Name/DC366046=Visible Variable/Name/DC380429=PrimalCritterTargets Variable/Name/DE447A01=Score_Enemy +Variable/Name/E0BA0ECB=LOCATION_ID_EAST_MAIN_PRIMAL_HIVE Variable/Name/E1D12D11=Location Variable/Name/E45533C6=P05_ZERG_HARVESTERS Variable/Name/E474C973=HarvestIndex @@ -515,6 +525,7 @@ Variable/Name/E4A02F1D=C_Width Variable/Name/E4B8C3E1=EnemyPlayers Variable/Name/E4E0F762=Score_Quota_Player Variable/Name/E64898D0=Harvester +Variable/Name/E6523BB5=LOCATION_ID_CENTER_ESSENCE_POOL Variable/Name/E68E6D5C=DroneBeingAttackedTimes Variable/Name/E6BD7AE8=index Variable/Name/E8290BA2=C_CORPSE_LIFEMAX @@ -537,3 +548,4 @@ Variable/Name/FBB5DCA9=P01_USER Variable/Name/FC6050DD=ClosestEnemy Variable/Name/FEB67088=INT Variable/Name/FEFFCB3E=HarvestIndex +Variable/Name/FF65D31F=LOCATION_ID_EAST_ESSENCE_POOL