diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/ComponentList.SC2Components index 2c400b1b8..a9ac61f9e 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData GameText DocumentInfo diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/DocumentHeader index f121acb45..aa2f7eb58 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/DocumentHeader differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/MapScript.galaxy index ddff8bc47..16da74d09 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/MapScript.galaxy @@ -37,6 +37,12 @@ const int gv_pLAYER_01_USER = 1; const int gv_pLAYER_02_ZERG = 2; const int gv_pLAYER_02_ZERG2 = 3; const int gv_pLAYER_02_ZERG22 = 4; +const int gv_LOCATION_ID_INFEST_GIANT_URSADON = 1; +const int gv_LOCATION_ID_FIRST_NIADRA_EVOLUTION = 2; +const int gv_LOCATION_ID_SECOND_NIADRA_EVOLUTION = 3; +const int gv_LOCATION_ID_THIRD_NIADRA_EVOLUTION = 4; +const int gv_LOCATION_ID_WARP_DRIVE = 5; +const int gv_LOCATION_ID_STASIS_QUADRANT = 6; //-------------------------------------------------------------------------------------------------- // Global Variables @@ -86,15 +92,15 @@ int gv_zerglingKills; int gv_roachKills; int gv_hydraliskKills; int gv_ursadonKills; -int gv_objectiveDestroyDominionBase22; -int gv_objectiveDestroyDominionBase222; -int gv_objectiveDestroyDominionBase2; -int gv_objectiveDestroyDominionBase23; -int gv_objectiveDestroyDominionBase232; -int gv_objectiveDestroyDominionBase322; -int gv_objectiveDestroyDominionBase3222; -int gv_objectiveDestroyDominionBase32222; -int gv_objectiveDestroyDominionBase323; +int gv_objectiveKillProtoss; +int gv_objectiveSwarmQueenSurvival; +int gv_objectiveGainBiomass; +int gv_objectiveFindSafePlace; +int gv_objectiveGrow; +int gv_objectiveDestroyWarpDrive; +int gv_objectiveEscapeWarpDrive; +int gv_objectiveDestroyEscapePods; +int gv_objectiveInfestGiantUrsadon; unitgroup gv_cinematicHiddenUnits; unitgroup gv_cinematicTempUnits; bool gv_cinematicCompleted; @@ -112,6 +118,8 @@ sound gv_midStasisSound; bool gv_midMusicCompleted; bool gv_victoryCinematicCompleted; sound gv_victoryZergSound; +int gv_objectiveGrowMore; +int gv_additionalGrows; void InitGlobals () { int init_i; @@ -147,18 +155,19 @@ void InitGlobals () { for (init_i = 0; init_i <= 10; init_i += 1) { gv_escapePodDlgBorder[init_i] = c_invalidDialogControlId; } - gv_objectiveDestroyDominionBase22 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase222 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase2 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase23 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase232 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase322 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase3222 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase32222 = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase323 = c_invalidObjectiveId; + gv_objectiveKillProtoss = c_invalidObjectiveId; + gv_objectiveSwarmQueenSurvival = c_invalidObjectiveId; + gv_objectiveGainBiomass = c_invalidObjectiveId; + gv_objectiveFindSafePlace = c_invalidObjectiveId; + gv_objectiveGrow = c_invalidObjectiveId; + gv_objectiveDestroyWarpDrive = c_invalidObjectiveId; + gv_objectiveEscapeWarpDrive = c_invalidObjectiveId; + gv_objectiveDestroyEscapePods = c_invalidObjectiveId; + gv_objectiveInfestGiantUrsadon = c_invalidObjectiveId; gv_cinematicHiddenUnits = UnitGroupEmpty(); gv_cinematicTempUnits = UnitGroupEmpty(); gv_midHiddenUnitGroup = UnitGroupEmpty(); + gv_objectiveGrowMore = c_invalidObjectiveId; } //-------------------------------------------------------------------------------------------------- @@ -388,6 +397,8 @@ trigger gt_VictoryCinematicEnd; trigger gt_VictoryCleanup; trigger gt_VictoryZergBridge1; trigger gt_VictoryZergBridge2; +trigger gt_ObjectiveGrowMoreCreate; +trigger gt_ObjectiveGrowMoreComplete; trigger gt_onDifficultyCasual; trigger gt_onDifficultyNormal; trigger gt_onDifficultyHard; @@ -1448,14 +1459,13 @@ bool gt_UpdateProtossRemainingObjective_Func (bool testConds, bool runActions) { gv_numberOfProtossRemaining = 0; } + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveKillProtoss, gv_numberOfProtossRemaining); if ((gv_escapePodPeopleRemaining == 0)) { TriggerExecute(gt_ObjectiveDestroyEscapePodsComplete, true, false); } - else { - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase22, gv_numberOfProtossRemaining); - } + if ((gv_numberOfProtossRemaining <= 0)) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory); TriggerExecute(gt_VictoryMainObjectivesCompleted, true, false); } @@ -1653,7 +1663,7 @@ bool gt_SwarmQueenusesParasiticInvasion_Func (bool testConds, bool runActions) { gf_KillLargeHoldingPen(EventUnitTargetPoint()); UnitSetOwner(EventUnitTargetUnit(), gv_pLAYER_01_USER, true); UnitSelect(EventUnitTargetUnit(), gv_pLAYER_01_USER, true); - if ((ObjectiveGetState(gv_objectiveDestroyDominionBase323) == c_objectiveStateActive)) { + if ((ObjectiveGetState(gv_objectiveInfestGiantUrsadon) == c_objectiveStateActive)) { PingDestroy(gv_giantUrsadonPing); libSwaC_gf_DisplayMissionObjectiveRewardFloatingText(UnitGetPosition(EventUnitTargetUnit()), "ZExpedition03Objective010", gv_pLAYER_01_USER); TriggerEnable(gt_GiantUrsadonDiesFailBonusObjective, false); @@ -1795,7 +1805,7 @@ bool gt_MorphtoSwarmQueenComplete_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIRST_NIADRA_EVOLUTION); if ((libABFE498B_gv_aP_Triggers_Option_grantStoryTech == true)) { libABFE498B_gf_AP_Triggers_Zerg_unlockZergling(gv_pLAYER_01_USER); } @@ -1839,6 +1849,8 @@ bool gt_MorphtoSwarmQueenComplete_Func (bool testConds, bool runActions) { TriggerExecute(gt_ObjectiveDestroytheProtossCreateQ, true, false); TriggerExecute(gt_ObjectiveSwarmQueenSurvivalCreateQ, true, false); TriggerExecute(gt_TransmissionP1SwarmQueenMorphCompleteQ, true, true); + Wait(3.0, c_timeGame); + TriggerExecute(gt_ObjectiveGrowMoreCreate, true, false); libSwaC_gf_CreateMissionAutosavePoint(StringExternal("Param/Value/2BE39A32")); return true; } @@ -1983,7 +1995,9 @@ bool gt_MorphtoLargeSwarmQueenComplete_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SECOND_NIADRA_EVOLUTION); + gv_additionalGrows = 1; + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveGrowMore, gv_additionalGrows); if ((libABFE498B_gv_aP_Triggers_Option_grantStoryTech == true)) { libABFE498B_gf_AP_Triggers_Zerg_unlockRoach(gv_pLAYER_01_USER); } @@ -2157,7 +2171,10 @@ bool gt_MorphtoHugeSwarmQueenComplete_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_THIRD_NIADRA_EVOLUTION); + gv_additionalGrows = 2; + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveGrowMore, gv_additionalGrows); + TriggerExecute(gt_ObjectiveGrowMoreComplete, true, false); if ((libABFE498B_gv_aP_Triggers_Option_grantStoryTech == true)) { libABFE498B_gf_AP_Triggers_Zerg_unlockHydralisk(gv_pLAYER_01_USER); } @@ -2807,7 +2824,7 @@ bool gt_FirstLyoteisConsumed_Func (bool testConds, bool runActions) { CameraSetData(PlayerGroupSingle(gv_pLAYER_01_USER), "LarvaCamera"); gf_ConsumeCritter(UnitFromId(16)); Wait(1.5, c_timeGame); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase2, PlayerGetPropertyInt(gv_pLAYER_01_USER, c_playerPropCustom)); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveGainBiomass, PlayerGetPropertyInt(gv_pLAYER_01_USER, c_playerPropCustom)); return true; } @@ -3659,7 +3676,7 @@ bool gt_UrsadonisConsumedResetCamera_Func (bool testConds, bool runActions) { UnitRemove(UnitFromId(294)); gf_ConsumeCritter(gv_tHE_ONE_URSADON); Wait(1.5, c_timeGame); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase2, PlayerGetPropertyInt(gv_pLAYER_01_USER, c_playerPropCustom)); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveGainBiomass, PlayerGetPropertyInt(gv_pLAYER_01_USER, c_playerPropCustom)); if ((PlayerGetPropertyInt(gv_pLAYER_01_USER, c_playerPropCustom) == 100)) { TriggerExecute(gt_ObjectiveGainBiomassComplete, true, false); } @@ -4706,8 +4723,7 @@ bool gt_EnteredWarpDriveQuadrant_Func (bool testConds, bool runActions) { gv_warpDrivePing = PingLastCreated(); VisRevealerCreate(gv_pLAYER_01_USER, RegionCircle(UnitGetPosition(UnitFromId(239)), 4.0)); gv_beaconRevealer = VisRevealerLastCreated(); - ObjectiveSetState(gv_objectiveDestroyDominionBase322, c_objectiveStateActive); - lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase322); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyWarpDrive, true); TriggerExecute(gt_TransmissionP3EnteredWarpDriveQuadQ, true, false); return true; } @@ -5176,7 +5192,7 @@ bool gt_WarpDriveDestroyedStartCountdownQ_Func (bool testConds, bool runActions) } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_WARP_DRIVE); VisRevealerDestroy(gv_beaconRevealer); TriggerExecute(gt_WarpDriveExplosions, true, false); SoundtrackPlay(PlayerGroupAll(), c_soundtrackCategoryMusic, "ZExpedition03MusicEvent02_WarpDriveBreach", c_soundtrackCueAny, c_soundtrackIndexAny, false); @@ -5236,8 +5252,7 @@ bool gt_WarpDriveDestroyedStartCountdownQ_Func (bool testConds, bool runActions) } TriggerExecute(gt_StalkerAttackAfterWarpDriveDestroyed, true, false); - ObjectiveSetState(gv_objectiveDestroyDominionBase3222, c_objectiveStateActive); - lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase3222); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveEscapeWarpDrive, true); TriggerQueueEnter(); libSwaC_gf_SetAllSoundChannelVolumesCampaign(libSwaC_ge_VolumeChannelModeCampaign_Speech); SoundChannelSetVolume(PlayerGroupAll(), c_soundCategoryMusic, 100.0, 1.0); @@ -5537,7 +5552,7 @@ bool gt_EscapedWarpDriveTransition_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(6); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_STASIS_QUADRANT); TriggerEnable(gt_EvacuateTimerEndsDestroyWarpDriveQuadrant, false); UnitKill(UnitFromId(275)); PingDestroy(gv_escapeExplosionPing); @@ -7531,7 +7546,7 @@ bool gt_Victory_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - if ((ObjectiveGetState(gv_objectiveDestroyDominionBase22) == c_objectiveStateCompleted) && (ObjectiveGetState(gv_objectiveDestroyDominionBase32222) == c_objectiveStateCompleted)) { + if ((ObjectiveGetState(gv_objectiveKillProtoss) == c_objectiveStateCompleted) && (ObjectiveGetState(gv_objectiveDestroyEscapePods) == c_objectiveStateCompleted)) { libSwaC_gf_CampaignAwardAchievement("ZKaldir03_1", gv_pLAYER_01_USER); } @@ -7666,10 +7681,12 @@ bool gt_ObjectiveDestroytheProtossCreate_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective01"); - gv_objectiveDestroyDominionBase22 = ObjectiveLastCreated(); - ObjectiveSetPriority(gv_objectiveDestroyDominionBase22, 1); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective01", "", 0); - lib5BD4895D_gf_AP_Core_enableObjectiveCounter(ObjectiveLastCreated(), "remaining", 100, 0); + gv_objectiveKillProtoss = ObjectiveLastCreated(); + ObjectiveSetPriority(gv_objectiveKillProtoss, 1); + ObjectiveShow(gv_objectiveKillProtoss, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveKillProtoss, lib5BD4895D_ge_APObjectiveCategory_Primary, "remaining", gv_numberOfProtossRemaining, 0, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveKillProtoss, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveKillProtoss, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7727,7 +7744,7 @@ bool gt_ObjectiveDestroytheProtossComplete_Func (bool testConds, bool runActions TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveDestroytheProtossCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase22); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveKillProtoss); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7756,7 +7773,7 @@ bool gt_ObjectiveDestroytheProtossFailed_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveDestroytheProtossCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase22); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveKillProtoss); return true; } @@ -7784,9 +7801,11 @@ bool gt_ObjectiveSwarmQueenSurvivalCreate_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective02"); - gv_objectiveDestroyDominionBase222 = ObjectiveLastCreated(); - ObjectiveSetPriority(gv_objectiveDestroyDominionBase222, 0); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective02", "", 0); + gv_objectiveSwarmQueenSurvival = ObjectiveLastCreated(); + ObjectiveSetPriority(gv_objectiveSwarmQueenSurvival, 0); + ObjectiveShow(gv_objectiveSwarmQueenSurvival, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveSwarmQueenSurvival, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveSwarmQueenSurvival, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7844,7 +7863,7 @@ bool gt_ObjectiveSwarmQueenSurvivalComplete_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveSwarmQueenSurvivalCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase222); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveSwarmQueenSurvival); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7873,11 +7892,11 @@ bool gt_ObjectiveSwarmQueenSurvivalFailed_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveSwarmQueenSurvivalCreate, true, false); - if ((ObjectiveGetState(gv_objectiveDestroyDominionBase3222) == c_objectiveStateActive)) { + if ((ObjectiveGetState(gv_objectiveEscapeWarpDrive) == c_objectiveStateActive)) { TriggerExecute(gt_ObjectiveEscapeFailed, true, false); } - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase222); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveSwarmQueenSurvival); return true; } @@ -7905,8 +7924,10 @@ bool gt_ObjectiveGainBiomassCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective03"); - gv_objectiveDestroyDominionBase2 = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective03", "", PlayerGetPropertyInt(gv_pLAYER_01_USER, c_playerPropCustom)); + gv_objectiveGainBiomass = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveGainBiomass, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveGainBiomass, lib5BD4895D_ge_APObjectiveCategory_Primary, "", PlayerGetPropertyInt(gv_pLAYER_01_USER, c_playerPropCustom), libSwaC_gf_MissionObjectiveItemCount("ZExpedition03Objective03"), false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveGainBiomass, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7935,7 +7956,7 @@ bool gt_ObjectiveGainBiomassComplete_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveGainBiomassCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase2); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveGainBiomass); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7964,8 +7985,7 @@ bool gt_ObjectiveGainBiomassCompleteHideQ_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - libSwaC_gf_ZS_SetMissionObjectiveState("ZExpedition03Objective03", libSwaC_ge_MissionObjectiveState_Undiscovered); - lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase2); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveGainBiomass, false); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); return true; @@ -7995,7 +8015,7 @@ bool gt_ObjectiveGainBiomassFailed_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveGainBiomassCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase2); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveGainBiomass); return true; } @@ -8022,7 +8042,11 @@ bool gt_ObjectiveFindSafePlaceCreate_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - gv_objectiveDestroyDominionBase23 = ObjectiveLastCreated(); + libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective09"); + gv_objectiveFindSafePlace = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveFindSafePlace, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveFindSafePlace, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveFindSafePlace, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8051,7 +8075,7 @@ bool gt_ObjectiveFindSafePlaceComplete_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveFindSafePlaceCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase23); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveFindSafePlace); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8080,7 +8104,7 @@ bool gt_ObjectiveFindSafePlaceCompleteHideQ_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - libSwaC_gf_ZS_SetMissionObjectiveState("ZExpedition03Objective09", libSwaC_ge_MissionObjectiveState_Undiscovered); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveFindSafePlace, false); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); return true; @@ -8110,7 +8134,7 @@ bool gt_ObjectiveFindSafePlaceFailed_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveFindSafePlaceCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase23); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveFindSafePlace); return true; } @@ -8138,8 +8162,11 @@ bool gt_ObjectiveGrowCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective08"); - gv_objectiveDestroyDominionBase232 = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective08", "", 0); + gv_objectiveGrow = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveGrow, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveGrow, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveGrow, gv_LOCATION_ID_FIRST_NIADRA_EVOLUTION); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveGrow, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8168,7 +8195,7 @@ bool gt_ObjectiveGrowComplete_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveGrowCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase232); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveGrow); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8197,8 +8224,7 @@ bool gt_ObjectiveGrowCompleteHideQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - libSwaC_gf_ZS_SetMissionObjectiveState("ZExpedition03Objective08", libSwaC_ge_MissionObjectiveState_Undiscovered); - lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase232); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveGrow, false); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); return true; @@ -8228,7 +8254,7 @@ bool gt_ObjectiveGrowFailed_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveGrowCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase232); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveGrow); return true; } @@ -8256,9 +8282,10 @@ bool gt_ObjectiveDestroyWarpDriveCreateHidden_Func (bool testConds, bool runActi TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective05"); - gv_objectiveDestroyDominionBase322 = ObjectiveLastCreated(); - libSwaC_gf_ZS_SetMissionObjectiveState("ZExpedition03Objective05", libSwaC_ge_MissionObjectiveState_Undiscovered); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective05", "", 0); + gv_objectiveDestroyWarpDrive = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveDestroyWarpDrive, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveDestroyWarpDrive, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyWarpDrive, gv_LOCATION_ID_WARP_DRIVE); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8287,7 +8314,7 @@ bool gt_ObjectiveDestroyWarpDriveComplete_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveDestroyWarpDriveCreateHidden, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase322); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyWarpDrive); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8316,7 +8343,7 @@ bool gt_ObjectiveDestroyWarpDriveFailed_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveDestroyWarpDriveCreateHidden, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase322); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyWarpDrive); return true; } @@ -8344,9 +8371,10 @@ bool gt_ObjectiveEscapeCreateHidden_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective06"); - gv_objectiveDestroyDominionBase3222 = ObjectiveLastCreated(); - libSwaC_gf_ZS_SetMissionObjectiveState("ZExpedition03Objective06", libSwaC_ge_MissionObjectiveState_Undiscovered); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective06", "", 0); + gv_objectiveEscapeWarpDrive = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveEscapeWarpDrive, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveEscapeWarpDrive, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveEscapeWarpDrive, gv_LOCATION_ID_STASIS_QUADRANT); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8375,7 +8403,7 @@ bool gt_ObjectiveEscapeComplete_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveEscapeCreateHidden, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase3222); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveEscapeWarpDrive); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8404,7 +8432,7 @@ bool gt_ObjectiveEscapeFailed_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveEscapeCreateHidden, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase3222); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveEscapeWarpDrive); return true; } @@ -8432,8 +8460,10 @@ bool gt_ObjectiveDestroyEscapePodsCreate_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective07"); - gv_objectiveDestroyDominionBase32222 = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective07", "", 0); + gv_objectiveDestroyEscapePods = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveDestroyEscapePods, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveDestroyEscapePods, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyEscapePods, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8491,7 +8521,7 @@ bool gt_ObjectiveDestroyEscapePodsComplete_Func (bool testConds, bool runActions TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveDestroyEscapePodsCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase32222); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyEscapePods); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8520,7 +8550,7 @@ bool gt_ObjectiveDestroyEscapePodsFailed_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveDestroyEscapePodsCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase32222); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyEscapePods); return true; } @@ -8533,7 +8563,13 @@ void gt_ObjectiveDestroyEscapePodsFailed_Init () { // Trigger: Objective Infest Giant Ursadon Create //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveInfestGiantUrsadonCreate_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))) { @@ -8548,8 +8584,11 @@ bool gt_ObjectiveInfestGiantUrsadonCreate_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZExpedition03Objective010"); - gv_objectiveDestroyDominionBase323 = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition03Objective010", "", 0); + gv_objectiveInfestGiantUrsadon = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveInfestGiantUrsadon, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveInfestGiantUrsadon, lv_category, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveInfestGiantUrsadon, gv_LOCATION_ID_INFEST_GIANT_URSADON); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveInfestGiantUrsadon, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8607,7 +8646,7 @@ bool gt_ObjectiveInfestGiantUrsadonComplete_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveInfestGiantUrsadonCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase323); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveInfestGiantUrsadon); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -8636,7 +8675,7 @@ bool gt_ObjectiveInfestGiantUrsadonFailed_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveInfestGiantUrsadonCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase323); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveInfestGiantUrsadon); return true; } @@ -9261,10 +9300,8 @@ bool gt_MidCleanup_Func (bool testConds, bool runActions) { SoundStop(gv_midExplosionSound, true); SoundStop(gv_midStasisSound, true); - ObjectiveSetState(gv_objectiveDestroyDominionBase322, c_objectiveStateHidden); - lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase322); - ObjectiveSetState(gv_objectiveDestroyDominionBase3222, c_objectiveStateHidden); - lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase3222); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyWarpDrive, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveEscapeWarpDrive, false); UnitKill(UnitFromId(273)); libNtve_gf_ShowHideUnit(UnitFromId(559), true); UnitKill(UnitFromId(559)); @@ -9835,6 +9872,74 @@ void gt_VictoryZergBridge2_Init () { gt_VictoryZergBridge2 = TriggerCreate("gt_VictoryZergBridge2_Func"); } +//-------------------------------------------------------------------------------------------------- +// Trigger: Objective GrowMore Create +//-------------------------------------------------------------------------------------------------- +bool gt_ObjectiveGrowMoreCreate_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Extra; + + // Conditions + if (testConds) { + if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { + return false; + } + } + + // Actions + if (!runActions) { + return true; + } + + TriggerEnable(TriggerGetCurrent(), false); + ObjectiveCreate(StringExternal("Param/Value/0F4B4616"), StringToText(""), c_objectiveStateHidden, false); + gv_objectiveGrowMore = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveGrowMore, lv_category, "", gv_additionalGrows, 2, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveGrowMore, gv_LOCATION_ID_SECOND_NIADRA_EVOLUTION); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveGrowMore, gv_LOCATION_ID_THIRD_NIADRA_EVOLUTION); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveGrowMore, true); + Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_ObjectiveGrowMoreCreate_Init () { + gt_ObjectiveGrowMoreCreate = TriggerCreate("gt_ObjectiveGrowMoreCreate_Func"); +} + +//-------------------------------------------------------------------------------------------------- +// Trigger: Objective GrowMore Complete +//-------------------------------------------------------------------------------------------------- +bool gt_ObjectiveGrowMoreComplete_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + // Conditions + if (testConds) { + if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { + return false; + } + } + + // Actions + if (!runActions) { + return true; + } + + TriggerEnable(TriggerGetCurrent(), false); + TriggerExecute(gt_ObjectiveGrowMoreCreate, true, false); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveGrowMore); + Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_ObjectiveGrowMoreComplete_Init () { + gt_ObjectiveGrowMoreComplete = TriggerCreate("gt_ObjectiveGrowMoreComplete_Func"); +} + //-------------------------------------------------------------------------------------------------- // Trigger: onDifficultyCasual //-------------------------------------------------------------------------------------------------- @@ -10034,7 +10139,7 @@ bool gt_InfestUrsadon_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_INFEST_GIANT_URSADON); return true; } @@ -10286,6 +10391,8 @@ void InitTriggers () { gt_VictoryCleanup_Init(); gt_VictoryZergBridge1_Init(); gt_VictoryZergBridge2_Init(); + gt_ObjectiveGrowMoreCreate_Init(); + gt_ObjectiveGrowMoreComplete_Init(); gt_onDifficultyCasual_Init(); gt_onDifficultyNormal_Init(); gt_onDifficultyHard_Init(); diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Preload.xml index c4eacc180..c32971d49 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Preload.xml +++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Preload.xml @@ -63,14 +63,6 @@ - - - - - - - - diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Triggers index c49183c51..49cf02975 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Triggers @@ -7097,6 +7097,7 @@ + @@ -7305,48 +7306,8 @@ 0 - - - Escape Pod - - - - - - - - - - - - - - - - - - - - - ZExpedition03Objective01 - - - - - - - - - - - - - - - - @@ -7358,6 +7319,16 @@ + + + Escape Pod + + + + + + + @@ -7400,17 +7371,17 @@ - + - - + + - + - - + + @@ -11213,7 +11184,7 @@ - + @@ -11250,6 +11221,9 @@ + + + @@ -11409,14 +11383,13 @@ - - - + + + - - - 2 - + + + @@ -12611,6 +12584,44 @@ + + + + + + + + 3.0 + + + + + + + + + Bonus Objective to conitnue growing + + + + + + + + + + + + + + + + + + + + + @@ -13143,7 +13154,9 @@ - + + + @@ -13232,15 +13245,41 @@ - - - + + + - - - 3 + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + @@ -14307,7 +14346,10 @@ - + + + + @@ -14430,15 +14472,60 @@ - - - + + + - - - 4 + + + + + + + + + + + + + + + + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -18549,7 +18636,6 @@ - @@ -18784,50 +18870,6 @@ - - - - - - - - - - - - ZExpedition03Objective03 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -23521,7 +23563,6 @@ - @@ -23799,50 +23840,6 @@ - - - - - - - - - - - - ZExpedition03Objective03 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -29225,8 +29222,7 @@ - - + @@ -29571,26 +29567,18 @@ - - - - + + + + - - + + - - - - - - - - - - - + + + @@ -32682,7 +32670,7 @@ - + @@ -32731,8 +32719,7 @@ - - + @@ -32798,14 +32785,13 @@ - - - + + + - - - 5 - + + + @@ -33992,26 +33978,18 @@ - - - - + + + + - - + + - - - - - - - - - - - + + + @@ -36035,7 +36013,7 @@ - + @@ -36178,14 +36156,13 @@ - - - + + + - - - 6 - + + + @@ -52410,7 +52387,6 @@ - objectiveDestroyDominionBase22 @@ -52426,8 +52402,10 @@ - - + + + + @@ -52521,63 +52499,88 @@ 1 - - - - - - + + + + + - - - + + + - - + + - - - ZExpedition03Objective01 - - + + + + + + + - - + + + + + + + + + + + + + + + + remaining - - + + + + + + 0 - - - - - - + + + false + - - - + + + - - + + + + - - - remaining - + + + - - - 100 - + + + - - - 0 - + + + + + + + + + + + + @@ -52871,7 +52874,6 @@ - objectiveDestroyDominionBase222 @@ -52887,7 +52889,9 @@ - + + + @@ -52981,34 +52985,58 @@ 0 - - - - - - + + + + + - - - + + + - - + + - - - ZExpedition03Objective02 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + @@ -53360,7 +53388,6 @@ - objectiveDestroyDominionBase2 @@ -53374,9 +53401,10 @@ - - + + + @@ -53440,50 +53468,6 @@ - - - - - - - - - - - - ZExpedition03Objective03 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -53500,47 +53484,97 @@ - - - - - - + + + + + - - - + + + - - + + - - - ZExpedition03Objective03 - - + + + + + + + - - + + + + + + + + + + + + + + + - - - + + + - + - - + + - + - + + + + + + + + + + + + ZExpedition03Objective03 + + + + + + false + + + + + + + + + + + + + + + + + + + @@ -53718,35 +53752,23 @@ - - + - - + + - - - - - - + + - - - ZExpedition03Objective03 - - - - - - - - - - + + + + + + @@ -53860,7 +53882,6 @@ - objectiveDestroyDominionBase23 @@ -53875,6 +53896,9 @@ + + + @@ -53929,7 +53953,6 @@ - @@ -53955,6 +53978,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + @@ -54132,24 +54208,22 @@ - + - - + + - - + + - - - + + + - - - ZExpedition03Objective09 - - + + + @@ -54269,7 +54343,6 @@ - objectiveDestroyDominionBase232 @@ -54284,7 +54357,10 @@ - + + + + @@ -54364,34 +54440,71 @@ - - - - - - + + + + + - - - + + + - - + + - - - ZExpedition03Objective08 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -54570,35 +54683,23 @@ - - + - - - - - - - - - - - - - ZExpedition03Objective08 - - - - - + + - + + - - + + + + + + @@ -54716,7 +54817,6 @@ - objectiveDestroyDominionBase322 @@ -54732,8 +54832,9 @@ - - + + + @@ -54818,49 +54919,58 @@ - - - - + + + + + - - - + + + - - - ZExpedition03Objective05 - - + + + + + + - - - - - - + + + - - - + + + + + - - + + + - - - ZExpedition03Objective05 - - + + + false + - - - + + + - - - 0 - + + + + + + + + + + + + @@ -55078,7 +55188,6 @@ - objectiveDestroyDominionBase3222 @@ -55094,8 +55203,9 @@ - - + + + @@ -55180,49 +55290,58 @@ - - - - + + + + + - - - + + + - - - ZExpedition03Objective06 - - + + - - - - - - + + + - - - + + + - - + + + + + - - - ZExpedition03Objective06 - - + + + - - - + + + false + - - - 0 - + + + + + + + + + + + + + + + + @@ -55446,7 +55565,6 @@ - objectiveDestroyDominionBase32222 @@ -55461,7 +55579,9 @@ - + + + @@ -55541,34 +55661,58 @@ - - - - - - + + + + + - - - + + + - - + + - - - ZExpedition03Objective07 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + @@ -55862,7 +56006,6 @@ - objectiveDestroyDominionBase323 @@ -55872,14 +56015,28 @@ + - + + + + + + + + + + + + + + @@ -55957,34 +56114,71 @@ - - - - - - + + + + + - - - + + + - - + + - - - ZExpedition03Objective010 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -62255,10 +62449,8 @@ - - - - + + @@ -62851,47 +63043,31 @@ - - - - + + + + - - + + - - - - - - - - - - - + + + - - - - + + + + - - + + - - - - - - - - - - - + + + @@ -67803,12 +67979,424 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + Create the objective + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + Ensure that the objective exists + + + + + + + + + + + + + + + + + + + + + + + + Update the objective + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LOCATION_ID_INFEST_GIANT_URSADON + + + + + + + + 1 + + + + LOCATION_ID_FIRST_NIADRA_EVOLUTION + + + + + + + + 2 + + + + LOCATION_ID_SECOND_NIADRA_EVOLUTION + + + + + + + + 3 + + + + LOCATION_ID_THIRD_NIADRA_EVOLUTION + + + + + + + + 4 + + + + LOCATION_ID_WARP_DRIVE + + + + + + + + 5 + + + + LOCATION_ID_STASIS_QUADRANT + + + + + + + + 6 + + @@ -68169,7 +68757,7 @@ - + @@ -68228,14 +68816,13 @@ - - - + + + - - - 1 - + + + diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Triggers.version index a7f61d74e..4b1af2ffc 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/Triggers.version differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt index 69593c4f8..7e0d42ff9 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -11,6 +11,7 @@ MapInfo/Player05/Name=Hostile Param/Expression/4445BE7B=~A~ Param/Value/02C35B1A=Destroy this to disable a nearby Force Field. Param/Value/0EB5D646=Biomass Collected +Param/Value/0F4B4616=Grow even stronger Param/Value/1125924E=Lowest Escape Pod Time Param/Value/15916EF9=+75 Biomass Param/Value/1893818B=Countdown: @@ -22,7 +23,6 @@ Param/Value/2BE39A32=Broodmother Param/Value/2F97BD64=Zergling Kills Param/Value/38AF6832=Move the Larva onto this Beacon. Param/Value/3E937DF7=Anniversary_ZExpedition03 granted -Param/Value/3EFBAEBF=remaining Param/Value/42CC902F=Get To Safety Param/Value/457C3CD3=Move Niadra Here Param/Value/4B5DC244=Vent Access diff --git a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index e37e77583..136c758c7 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/HotS/ap_enemy_within.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -4,6 +4,7 @@ Category/Name/076F90FA=Primary Objective - Destroy the Warp Drive Category/Name/10C7C620=Part 4 (Stasis Quadrant) Category/Name/1941F0D5======== OBJECTIVES ======= Category/Name/197357EB=Midgame Cinematic +Category/Name/1D447984=Location IDs Category/Name/38CAB7C5======== GAMEPLAY ======= Category/Name/3A4135FD=Victory/Defeat Category/Name/3E14F489=Starting Sequence @@ -32,6 +33,7 @@ Category/Name/C52BD72A=Tips Category/Name/CB6CA4CF======== ARCHIPELAGO ======= Category/Name/CB89B1F2=Stats & Achievements Category/Name/CDF08ABD=Steam Vents +Category/Name/CE426FE2=Custom Objectives Category/Name/CF0772E0=Part 1 (Larval Queen) Category/Name/DAF284C0=Bonus Objective - Infest the Giant Ursadon Category/Name/E8BEF289=Primary Objective - Grow @@ -170,6 +172,7 @@ Trigger/Name/8BDFB951=Second Zealot Patrol Path Trigger/Name/8C8CA969=Mid Music Trigger/Name/8F0DDC37=Transmission - P3 - First Force Field Open Q Trigger/Name/8F547A6F=Larval Queen Reveal First Room +Trigger/Name/901C81A5=Objective GrowMore Complete Trigger/Name/93000F72=Morph to Swarm Queen Complete Trigger/Name/94DA8019=onDifficultyNormal Trigger/Name/9539EECA=Turn off Grow to Huge Queen Blinky @@ -220,6 +223,7 @@ Trigger/Name/C056FE49=Objective Destroy Escape Pods Create Q Trigger/Name/C06A7B2B=Mid Q Trigger/Name/C07DB8AC=Protoss Reaction in Resource Chamber Trigger/Name/C1EE8B01=Swarm Queen uses Parasitic Invasion +Trigger/Name/C3162B09=Objective GrowMore Create Trigger/Name/C35EFD61=Intro Setup Trigger/Name/C38FADB4=Open Door to the Bridge Trigger/Name/C39AD6FE=Defeat @@ -282,6 +286,7 @@ Trigger/Name/FEE6A5B6=Kill Helper Model - Warp Drive Vent Door Variable/Name/009E7C4F=VisionGroup Variable/Name/014479BE=EscapePodDlgMax Variable/Name/03F7FA70=currentUnit +Variable/Name/0B503917=AdditionalGrows Variable/Name/0DBEE3C5=Stalker03 Variable/Name/0E6C12D3=actor Variable/Name/0EAF9E3B=SentryTopPosition @@ -301,9 +306,11 @@ Variable/Name/1C29105A=Stalker02 Variable/Name/1F29C197=EscapePodTimes Variable/Name/207339CD=MidStasisSound Variable/Name/212F49C7=HydraliskKills +Variable/Name/23A5609A=ObjectiveGrowMore Variable/Name/26F81928=SentryBottomPosition Variable/Name/3016E2BD=EscapePodShields Variable/Name/31A80675=WarpDrivePing +Variable/Name/35A8DA35=category Variable/Name/36E595F6=FadeDuration Variable/Name/39A3F463=C_Width Variable/Name/3A292DE2=SafePlacePing @@ -311,6 +318,8 @@ Variable/Name/3A429653=ProtossEscapePods Variable/Name/3B0867A9=EscapePodLife Variable/Name/3BBCA868=SentryLeft Variable/Name/3C0662AC=HelperModel_SteamVent +Variable/Name/3E67DB73=LOCATION_ID_FIRST_NIADRA_EVOLUTION +Variable/Name/3EB811BE=LOCATION_ID_INFEST_GIANT_URSADON Variable/Name/4253F7C7=SwarmQueenLife Variable/Name/44B2025A=Sentry01 Variable/Name/460D40BF=currentUnit @@ -328,7 +337,9 @@ Variable/Name/56AEB68E=ObjectiveKillProtoss Variable/Name/586DFBA4=MidHiddenUnitGroup Variable/Name/59444368=ParasiteUsed Variable/Name/5961773F=StasisPulses +Variable/Name/5A60443F=category Variable/Name/5AEAEE18=Panel +Variable/Name/5B46955F=LOCATION_ID_WARP_DRIVE Variable/Name/5E1CA16F=LasarraPosition Variable/Name/5E56DC65=EscapePodDlgProgressBar Variable/Name/5EF841BB=TimeTextTag @@ -351,10 +362,12 @@ Variable/Name/8C4DE6E7=NumberOfUnitsSpawned Variable/Name/8FD95DCD=Zealot02 Variable/Name/903F390E=IntroWarpSound1 Variable/Name/9E6C7824=PatrollingZealot +Variable/Name/9FB4A24D=LOCATION_ID_STASIS_QUADRANT Variable/Name/A0F7E071=ZergLeft Variable/Name/A1CF9D47=CinematicCompleted Variable/Name/A35882B0=HighTemplar Variable/Name/A6039410=UrsadonKills +Variable/Name/A6FD24B6=LOCATION_ID_THIRD_NIADRA_EVOLUTION Variable/Name/A7BD8CE4=HelperModel_VentTunnel Variable/Name/AF263D54=targetUnit Variable/Name/B0E3BE6B=EssenceUnit @@ -394,6 +407,7 @@ Variable/Name/D7F605A1=LowestTime Variable/Name/D98BAA3B=PLAYER_04_PODS Variable/Name/DA141920=EscapeExplosionPing Variable/Name/DC848B99=Stalker01 +Variable/Name/DD3F0AE2=LOCATION_ID_SECOND_NIADRA_EVOLUTION Variable/Name/E1AA5332=ExplosionAngle Variable/Name/E1EAFC32=PlayerUnitGroup Variable/Name/E28AA3B9=ZergRight diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/ComponentList.SC2Components index b28fb66b6..ab98366c3 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData GameText DocumentInfo diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/DocumentHeader index 9a1169284..ad719e61b 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/DocumentHeader differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy index 8a03b533a..2e1d55774 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy @@ -44,6 +44,14 @@ const int gv_pLAYER_05_PROTOSS = 5; const int gv_pLAYER_06_PROTOSS = 6; const int gv_pLAYER_09_ESSENCE = 9; const int gv_pLAYER_10_URSADON = 10; +const int gv_LOCATION_ID_FIRST_URSADON_MATRIARCH = 1; +const int gv_LOCATION_ID_NORTH_URSADON_MATRIARCH = 2; +const int gv_LOCATION_ID_WEST_URSADON_MATRIARCH = 3; +const int gv_LOCATION_ID_LOST_BROOD = 4; +const int gv_LOCATION_ID_NORTHEAST_PSILINK_SPIRE = 5; +const int gv_LOCATION_ID_NORTHWEST_PSILINK_SPIRE = 6; +const int gv_LOCATION_ID_SOUTHWEST_PSILINK_SPIRE = 7; +const int gv_LOCATION_ID_NAFASH = 8; //-------------------------------------------------------------------------------------------------- // Global Variables @@ -97,19 +105,19 @@ int gv_unfrozenStructureDestroyed; timer gv_speedRunTimer; timer gv_completionistTimer; int gv_largestZergForce; -int gv_objectiveDestroyDominionBase3; +int gv_objectiveCollectUrsadonEssence; int gv_ursadonEssence_Collected; int gv_ursadonEssence_Needed; -int gv_objectiveDestroyDominionBase; -int gv_objectiveDestroyDominionBase22; +int gv_objectiveRecoverLostBrood; +int gv_objectiveDestroyPsiLinkSpires; int gv_psiLinkSpiresDestroyed; -int gv_objectiveRescueBrood; +int gv_objectiveKillUrsadonMatriarchs; int gv_matriarchsKilled; int gv_ursadonMatriarchPingWest; int gv_ursadonMatriarchPingNorth; bool gv_aPNorthMatriarch; bool gv_aPSouthMatriarch; -int gv_objectiveDestroyDominionBase2; +int gv_objectiveFindNafashCorpse; bool gv_cinematicCompleted; unitgroup gv_cinematicTempUnits; unitgroup gv_cinematicHiddenUnits; @@ -141,14 +149,14 @@ void InitGlobals () { gv_firstZealotAttackGroup = UnitGroupEmpty(); gv_speedRunTimer = TimerCreate(); gv_completionistTimer = TimerCreate(); - gv_objectiveDestroyDominionBase3 = c_invalidObjectiveId; + gv_objectiveCollectUrsadonEssence = c_invalidObjectiveId; gv_ursadonEssence_Needed = 1; - gv_objectiveDestroyDominionBase = c_invalidObjectiveId; - gv_objectiveDestroyDominionBase22 = c_invalidObjectiveId; - gv_objectiveRescueBrood = c_invalidObjectiveId; + gv_objectiveRecoverLostBrood = c_invalidObjectiveId; + gv_objectiveDestroyPsiLinkSpires = c_invalidObjectiveId; + gv_objectiveKillUrsadonMatriarchs = c_invalidObjectiveId; gv_ursadonMatriarchPingWest = c_invalidPingId; gv_ursadonMatriarchPingNorth = c_invalidPingId; - gv_objectiveDestroyDominionBase2 = c_invalidObjectiveId; + gv_objectiveFindNafashCorpse = c_invalidObjectiveId; gv_cinematicTempUnits = UnitGroupEmpty(); gv_cinematicHiddenUnits = UnitGroupEmpty(); gv_victoryHiddenUnitGroup = UnitGroupEmpty(); @@ -1993,7 +2001,7 @@ bool gt_StartGameStage2Q_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_LOST_BROOD); if ((libHots_gf_DifficultyValueInt2(1, 1, 0) == 1)) { } @@ -3714,7 +3722,7 @@ bool gt_FlashFreezeEndingRandomQ_Func (bool testConds, bool runActions) { lv_randomLine = RandomInt(1, 4); TriggerQueueEnter(); libSwaC_gf_SetAllSoundChannelVolumesCampaign(libSwaC_ge_VolumeChannelModeCampaign_Speech); - if ((gv_flashFreezeRetreatLineDelivered == false) && ((ObjectiveGetState(gv_objectiveDestroyDominionBase3) == c_objectiveStateCompleted) || (ObjectiveGetState(gv_objectiveDestroyDominionBase3) == c_objectiveStateHidden))) { + if ((gv_flashFreezeRetreatLineDelivered == false) && ((ObjectiveGetState(gv_objectiveCollectUrsadonEssence) == c_objectiveStateCompleted) || (ObjectiveGetState(gv_objectiveCollectUrsadonEssence) == c_objectiveStateHidden))) { lv_deliverRetreatLine = gf_FlashFreezeRetreat(); } @@ -4226,7 +4234,7 @@ bool gt_PsiLinkSpireDestroyed_Func (bool testConds, bool runActions) { TriggerExecute(gt_ObjectiveDestroyPsiLinkSpiresUpdate, true, false); TriggerExecute(gt_CreatePingPsiLinkSpire0203, true, false); if ((EventUnit() == UnitFromId(7))) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTHEAST_PSILINK_SPIRE); PingDestroy(gv_pingSpire01); gv_pingSpire01 = c_invalidPingId; UnitRemove(UnitFromId(1226)); @@ -4235,7 +4243,7 @@ bool gt_PsiLinkSpireDestroyed_Func (bool testConds, bool runActions) { } if ((EventUnit() == UnitFromId(5))) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(6); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTHWEST_PSILINK_SPIRE); PingDestroy(gv_pingSpire02); gv_pingSpire02 = c_invalidPingId; UnitRemove(UnitFromId(1227)); @@ -4244,7 +4252,7 @@ bool gt_PsiLinkSpireDestroyed_Func (bool testConds, bool runActions) { } if ((EventUnit() == UnitFromId(6))) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(7); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHWEST_PSILINK_SPIRE); PingDestroy(gv_pingSpire03); gv_pingSpire03 = c_invalidPingId; UnitRemove(UnitFromId(1228)); @@ -4933,7 +4941,7 @@ bool gt_TransmissionKerriganFindsDeadQueenQ_Func (bool testConds, bool runAction } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(8); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NAFASH); TriggerExecute(gt_ObjectiveFindNafashCorpseComplete, true, false); TriggerQueueEnter(); libSwaC_gf_PingMinimapCampaign(PlayerGroupAll(), UnitGetPosition(UnitFromId(18)), 2.0, Color(100.00, 100.00, 0.00)); @@ -6339,11 +6347,11 @@ bool gt_AchievementCompletionistRunH_Func (bool testConds, bool runActions) { return false; } - if (!((ObjectiveGetState(gv_objectiveDestroyDominionBase22) == c_objectiveStateCompleted))) { + if (!((ObjectiveGetState(gv_objectiveDestroyPsiLinkSpires) == c_objectiveStateCompleted))) { return false; } - if (!((ObjectiveGetState(gv_objectiveRescueBrood) == c_objectiveStateCompleted))) { + if (!((ObjectiveGetState(gv_objectiveKillUrsadonMatriarchs) == c_objectiveStateCompleted))) { return false; } @@ -6522,7 +6530,7 @@ bool gt_VictoryPsiLinkSpiresDestroyed_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; } @@ -6578,7 +6586,7 @@ bool gt_Victory_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); UnitPauseAll(true); AITimePause(true); - if ((ObjectiveGetState(gv_objectiveDestroyDominionBase22) == c_objectiveStateCompleted)) { + if ((ObjectiveGetState(gv_objectiveDestroyPsiLinkSpires) == c_objectiveStateCompleted)) { libSwaC_gf_CampaignAwardAchievement("ZKaldir01_1", gv_pLAYER_01_USER); } @@ -6722,8 +6730,11 @@ bool gt_ObjectiveCollectUrsadonEssenceCreate_Func (bool testConds, bool runActio TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZExpedition01Objective2"); - gv_objectiveDestroyDominionBase3 = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition01Objective2", "", gv_ursadonEssence_Collected); + gv_objectiveCollectUrsadonEssence = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveCollectUrsadonEssence, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveCollectUrsadonEssence, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveCollectUrsadonEssence, gv_LOCATION_ID_FIRST_URSADON_MATRIARCH); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveCollectUrsadonEssence, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6752,7 +6763,7 @@ bool gt_ObjectiveCollectUrsadonEssenceComplete_Func (bool testConds, bool runAct TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveCollectUrsadonEssenceCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase3); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveCollectUrsadonEssence); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6781,7 +6792,7 @@ bool gt_ObjectiveCollectUrsadonEssenceFailed_Func (bool testConds, bool runActio TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveCollectUrsadonEssenceCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase3); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveCollectUrsadonEssence); return true; } @@ -6809,8 +6820,11 @@ bool gt_ObjectiveRecoverLostBroodCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZExpedition01Objective1"); - gv_objectiveDestroyDominionBase = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition01Objective1", "", 0); + gv_objectiveRecoverLostBrood = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveRecoverLostBrood, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveRecoverLostBrood, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveRecoverLostBrood, gv_LOCATION_ID_LOST_BROOD); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveRecoverLostBrood, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6839,7 +6853,7 @@ bool gt_ObjectiveRecoverLostBroodComplete_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveRecoverLostBroodCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveRecoverLostBrood); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6868,7 +6882,7 @@ bool gt_ObjectiveRecoverLostBroodFailed_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveRecoverLostBroodCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveRecoverLostBrood); return true; } @@ -6896,8 +6910,14 @@ bool gt_ObjectiveDestroyPsiLinkSpiresCreate_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZExpedition01Objective04"); - gv_objectiveDestroyDominionBase22 = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition01Objective04", "", gv_psiLinkSpiresDestroyed); + gv_objectiveDestroyPsiLinkSpires = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveDestroyPsiLinkSpires, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveDestroyPsiLinkSpires, lib5BD4895D_ge_APObjectiveCategory_Primary, "", gv_psiLinkSpiresDestroyed, 3, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyPsiLinkSpires, gv_LOCATION_ID_NORTHEAST_PSILINK_SPIRE); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyPsiLinkSpires, gv_LOCATION_ID_NORTHWEST_PSILINK_SPIRE); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyPsiLinkSpires, gv_LOCATION_ID_SOUTHWEST_PSILINK_SPIRE); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyPsiLinkSpires, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyPsiLinkSpires, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6925,7 +6945,7 @@ bool gt_ObjectiveDestroyPsiLinkSpiresUpdate_Func (bool testConds, bool runAction } TriggerExecute(gt_ObjectiveDestroyPsiLinkSpiresCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase22, gv_psiLinkSpiresDestroyed); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyPsiLinkSpires, gv_psiLinkSpiresDestroyed); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6954,8 +6974,8 @@ bool gt_ObjectiveDestroyPsiLinkSpiresComplete_Func (bool testConds, bool runActi TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveDestroyPsiLinkSpiresCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase22, gv_psiLinkSpiresDestroyed); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase22); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyPsiLinkSpires, gv_psiLinkSpiresDestroyed); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyPsiLinkSpires); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6984,7 +7004,7 @@ bool gt_ObjectiveDestroyPsiLinkSpiresFailed_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveDestroyPsiLinkSpiresCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase22); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyPsiLinkSpires); return true; } @@ -6997,7 +7017,13 @@ void gt_ObjectiveDestroyPsiLinkSpiresFailed_Init () { // Trigger: Objective Ursadon Matriarchs Create //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveUrsadonMatriarchsCreate_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))) { @@ -7012,8 +7038,12 @@ bool gt_ObjectiveUrsadonMatriarchsCreate_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZExpedition01Objective05"); - gv_objectiveRescueBrood = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition01Objective05", "", gv_matriarchsKilled); + gv_objectiveKillUrsadonMatriarchs = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveKillUrsadonMatriarchs, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveKillUrsadonMatriarchs, lv_category, "", gv_matriarchsKilled, 2, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveKillUrsadonMatriarchs, gv_LOCATION_ID_NORTH_URSADON_MATRIARCH); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveKillUrsadonMatriarchs, gv_LOCATION_ID_WEST_URSADON_MATRIARCH); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveKillUrsadonMatriarchs, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7048,7 +7078,7 @@ bool gt_ObjectiveUrsadonMatriarchsUpdate_Func (bool testConds, bool runActions) if ((gv_aPSouthMatriarch == false)) { gv_aPSouthMatriarch = true; PingDestroy(gv_ursadonMatriarchPingWest); - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_WEST_URSADON_MATRIARCH); } } @@ -7056,7 +7086,7 @@ bool gt_ObjectiveUrsadonMatriarchsUpdate_Func (bool testConds, bool runActions) if ((gv_aPNorthMatriarch == false)) { gv_aPNorthMatriarch = true; PingDestroy(gv_ursadonMatriarchPingNorth); - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTH_URSADON_MATRIARCH); } } @@ -7065,7 +7095,7 @@ bool gt_ObjectiveUrsadonMatriarchsUpdate_Func (bool testConds, bool runActions) TriggerExecute(gt_MatriarchKilledUpgradeZergQ, true, false); TriggerExecute(gt_ObjectiveUrsadonMatriarchsCreate, true, false); libSwaC_gf_DisplayMissionObjectiveRewardFloatingText(UnitGetPosition(EventUnit()), "ZExpedition01Objective05", gv_pLAYER_01_USER); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveRescueBrood, gv_matriarchsKilled); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveKillUrsadonMatriarchs, gv_matriarchsKilled); TriggerExecute(gt_ObjectiveUrsadonMatriarchsComplete, true, false); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; @@ -7107,8 +7137,8 @@ bool gt_ObjectiveUrsadonMatriarchsComplete_Func (bool testConds, bool runActions TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveUrsadonMatriarchsCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveRescueBrood, gv_matriarchsKilled); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveRescueBrood); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveKillUrsadonMatriarchs, gv_matriarchsKilled); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveKillUrsadonMatriarchs); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7137,7 +7167,7 @@ bool gt_ObjectiveUrsadonMatriarchsFailedQ_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveUrsadonMatriarchsCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveRescueBrood); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveKillUrsadonMatriarchs); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7151,7 +7181,13 @@ void gt_ObjectiveUrsadonMatriarchsFailedQ_Init () { // Trigger: Objective Find Nafash Corpse Create //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveFindNafashCorpseCreate_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Extra; + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -7165,9 +7201,11 @@ bool gt_ObjectiveFindNafashCorpseCreate_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - ObjectiveCreate(StringExternal("Param/Value/C5DC69B4"), StringToText(""), c_objectiveStateActive, false); - gv_objectiveDestroyDominionBase2 = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveSimple(gv_objectiveDestroyDominionBase2); + ObjectiveCreate(StringExternal("Param/Value/C5DC69B4"), StringToText(""), c_objectiveStateHidden, false); + gv_objectiveFindNafashCorpse = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveFindNafashCorpse, lv_category, true); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindNafashCorpse, gv_LOCATION_ID_NAFASH); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveFindNafashCorpse, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7196,7 +7234,7 @@ bool gt_ObjectiveFindNafashCorpseComplete_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveFindNafashCorpseCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase2); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveFindNafashCorpse); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -7225,7 +7263,7 @@ bool gt_ObjectiveFindNafashCorpseFailed_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveFindNafashCorpseCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase2); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveFindNafashCorpse); return true; } @@ -7957,10 +7995,8 @@ bool gt_MidRecoverBroodCleanup_Func (bool testConds, bool runActions) { UnitSetPropertyFixed(gv_kerrigan, c_unitPropEnergyPercent, 100.0); UIAlertClear(gv_pLAYER_01_USER); PingDestroy(gv_pingZergBase); - ObjectiveShow(gv_objectiveDestroyDominionBase3, PlayerGroupAll(), false); - lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase3); - ObjectiveShow(gv_objectiveDestroyDominionBase, PlayerGroupAll(), false); - lib5BD4895D_gf_AP_Core_showObjective(gv_objectiveDestroyDominionBase); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveCollectUrsadonEssence, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveRecoverLostBrood, false); TriggerEnable(gt_DefeatBaseDead, true); TriggerEnable(gt_DefeatKerriganDead, false); if ((gv_cinematicCompleted == true)) { @@ -8637,7 +8673,7 @@ bool gt_UrsadonMatriarchFirst_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIRST_URSADON_MATRIARCH); return true; } diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Preload.xml index ebb0c2123..df2a879c8 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Preload.xml +++ b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Preload.xml @@ -49,10 +49,6 @@ - - - - diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers index 4948eaea5..ad5ff7d72 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers @@ -9020,7 +9020,7 @@ - + @@ -9117,14 +9117,13 @@ - - - + + + - - - 4 - + + + @@ -27487,7 +27486,7 @@ - + @@ -27495,15 +27494,14 @@ - - + + - + - - - 5 - + + + @@ -27596,7 +27594,7 @@ - + @@ -27604,15 +27602,14 @@ - - + + - + - - - 6 - + + + @@ -27705,22 +27702,21 @@ - + - - + + - + - - - 7 - + + + @@ -32389,7 +32385,7 @@ - + @@ -32606,14 +32602,13 @@ - - - + + + - - - 8 - + + + @@ -43601,7 +43596,7 @@ - + @@ -43742,12 +43737,12 @@ - - - + + + - - + + @@ -44739,7 +44734,6 @@ - objectiveDestroyDominionBase3 @@ -44773,9 +44767,11 @@ - - + + + + @@ -44839,37 +44835,6 @@ - - - - - - - - - - - - ZExpedition01Objective2 - - - - - - - - - - - - - - - - - - - @@ -44886,33 +44851,71 @@ - - - - - - + + + + + - - - + + + - - + + - - - ZExpedition01Objective2 - - + + + - - - + + + - - - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44933,8 +44936,6 @@ - - @@ -45013,51 +45014,6 @@ Update the objective - - - - - - - - - - - - - - - - - - - - - - - - - - ZExpedition01Objective2 - - - - - - - - - - - - - - - - - - - @@ -45183,7 +45139,6 @@ - objectiveDestroyDominionBase @@ -45198,7 +45153,10 @@ - + + + + @@ -45278,34 +45236,71 @@ - - - - - - + + + + + - - - + + + - - + + - - - ZExpedition01Objective1 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45326,8 +45321,6 @@ - - @@ -45406,52 +45399,6 @@ Update the objective - - - - - - - - - - - - - - - - - - - - - - - - - - ZExpedition01Objective1 - - - - - - 1 - - - - - - - - - - - - - - @@ -45578,7 +45525,6 @@ - objectiveDestroyDominionBase22 @@ -45602,9 +45548,14 @@ - - + + + + + + + @@ -45668,37 +45619,6 @@ - - - - - - - - - - - - ZExpedition01Objective04 - - - - - - - - - - - - - - - - - - - @@ -45715,34 +45635,127 @@ - - - - - - + + + + + - - - + + + - - + + - - - ZExpedition01Objective04 - - + + + - - + + + + + + + + + + + + + + + + + + + - - + + + + + 3 + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45761,7 +45774,6 @@ - @@ -45824,37 +45836,6 @@ Update the objective - - - - - - - - - - - - ZExpedition01Objective04 - - - - - - - - - - - - - - - - - - - @@ -45887,8 +45868,6 @@ - - @@ -45968,51 +45947,6 @@ Update the objective - - - - - - - - - - - - - - - - - - - - - - - - - - ZExpedition01Objective04 - - - - - - - - - - - - - - - - - - - @@ -46151,7 +46085,6 @@ - objectiveRescueBrood @@ -46209,14 +46142,28 @@ + - - + + + + + + + + + + + + + + + @@ -46273,37 +46220,6 @@ - - - - - - - - - - - - ZExpedition01Objective05 - - - - - - - - - - - - - - - - - - - @@ -46320,34 +46236,101 @@ - - - - - - + + + + + - - - + + + - - + + - - - ZExpedition01Objective05 - - + + + - - + + + + + + + + + + + + + + + + + + + - - + + + + + 2 + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -46376,7 +46359,6 @@ - @@ -46514,7 +46496,7 @@ - + @@ -46560,15 +46542,14 @@ - - + + - + - - - 3 - + + + @@ -46587,7 +46568,7 @@ - + @@ -46633,15 +46614,14 @@ - - + + - + - - - 2 - + + + @@ -46727,37 +46707,6 @@ Update the objective - - - - - - - - - - - - ZExpedition01Objective05 - - - - - - - - - - - - - - - - - - - @@ -46810,9 +46759,7 @@ - - @@ -46943,57 +46890,11 @@ - - - - - - - - - - - - - - Update the campaign progress for this objective. This must be done whenever an objective's progress changes. - - - - - - - - - - - - ZExpedition01Objective05 - - - - - - 2 - - - - - - - - - - - - - - @@ -47135,7 +47036,6 @@ - objectiveDestroyDominionBase2 @@ -47145,14 +47045,27 @@ + - + + + + + + + + + + + + + @@ -47217,7 +47130,7 @@ - + @@ -47243,14 +47156,51 @@ - - - + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + @@ -47270,8 +47220,6 @@ - - @@ -47350,52 +47298,6 @@ Update the objective - - - - - - - - - - - - - - - - - - - - - - - - - - ZExpedition01Objective1 - - - - - - 1 - - - - - - - - - - - - - - @@ -53554,10 +53456,8 @@ - - - - + + @@ -55132,64 +55032,32 @@ - - - - - - - - - - - - + + + + - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - + + + + - - + + + + + + @@ -59053,6 +58921,7 @@ + @@ -59060,6 +58929,112 @@ + + + + + + + + + + + + LOCATION_ID_FIRST_URSADON_MATRIARCH + + + + + + + + 1 + + + + LOCATION_ID_NORTH_URSADON_MATRIARCH + + + + + + + + 2 + + + + LOCATION_ID_WEST_URSADON_MATRIARCH + + + + + + + + 3 + + + + LOCATION_ID_LOST_BROOD + + + + + + + + 4 + + + + LOCATION_ID_NORTHEAST_PSILINK_SPIRE + + + + + + + + 5 + + + + LOCATION_ID_NORTHWEST_PSILINK_SPIRE + + + + + + + + 6 + + + + LOCATION_ID_SOUTHWEST_PSILINK_SPIRE + + + + + + + + 7 + + + + LOCATION_ID_NAFASH + + + + + + + + 8 + + @@ -59776,7 +59751,7 @@ - + @@ -59850,13 +59825,12 @@ - - - + + + - - - 1 - + + + \ No newline at end of file diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers.version index e0c6aa4d6..72139f657 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers.version differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 2197a0e29..b33f106a4 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -15,6 +15,7 @@ Category/Name/618FC7C6=Debug Category/Name/684BC26C=Flash Freeze Category/Name/6CA7F69B======== OBJECTIVES ======= Category/Name/6F59E1F6======== ARCHIPELAGO ======= +Category/Name/77AE09E1=Location IDs Category/Name/885B00E0=Main Objective - Recover Lost Brood Category/Name/916B6E65=Ursadon Behaviors Category/Name/A1EBD7CD=Campaign Mission @@ -244,6 +245,7 @@ Variable/Name/02E8C526=StartingHatchery Variable/Name/031E89DA=FadeDuratioin Variable/Name/03EF75D2=Ursadon_CenterNorth Variable/Name/0513D93C=Soundtrack +Variable/Name/0748906E=category Variable/Name/0780B88F=VisibilitySpire01 Variable/Name/08D04A5A=PLAYER_02_RESCUE_ZERG Variable/Name/0A683C06=DeliverRetreatLine @@ -266,9 +268,11 @@ Variable/Name/2992968B=playerGroup Variable/Name/2AFE9BF2=currentUnit Variable/Name/2F9750F7=LargestZergForce Variable/Name/31895DEC=ObjectiveCollectUrsadonEssence +Variable/Name/32930D6C=LOCATION_ID_NORTHWEST_PSI-LINK_SPIRE Variable/Name/33C20B4B=PLAYER_10_URSADON Variable/Name/352E6C6A=VisibilitySpire03 Variable/Name/3620FDE7=Owner +Variable/Name/3635BF07=LOCATION_ID_NAFASH Variable/Name/367F82A2=ESSENCE_Ursadon Variable/Name/38DBA272=currentUnit Variable/Name/3DDF366B=FlashFreezeDuration_Window @@ -279,6 +283,9 @@ Variable/Name/45A29DD1=FlashFreezeActive Variable/Name/4652F608=Ursadon_CenterSouth Variable/Name/473D6933=SpireActorModel01 Variable/Name/48B6AAF1=ObjectiveFindNafashCorpse +Variable/Name/5013A472=LOCATION_ID_NORTHEAST_PSI-LINK_SPIRE +Variable/Name/50BAF2D9=LOCATION_ID_SOUTHWEST_PSI-LINK_SPIRE +Variable/Name/51F8A781=LOCATION_ID_NORTH_URSADON_MATRIARCH Variable/Name/55A19E62=VictoryZerg Variable/Name/57075A22=FadeDuration Variable/Name/5800A47D=Soundtrack @@ -312,6 +319,7 @@ Variable/Name/94BAE39F=FlashFreeze_Duration Variable/Name/94C59571=MatriarchActor Variable/Name/95817396=DelayTop Variable/Name/97030D13=THE_ONE_KERRIGAN +Variable/Name/986CAB71=LOCATION_ID_FIRST_URSADON_MATRIARCH Variable/Name/9AE34E09=CinematicKerrigan Variable/Name/9C9C0A38=CompletionistTimer Variable/Name/9EB95045=Random @@ -354,6 +362,7 @@ Variable/Name/DAE15D50=CinematicZergling Variable/Name/DC0DE0D0=UrsadonEssence_Needed Variable/Name/E0F025BC=VictoryZerg Variable/Name/E40AB925=ProtossPlayers +Variable/Name/E5841B91=LOCATION_ID_LOST_BROOD Variable/Name/E64436C2=CinematicTempUnits Variable/Name/E8A527A5=InCinematic Variable/Name/E943ADF6=Shield @@ -365,6 +374,8 @@ Variable/Name/EE8440F3=Position Variable/Name/EEE9A14D=DROP_UNITS Variable/Name/EF5BE4BF=StartingVision Variable/Name/F00A88F4=PLAYER_01_USER +Variable/Name/F1BD908A=category +Variable/Name/F74CDEFA=LOCATION_ID_WEST_URSADON_MATRIARCH Variable/Name/F771F7AC=ProtossKilledDuringFlashFreeze Variable/Name/FBEDA95E=PingZergBase Variable/Name/FD0CC27F=DelayBottom diff --git a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/ComponentList.SC2Components index c8f4a47f3..2dce1a8f1 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData GameText DocumentInfo diff --git a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/DocumentHeader index b37d808a6..75b207425 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/DocumentHeader differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/MapScript.galaxy index b9bf95e2c..2c3c0a5f9 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/MapScript.galaxy @@ -49,6 +49,15 @@ const fixed gv_warningDistance = 25.0; const int gv_stasisChamberPingIndex = 0; const string gv_launchFacilityType = "ProtossDockingBayUnit"; const int gv_objectiveFindFrozenZergTotal = 4; +const int gv_LOCATION_ID_EAST_STATIS_CHAMBER = 1; +const int gv_LOCATION_ID_CENTER_STATIS_CHAMBER = 2; +const int gv_LOCATION_ID_WEST_STATIS_CHAMBER = 3; +const int gv_LOCATION_ID_DESTROY_4_SHUTTLES = 4; +const int gv_LOCATION_ID_FROZEN_EXPANSION = 5; +const int gv_LOCATION_ID_SOUTHWEST_FROZEN_ZERG = 6; +const int gv_LOCATION_ID_SOUTHEAST_FROZEN_ZERG = 7; +const int gv_LOCATION_ID_WEST_FROZEN_ZERG = 8; +const int gv_LOCATION_ID_EAST_FROZEN_ZERG = 9; //-------------------------------------------------------------------------------------------------- // Global Preset Declarations @@ -104,7 +113,7 @@ int gv_nexusDestroyedCount; int gv_feralZergUnfrozen; int gv_feralZergFrozenTotal; int gv_dockingBaysDestroyed; -int gv_objectiveDestroyDominionBase; +int gv_objectiveDestroyAllProtossShuttles; int gv_shuttleWavesRemaining; int gv_objectiveNoShuttleCanEscape; int gv_objectiveBonusDestroyStasisChamber; @@ -145,7 +154,7 @@ void InitGlobals () { gv_stasisChamberPingArray[init_i] = c_invalidPingId; } gv_noShuttleHasSlowedDown = true; - gv_objectiveDestroyDominionBase = c_invalidObjectiveId; + gv_objectiveDestroyAllProtossShuttles = c_invalidObjectiveId; gv_shuttleWavesRemaining = 8; gv_objectiveNoShuttleCanEscape = c_invalidObjectiveId; gv_objectiveBonusDestroyStasisChamber = c_invalidObjectiveId; @@ -271,6 +280,7 @@ trigger gt_ObjectiveNoShuttleCanEscapeComplete; trigger gt_ObjectiveNoShuttleCanEscapeFailed; trigger gt_ObjectiveDestroyStasisChamberCreate; trigger gt_ObjectiveDestroyStasisChamberUpdate; +trigger gt_ObjectiveDestroyStatisChamberDeactivate; trigger gt_ObjectiveDestroyStasisChamberComplete; trigger gt_ObjectiveFindFrozenZergCreate; trigger gt_ObjectiveFindFrozenZergUpdate; @@ -3213,7 +3223,7 @@ bool gt_RescueFrozenZergExpansion_Func (bool testConds, bool runActions) { libSwaC_gf_PingMinimapCampaign(PlayerGroupSingle(gv_pLAYER_01_USER), UnitGetPosition(UnitFromId(1)), 2.0, Color(0.00, 100.00, 0.00)); UIAlertUnit("Trigger", gv_pLAYER_01_USER, StringExternal("Param/Value/66AC2FE8"), null, UnitFromId(1)); TriggerExecute(gt_TransmissionFrozenBaseRescuedQ, true, false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FROZEN_EXPANSION); TriggerExecute(gt_ObjectiveFindFrozenZergBaseComplete, true, false); auto5E51DAD4_g = UnitGroup(null, gv_pLAYER_07_FROZENZERG, RegionFromId(13), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); auto5E51DAD4_u = UnitGroupCount(auto5E51DAD4_g, c_unitCountAll); @@ -4407,7 +4417,7 @@ bool gt_VictoryDockingBaysDestroyed_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); if ((gv_shuttleWavesRemaining > 4)) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_DESTROY_4_SHUTTLES); } libSwaC_gf_UpdateMissionObjectiveText("ZExpedition02Objective2", 0, false, StringExternal("Param/Value/DCC58208")); @@ -4439,7 +4449,7 @@ bool gt_VictorySequence_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory); gv_gameOver = true; SoundtrackPlay(PlayerGroupAll(), c_soundtrackCategoryMusic, "ZExpedition02MusicCutscene_MissionVictoryStinger", c_soundtrackCueAny, c_soundtrackIndexAny, false); if ((UnitIsAlive(gv_kerrigan) == true)) { @@ -4476,7 +4486,7 @@ bool gt_Victory_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - if ((ObjectiveGetState(gv_objectiveDestroyDominionBase) == c_objectiveStateCompleted) && (ObjectiveGetState(gv_objectiveNoShuttleCanEscape) == c_objectiveStateCompleted)) { + if ((ObjectiveGetState(gv_objectiveDestroyAllProtossShuttles) == c_objectiveStateCompleted) && (ObjectiveGetState(gv_objectiveNoShuttleCanEscape) == c_objectiveStateCompleted)) { libSwaC_gf_CampaignAwardAchievement("ZKaldir02_1", gv_pLAYER_01_USER); } @@ -4765,8 +4775,12 @@ bool gt_ObjectiveDestroyAllProtossShuttlesCreate_Func (bool testConds, bool runA TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZExpedition02Objective2"); - gv_objectiveDestroyDominionBase = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition02Objective2", gf_Objective_LabelText(), gv_shuttleWavesRemaining); + gv_objectiveDestroyAllProtossShuttles = ObjectiveLastCreated(); + ObjectiveShow(gv_objectiveDestroyAllProtossShuttles, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveDestroyAllProtossShuttles, lib5BD4895D_ge_APObjectiveCategory_Primary, gf_Objective_LabelText(), gv_shuttleWavesRemaining, 0, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyAllProtossShuttles, gv_LOCATION_ID_DESTROY_4_SHUTTLES); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyAllProtossShuttles, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyAllProtossShuttles, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -4808,14 +4822,14 @@ bool gt_ObjectiveDestroyAllProtossShuttlesUpdate_Func (bool testConds, bool runA TriggerExecute(gt_ObjectiveDestroyAllProtossShuttlesCreate, true, false); gv_shuttleWavesRemaining -= 1; - lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveDestroyDominionBase, gf_Objective_LabelText()); - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyDominionBase, gv_shuttleWavesRemaining); + lib5BD4895D_gf_AP_Core_setObjectiveCounterSuffix(gv_objectiveDestroyAllProtossShuttles, gf_Objective_LabelText()); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyAllProtossShuttles, gv_shuttleWavesRemaining); if ((gv_shuttleWavesRemaining <= 0)) { TriggerExecute(gt_VictorySequence, true, false); } if ((gv_shuttleWavesRemaining == 4)) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_DESTROY_4_SHUTTLES); } return true; @@ -4846,7 +4860,7 @@ bool gt_ObjectiveDestroyAllProtossShuttlesComplete_Func (bool testConds, bool ru TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveDestroyAllProtossShuttlesCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyAllProtossShuttles); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -4875,7 +4889,7 @@ bool gt_ObjectiveDestroyAllProtossShuttlesFailed_Func (bool testConds, bool runA TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveDestroyAllProtossShuttlesCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyAllProtossShuttles); return true; } @@ -4904,7 +4918,9 @@ bool gt_ObjectiveNoShuttleCanEscapeCreate_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZExpedition02Objective3"); gv_objectiveNoShuttleCanEscape = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition02Objective3", "", 0); + ObjectiveShow(gv_objectiveNoShuttleCanEscape, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveNoShuttleCanEscape, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveNoShuttleCanEscape, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -4933,7 +4949,7 @@ bool gt_ObjectiveNoShuttleCanEscapeComplete_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveNoShuttleCanEscapeCreate, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyAllProtossShuttles); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -4977,7 +4993,13 @@ void gt_ObjectiveNoShuttleCanEscapeFailed_Init () { // Trigger: Objective Destroy Stasis Chamber Create //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveDestroyStasisChamberCreate_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))) { @@ -4993,7 +5015,12 @@ bool gt_ObjectiveDestroyStasisChamberCreate_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZExpedition02Objective1"); gv_objectiveBonusDestroyStasisChamber = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "ZExpedition02Objective1", "", 0); + ObjectiveShow(gv_objectiveBonusDestroyStasisChamber, PlayerGroupAll(), false); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveBonusDestroyStasisChamber, lv_category, "", gv_stasisChamberDestroyed, libSwaC_gf_MissionObjectiveItemCount("ZExpedition02Objective1"), true); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveBonusDestroyStasisChamber, gv_LOCATION_ID_EAST_STATIS_CHAMBER); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveBonusDestroyStasisChamber, gv_LOCATION_ID_CENTER_STATIS_CHAMBER); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveBonusDestroyStasisChamber, gv_LOCATION_ID_WEST_STATIS_CHAMBER); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveBonusDestroyStasisChamber, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -5030,6 +5057,39 @@ void gt_ObjectiveDestroyStasisChamberUpdate_Init () { gt_ObjectiveDestroyStasisChamberUpdate = TriggerCreate("gt_ObjectiveDestroyStasisChamberUpdate_Func"); } +//-------------------------------------------------------------------------------------------------- +// Trigger: Objective Destroy Statis Chamber Deactivate +//-------------------------------------------------------------------------------------------------- +bool gt_ObjectiveDestroyStatisChamberDeactivate_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + // Conditions + if (testConds) { + if (!(((lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_EAST_STATIS_CHAMBER] == false) && (lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_CENTER_STATIS_CHAMBER] == false) && (lib5BD4895D_gv_aP_Core_locationCollectable[gv_LOCATION_ID_WEST_STATIS_CHAMBER] == false)))) { + return false; + } + } + + // Actions + if (!runActions) { + return true; + } + + TriggerEnable(gt_ObjectiveDestroyStasisChamberCreate, false); + TriggerEnable(gt_ObjectiveDestroyStasisChamberUpdate, false); + TriggerEnable(gt_TransmissionStasisChamberIntroQ, false); + TriggerEnable(gt_TransmissionStasisChamberDestroyedQ, false); + TriggerEnable(gt_StasisChamberDestroyed, false); + TriggerEnable(gt_ShowBonusObjectiveProximity, false); + TriggerEnable(gt_BonusObjectiveIntroQ, false); + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_ObjectiveDestroyStatisChamberDeactivate_Init () { + gt_ObjectiveDestroyStatisChamberDeactivate = TriggerCreate("gt_ObjectiveDestroyStatisChamberDeactivate_Func"); + TriggerAddEventTimeElapsed(gt_ObjectiveDestroyStatisChamberDeactivate, 2.0, c_timeGame); +} + //-------------------------------------------------------------------------------------------------- // Trigger: Objective Destroy Stasis Chamber Complete //-------------------------------------------------------------------------------------------------- @@ -5063,7 +5123,13 @@ void gt_ObjectiveDestroyStasisChamberComplete_Init () { // Trigger: Objective Find Frozen Zerg Create //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveFindFrozenZergCreate_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Extra; + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -5077,9 +5143,14 @@ bool gt_ObjectiveFindFrozenZergCreate_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - ObjectiveCreate(StringExternal("Param/Value/2AB0D04A"), StringToText(""), c_objectiveStateActive, false); + ObjectiveCreate(StringExternal("Param/Value/2AB0D04A"), StringToText(""), c_objectiveStateHidden, false); gv_objectiveFindFrozenZerg = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(gv_objectiveFindFrozenZerg, "", gv_objectiveFindFrozenZergFound, gv_objectiveFindFrozenZergTotal); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveFindFrozenZerg, lv_category, "", gv_objectiveFindFrozenZergFound, gv_objectiveFindFrozenZergTotal, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindFrozenZerg, gv_LOCATION_ID_EAST_FROZEN_ZERG); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindFrozenZerg, gv_LOCATION_ID_WEST_FROZEN_ZERG); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindFrozenZerg, gv_LOCATION_ID_SOUTHEAST_FROZEN_ZERG); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindFrozenZerg, gv_LOCATION_ID_SOUTHWEST_FROZEN_ZERG); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveFindFrozenZerg, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -5154,7 +5225,13 @@ void gt_ObjectiveFindFrozenZergComplete_Init () { // Trigger: Objective Find Frozen Zerg Base Create //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveFindFrozenZergBaseCreate_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Extra; + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -5168,9 +5245,11 @@ bool gt_ObjectiveFindFrozenZergBaseCreate_Func (bool testConds, bool runActions) } TriggerEnable(TriggerGetCurrent(), false); - ObjectiveCreate(StringExternal("Param/Value/43CE71A7"), StringToText(""), c_objectiveStateActive, false); + ObjectiveCreate(StringExternal("Param/Value/43CE71A7"), StringToText(""), c_objectiveStateHidden, false); gv_objectiveFindFrozenZergBase = ObjectiveLastCreated(); - lib5BD4895D_gf_AP_Core_addObjectiveSimple(gv_objectiveFindFrozenZergBase); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveFindFrozenZergBase, lv_category, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveFindFrozenZergBase, gv_LOCATION_ID_FROZEN_EXPANSION); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveFindFrozenZergBase, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -6077,7 +6156,7 @@ bool gt_StasisChamberDestroyedEast_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_EAST_STATIS_CHAMBER); return true; } @@ -6108,7 +6187,7 @@ bool gt_StasisChamberDestroyedCenter_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_CENTER_STATIS_CHAMBER); return true; } @@ -6139,7 +6218,7 @@ bool gt_StasisChamberDestroyedWest_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_WEST_STATIS_CHAMBER); return true; } @@ -6179,7 +6258,7 @@ bool gt_SouthwestFrozenZerg_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(6); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHWEST_FROZEN_ZERG); TriggerExecute(gt_ObjectiveFindFrozenZergUpdate, true, false); return true; } @@ -6220,7 +6299,7 @@ bool gt_WestFrozenZerg_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(8); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_WEST_FROZEN_ZERG); TriggerExecute(gt_ObjectiveFindFrozenZergUpdate, true, false); return true; } @@ -6261,7 +6340,7 @@ bool gt_SoutheastFrozenZerg_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(7); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHEAST_FROZEN_ZERG); TriggerExecute(gt_ObjectiveFindFrozenZergUpdate, true, false); return true; } @@ -6302,7 +6381,7 @@ bool gt_EastFrozenZerg_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(9); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_EAST_FROZEN_ZERG); TriggerExecute(gt_ObjectiveFindFrozenZergUpdate, true, false); return true; } @@ -6410,6 +6489,7 @@ void InitTriggers () { gt_ObjectiveNoShuttleCanEscapeFailed_Init(); gt_ObjectiveDestroyStasisChamberCreate_Init(); gt_ObjectiveDestroyStasisChamberUpdate_Init(); + gt_ObjectiveDestroyStatisChamberDeactivate_Init(); gt_ObjectiveDestroyStasisChamberComplete_Init(); gt_ObjectiveFindFrozenZergCreate_Init(); gt_ObjectiveFindFrozenZergUpdate_Init(); diff --git a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Preload.xml index f506ee230..d835a1395 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Preload.xml +++ b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Preload.xml @@ -40,9 +40,6 @@ - - - diff --git a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Triggers index 09ede69ab..ad03cb49f 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Triggers @@ -21875,7 +21875,7 @@ - + @@ -22270,14 +22270,13 @@ - - - + + + - - - 5 - + + + @@ -29018,18 +29017,17 @@ - + - - + + - + - - - 4 - + + + @@ -29112,7 +29110,7 @@ - + @@ -29141,12 +29139,12 @@ false - - - + + + - - + + @@ -31042,7 +31040,6 @@ - objectiveDestroyDominionBase @@ -31120,8 +31117,11 @@ - - + + + + + @@ -31201,65 +31201,103 @@ - - - - - - - + + + + + - - - ZExpedition02Objective2 - - + + + - - - + + - - + + - - - + + + + + + + + + + + + + + + + - + + + + + - - - - - - + + + - - - + + + 0 + - - + + + false + - - - ZExpedition02Objective2 - - + + + - - - + + + + - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -31283,7 +31321,6 @@ - @@ -31436,35 +31473,6 @@ - - - - - - - - - - - ZExpedition02Objective2 - - - - - - - - - - - - - - - - - - @@ -31541,18 +31549,17 @@ - + - - + + - + - - - 4 - + + + @@ -31791,7 +31798,9 @@ - + + + @@ -31871,34 +31880,58 @@ - - - - - - + + + + + - - - + + + - - + + - - - ZExpedition02Objective3 - - + + + - - - + + + - - - 0 - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + @@ -32147,6 +32180,7 @@ + @@ -32159,15 +32193,30 @@ + - - + + + + + + + + + + + + + + + + @@ -32245,66 +32294,122 @@ - - - - - - - - - - - - ZExpedition02Objective1 - - + + + + + - - - 0 - + + + - - - + + - - - + + + - - - + + + + + + + + + + + + + + + + - - - - - - + + + - - - + + + - - + + + - - + + + + + + ZExpedition02Objective1 - - - + + + true + - - - 0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -32381,6 +32486,207 @@ + + + + + + + + + + + + + + + + + + + 2.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -32525,14 +32831,30 @@ + - + + + + + + + + + + + + + + + + @@ -32597,7 +32919,7 @@ - + @@ -32623,29 +32945,105 @@ - - - - - - - - - + + + + + + + + + + + - - + + - - + + - - + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -32907,14 +33305,27 @@ + - + + + + + + + + + + + + + @@ -32979,7 +33390,7 @@ - + @@ -33005,14 +33416,51 @@ - - - + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + @@ -38901,12 +39349,132 @@ + + + + + + + + + + + + + + LOCATION_ID_EAST_STATIS_CHAMBER + + + + + + + + 1 + + + + LOCATION_ID_CENTER_STATIS_CHAMBER + + + + + + + + 2 + + + + LOCATION_ID_WEST_STATIS_CHAMBER + + + + + + + + 3 + + + + LOCATION_ID_DESTROY_4_SHUTTLES + + + + + + + + 4 + + + + LOCATION_ID_FROZEN_EXPANSION + + + + + + + + 5 + + + + LOCATION_ID_SOUTHWEST_FROZEN_ZERG + + + + + + + + 6 + + + + LOCATION_ID_SOUTHEAST_FROZEN_ZERG + + + + + + + + 7 + + + + LOCATION_ID_WEST_FROZEN_ZERG + + + + + + + + 8 + + + + LOCATION_ID_EAST_FROZEN_ZERG + + + + + + + + 9 + + @@ -39262,7 +39830,7 @@ - + @@ -39311,20 +39879,19 @@ false - - - + + + - - - 1 - + + + - + @@ -39373,20 +39940,19 @@ false - - - + + + - - - 2 - + + + - + @@ -39435,14 +40001,13 @@ false - - - + + + - - - 3 - + + + @@ -39457,7 +40022,7 @@ - + @@ -39603,14 +40168,13 @@ - - - + + + - - - 6 - + + + @@ -39638,7 +40202,7 @@ - + @@ -39784,14 +40348,13 @@ - - - + + + - - - 8 - + + + @@ -39819,7 +40382,7 @@ - + @@ -39965,14 +40528,13 @@ - - - + + + - - - 7 - + + + @@ -40000,7 +40562,7 @@ - + @@ -40146,14 +40708,13 @@ - - - + + + - - - 9 - + + + diff --git a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Triggers.version index 9ecc46014..d72159707 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/Triggers.version differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 455def7f9..7b55615e8 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/HotS/ap_shoot_the_messenger.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -24,6 +24,7 @@ Category/Name/B5BC3B18=StasisChambers Category/Name/BA8845F8======== GAMEPLAY ======= Category/Name/BF77F330=Cinematic Variables Category/Name/C153E1A7=Shuttles Create Wave +Category/Name/C385A601=Location IDs Category/Name/C4702FF8=Tips Category/Name/C807414E=In Combat Check Category/Name/CB578672=Stats & Achievements @@ -136,6 +137,7 @@ Trigger/Name/40309A3D=Transmission: Docking Bay Destroyed Q Trigger/Name/40F0BAAD=Shuttle Send Wave 01 Trigger/Name/45ECFEA1=Transmission: Shuttle Launch 06 Q Trigger/Name/46B05084=Transmission: Shuttle Launch 02 Q +Trigger/Name/47552536=Objective Destroy Statis Chamber Deactivate Trigger/Name/49F50C5E=Start Upgrades (Normal) Trigger/Name/4C5BC8AB=Create Auto Saves Trigger/Name/4DC35103=Initialization @@ -234,6 +236,7 @@ Variable/Name/04659B11=foreachint_i Variable/Name/09444D1B=NexusDestroyedCount Variable/Name/0D57D24C=PLAYER_02_SHUTTLE_BLUE Variable/Name/0E5CD9F4=Color +Variable/Name/130228EC=category Variable/Name/138D6CA6=FadeDuration Variable/Name/13B20AB7=FadeDuration Variable/Name/158C0C16=WarningCounter @@ -255,6 +258,7 @@ Variable/Name/2BCEBA84=lv_EvacPoint Variable/Name/2F5310E2=Offset Variable/Name/2FAB2529=ShuttleLaunched Variable/Name/2FFB52C6=EvacShuttleType +Variable/Name/333CBF01=LOCATION_ID_FROZEN_EXPANSION Variable/Name/34F59F3B=ShuttleStoreDestination_cv Variable/Name/350B4BD0=ShuttleIdentifier_cv Variable/Name/353DB6C4=ShuttleIDStore_cv @@ -276,6 +280,8 @@ Variable/Name/56CDE09F=ShuttleShields Variable/Name/56DA0A62=Index Variable/Name/58112AB7=Warp Away Panel Variable/Name/5D0BF7AA=ShuttleUnit +Variable/Name/60D71325=LOCATION_ID_SOUTHEAST_FROZEN_ZERG +Variable/Name/6B8AA530=LOCATION_ID_DESTROY_4_SHUTTLES Variable/Name/6D28E861=distance chunks Variable/Name/6D6BE244=VictoryKerrigan Variable/Name/701DC7E9=VictoryZerg @@ -294,6 +300,7 @@ Variable/Name/81FDE8CF=ObjectiveBonusDestroyStasisChamber Variable/Name/840DF5C6=lv_EscortGroup Variable/Name/840FA217=AlternateVictory Variable/Name/870D84B7=LaunchFacilityType +Variable/Name/89A97B10=category Variable/Name/89C7AFA7=VictoryHiddenUnitGroup Variable/Name/89ED41DB=distance between launch and evac Variable/Name/8B0AAD5D=LaunchTrans_WAIT @@ -320,8 +327,10 @@ Variable/Name/AFA3F007=PLAYER_07_FROZENZERG Variable/Name/B1FB5E96=StasisChamberPingArray Variable/Name/B8217ACA=EscortIncrement Variable/Name/B9550754=ShuttleEscapePoint +Variable/Name/B95B0121=LOCATION_ID_CENTER_STATIS_CHAMBER Variable/Name/BDBCDE9D=Movement Speed Variable/Name/C029EF92=GameOver +Variable/Name/C03BE7AF=LOCATION_ID_EAST_FROZEN_ZERG Variable/Name/C2C1DB92=Angle Variable/Name/C562C2C7=FirstWave Variable/Name/C5B854F7=IntroHydras @@ -329,6 +338,7 @@ Variable/Name/C5C13F2F=ShuttleSpeed Variable/Name/C6D054DF=lv_i Variable/Name/C6DA6BB9=ProtossPlayers Variable/Name/C91BE7B9=Warp Away Value +Variable/Name/CBA076BE=LOCATION_ID_WEST_STATIS_CHAMBER Variable/Name/CF56E621=MapMusicTrack Variable/Name/CFC1F25B=C_Height Variable/Name/D127C8D0=lv_ShuttlePosition @@ -336,20 +346,24 @@ Variable/Name/D3B387E2=EscortHeight Variable/Name/D572EC45=Radius Variable/Name/D626D20A=FeralZergFrozenTotal Variable/Name/DCFDBF78=CinematicTempUnits +Variable/Name/DD3A392C=category Variable/Name/DEA0756B=InCinematic Variable/Name/DF0722EB=Warp Away ProgressBar Variable/Name/E0915EC2=IntroShuttle Variable/Name/E188175F=CinematicHiddenUnits Variable/Name/E2108845=IntroHydra3 Variable/Name/E3F61AE1=Soundtrack +Variable/Name/E6928370=LOCATION_ID_EAST_STATIS_CHAMBER Variable/Name/E831172A=ShuttleWavesRemaining Variable/Name/E9795B8F=RevealRightGate Variable/Name/EA562404=DockingBaysDestroyed +Variable/Name/EB11954F=LOCATION_ID_WEST_FROZEN_ZERG Variable/Name/EB8E8AA8=StasisChamberDestroyed Variable/Name/EEFC0270=PLAYER_03_PROTOSS_GREEN Variable/Name/F249FE69=index Variable/Name/F3DC9DD8=ObjectiveFindFrozenZergTotal Variable/Name/F48FF916=currentUnit +Variable/Name/F5E886DB=LOCATION_ID_SOUTHWEST_FROZEN_ZERG Variable/Name/F6F0A545=dist b/w pings Variable/Name/FA5B0329=StasisChamberPingIndex Variable/Name/FCC975C2=InCombatIndicator