diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/ComponentList.SC2Components index ddca4d875..8ec37b9e7 100644 --- a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData GameText DocumentInfo diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/DocumentHeader index 4e0bbf6c6..0493ebfe0 100644 Binary files a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/DocumentHeader differ diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/MapScript.galaxy index 90e5b5701..5bfcf2c2f 100644 --- a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/MapScript.galaxy @@ -193,7 +193,7 @@ int gv_unitsDestroyedByKerrigan; int gv_unitsLostToTerrainDestruction; int gv_tripleTapCounter; bool gv_achievementConstructedSpire; -int gv_objectiveDestroyZergBase; +int gv_objective_DestroyCrystals; unitgroup gv_cinematicHiddenUnits; unitgroup gv_cinematicTempUnits; bool gv_cinematicCompleted; @@ -265,7 +265,7 @@ void InitGlobals () { } gv_numberOfWorldCleaverBaseAreas = 9; gv_numberOfWorldCleaverFieldAreas = 6; - gv_objectiveDestroyZergBase = c_invalidObjectiveId; + gv_objective_DestroyCrystals = c_invalidObjectiveId; gv_cinematicHiddenUnits = UnitGroupEmpty(); gv_cinematicTempUnits = UnitGroupEmpty(); gv_cinematicPausedUnits = UnitGroupEmpty(); @@ -5668,7 +5668,7 @@ bool gt_VictorySequence_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); libVCMI_gf_GameOver(libVCMI_ge_CampaignMissionGameResultType_Victory); Wait(2.0, c_timeReal); libVoiC_gf_CampaignAwardAchievement("SC2Epilogue03_1", gv_pLAYER_01_USER); @@ -5945,8 +5945,12 @@ bool gt_ObjectiveDestroyCrystalsCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libVCMI_gf_CreateObjectiveCampaign("SC2Epilogue03Primary01"); - gv_objectiveDestroyZergBase = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "SC2Epilogue03Primary01", "", gv_crystalsDestroyed); + gv_objective_DestroyCrystals = ObjectiveLastCreated(); + ObjectiveSetName(gv_objective_DestroyCrystals, libVoiC_gf_MissionObjectiveName("SC2Epilogue03Primary01")); + ObjectiveShow(gv_objective_DestroyCrystals, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objective_DestroyCrystals, lib5BD4895D_ge_APObjectiveCategory_Primary, "", gv_crystalsDestroyed, libVoiC_gf_MissionObjectiveItemCount("SC2Epilogue03Primary01"), false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_DestroyCrystals, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_DestroyCrystals, true); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -5975,7 +5979,7 @@ bool gt_ObjectiveDestroyCrystalsComplete_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveDestroyCrystalsCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyZergBase); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objective_DestroyCrystals); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -5996,7 +6000,7 @@ bool gt_ObjectiveDestroyCrystalsUpdate_Func (bool testConds, bool runActions) { } TriggerExecute(gt_ObjectiveDestroyCrystalsCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyZergBase, gv_crystalsDestroyed); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objective_DestroyCrystals, gv_crystalsDestroyed); return true; } diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Preload.xml index e02cce0d8..3a7e8e9bf 100644 --- a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Preload.xml +++ b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Preload.xml @@ -47,7 +47,6 @@ - diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Triggers b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Triggers index 5402c8a22..54d7532fe 100644 --- a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Triggers @@ -8,11 +8,22 @@ + + + + + + + Placeholder as this doesn't have any locations other than victory + Format: LOCATION_ID_NAME_OF_LOC + Value: Integer, Constant + + @@ -74956,11 +74967,11 @@ - - + + - - + + @@ -76488,7 +76499,6 @@ - objectiveDestroyZergBase @@ -76502,8 +76512,11 @@ - - + + + + + @@ -76579,53 +76592,119 @@ - - - - - - + + + + - - - + + + - - + + + - - + + SC2Epilogue03Primary01 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + - - - + + + - - - + + + SC2Epilogue03Primary01 + + - - - - + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -76760,7 +76839,6 @@ - @@ -76792,22 +76870,6 @@ Update the campaign progress for this objective. This must be done whenever an objective's progress changes. - - - - - - - - - SC2Epilogue03Primary01 - - - - - - - diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Triggers.version index 57dce9020..f3c18f3c7 100644 Binary files a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Triggers.version differ diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 20e695eed..5ee4c152d 100644 --- a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -14,6 +14,7 @@ Category/Name/A16CC4BB=Global Variables Category/Name/AB2872B7=World Cleavers Category/Name/ACE330BC======== MAIN ======= Category/Name/B21359E5=Kerrigan +Category/Name/BDABF86E=Location IDs Category/Name/CCF07DD9=Raynor Category/Name/CD00E451=AI Category/Name/CD165228=Constructs diff --git a/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/ComponentList.SC2Components index 18c26f94b..d03ed05d6 100644 --- a/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData GameText DocumentInfo diff --git a/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/DocumentHeader index bcfd4b353..451c86b01 100644 Binary files a/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/DocumentHeader differ diff --git a/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/MapScript.galaxy index 17194370a..784703a82 100644 --- a/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/MapScript.galaxy @@ -43,6 +43,11 @@ void InitLibs () { //-------------------------------------------------------------------------------------------------- // Constants //-------------------------------------------------------------------------------------------------- +const int gv_LOCATION_ID_CORRUPTION_SOURCE = 1; +const int gv_LOCATION_ID_SOUTHWEST_FORWARD_POSITION = 2; +const int gv_LOCATION_ID_NORTHWEST_FORWARD_POSITION = 3; +const int gv_LOCATION_ID_SOUTHEAST_FORWARD_POSITION = 4; +const int gv_LOCATION_ID_NORTHEAST_FORWARD_POSITION = 5; const int gv_pLAYER_01_USER = 1; const int gv_pLAYER_02_RAYNOR = 2; const int gv_pLAYER_03_KERRIGAN = 3; @@ -3782,7 +3787,7 @@ bool gt_S1FirstVoidCorruptionDiesQ_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_CORRUPTION_SOURCE); PingDestroy(libHots_gf_PingStoredForUnit(gv_s1_VoidCorruption, 1)); auto7DE0A72C_g = UnitGroup("ShadowCloudEpilogue01", c_playerAny, lv_towerRegion, UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); auto7DE0A72C_u = UnitGroupCount(auto7DE0A72C_g, c_unitCountAll); @@ -4404,7 +4409,7 @@ bool gt_BonusObjectiveCleared01Q_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHWEST_FORWARD_POSITION); PingDestroy(gv_bonusObjectivePing01); gv_bonusObjectiveComplete01 = true; gv_objectiveEstablishAllyExpansionsCount += 1; @@ -4482,7 +4487,7 @@ bool gt_BonusObjectiveCleared02Q_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTHWEST_FORWARD_POSITION); PingDestroy(gv_bonusObjectivePing02); gv_bonusObjectiveComplete02 = true; gv_objectiveEstablishAllyExpansionsCount += 1; @@ -4566,7 +4571,7 @@ bool gt_BonusObjectiveCleared03Q_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHEAST_FORWARD_POSITION); PingDestroy(gv_bonusObjectivePing03); gv_bonusObjectiveComplete03 = true; gv_objectiveEstablishAllyExpansionsCount += 1; @@ -4650,7 +4655,7 @@ bool gt_BonusObjectiveCleared04Q_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTHEAST_FORWARD_POSITION); PingDestroy(gv_bonusObjectivePing04); gv_bonusObjectiveComplete04 = true; gv_objectiveEstablishAllyExpansionsCount += 1; @@ -4887,7 +4892,7 @@ bool gt_VictorySequence_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); libVCMI_gf_GameOver(libVCMI_ge_CampaignMissionGameResultType_Victory); libNtve_gf_PauseUnit(gv_narud, true); TriggerExecute(gt_ObjectiveDefeatNarudComplete, true, true); @@ -8539,7 +8544,10 @@ bool gt_ObjectiveFindCorruptionSourceCreate_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); libVCMI_gf_CreateObjectiveCampaign("SC2Epilogue01Primary03"); gv_objectiveFindCorruptionSource = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "SC2Epilogue01Primary03", "", 0); + ObjectiveShow(gv_objectiveFindCorruptionSource, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveFindCorruptionSource, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindCorruptionSource, gv_LOCATION_ID_CORRUPTION_SOURCE); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveFindCorruptionSource, true); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8632,7 +8640,10 @@ bool gt_ObjectiveDefeatNarudCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libVCMI_gf_CreateObjectiveCampaign("SC2Epilogue01Primary01"); gv_objectiveDefeatNarud = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "SC2Epilogue01Primary01", "", 0); + ObjectiveShow(gv_objectiveDefeatNarud, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveDefeatNarud, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDefeatNarud, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDefeatNarud, true); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8725,7 +8736,9 @@ bool gt_ObjectiveAlliesMustSurviveCreate_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); libVCMI_gf_CreateObjectiveCampaign("SC2Epilogue01Primary02"); gv_objectiveAlliesMustSurvive = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "SC2Epilogue01Primary02", "", 0); + ObjectiveShow(gv_objectiveAlliesMustSurvive, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveAlliesMustSurvive, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveAlliesMustSurvive, true); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8803,7 +8816,13 @@ void gt_ObjectiveAlliesMustSurviveFailed_Init () { // Trigger: Objective Establish Ally Expansions Create //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveEstablishAllyExpansionsCreate_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))) { @@ -8822,7 +8841,14 @@ bool gt_ObjectiveEstablishAllyExpansionsCreate_Func (bool testConds, bool runAct } libVCMI_gf_CreateObjectiveCampaign("SC2Epilogue01Bonus01"); gv_objectiveEstablishAllyExpansions = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "SC2Epilogue01Bonus01", "", gv_objectiveEstablishAllyExpansionsCount); + ObjectiveSetName(gv_objectiveEstablishAllyExpansions, libVoiC_gf_MissionObjectiveName("SC2Epilogue01Bonus01")); + ObjectiveShow(gv_objectiveEstablishAllyExpansions, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveEstablishAllyExpansions, lv_category, "", gv_objectiveEstablishAllyExpansionsCount, gv_objectiveEstablishAllyExpansionsMax, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveEstablishAllyExpansions, gv_LOCATION_ID_SOUTHWEST_FORWARD_POSITION); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveEstablishAllyExpansions, gv_LOCATION_ID_NORTHWEST_FORWARD_POSITION); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveEstablishAllyExpansions, gv_LOCATION_ID_SOUTHEAST_FORWARD_POSITION); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveEstablishAllyExpansions, gv_LOCATION_ID_NORTHEAST_FORWARD_POSITION); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveEstablishAllyExpansions, true); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -9609,8 +9635,7 @@ bool gt_MidCleanup_Func (bool testConds, bool runActions) { TriggerEnable(gt_DefeatUnitsDead, false); TriggerEnable(gt_DefeatBaseDead, true); TriggerEnable(gt_DefeatPrimaryObjectiveFailed, true); - ObjectiveShow(gv_objectiveFindCorruptionSource, PlayerGroupAll(), false); - lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveFindCorruptionSource); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveFindCorruptionSource, false); gv_missionStage = 2; UnitRemove(gv_s1_VoidRift01); auto50063EDF_g = UnitGroup(null, gv_pLAYER_05_VOIDFORCES, RegionFromId(48), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); diff --git a/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/Preload.xml index a92e13c2c..d493e758c 100644 --- a/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/Preload.xml +++ b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/Preload.xml @@ -36,10 +36,6 @@ - - - - diff --git a/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/Triggers b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/Triggers index 6ffdb3982..d6b2f4e4d 100644 --- a/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/Triggers @@ -8,6 +8,7 @@ + @@ -15,6 +16,73 @@ + + + + + + + + + LOCATION_ID_CORRUPTION_SOURCE + + + + + + + + 1 + + + + LOCATION_ID_SOUTHWEST_FORWARD_POSITION + + + + + + + + 2 + + + + LOCATION_ID_NORTHWEST_FORWARD_POSITION + + + + + + + + 3 + + + + LOCATION_ID_SOUTHEAST_FORWARD_POSITION + + + + + + + + 4 + + + + LOCATION_ID_NORTHEAST_FORWARD_POSITION + + + + + + + + 5 + + @@ -18881,7 +18949,7 @@ - + @@ -19070,14 +19138,13 @@ - - - + + + - - - 1 - + + + @@ -24395,7 +24462,7 @@ - + @@ -24588,14 +24655,13 @@ - - - + + + - - - 2 - + + + @@ -25212,7 +25278,7 @@ - + @@ -25405,14 +25471,13 @@ - - - + + + - - - 3 - + + + @@ -26030,7 +26095,7 @@ - + @@ -26233,14 +26298,13 @@ - - - + + + - - - 4 - + + + @@ -26927,7 +26991,7 @@ - + @@ -27135,14 +27199,13 @@ - - - + + + - - - 5 - + + + @@ -32526,7 +32589,7 @@ - + @@ -32581,12 +32644,12 @@ - - - + + + - - + + @@ -70268,7 +70331,10 @@ - + + + + @@ -70350,34 +70416,71 @@ - - - - - - + + + + + - - - + + + - - + + - - - SC2Epilogue01Primary03 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -70711,7 +70814,10 @@ - + + + + @@ -70793,34 +70899,71 @@ - - - - - - + + + + + - - - + + + - - + + - - - SC2Epilogue01Primary01 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -71149,7 +71292,9 @@ - + + + @@ -71231,34 +71376,58 @@ - - - - - - + + + + + - - - + + + - - + + - - - SC2Epilogue01Primary02 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + @@ -71620,6 +71789,7 @@ + @@ -71627,11 +71797,27 @@ - - + + + + + + + + + + + + + + + + + + - - - - - - - - - SC2Epilogue01Bonus01 - - - - - - - @@ -79069,8 +79337,7 @@ - - + @@ -79470,34 +79737,18 @@ - - - - - - - - - - - - - - - - + + + + - - + + - - - - - - - + + + diff --git a/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/Triggers.version index 8abee6a6c..dad065656 100644 Binary files a/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/Triggers.version differ diff --git a/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 2d4d9d755..9c9d74876 100644 --- a/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -9,6 +9,7 @@ Category/Name/42AD4CFE=Bonus Objective Category/Name/532F1FFB=Difficulty Category/Name/58696F18=Victory/Defeat Category/Name/6E70CBDC======== OBJECTIVES ======= +Category/Name/7219BF8D=Location IDs Category/Name/74D2A13C=Performance Category/Name/7E51EE7C=Attack Waves Category/Name/8205DCF6======== ARCHIPELAGO ======= @@ -268,6 +269,7 @@ Variable/Name/059F2D17=StalkerUnitGroup Variable/Name/05C53BD8=CinematicProtossArmy Variable/Name/07410BF0=S1_VoidCorruption Variable/Name/08F866E7=TowerRegion +Variable/Name/0A58D5D4=LOCATION_ID_SOUTHWEST_FORWARD_POSITION Variable/Name/0B4384BE=DropPodUnits01 Variable/Name/0C3EF59A=RiftIndex Variable/Name/0D7B5A81=FadeDuration @@ -345,10 +347,12 @@ Variable/Name/59D8E3CB=Medivac2 Variable/Name/5A4100AF=PerformanceUnitsBonus Variable/Name/5AB0A65B=Revealer02 Variable/Name/5E5AA5D5=VoidRiftPoint +Variable/Name/5E74E115=LOCATION_ID_NORTHEAST_FORWARD_POSITION Variable/Name/6044EE78=CinematicCelestialTower Variable/Name/642B36AD=ZealotUnitGroup Variable/Name/64BFA907=MissionStage Variable/Name/65FB2727=IndexUnit +Variable/Name/66366BEC=LOCATION_ID_NORTHWEST_FORWARD_POSITION Variable/Name/668A7746=Medivac1 Variable/Name/67126AA8=BonusObjectivePing03 Variable/Name/6809F284=CinematicStukov @@ -360,6 +364,7 @@ Variable/Name/6C86DE46=CinematicArtanis Variable/Name/6ED4F895=i Variable/Name/6FBC1648=AttackPathWaypointString Variable/Name/71240057=AbilityCommand +Variable/Name/71B75BCC=LOCATION_ID_CORRUPTION_SOURCE Variable/Name/722844F5=Cargo1 Variable/Name/726116FF=VoidThrasherSummonedUnitCap Variable/Name/73409D5D=DropPodUnits01 @@ -408,6 +413,7 @@ Variable/Name/A16C6258=DefendRegion Variable/Name/A1E9E2BE=VoidCorruptionDestroyed Variable/Name/A30261D2=ClampLeft Variable/Name/A3BCDBD3=ObjectiveEstablishAllyExpansionsCount +Variable/Name/A4205B95=LOCATION_ID_SOUTHEAST_FORWARD_POSITION Variable/Name/A429EB02=LastSentTransmission Variable/Name/A4D28899=PLAYER_04_NARUD Variable/Name/A5DC6276=DropPodUnits02 @@ -439,6 +445,7 @@ Variable/Name/BB857AD2=hivePosition Variable/Name/BBA48BB0=Point Variable/Name/BCEF3D23=PLAYER_06_VOIDFORCES Variable/Name/C20E47D8=BonusObjectivePing02 +Variable/Name/C29BD057=category Variable/Name/C760B6B8=FadeDuration Variable/Name/C7B01BE3=NarudRiftsMax Variable/Name/C865F12E=DropPodUnits02 diff --git a/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/ComponentList.SC2Components index 360bfe07f..ce6e7eb74 100644 --- a/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData GameText DocumentInfo diff --git a/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/DocumentHeader index 7520b6f16..e5c360bd8 100644 Binary files a/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/DocumentHeader differ diff --git a/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/MapScript.galaxy index 0cbbf5fe7..0ce86c1bf 100644 --- a/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/MapScript.galaxy @@ -40,6 +40,7 @@ void InitLibs () { //-------------------------------------------------------------------------------------------------- // Constants //-------------------------------------------------------------------------------------------------- +const int gv_LOCATION_ID_VOID_THRASHERS = 1; const int gv_pLAYER_01_USER = 1; const int gv_pLAYER_02_DOMINION = 2; const int gv_pLAYER_02_DOMINION2 = 3; @@ -89,12 +90,12 @@ bool gv_celestialAchievementAwarded; unitgroup gv_resourcePickups; int gv_resourcePickupsCollected; int gv_resourcePickupsTotal; -int gv_objectiveDestroyZergBase2; -int gv_objectiveDestroyZergBase3; -int gv_objectiveDestroyZergBase; -int gv_objectiveDestroyZergBase4; -int gv_objectiveRescueStalkers; -int gv_objectiveRescueStalkers2; +int gv_objectiveDestroyVoidForces; +int gv_objectiveKerriganMustSurvive; +int gv_objectiveDefendKerrigan; +int gv_objectiveKerriganMustSurvive2; +int gv_objectiveProtossSurvival; +int gv_objectiveZergSurvival; unitgroup gv_cinematicHiddenUnits; unitgroup gv_cinematicPausedUnits; unitgroup gv_cinematicTempUnits; @@ -137,12 +138,12 @@ void InitGlobals () { gv_voidThrasherTerrainHideRegion = RegionFromId(30); gv_kerriganLifeAchievementThreshold = 1500.0; gv_resourcePickups = UnitGroupEmpty(); - gv_objectiveDestroyZergBase2 = c_invalidObjectiveId; - gv_objectiveDestroyZergBase3 = c_invalidObjectiveId; - gv_objectiveDestroyZergBase = c_invalidObjectiveId; - gv_objectiveDestroyZergBase4 = c_invalidObjectiveId; - gv_objectiveRescueStalkers = c_invalidObjectiveId; - gv_objectiveRescueStalkers2 = c_invalidObjectiveId; + gv_objectiveDestroyVoidForces = c_invalidObjectiveId; + gv_objectiveKerriganMustSurvive = c_invalidObjectiveId; + gv_objectiveDefendKerrigan = c_invalidObjectiveId; + gv_objectiveKerriganMustSurvive2 = c_invalidObjectiveId; + gv_objectiveProtossSurvival = c_invalidObjectiveId; + gv_objectiveZergSurvival = c_invalidObjectiveId; gv_cinematicHiddenUnits = UnitGroupEmpty(); gv_cinematicPausedUnits = UnitGroupEmpty(); gv_cinematicTempUnits = UnitGroupEmpty(); @@ -6714,7 +6715,7 @@ bool gt_DefeatKerriganDied_Func (bool testConds, bool runActions) { TriggerQueuePause(true); TriggerQueueClear(c_triggerQueueRemove); Wait(2.0, c_timeReal); - if ((ObjectiveVisible(gv_objectiveDestroyZergBase3, gv_pLAYER_01_USER) == true)) { + if ((ObjectiveVisible(gv_objectiveKerriganMustSurvive, gv_pLAYER_01_USER) == true)) { TriggerExecute(gt_ObjectiveKerriganMustSurviveFailed, true, false); } else { @@ -6783,7 +6784,7 @@ bool gt_VictorySequence_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); libVCMI_gf_GameOver(libVCMI_ge_CampaignMissionGameResultType_Victory); Wait(2.0, c_timeReal); TriggerExecute(gt_ObjectiveProtossSurvivalComplete, true, true); @@ -7015,9 +7016,12 @@ bool gt_ObjectiveDestroyVoidForcesCreate_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); libVCMI_gf_CreateObjectiveCampaign("SC2Epilogue02Primary01"); - gv_objectiveDestroyZergBase2 = ObjectiveLastCreated(); - ObjectiveSetPriority(ObjectiveLastCreated(), 3); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "SC2Epilogue02Primary01", "", 0); + gv_objectiveDestroyVoidForces = ObjectiveLastCreated(); + ObjectiveSetPriority(gv_objectiveDestroyVoidForces, 3); + ObjectiveShow(gv_objectiveDestroyVoidForces, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveDestroyVoidForces, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyVoidForces, gv_LOCATION_ID_VOID_THRASHERS); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyVoidForces, true); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7049,7 +7053,7 @@ bool gt_ObjectiveDestroyVoidForcesComplete_Func (bool testConds, bool runActions Wait(1.0, c_timeGame); } TriggerExecute(gt_ObjectiveDestroyVoidForcesCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyZergBase2); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyVoidForces); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7081,7 +7085,7 @@ bool gt_ObjectiveDestroyVoidForcesFailed_Func (bool testConds, bool runActions) Wait(1.0, c_timeGame); } TriggerExecute(gt_ObjectiveDestroyVoidForcesCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyZergBase2); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyVoidForces); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7110,9 +7114,11 @@ bool gt_ObjectiveKerriganMustSurviveCreate_Func (bool testConds, bool runActions TriggerEnable(TriggerGetCurrent(), false); libVCMI_gf_CreateObjectiveCampaign("SC2Epilogue02Primary02"); - gv_objectiveDestroyZergBase3 = ObjectiveLastCreated(); - ObjectiveSetPriority(ObjectiveLastCreated(), 3); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "SC2Epilogue02Primary02", "", 0); + gv_objectiveKerriganMustSurvive = ObjectiveLastCreated(); + ObjectiveSetPriority(gv_objectiveKerriganMustSurvive, 2); + ObjectiveShow(gv_objectiveKerriganMustSurvive, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveKerriganMustSurvive, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveKerriganMustSurvive, true); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7144,7 +7150,7 @@ bool gt_ObjectiveKerriganMustSurviveComplete_Func (bool testConds, bool runActio Wait(1.0, c_timeGame); } TriggerExecute(gt_ObjectiveKerriganMustSurviveCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyZergBase3); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveKerriganMustSurvive); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7176,7 +7182,7 @@ bool gt_ObjectiveKerriganMustSurviveFailed_Func (bool testConds, bool runActions Wait(1.0, c_timeGame); } TriggerExecute(gt_ObjectiveKerriganMustSurviveCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyZergBase3); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveKerriganMustSurvive); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7205,9 +7211,12 @@ bool gt_ObjectiveDefendKerriganCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libVCMI_gf_CreateObjectiveCampaign("SC2Epilogue02Primary03"); - gv_objectiveDestroyZergBase = ObjectiveLastCreated(); - ObjectiveSetPriority(ObjectiveLastCreated(), 3); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "SC2Epilogue02Primary03", "", 0); + gv_objectiveDefendKerrigan = ObjectiveLastCreated(); + ObjectiveSetPriority(gv_objectiveDefendKerrigan, 3); + ObjectiveShow(gv_objectiveDefendKerrigan, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveDefendKerrigan, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDefendKerrigan, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDefendKerrigan, true); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7239,7 +7248,7 @@ bool gt_ObjectiveDefendKerriganComplete_Func (bool testConds, bool runActions) { Wait(1.0, c_timeGame); } TriggerExecute(gt_ObjectiveDefendKerriganCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyZergBase); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDefendKerrigan); return true; } @@ -7270,7 +7279,7 @@ bool gt_ObjectiveDefendKerriganFailed_Func (bool testConds, bool runActions) { Wait(1.0, c_timeGame); } TriggerExecute(gt_ObjectiveDefendKerriganCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyZergBase); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDefendKerrigan); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7299,9 +7308,11 @@ bool gt_ObjectiveKerriganMustSurviveCreate2_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); libVCMI_gf_CreateObjectiveCampaign("SC2Epilogue02Primary02"); - gv_objectiveDestroyZergBase4 = ObjectiveLastCreated(); - ObjectiveSetPriority(ObjectiveLastCreated(), 3); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "SC2Epilogue02Primary02", "", 0); + gv_objectiveKerriganMustSurvive2 = ObjectiveLastCreated(); + ObjectiveSetPriority(gv_objectiveKerriganMustSurvive2, 2); + ObjectiveShow(gv_objectiveKerriganMustSurvive2, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveKerriganMustSurvive2, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveKerriganMustSurvive2, true); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7333,7 +7344,7 @@ bool gt_ObjectiveKerriganMustSurviveComplete2_Func (bool testConds, bool runActi Wait(1.0, c_timeGame); } TriggerExecute(gt_ObjectiveKerriganMustSurviveCreate2, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyZergBase4); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveKerriganMustSurvive2); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7365,7 +7376,7 @@ bool gt_ObjectiveKerriganMustSurviveFailed2_Func (bool testConds, bool runAction Wait(1.0, c_timeGame); } TriggerExecute(gt_ObjectiveKerriganMustSurviveCreate2, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyZergBase4); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveKerriganMustSurvive2); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7379,7 +7390,13 @@ void gt_ObjectiveKerriganMustSurviveFailed2_Init () { // Trigger: Objective Protoss Survival Create //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveProtossSurvivalCreate_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))) { @@ -7396,9 +7413,11 @@ bool gt_ObjectiveProtossSurvivalCreate_Func (bool testConds, bool runActions) { while (!((libNtve_gf_PlayerInCinematicMode(gv_pLAYER_01_USER) == false))) { Wait(1.0, c_timeGame); } - gv_objectiveRescueStalkers = ObjectiveLastCreated(); libVCMI_gf_CreateObjectiveCampaign("SC2Epilogue02Bonus02"); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "SC2Epilogue02Bonus02", "", 0); + gv_objectiveProtossSurvival = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveProtossSurvival, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveProtossSurvival, lv_category, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveProtossSurvival, true); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7427,7 +7446,7 @@ bool gt_ObjectiveProtossSurvivalComplete_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveProtossSurvivalCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveRescueStalkers); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveProtossSurvival); return true; } @@ -7459,7 +7478,7 @@ bool gt_ObjectiveProtossSurvivalFailedQ_Func (bool testConds, bool runActions) { } TriggerExecute(gt_ObjectiveProtossSurvivalCreate, true, false); TriggerQueueEnter(); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveRescueStalkers); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveProtossSurvival); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); return true; @@ -7474,7 +7493,13 @@ void gt_ObjectiveProtossSurvivalFailedQ_Init () { // Trigger: Objective Zerg Survival Create //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveZergSurvivalCreate_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))) { @@ -7492,8 +7517,10 @@ bool gt_ObjectiveZergSurvivalCreate_Func (bool testConds, bool runActions) { Wait(1.0, c_timeGame); } libVCMI_gf_CreateObjectiveCampaign("SC2Epilogue02Bonus01"); - gv_objectiveRescueStalkers2 = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "SC2Epilogue02Bonus01", "", 0); + gv_objectiveZergSurvival = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveZergSurvival, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveZergSurvival, lv_category, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveZergSurvival, true); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7522,7 +7549,7 @@ bool gt_ObjectiveZergSurvivalComplete_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveZergSurvivalCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveRescueStalkers2); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveZergSurvival); return true; } @@ -7554,7 +7581,7 @@ bool gt_ObjectiveZergSurvivalFailedQ_Func (bool testConds, bool runActions) { } TriggerExecute(gt_ObjectiveZergSurvivalCreate, true, false); TriggerQueueEnter(); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveRescueStalkers2); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveZergSurvival); Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); return true; @@ -8439,10 +8466,8 @@ bool gt_MidCleanup_Func (bool testConds, bool runActions) { Wait(0.0625, c_timeGame); SoundtrackStop(PlayerGroupAll(), c_soundtrackCategoryMusic, true); SoundtrackPlay(PlayerGroupAll(), c_soundtrackCategoryMusic, gv_mapMusicTrack, c_soundtrackCueAny, c_soundtrackIndexAny, true); - ObjectiveSetState(gv_objectiveDestroyZergBase2, c_objectiveStateHidden); - lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyZergBase2); - ObjectiveSetState(gv_objectiveDestroyZergBase3, c_objectiveStateHidden); - lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyZergBase3); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyVoidForces, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveKerriganMustSurvive, false); CameraApplyInfo(gv_pLAYER_01_USER, CameraInfoDefault(), 0.0, -1, 10, false); VisExploreArea(gv_pLAYER_01_USER, RegionEntireMap(), false, false); if ((libABFE498B_gv_aP_Triggers_skipCutscenes == false)) { @@ -8506,7 +8531,7 @@ bool gt_MidCleanup_Func (bool testConds, bool runActions) { TriggerExecute(gt_TransferProtossControlToPlayer, true, false); } - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_VOID_THRASHERS); TriggerExecute(gt_StartAI, true, false); Wait(0.5, c_timeReal); if ((gv_cinematicCompleted == true)) { diff --git a/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/Preload.xml index 57288be03..3ead14f49 100644 --- a/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/Preload.xml +++ b/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/Preload.xml @@ -39,11 +39,6 @@ - - - - - diff --git a/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/Triggers b/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/Triggers index dff53f73d..f34ad1112 100644 --- a/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/Triggers @@ -8,10 +8,26 @@ + + + + + + LOCATION_ID_VOID_THRASHERS + + + + + + + + 1 + + @@ -61124,7 +61140,7 @@ - + @@ -61180,12 +61196,12 @@ - - - + + + - - + + @@ -62183,7 +62199,6 @@ - objectiveDestroyZergBase2 @@ -62199,7 +62214,10 @@ - + + + + @@ -62288,44 +62306,78 @@ - - - - + 3 - - - - - - + + + + + - - - + + + - - + + - - - SC2Epilogue02Primary01 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -62658,7 +62710,6 @@ - objectiveDestroyZergBase3 @@ -62674,7 +62725,9 @@ - + + + @@ -62763,44 +62816,65 @@ - - - - + - 3 + 2 - - - - - - + + + + + - - - + + + - - + + - - - SC2Epilogue02Primary02 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + @@ -63133,7 +63207,6 @@ - objectiveDestroyZergBase @@ -63149,7 +63222,10 @@ - + + + + @@ -63238,44 +63314,78 @@ - - - - + 3 - - - - - - + + + + + - - - + + + - - + + - - - SC2Epilogue02Primary03 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -63588,7 +63698,6 @@ - objectiveDestroyZergBase4 @@ -63604,7 +63713,9 @@ - + + + @@ -63693,44 +63804,65 @@ - - - - + - 3 + 2 - - - - - - + + + + + - - - + + + - - + + - - - SC2Epilogue02Primary02 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + @@ -64063,7 +64195,6 @@ - objectiveRescueStalkers @@ -64073,16 +64204,29 @@ + - - + + + + + + + + + + + + + + @@ -64177,6 +64321,16 @@ Create the objective + + + + + + + SC2Epilogue02Bonus02 + + + @@ -64193,44 +64347,58 @@ - - - + + + + + - - - SC2Epilogue02Bonus02 - - + + + - - - - - - + + - - - + + + - - + + + - - - SC2Epilogue02Bonus02 - - + + + + + - - - + + + - - - 0 - + + + false + + + + + + + + + + + + + + + + + + @@ -64491,7 +64659,6 @@ - objectiveRescueStalkers2 @@ -64501,16 +64668,29 @@ + - + + + + + + + + + + + + + @@ -64631,34 +64811,58 @@ - - - - - - + + + + + - - - + + + - - + + - - - SC2Epilogue02Bonus01 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + @@ -73242,10 +73446,8 @@ - - - - + + @@ -73275,7 +73477,7 @@ - + @@ -73669,47 +73871,31 @@ Reset selection, camera, and visibility. - - - - + + + + - - + + - - - - - - - - - - - + + + - - - - + + + + - - + + - - - - - - - - - - - + + + @@ -74767,14 +74953,13 @@ true - - - + + + - - - 1 - + + + diff --git a/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/Triggers.version index 25422d9c6..93bf5d8b3 100644 Binary files a/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/Triggers.version differ diff --git a/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index a9c24f7f7..e21b2ccc0 100644 --- a/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/LotV/ap_the_essence_of_eternity.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -4,6 +4,7 @@ Category/Name/0421978B=Main Objective - Kerrigan Must Survive Stage 2 Category/Name/09706966======== ARCHIPELAGO ======= Category/Name/0AFC9C66=Main Objective - Kerrigan Must Survive Stage 1 Category/Name/0BBFFE42=Cinematic Variables +Category/Name/15B51602=Location IDs Category/Name/183158CF=Victory Cinematic Category/Name/1FFBC3C3=Scripted Events (Stage 02) Category/Name/20004584=Intro Cinematic @@ -266,6 +267,7 @@ Variable/Name/551B80BC=Y Variable/Name/55A76383=Target Variable/Name/5862AD9E=PLAYER_03_PROTOSS Variable/Name/5A5C8375=ObjectiveZergSurvival +Variable/Name/5AFFE4DE=LOCATION_ID_VOID_THRASHERS Variable/Name/5FF7E531=hivePosition Variable/Name/6059A449=RageWaveUnitCap Variable/Name/61266955=ClusterCount @@ -293,6 +295,7 @@ Variable/Name/86AB8A6D=CineExtinctionFired Variable/Name/8937824A=A Variable/Name/8EB84D06=PingActive Variable/Name/906378FE=CinematicPausedUnits +Variable/Name/912E5E69=category Variable/Name/9158883D=ZAGARA Variable/Name/9209C42C=NormalLighting Variable/Name/92D31E1A=IntroTerranForcesGroup @@ -338,6 +341,7 @@ Variable/Name/D9F78CE0=ResourcePickups Variable/Name/DA4A34FC=SuperWarpGate Variable/Name/DCB33CE8=S2_KerriganPowerProgress Variable/Name/E64976E6=AlliedPlayers +Variable/Name/E9376988=category Variable/Name/EA381057=Target Variable/Name/ECF8ED64=PLAYER_06_VOIDFORCES Variable/Name/ED458599=S1_VoidForcesGroup