diff --git a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/ComponentList.SC2Components index 1943363eb..83f8457b5 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData DocumentInfo MapInfo diff --git a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/DocumentHeader index 78c4c323c..7975e2c9f 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/DocumentHeader differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/MapScript.galaxy index 048f1a4fc..1ce38172e 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/MapScript.galaxy @@ -29,6 +29,11 @@ void InitLibs () { //-------------------------------------------------------------------------------------------------- // Constants //-------------------------------------------------------------------------------------------------- +const int gv_LOCATION_ID_FIRST_KERRIGAN_ATTACK = 1; +const int gv_LOCATION_ID_SECOND_KERRIGAN_ATTACK = 2; +const int gv_LOCATION_ID_THIRD_KERRIGAN_ATTACK = 3; +const int gv_LOCATION_ID_FOURTH_KERRIGAN_ATTACK = 4; +const int gv_LOCATION_ID_FIFTH_KERRIGAN_ATTACK = 5; const int gv_pLAYER_USER = 1; const int gv_pLAYER_ZERG_MAIN = 2; const int gv_pLAYER_ZERG_SPECIAL = 3; @@ -3889,7 +3894,7 @@ bool gt_KerriganDeepTunnelQ_Func (bool testConds, bool runActions) { libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); auto5D28AA2D_val = gv_kerriganAttackCount; if (auto5D28AA2D_val == 1) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIRST_KERRIGAN_ATTACK); // Transmission - SoundLink("TValerian03Kerrigan00058", -1) libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Kerrigan00058", -1), c_transmissionDurationAdd, 0.0, true); // Transmission - SoundLink("TValerian03Raynor00020", -1) @@ -3898,28 +3903,28 @@ bool gt_KerriganDeepTunnelQ_Func (bool testConds, bool runActions) { libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/001EB8FC") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/40499C88"))); } else if (auto5D28AA2D_val == 2) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SECOND_KERRIGAN_ATTACK); // Transmission - SoundLink("TValerian03Warfield00025", -1) libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Warfield00025", -1), c_transmissionDurationAdd, 0.0, true); Wait(2.0, c_timeReal); libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/EAB5D976") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/8F6AFC37"))); } else if (auto5D28AA2D_val == 3) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_THIRD_KERRIGAN_ATTACK); // Transmission - SoundLink("TValerian03Raynor00028", -1) libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Raynor00028", -1), c_transmissionDurationAdd, 0.0, true); Wait(2.0, c_timeReal); libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/E75186CD") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/CDE6292E"))); } else if (auto5D28AA2D_val == 4) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FOURTH_KERRIGAN_ATTACK); // Transmission - SoundLink("TValerian03Tychus00032", -1) libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Tychus00032", -1), c_transmissionDurationAdd, 0.0, true); Wait(2.0, c_timeReal); libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/1AD4E910") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/A6904814"))); } else if (auto5D28AA2D_val == 5) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIFTH_KERRIGAN_ATTACK); // Transmission - SoundLink("TValerian03Queen00033", -1) libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Queen00033", -1), c_transmissionDurationAdd, 0.0, true); // Transmission - SoundLink("TValerian03Sarah00034", -1) @@ -4633,11 +4638,11 @@ bool gt_VictoryArtifactCharged_Func (bool testConds, bool runActions) { lv_location = 1; for ( ; ( (auto9F5F09C8_ai >= 0 && lv_location <= auto9F5F09C8_ae) || (auto9F5F09C8_ai < 0 && lv_location >= auto9F5F09C8_ae) ) ; lv_location += auto9F5F09C8_ai ) { if ((lib5BD4895D_gf_AP_Core_isLocationSent(lv_location) == false)) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(lv_location); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lv_location); } } - lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory); libNtve_gf_ChangeUnitDamage(gv_artifact, libNtve_ge_UnitDamageTakenDealt_Damage_Take, libNtve_ge_UnitDamageChangeOption_No); TriggerQueueClear(c_triggerQueueRetain); TriggerExecute(gt_ObjectiveArtifactComplete, true, false); @@ -4867,9 +4872,16 @@ bool gt_ObjectiveArtifactCreateQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/CA604703"), StringExternal("Param/Value/BFB1AA45"), c_objectiveStateActive, true); - lib5BD4895D_gf_AP_Core_addObjectiveSimple(ObjectiveLastCreated()); + ObjectiveCreate(StringExternal("Param/Value/CA604703"), StringExternal("Param/Value/BFB1AA45"), c_objectiveStateHidden, true); gv_objective_Artifact = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objective_Artifact, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_FIRST_KERRIGAN_ATTACK); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_SECOND_KERRIGAN_ATTACK); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_THIRD_KERRIGAN_ATTACK); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_FOURTH_KERRIGAN_ATTACK); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_FIFTH_KERRIGAN_ATTACK); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_Artifact, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TValerian03Objective1, ObjectiveLastCreated(), StringExternal("Param/Value/BCFF1976")); libNtve_gf_CreatePingFacingAngle(PlayerGroupSingle(gv_pLAYER_USER), "PingObjective", UnitGetPosition(gv_artifact), ColorWithAlpha(0.00, 100.00, 100.00, 0.00), 0.0, 135.0); PingSetTooltip(PingLastCreated(), StringExternal("Param/Value/0140CB99")); diff --git a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/Triggers index 73c505bf1..de205bd0b 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/Triggers @@ -11,12 +11,80 @@ + + + + + + + + + + LOCATION_ID_FIRST_KERRIGAN_ATTACK + + + + + + + + 1 + + + + LOCATION_ID_SECOND_KERRIGAN_ATTACK + + + + + + + + 2 + + + + LOCATION_ID_THIRD_KERRIGAN_ATTACK + + + + + + + + 3 + + + + LOCATION_ID_FOURTH_KERRIGAN_ATTACK + + + + + + + + 4 + + + + LOCATION_ID_FIFTH_KERRIGAN_ATTACK + + + + + + + + 5 + + @@ -40103,7 +40171,7 @@ - + @@ -40116,15 +40184,14 @@ 1 - - + + - + - - - 1 - + + + @@ -40271,7 +40338,7 @@ - + @@ -40282,15 +40349,14 @@ 2 - - + + - + - - - 2 - + + + @@ -40396,7 +40462,7 @@ - + @@ -40407,15 +40473,14 @@ 3 - - + + - + - - - 3 - + + + @@ -40521,7 +40586,7 @@ - + @@ -40532,15 +40597,14 @@ 4 - - + + - + - - - 4 - + + + @@ -40646,7 +40710,7 @@ - + @@ -40661,15 +40725,14 @@ 5 - - + + - + - - - 5 - + + + @@ -48486,7 +48549,7 @@ - + @@ -48591,16 +48654,16 @@ - + - - + + - + - - + + @@ -48631,12 +48694,12 @@ false - - - + + + - - + + @@ -49879,8 +49942,15 @@ - + + + + + + + + @@ -49901,7 +49971,7 @@ - + @@ -49911,18 +49981,6 @@ - - - - - - - - - - - - @@ -49940,6 +49998,124 @@ + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/Triggers.version index 95a4828b2..f4322c070 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/Triggers.version differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 90c4d181b..2a0636b4c 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -21,6 +21,7 @@ Category/Name/DC8AAE34=Zerg Outer Defenses Category/Name/DEFC277E=Victory/Defeat Category/Name/E575F3F5=Global Variables Category/Name/E7DC9647=Nydus Worms +Category/Name/EB32E18A=Location IDs Category/Name/F6464BC8=Crashing Debris Category/Name/FA05B1C2======== ARCHIPELAGO ======= FunctionDef/Grammar/17C3CF2D=Spawn a light attack wave from ~nydus~ (and wait) @@ -228,6 +229,7 @@ Variable/Name/12FE9BE0=TempSpot Variable/Name/1322361A=AmbientOverlordsSize Variable/Name/15F57EA3=location Variable/Name/16D9836B=i +Variable/Name/18CE01B9=LOCATION_ID_THIRD_KERRIGAN_ATTACK Variable/Name/1D52FF36=ArtifactBoard Variable/Name/1F3D186E=AmbientOverlords Variable/Name/1FF3112B=ArtifactPosition @@ -256,6 +258,7 @@ Variable/Name/48EF4DAD=Destination Variable/Name/4B3AC9C5=EnergyNovasUsed Variable/Name/4CDA752E=SpawnRegion Variable/Name/4CEB3458=RecentBuildingDeaths +Variable/Name/4D0E5BE1=LOCATION_ID_FOURTH_KERRIGAN_ATTACK Variable/Name/5198F5D7=i Variable/Name/52586B14=FirstAirTransmission Variable/Name/550AAA5C=i @@ -276,6 +279,7 @@ Variable/Name/6C2A5957=Unit Variable/Name/72177A17=PickedUnit Variable/Name/725B7204=MainSpawnRegions Variable/Name/73D68420=RecentBuildingDeathHistory +Variable/Name/75E7DA4A=LOCATION_ID_FIFTH_KERRIGAN_ATTACK Variable/Name/77EFAC0F=i Variable/Name/79D8EF48=KerriganHasRetreated Variable/Name/7F9B575C=ArtifactChargeCurrent @@ -317,6 +321,7 @@ Variable/Name/CD30EAD3=CurrentRegion Variable/Name/CF5F81CC=FadeDuratioin Variable/Name/D007B9DB=SpawnNydusWormRegion Variable/Name/D0100249=NydusSpitPeriod +Variable/Name/D24013DE=LOCATION_ID_FIRST_KERRIGAN_ATTACK Variable/Name/D6E1593A=KerriganMaxHP Variable/Name/DC3BDAC6=ZergPlayers Variable/Name/DD8D923A=Position @@ -332,6 +337,7 @@ Variable/Name/E700F056=IntroHiddenUnitGroup Variable/Name/EA94AA17=currentUnit Variable/Name/F4528EAA=currentUnit Variable/Name/F4593442=PLAYER_ZERG_EAST +Variable/Name/F72CE420=LOCATION_ID_SECOND_KERRIGAN_ATTACK Variable/Name/F76C570A=DropPodSpot Variable/Name/FACF0076=Msg Variable/Name/FEA0764B=AirPingBehind diff --git a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/ComponentList.SC2Components index 971c50088..101b91b67 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData DocumentInfo MapInfo diff --git a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/DocumentHeader index aca0ab919..85388101a 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/DocumentHeader differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/MapScript.galaxy index be10247ce..19f70741c 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/MapScript.galaxy @@ -27,6 +27,12 @@ void InitLibs () { //-------------------------------------------------------------------------------------------------- // Constants //-------------------------------------------------------------------------------------------------- +const int gv_LOCATION_ID_FIRST_CHARGE = 1; +const int gv_LOCATION_ID_SECOND_CHARGE = 2; +const int gv_LOCATION_ID_THIRD_CHARGE = 3; +const int gv_LOCATION_ID_FIRST_GROUP_RESCUED = 4; +const int gv_LOCATION_ID_SECOND_GROUP_RESCUED = 5; +const int gv_LOCATION_ID_THIRD_GROUP_RESCUED = 6; const int gv_p1_USER = 1; const int gv_p2_ZERG = 2; const int gv_p4_DOMINIONALLIES = 4; @@ -35,7 +41,7 @@ const int gv_p5_EGGS = 5; //-------------------------------------------------------------------------------------------------- // Global Variables //-------------------------------------------------------------------------------------------------- -int gv_objectiveRescudeDominionTeams; +int gv_objectiveRescueDominionTeams; int gv_dominionTeamsRescued; bool gv_gameOver; bool gv_inCinematic; @@ -159,7 +165,7 @@ doodad gv_cinematicFissureDoodad; bool gv_briefingActionMercDismissed; void InitGlobals () { - gv_objectiveRescudeDominionTeams = c_invalidObjectiveId; + gv_objectiveRescueDominionTeams = c_invalidObjectiveId; gv_tHEONEBROODMOTHER = UnitFromId(2318); gv_nonHeroicDudes = UnitGroupEmpty(); gv__1BroodchamberAllUnits = UnitGroupEmpty(); @@ -678,22 +684,22 @@ void gf_ResetHeroCooldowns () { void gf_ObjectivePlantSeismicChargesUpdate (int lp_nukesPlanted) { // Automatic Variable Declarations + int auto10F18FEE_val; + // Implementation - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_oBJPlantSeismicCharges, (3 - lp_nukesPlanted)); - if ((lp_nukesPlanted >= 3)) { + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_oBJPlantSeismicCharges, lp_nukesPlanted); + auto10F18FEE_val = lp_nukesPlanted; + if (auto10F18FEE_val == 1) { + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIRST_CHARGE); + } + else if (auto10F18FEE_val == 2) { + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SECOND_CHARGE); + } + else if (auto10F18FEE_val == 3) { + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_THIRD_CHARGE); lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_oBJPlantSeismicCharges); - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); } else { - if ((lp_nukesPlanted == 1)) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); - } - else { - if ((lp_nukesPlanted == 2)) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); - } - - } } } @@ -708,7 +714,13 @@ void gf_CinematicDeployNukeWrapper (unit lp_unit) { // Trigger: Objective Rescue Dominion Teams Create Q //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveRescueDominionTeamsCreateQ_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Secondary; + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -723,9 +735,13 @@ bool gt_ObjectiveRescueDominionTeamsCreateQ_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/21224AA7"), StringExternal("Param/Value/83FD56F1"), c_objectiveStateActive, false); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "checks", (3 - gv_dominionTeamsRescued), 0); - gv_objectiveRescudeDominionTeams = ObjectiveLastCreated(); + ObjectiveCreate(StringExternal("Param/Value/21224AA7"), StringExternal("Param/Value/83FD56F1"), c_objectiveStateHidden, false); + gv_objectiveRescueDominionTeams = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveRescueDominionTeams, lv_category, "", 0, 3, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveRescueDominionTeams, gv_LOCATION_ID_FIRST_GROUP_RESCUED); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveRescueDominionTeams, gv_LOCATION_ID_SECOND_GROUP_RESCUED); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveRescueDominionTeams, gv_LOCATION_ID_THIRD_GROUP_RESCUED); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveRescueDominionTeams, true); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); return true; @@ -755,7 +771,7 @@ bool gt_ObjectiveRescueDominionTeamsComplete_Func (bool testConds, bool runActio TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveRescueDominionTeamsCreateQ, true, false); - lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveRescudeDominionTeams); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveRescueDominionTeams); return true; } @@ -787,7 +803,7 @@ bool gt_ObjectiveRescueDominionTeamsUpdate_Func (bool testConds, bool runActions TriggerExecute(gt_ObjectiveRescueDominionTeamsCreateQ, true, false); gv_dominionTeamsRescued += 1; - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveRescudeDominionTeams, (3 - gv_dominionTeamsRescued)); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveRescueDominionTeams, gv_dominionTeamsRescued); if ((gv_dominionTeamsRescued == 3)) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveRescueDominionTeamsComplete, true, false); @@ -3062,7 +3078,7 @@ bool gt__1SaveDominionQ_Func (bool testConds, bool runActions) { PingDestroy(gv__1RescueDominionPing); TriggerEnable(gt__1CallforHelpSNUFFED, false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIRST_GROUP_RESCUED); TriggerExecute(gt_ObjectiveRescueDominionTeamsUpdate, true, false); autoFEEFD5BB_g = gv__1RescuableDominionGroup; autoFEEFD5BB_u = UnitGroupCount(autoFEEFD5BB_g, c_unitCountAll); @@ -5120,7 +5136,7 @@ bool gt__2SaveDominionQ_Func (bool testConds, bool runActions) { PingDestroy(gv__2RescueDominionPing); TriggerEnable(gt__2CallforHelpSNUFFED, false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SECOND_GROUP_RESCUED); TriggerExecute(gt_ObjectiveRescueDominionTeamsUpdate, true, false); autoA409A568_g = gv__2RescuableDominionGroup; autoA409A568_u = UnitGroupCount(autoA409A568_g, c_unitCountAll); @@ -7151,7 +7167,7 @@ bool gt__3SaveDominionQ_Func (bool testConds, bool runActions) { PingDestroy(gv__3RescueDominionPing); TriggerEnable(gt__3CallforHelpSNUFFED, false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(6); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_THIRD_GROUP_RESCUED); TriggerExecute(gt_ObjectiveRescueDominionTeamsUpdate, true, false); auto70C592E4_g = gv__3RescuableDominionGroup; auto70C592E4_u = UnitGroupCount(auto70C592E4_g, c_unitCountAll); @@ -8507,7 +8523,7 @@ bool gt__4Extraction_Func (bool testConds, bool runActions) { } if ((gv__4HeroesSaved == 4)) { - lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory); gv__4HeroesSaved += 1; SoundPlay(SoundLink("Terran_Veterancy", -1), PlayerGroupAll(), 100.0, 0.0); UnitKill(UnitFromId(2406)); @@ -9532,9 +9548,13 @@ bool gt_ObjectivePlantSeismicChargesCreateQ_Func (bool testConds, bool runAction TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/70CCCF96"), StringExternal("Param/Value/45096F8B"), c_objectiveStateActive, true); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "checks", 3, 0); + ObjectiveCreate(StringExternal("Param/Value/70CCCF96"), StringExternal("Param/Value/45096F8B"), c_objectiveStateHidden, true); gv_oBJPlantSeismicCharges = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_oBJPlantSeismicCharges, lib5BD4895D_ge_APObjectiveCategory_Primary, "", 0, 3, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_oBJPlantSeismicCharges, gv_LOCATION_ID_FIRST_CHARGE); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_oBJPlantSeismicCharges, gv_LOCATION_ID_SECOND_CHARGE); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_oBJPlantSeismicCharges, gv_LOCATION_ID_THIRD_CHARGE); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_oBJPlantSeismicCharges, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TValerian02AObjective1, ObjectiveLastCreated(), StringExternal("Param/Value/9E819C5A")); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); @@ -9595,9 +9615,11 @@ bool gt_ObjectiveExfiltrationCreateQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/2364874E"), StringExternal("Param/Value/DD330B9F"), c_objectiveStateActive, true); - lib5BD4895D_gf_AP_Core_addObjectiveSimple(ObjectiveLastCreated()); + ObjectiveCreate(StringExternal("Param/Value/2364874E"), StringExternal("Param/Value/DD330B9F"), c_objectiveStateHidden, true); gv_oBJExfiltrate = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_oBJExfiltrate, lib5BD4895D_ge_APObjectiveCategory_Primary, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_oBJExfiltrate, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_oBJExfiltrate, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TValerian02AObjective2, ObjectiveLastCreated(), StringExternal("Param/Value/2864B30D")); TriggerQueueExit(); return true; diff --git a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/Triggers index c1f3ed8d2..4ce806973 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/Triggers @@ -16,11 +16,92 @@ + + + + + + + + + + + LOCATION_ID_FIRST_CHARGE + + + + + + + + 1 + + + + LOCATION_ID_SECOND_CHARGE + + + + + + + + 2 + + + + LOCATION_ID_THIRD_CHARGE + + + + + + + + 3 + + + + LOCATION_ID_FIRST_GROUP_RESCUED + + + + + + + + 4 + + + + LOCATION_ID_SECOND_GROUP_RESCUED + + + + + + + + 5 + + + + LOCATION_ID_THIRD_GROUP_RESCUED + + + + + + + + 6 + + @@ -48,11 +129,22 @@ + + + + + + + + + + + @@ -107,8 +199,12 @@ - + + + + + @@ -125,7 +221,7 @@ - + @@ -135,71 +231,116 @@ - - + + - - - - + + - - - + + + - + - - - checks - + + + - - - + + + + + + + + + + + + + - - - - - + + + - - - + + + 0 + - - + + 3 - - - + + + false + - - - 0 - + + + - - + + - - + + - - - + + + - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -411,25 +552,6 @@ - - - - - - - - - - - - - - - 3 - - - - @@ -17456,7 +17578,7 @@ - + @@ -17676,14 +17798,13 @@ - - - + + + - - - 4 - + + + @@ -31740,7 +31861,7 @@ - + @@ -31958,14 +32079,13 @@ - - - + + + - - - 5 - + + + @@ -47037,7 +47157,7 @@ - + @@ -47094,14 +47214,13 @@ - - - + + + - - - 6 - + + + @@ -58521,7 +58640,7 @@ - + @@ -58537,13 +58656,13 @@ - - + + - + - - + + @@ -68820,8 +68939,12 @@ - + + + + + @@ -68839,7 +68962,7 @@ - + @@ -68849,36 +68972,6 @@ - - - - - - - - - - - - - - - - - - checks - - - - - 3 - - - - - 0 - - @@ -68896,6 +68989,99 @@ + + + + + + + + + + + + + + + + + + + + + 0 + + + + + 3 + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -68936,7 +69122,7 @@ - + @@ -68959,146 +69145,89 @@ - - - - - - - - - - - - - - - - - 3 - - - - - - - - + + + + + + - - - - - - + + + - - - - + + + + + - - + + 1 - - - - - + + + + - - - - + + + + + + + + + - - + + 2 - - - - - - + + + + - - - + + + - - - + + + + + + - - - 2 + + + 3 - - - - - - - - - - + + + + - - - - - - - 1 - + + + - + - - - - - - - - 3 - - - - - - - - - - - - - - - - - - - - 3 - - @@ -69286,8 +69415,10 @@ - + + + @@ -69304,7 +69435,7 @@ - + @@ -69314,18 +69445,6 @@ - - - - - - - - - - - - @@ -69343,6 +69462,54 @@ + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/Triggers.version index 77e9ab248..c177b31af 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/Triggers.version differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 4f0232265..7a16c7a52 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_belly_of_the_beast.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -30,6 +30,7 @@ Category/Name/A5E951E1======== CINEMATIC ======= Category/Name/A756A79A=Objective - Plant Seismic Charges Category/Name/AE7FC9BD=Global Variables Category/Name/B49DFEB8=Incapacitation +Category/Name/BB4417EC=Location IDs Category/Name/C17E7AB9=Map Triggers Category/Name/C5123994=Intro Cinematic Category/Name/C601506C=Global Variables @@ -376,6 +377,7 @@ Variable/Name/0483FEA9=FadeDuration Variable/Name/0580ACA7=FadeDuration Variable/Name/05E7DBB4=3BroodchamberAllUnits Variable/Name/0617E3F6=FadeDuration +Variable/Name/07379698=LOCATION_ID_FIRST_GROUP_RESCUED Variable/Name/0ADEF379=InCinematic Variable/Name/0B3B7A15=InCinematic Variable/Name/0B579E15=GasGroup @@ -388,6 +390,7 @@ Variable/Name/10EDC11F=ChosenUnit Variable/Name/119E2C32=VictoryCinematicCompleted Variable/Name/15C492E7=FadeDuration Variable/Name/17CCDAF0=FadeDuration +Variable/Name/17E74BF4=LOCATION_ID_FIRST_CHARGE Variable/Name/190888BD=unittype Variable/Name/1A5D9E0D=FadeDuration Variable/Name/1B7B4AEC=FadeDuration @@ -398,6 +401,7 @@ Variable/Name/23998836=PickedUnit Variable/Name/24723F62=4HeroesExtracted Variable/Name/26D175BC=2BroodchamberLocPing Variable/Name/29044B51=P2_ZERG +Variable/Name/2B0748AA=category Variable/Name/2C516644=CinematicFissureDoodad Variable/Name/2D241443=1BroodchamberLocPing Variable/Name/2D456197=ChosenUnit @@ -405,6 +409,7 @@ Variable/Name/2DC5B6C4=3RescueDominionPing Variable/Name/2F485A93=FadeDuration Variable/Name/2FF4C56A=IntroHiddenUnitGroup Variable/Name/3046E95A=PoppedEggPoint +Variable/Name/30A149FF=LOCATION_ID_SECOND_CHARGE Variable/Name/31879156=CinematicStartHoldout1Ping1a Variable/Name/329B3BB3=1SEZergBulliesEast Variable/Name/3379AF49=FadeDuration @@ -419,6 +424,7 @@ Variable/Name/39CF4AEF=rallypoint Variable/Name/3A280E10=RaynorSnipeKillsBest Variable/Name/3A7B7692=currentUnit Variable/Name/3B476E41=3RescuableDominionGroup +Variable/Name/3D153322=LOCATION_ID_SECOND_GROUP_RESCUED Variable/Name/4089072A=ChosenUnit Variable/Name/43067237=AIThinkGroup Variable/Name/4324FC57=rallypoint @@ -450,7 +456,7 @@ Variable/Name/6253B730=4LavaDoodadPositions Variable/Name/6293E02B=targets Variable/Name/62C08CBC=reaper2 Variable/Name/633A3AF3=HoldoutTimerWindow -Variable/Name/6423E590=ObjectiveRescudeDominionTeams +Variable/Name/6423E590=ObjectiveRescueDominionTeams Variable/Name/6492896D=3QueenEggPopLimit Variable/Name/64B3A813=HoldoutTimer Variable/Name/68E5CB78=1TeachNadesAgainBullies @@ -471,6 +477,7 @@ Variable/Name/7689E23A=CINEMATIC_NukeUnit Variable/Name/79A0F639=3QueenBossBarIndex Variable/Name/79ABFBDC=CinematicCompleted Variable/Name/7AC3CB55=ping +Variable/Name/7B0C42B8=LOCATION_ID_THIRD_GROUP_RESCUED Variable/Name/7B4A678C=1TeachSnipeAgainBullies Variable/Name/7B863929=CinematicZergStrays Variable/Name/7BF707E1=currentUnit @@ -554,6 +561,7 @@ Variable/Name/D5413304=VictoryHiddenUnitGroup Variable/Name/D5C8D835=2BroodchamberNuke Variable/Name/D6835E89=NydusWormHP Variable/Name/D9E8ADE3=1SnipeHereActor +Variable/Name/DB62DE9C=LOCATION_ID_THIRD_CHARGE Variable/Name/DBD1317C=FadeDuration Variable/Name/DC92C29C=2HiddenZergUnits Variable/Name/DDF63E30=4CurrentExtractionUnit diff --git a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/ComponentList.SC2Components index 010746340..e6bcfc267 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/ComponentList.SC2Components @@ -1,5 +1,6 @@ + GameData DocumentInfo MapInfo diff --git a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/DocumentHeader index 76dfa2920..6d3feae5e 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/DocumentHeader differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/MapScript.galaxy index 5adc477c7..86a48ce0c 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/MapScript.galaxy @@ -29,6 +29,14 @@ void InitLibs () { //-------------------------------------------------------------------------------------------------- // Constants //-------------------------------------------------------------------------------------------------- +const int gv_LOCATION_ID_CLOSE_COOLANT_TOWER = 1; +const int gv_LOCATION_ID_NORTHWEST_COOLANT_TOWER = 2; +const int gv_LOCATION_ID_SOUTHEAST_COOLANT_TOWER = 3; +const int gv_LOCATION_ID_SOUTHWEST_COOLANT_TOWER = 4; +const int gv_LOCATION_ID_LEVIATHAN = 5; +const int gv_LOCATION_ID_EAST_HATCHERY = 6; +const int gv_LOCATION_ID_NORTH_HATCHERY = 7; +const int gv_LOCATION_ID_MID_HATCHERY = 8; const int gv_pLAYER_P01_USER = 1; const int gv_pLAYER_P02_COOLANT_TOWERS = 2; const int gv_pLAYER_P03_ZERG_BR = 3; @@ -593,7 +601,13 @@ void gf_AddUpgradeLevelforZergPlayerGroup (string lp_upgrade) { // Trigger: Objective Destroy Hatcheries Create Q //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveDestroyHatcheriesCreateQ_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Extra; + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -608,9 +622,13 @@ bool gt_ObjectiveDestroyHatcheriesCreateQ_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/DF10FD2C"), StringExternal("Param/Value/F7A0C2B9"), c_objectiveStateActive, false); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "checks", (3 - gv_hatcheriesDestroyed), 0); + ObjectiveCreate(StringExternal("Param/Value/DF10FD2C"), StringExternal("Param/Value/F7A0C2B9"), c_objectiveStateHidden, false); gv_objectiveDestroyHatcheries = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveDestroyHatcheries, lv_category, "", gv_hatcheriesDestroyed, 3, true); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyHatcheries, gv_LOCATION_ID_EAST_HATCHERY); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyHatcheries, gv_LOCATION_ID_NORTH_HATCHERY); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyHatcheries, gv_LOCATION_ID_MID_HATCHERY); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyHatcheries, true); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); TriggerQueueExit(); return true; @@ -672,7 +690,7 @@ bool gt_ObjectiveDestroyHatcheriesUpdate_Func (bool testConds, bool runActions) TriggerExecute(gt_ObjectiveDestroyHatcheriesCreateQ, true, false); gv_hatcheriesDestroyed += 1; - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyHatcheries, (3 - gv_hatcheriesDestroyed)); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyHatcheries, gv_hatcheriesDestroyed); if ((gv_hatcheriesDestroyed == 3)) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveDestroyHatcheriesComplete, true, false); @@ -696,7 +714,7 @@ bool gt_EastHatchery_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(6); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_EAST_HATCHERY); TriggerExecute(gt_ObjectiveDestroyHatcheriesUpdate, true, false); return true; } @@ -717,7 +735,7 @@ bool gt_NorthHatchery_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(7); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTH_HATCHERY); TriggerExecute(gt_ObjectiveDestroyHatcheriesUpdate, true, false); return true; } @@ -738,7 +756,7 @@ bool gt_MidHatchery_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(8); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_MID_HATCHERY); TriggerExecute(gt_ObjectiveDestroyHatcheriesUpdate, true, false); return true; } @@ -898,7 +916,7 @@ bool gt_CloseTower_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(1); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_CLOSE_COOLANT_TOWER); return true; } @@ -925,7 +943,7 @@ bool gt_NorthwestTower_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(2); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_NORTHWEST_COOLANT_TOWER); return true; } @@ -952,7 +970,7 @@ bool gt_SoutheastTower_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(3); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHEAST_COOLANT_TOWER); return true; } @@ -979,7 +997,7 @@ bool gt_SouthwestTower_Func (bool testConds, bool runActions) { return true; } - lib5BD4895D_gf_AP_Core_sendLocationLocal(4); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SOUTHWEST_COOLANT_TOWER); return true; } @@ -5388,7 +5406,7 @@ bool gt_VictoryDestroySpacePlatformsCompleted_Func (bool testConds, bool runActi } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory); gv_gameOver = true; TriggerExecute(gt_ObjectiveDestroyCoolantTowersComplete, true, false); libCamp_gf_RunMissionVictorySequence(gt_VictoryQ); @@ -5580,9 +5598,15 @@ bool gt_ObjectiveDestroyCoolantTowersCreateQ_Func (bool testConds, bool runActio TriggerEnable(TriggerGetCurrent(), false); gv_objectiveDestroyCoolantTowersTotal = 4; TriggerQueueEnter(); - ObjectiveCreate(StringExternal("Param/Value/FDB17885"), StringExternal("Param/Value/06F1D37B"), c_objectiveStateActive, true); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "checks", (4 - gv_objectiveDestroyCoolantTowerProgress), 0); + ObjectiveCreate(StringExternal("Param/Value/FDB17885"), StringExternal("Param/Value/06F1D37B"), c_objectiveStateHidden, true); gv_objectiveDestroyCoolantTowers = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objectiveDestroyCoolantTowers, lib5BD4895D_ge_APObjectiveCategory_Primary, "", gv_objectiveDestroyCoolantTowerProgress, 4, false); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyCoolantTowers, gv_LOCATION_ID_CLOSE_COOLANT_TOWER); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyCoolantTowers, gv_LOCATION_ID_NORTHWEST_COOLANT_TOWER); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyCoolantTowers, gv_LOCATION_ID_SOUTHEAST_COOLANT_TOWER); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyCoolantTowers, gv_LOCATION_ID_SOUTHWEST_COOLANT_TOWER); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveDestroyCoolantTowers, lib5BD4895D_gv_aP_Core_locationVictory); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveDestroyCoolantTowers, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TValerian02BObjective1, ObjectiveLastCreated(), StringExternal("Param/Value/09462CD7")); Wait(libCamp_gv_campaignObjectiveDelay, c_timeGame); TriggerQueueExit(); @@ -5616,7 +5640,7 @@ bool gt_ObjectiveDestroyCoolantTowersUpdate_Func (bool testConds, bool runAction } gv_objectiveDestroyCoolantTowerProgress += 1; - lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyCoolantTowers, (4 - gv_objectiveDestroyCoolantTowerProgress)); + lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyCoolantTowers, gv_objectiveDestroyCoolantTowerProgress); if ((gv_objectiveDestroyCoolantTowerProgress == 1)) { TriggerExecute(gt_PlatformLinesFirstTowerQ, true, false); } @@ -5689,7 +5713,13 @@ void gt_ObjectiveDestroyCoolantTowersFailed_Init () { // Trigger: Objective Kill Leviathan Create Q //-------------------------------------------------------------------------------------------------- bool gt_ObjectiveKillLeviathanCreateQ_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_category; + // Automatic Variable Declarations + // Variable Initialization + lv_category = lib5BD4895D_ge_APObjectiveCategory_Secondary; + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -5704,9 +5734,11 @@ bool gt_ObjectiveKillLeviathanCreateQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - ObjectiveCreate((StringExternal("Param/Value/739C328F")), StringExternal("Param/Value/0BCA1AE6"), c_objectiveStateActive, false); - lib5BD4895D_gf_AP_Core_addObjectiveWithCounter(ObjectiveLastCreated(), "check", 1, 0); + ObjectiveCreate((StringExternal("Param/Value/739C328F")), StringExternal("Param/Value/0BCA1AE6"), c_objectiveStateHidden, false); gv_objectiveKillLeviathan = ObjectiveLastCreated(); + lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveKillLeviathan, lv_category, true); + lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveKillLeviathan, gv_LOCATION_ID_LEVIATHAN); + lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveKillLeviathan, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TValerian02BObjective2, ObjectiveLastCreated(), StringExternal("Param/Value/B8769560")); Wait(libCamp_gv_campaignObjectiveDelay, c_timeGame); TriggerQueueExit(); @@ -5736,7 +5768,7 @@ bool gt_ObjectiveKillLeviathanComplete_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - lib5BD4895D_gf_AP_Core_sendLocationLocal(5); + lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_LEVIATHAN); TriggerExecute(gt_ObjectiveKillLeviathanCreateQ, true, false); lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveKillLeviathan); Wait(libCamp_gv_campaignObjectiveDelay, c_timeReal); diff --git a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/Triggers index d074a3ac4..8e04709d1 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/Triggers @@ -11,11 +11,118 @@ + + + + + + + + + + + + + LOCATION_ID_CLOSE_COOLANT_TOWER + + + + + + + + 1 + + + + LOCATION_ID_NORTHWEST_COOLANT_TOWER + + + + + + + + 2 + + + + LOCATION_ID_SOUTHEAST_COOLANT_TOWER + + + + + + + + 3 + + + + LOCATION_ID_SOUTHWEST_COOLANT_TOWER + + + + + + + + 4 + + + + LOCATION_ID_LEVIATHAN + + + + + + + + 5 + + + + LOCATION_ID_EAST_HATCHERY + + + + + + + + 6 + + + + LOCATION_ID_NORTH_HATCHERY + + + + + + + + 7 + + + + LOCATION_ID_MID_HATCHERY + + + + + + + + 8 + + @@ -46,11 +153,22 @@ + + + + + + + + + + + @@ -105,8 +223,12 @@ - + + + + + @@ -123,7 +245,7 @@ - + @@ -133,71 +255,115 @@ - - + + - - - - + + - - - + + + - + - - - checks - + + + - - - + + + + + + + + + + + + + - - - - - + + + - - - + + + - - + + 3 - - - + + + true + - - - 0 - + + + - - + + - - + + - - - + + + - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -409,25 +575,6 @@ - - - - - - - - - - - - - - - 3 - - - - @@ -495,7 +642,7 @@ - + @@ -507,14 +654,13 @@ - - - + + + - - - 6 - + + + @@ -537,7 +683,7 @@ - + @@ -549,14 +695,13 @@ - - - + + + - - - 7 - + + + @@ -579,7 +724,7 @@ - + @@ -591,14 +736,13 @@ - - - + + + - - - 8 - + + + @@ -782,7 +926,7 @@ - + @@ -814,19 +958,18 @@ - - - + + + - - - 1 - + + + - + @@ -858,19 +1001,18 @@ - - - + + + - - - 2 - + + + - + @@ -902,19 +1044,18 @@ - - - + + + - - - 3 - + + + - + @@ -946,14 +1087,13 @@ - - - + + + - - - 4 - + + + @@ -41703,7 +41843,7 @@ - + @@ -41763,12 +41903,12 @@ - - - + + + - - + + @@ -42896,8 +43036,14 @@ - + + + + + + + @@ -42915,7 +43061,7 @@ - + @@ -42925,70 +43071,142 @@ - - + + - - - - - - - - + + - - + + + - - - checks - + + + - - - + + - - - - - + + + + + + + + + + + + + - - - + + + - - + + - - + + 4 - - - 0 - + + + false + - - + + + + + + - - + + - - + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -43112,27 +43330,8 @@ - - - - - - - - - - - - - - - - - 4 - - @@ -43366,10 +43565,21 @@ + + + + + + + + + + + @@ -43419,8 +43629,10 @@ - + + + @@ -43438,7 +43650,7 @@ - + @@ -43456,36 +43668,6 @@ - - - - - - - - - - - - - - - - - - check - - - - - 1 - - - - - 0 - - @@ -43503,6 +43685,54 @@ + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -43542,7 +43772,7 @@ - + @@ -43596,14 +43826,13 @@ - - - + + + - - - 5 - + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/Triggers.version index 14774385f..413df0b29 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/Triggers.version differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt index 6c6eee157..439c098d7 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -69,7 +69,7 @@ Param/Value/CDAD72B4= Param/Value/D09C0E7C=Anniversary_TValerian_02B granted Param/Value/D25FAA3E=>> P6 cannot attack Param/Value/D3234E71=First Platform Gone -Param/Value/DF10FD2C=Destroy Hatcheries at Resouce Nodes +Param/Value/DF10FD2C=Destroy Hatcheries at Resource Nodes Param/Value/E7BF8BDE=All of your structures have been destroyed. Param/Value/EA5459E5=>> P6 can attack Param/Value/EBA46453=Mutalisks will come out of thistunnel entrance. diff --git a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index c4c293616..d9f880f12 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_shatter_the_sky.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -3,6 +3,7 @@ Category/Name/021289C9=AI Category/Name/036FC2A2=Victory/Defeat Category/Name/19ACF57A=Midgame Leviathan Cinematic Category/Name/1D219AF4=Stats & Achievements +Category/Name/1E95FDFE=Location IDs Category/Name/2A82763F======== GAMEPLAY ======= Category/Name/49025870=Debug Category/Name/58128BAF=Variables @@ -214,6 +215,8 @@ Variable/Name/03F2E6FB=ZergPlayers Variable/Name/068AEAD0=Revealer Variable/Name/07E170DB=i Variable/Name/089B5EA3=VictoryRevealer +Variable/Name/0A5A1260=LOCATION_ID_NORTH_HATCHERY +Variable/Name/0B3AB082=LOCATION_ID_LEVIATHAN Variable/Name/0B3B7A15=InCinematic Variable/Name/0D12A7DF=Facing Variable/Name/0D179B8C=ObjectivePlatformsActor01 @@ -248,6 +251,7 @@ Variable/Name/37033D23=PickedArea Variable/Name/38ACD40F=Position Variable/Name/39E62D35=ObjectiveDestroyCoolant Towers Variable/Name/3A20EF01=PickedArea +Variable/Name/3A8CB4B2=category Variable/Name/3C35F17B=NumberOfUnitsArea03 Variable/Name/3D6555BC=HiddenCommandCenter Variable/Name/3E37D591=Merc @@ -279,6 +283,7 @@ Variable/Name/6AA47504=cycle Variable/Name/6E55DAFB=Facing Variable/Name/6EFC94EA=VictoryHiddenUnitGroup Variable/Name/705ED84B=Leviathan +Variable/Name/71A77F97=LOCATION_ID_EAST_HATCHERY Variable/Name/72A11FB2=i Variable/Name/74111C05=Attacker Variable/Name/751E1583=LeviathanMutaGroup @@ -304,16 +309,19 @@ Variable/Name/9A106E07=UnitType Variable/Name/9BB6106E=FleetLinesGiven Variable/Name/9DE56CEF=InCombatIndicator Variable/Name/9E344CA6=PLAYER_P01_USER +Variable/Name/A00131FA=LOCATION_ID_CLOSE_COOLANT_TOWER Variable/Name/A015EC71=cMutaRadiusCheckSlow Variable/Name/A1FBB107=GameOver Variable/Name/A2A94725=Achievement-HardTimer Variable/Name/A54001D0=MidPlatformsRevealer Variable/Name/A7CF71A1=UnitType +Variable/Name/A7E8A169=LOCATION_ID_SOUTHWEST_COOLANT_TOWER Variable/Name/A8CE6620=Attacker Variable/Name/AAF54A14=UnitsArea04 Variable/Name/AD30624D=Revealer Variable/Name/AD8D0B99=cMutaSpewSizeSlow Variable/Name/ADFFDF9B=ChosenUnit +Variable/Name/AE99CA1A=LOCATION_ID_MID_HATCHERY Variable/Name/AFE92F38=ObjectivePlatformsPing01 Variable/Name/B078254A=currentUnit Variable/Name/B09098AD=MidPlatformsCinematicCompleted @@ -322,10 +330,12 @@ Variable/Name/B25D27A3=Timer Ready to Blow Area 01 Variable/Name/B337A727=MidLeviathanHiddenUnitGroup Variable/Name/B5729D56=Platform Blows Timer Area 04 Variable/Name/B7B3E26C=First Muta Spawner +Variable/Name/BA62CC5D=LOCATION_ID_NORTHWEST_COOLANT_TOWER Variable/Name/BC76E600=LeviathanMaxLife Variable/Name/BD77D7C4=PATHING BLOCKER AREA04 Variable/Name/C54E2A27=MutaDefenders Variable/Name/C5EA0E59=Position +Variable/Name/C6127DE2=LOCATION_ID_SOUTHEAST_COOLANT_TOWER Variable/Name/C63CC948=Facing Variable/Name/C6C86850=PLAYER_P07_ZERG_EXP Variable/Name/C78A17B3=ObjectiveDestroyCoolantTowerProgress @@ -366,3 +376,4 @@ Variable/Name/FA4D15DD=Ground - 5 Variable/Name/FBF97B32=PLAYER_P11_PLATFORM_PIECES Variable/Name/FCA2B08F=LeviathanSpawnRegion Variable/Name/FD9031C0=currentUnit +Variable/Name/FE033C9B=category