From 569fb51a67ec535b4050d8a4445a93296570fc91 Mon Sep 17 00:00:00 2001 From: Ziktofel Date: Fri, 20 Dec 2024 22:34:08 +0100 Subject: [PATCH] Add In Utter Darkness Race Swaps --- .../ComponentList.SC2Components | 1 - .../DocumentHeader | Bin 6816 -> 6816 bytes .../MapScript.galaxy | 491 +- .../ap_in_utter_darkness.SC2Map/Minimap.tga | Bin 196652 -> 196652 bytes .../WoL/ap_in_utter_darkness.SC2Map/Objects | 1495 ++- .../Objects.version | Bin 44 -> 44 bytes .../ap_in_utter_darkness.SC2Map/Preload.xml | 53 + .../WoL/ap_in_utter_darkness.SC2Map/Regions | 8 + .../Regions.version | Bin 44 -> 44 bytes .../WoL/ap_in_utter_darkness.SC2Map/Triggers | 8878 ++++++++++++++--- .../Triggers.version | Bin 44 -> 44 bytes .../LocalizedData/GameStrings.txt | 2 + .../LocalizedData/TriggerStrings.txt | 11 + .../ap_in_utter_darkness.SC2Map/t3HeightMap | Bin 171398 -> 171398 bytes .../t3SyncHeightMap | Bin 114308 -> 114308 bytes .../t3Terrain.version | Bin 44 -> 44 bytes .../ap_in_utter_darkness.SC2Map/t3Terrain.xml | 2 +- .../WoL/ap_in_utter_darkness.SC2Map/t3VertCol | Bin 277573 -> 277573 bytes .../WoL/ap_in_utter_darkness.SC2Map/t3Water | Bin 928 -> 928 bytes .../Base.SC2Data/GameData/ActorData.xml | 43 +- .../Base.SC2Data/GameData/ModelData.xml | 12 + .../Base.SC2Data/GameData/UnitData.xml | 11 + .../Base.SC2Data/GameData/ValidatorData.xml | 15 + .../Base.SC2Data/GameData/AbilData.xml | 54 + .../Base.SC2Data/GameData/BehaviorData.xml | 84 + .../Base.SC2Data/GameData/ValidatorData.xml | 8 + 26 files changed, 9569 insertions(+), 1599 deletions(-) diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/ComponentList.SC2Components index 8fbed77a5..786240269 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/ComponentList.SC2Components @@ -1,6 +1,5 @@ - GameData DocumentInfo MapInfo diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/DocumentHeader index 4366ffb2a89f303a8536a3379ae6b4d01e7f3633..9c69d02cbf922bbce4134ecc074c51993bc67885 100644 GIT binary patch delta 19 YcmZ2ry1;aT49C&v2U9_Kqe_hw09Y>w^Z)<= delta 19 YcmZ2ry1;aT49Bw7jaDGMQKd!-08n`c;s5{u diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/MapScript.galaxy index 5d8635450..87e4c263d 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/MapScript.galaxy @@ -78,6 +78,7 @@ timer gv_protectArchiveTimer; int[11] gv_mineralFieldAmounts; int gv_leaderboard; int gv_killCount; +unitgroup gv_reinforcementUnits; bool gv_mothershipHeroBorn; unitgroup gv_gGWavesUnitGroup; fixed gv_nydusSpawnDelay; @@ -124,6 +125,7 @@ void InitGlobals () { gv_zeratul = UnitFromId(34); gv_protectArchiveTimer = TimerCreate(); gv_leaderboard = c_boardNone; + gv_reinforcementUnits = UnitGroupEmpty(); gv_gGWavesUnitGroup = UnitGroupEmpty(); gv_nydusSpawnDelay = 2.0; gv_statAchievementTierLevel = 1; @@ -148,6 +150,7 @@ void gf_SpawnNydusWormZerglings (region lp_region); //-------------------------------------------------------------------------------------------------- // Trigger Variables //-------------------------------------------------------------------------------------------------- +trigger gt_FactionSwapInit; trigger gt_KillPlayerDead; trigger gt_RandomizeButtonText; trigger gt_InitEndGameButton; @@ -180,6 +183,7 @@ trigger gt_HeroVoidRayDiesQ; trigger gt_HeroCarrierDiesQ; trigger gt_HeroMothershipDiesQ; trigger gt_ArchivistWarpedin; +trigger gt_ReinforcementUnitMorph; trigger gt_StartAI; trigger gt_AIUpgradesEN; trigger gt_AIUpgradesH; @@ -346,6 +350,75 @@ void gf_SpawnNydusWormZerglings (region lp_region) { TriggerExecute(gt_NydusSpawningTriggerZerglings, true, false); } +//-------------------------------------------------------------------------------------------------- +// Trigger: Faction Swap Init +//-------------------------------------------------------------------------------------------------- +bool gt_FactionSwapInit_Func (bool testConds, bool runActions) { + // Variable Declarations + unit lv_unit; + + // Automatic Variable Declarations + unitgroup auto08E7ECA5_g; + int auto08E7ECA5_u; + unitgroup autoA07780D6_g; + int autoA07780D6_u; + + // Variable Initialization + + // Actions + if (!runActions) { + return true; + } + + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut")) { + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(1), "Prot", false); + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(2), "Prot", false); + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(3), "Prot", false); + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(4), "Prot", false); + } + else { + libABFE498B_gv_aP_Triggers_skipCutscenes = true; + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(1), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace, true); + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(2), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace, true); + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(3), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace, true); + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(4), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace, true); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Terr")) { + PlayerSetRace(gv_p01_PLAYER, "Terr"); + lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p01_PLAYER, lib5BD4895D_gv_aP_Core_Faction_RAYNORS_RAIDERS); + } + else { + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) { + PlayerSetRace(gv_p01_PLAYER, "Zerg"); + lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p01_PLAYER, lib5BD4895D_gv_aP_Core_Faction_KERRIGAN_SWARM); + } + + } + libLbty_gf_OrderWorkerstoGatherNearbyResources(RegionEntireMap(), gv_p01_PLAYER); + } + lib15EF4C78_gf_AP_Player_UtilTownHallAutoRally(gv_p01_PLAYER); + VisRevealArea(gv_p01_PLAYER, RegionFromId(16), 1.0, false); + auto08E7ECA5_g = UnitGroup("AP_CommandCenter", c_playerAny, RegionFromId(16), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + auto08E7ECA5_u = UnitGroupCount(auto08E7ECA5_g, c_unitCountAll); + for (;; auto08E7ECA5_u -= 1) { + lv_unit = UnitGroupUnitFromEnd(auto08E7ECA5_g, auto08E7ECA5_u); + if (lv_unit == null) { break; } + UnitRemove(lv_unit); + } + autoA07780D6_g = UnitGroup("AP_Nexus", c_playerAny, RegionFromId(16), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + autoA07780D6_u = UnitGroupCount(autoA07780D6_g, c_unitCountAll); + for (;; autoA07780D6_u -= 1) { + lv_unit = UnitGroupUnitFromEnd(autoA07780D6_g, autoA07780D6_u); + if (lv_unit == null) { break; } + UnitRemove(lv_unit); + } + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_FactionSwapInit_Init () { + gt_FactionSwapInit = TriggerCreate("gt_FactionSwapInit_Func"); +} + //-------------------------------------------------------------------------------------------------- // Trigger: Kill Player Dead //-------------------------------------------------------------------------------------------------- @@ -565,7 +638,13 @@ void gt_HandleEndGameButtons_Init () { // Trigger: Arch Init //-------------------------------------------------------------------------------------------------- bool gt_ArchInit_Func (bool testConds, bool runActions) { + // Variable Declarations + playergroup lv_playerGroup; + // Automatic Variable Declarations + // Variable Initialization + lv_playerGroup = PlayerGroupEmpty(); + // Actions if (!runActions) { return true; @@ -577,7 +656,9 @@ bool gt_ArchInit_Func (bool testConds, bool runActions) { lib5BD4895D_gf_AP_Core_MapConfig_setMapInit(gt_Initialization); libABFE498B_gf_AP_Triggers_MapConfig_setMissionProtoss(libABFE498B_gv_aP_Triggers_MapConfig_MISSION_PROTOSS_NOT_LOTV_MAIN); lib5BD4895D_gf_AP_Core_MapConfig_setChatboxPosition(c_anchorTopRight, 500, 350, 0, 160); - lib5BD4895D_gf_AP_Core_MapConfig_setAffectedPlayers(PlayerGroupSingle(gv_p01_PLAYER)); + PlayerGroupAdd(lv_playerGroup, gv_p01_PLAYER); + PlayerGroupAdd(lv_playerGroup, gv_p10_REINFORCEMENTPROTOSS); + lib5BD4895D_gf_AP_Core_MapConfig_setAffectedPlayers(lv_playerGroup); lib5BD4895D_gf_AP_Core_initObjectivePanel(); return true; } @@ -603,6 +684,7 @@ bool gt_Initialization_Func (bool testConds, bool runActions) { TriggerExecute(gt_Init04Music, true, true); TriggerExecute(gt_Init05Environment, true, true); TriggerExecute(gt_Init06Difficulties, true, true); + TriggerExecute(gt_FactionSwapInit, true, true); TriggerEnable(gt_InitEndGameButton, true); TriggerExecute(gt_IntroQ, true, false); return true; @@ -712,6 +794,15 @@ bool gt_Init03Units_Func (bool testConds, bool runActions) { unitgroup auto1409AA2F_g; int auto1409AA2F_u; unit auto1409AA2F_var; + unitgroup auto6DD98308_g; + int auto6DD98308_u; + unit auto6DD98308_var; + unitgroup auto3521A0B3_g; + int auto3521A0B3_u; + unit auto3521A0B3_var; + unitgroup auto17BFF652_g; + int auto17BFF652_u; + unit auto17BFF652_var; unitgroup auto9F375F4C_g; int auto9F375F4C_u; unit auto9F375F4C_var; @@ -734,20 +825,41 @@ bool gt_Init03Units_Func (bool testConds, bool runActions) { libNtve_gf_MakeUnitInvulnerable(UnitFromId(716), false); UnitSetPropertyFixed(UnitFromId(716), c_unitPropLifeMax, 1500.0); UnitSetPropertyFixed(UnitFromId(716), c_unitPropLife, 1500.0); - autoDDCF4B99_g = UnitGroup("HighTemplar", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + autoDDCF4B99_g = UnitGroup("AP_HighTemplar", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); autoDDCF4B99_u = UnitGroupCount(autoDDCF4B99_g, c_unitCountAll); for (;; autoDDCF4B99_u -= 1) { autoDDCF4B99_var = UnitGroupUnitFromEnd(autoDDCF4B99_g, autoDDCF4B99_u); if (autoDDCF4B99_var == null) { break; } UnitSetPropertyFixed(autoDDCF4B99_var, c_unitPropEnergyPercent, 100.0); } - auto1409AA2F_g = UnitGroup("Phoenix", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + auto1409AA2F_g = UnitGroup("AP_Infestor", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); auto1409AA2F_u = UnitGroupCount(auto1409AA2F_g, c_unitCountAll); for (;; auto1409AA2F_u -= 1) { auto1409AA2F_var = UnitGroupUnitFromEnd(auto1409AA2F_g, auto1409AA2F_u); if (auto1409AA2F_var == null) { break; } UnitSetPropertyFixed(auto1409AA2F_var, c_unitPropEnergyPercent, 100.0); } + auto6DD98308_g = UnitGroup("AP_Ghost", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + auto6DD98308_u = UnitGroupCount(auto6DD98308_g, c_unitCountAll); + for (;; auto6DD98308_u -= 1) { + auto6DD98308_var = UnitGroupUnitFromEnd(auto6DD98308_g, auto6DD98308_u); + if (auto6DD98308_var == null) { break; } + UnitSetPropertyFixed(auto6DD98308_var, c_unitPropEnergyPercent, 100.0); + } + auto3521A0B3_g = UnitGroup("AP_Medic", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + auto3521A0B3_u = UnitGroupCount(auto3521A0B3_g, c_unitCountAll); + for (;; auto3521A0B3_u -= 1) { + auto3521A0B3_var = UnitGroupUnitFromEnd(auto3521A0B3_g, auto3521A0B3_u); + if (auto3521A0B3_var == null) { break; } + UnitSetPropertyFixed(auto3521A0B3_var, c_unitPropEnergyPercent, 100.0); + } + auto17BFF652_g = UnitGroup("AP_Thor", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + auto17BFF652_u = UnitGroupCount(auto17BFF652_g, c_unitCountAll); + for (;; auto17BFF652_u -= 1) { + auto17BFF652_var = UnitGroupUnitFromEnd(auto17BFF652_g, auto17BFF652_u); + if (auto17BFF652_var == null) { break; } + UnitSetPropertyFixed(auto17BFF652_var, c_unitPropEnergyPercent, 100.0); + } auto9F375F4C_g = UnitGroup("MineralField", c_playerAny, RegionFromId(34), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); auto9F375F4C_u = UnitGroupCount(auto9F375F4C_g, c_unitCountAll); for (;; auto9F375F4C_u -= 1) { @@ -1216,6 +1328,8 @@ void gt_ActivateHeroWayGate_Init () { //-------------------------------------------------------------------------------------------------- bool gt_NewTech01PhoenixQ_Func (bool testConds, bool runActions) { // Automatic Variable Declarations + string autoD5650BCE_val; + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -1239,17 +1353,41 @@ bool gt_NewTech01PhoenixQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); gv_reinforcementAutoMove = true; TriggerQueueEnter(); - libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Stargate", c_unitCreateConstruct, gv_p01_PLAYER, RegionGetCenter(RegionFromId(80))); - UnitSetProgressComplete(UnitLastCreated(), 1, 95); - libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Stargate", c_unitCreateConstruct, gv_p01_PLAYER, RegionGetCenter(RegionFromId(81))); - UnitSetProgressComplete(UnitLastCreated(), 1, 95); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut")) { + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Stargate", c_unitCreateConstruct, gv_p01_PLAYER, RegionGetCenter(RegionFromId(80))); + UnitSetProgressComplete(UnitLastCreated(), 1, 95); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Stargate", c_unitCreateConstruct, gv_p01_PLAYER, RegionGetCenter(RegionFromId(81))); + UnitSetProgressComplete(UnitLastCreated(), 1, 95); + } + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("SuperWarpGateTrain", 11), PointFromId(57)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(630)), c_orderQueueAddToEnd); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(631)), c_orderQueueAddToEnd); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(632)), c_orderQueueAddToEnd); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(634)), c_orderQueueAddToEnd); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(109)), c_orderQueueAddToEnd); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(124)), c_orderQueueAddToEnd); + autoD5650BCE_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (autoD5650BCE_val == "Neut") { + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(630)), c_orderQueueAddToEnd); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(631)), c_orderQueueAddToEnd); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(632)), c_orderQueueAddToEnd); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(634)), c_orderQueueAddToEnd); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(109)), c_orderQueueAddToEnd); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(124)), c_orderQueueAddToEnd); + } + else if (autoD5650BCE_val == "Terr") { + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 9), PointFromId(630)), c_orderQueueAddToEnd); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 9), PointFromId(631)), c_orderQueueAddToEnd); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 9), PointFromId(632)), c_orderQueueAddToEnd); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 9), PointFromId(634)), c_orderQueueAddToEnd); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 9), PointFromId(109)), c_orderQueueAddToEnd); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 9), PointFromId(124)), c_orderQueueAddToEnd); + } + else if (autoD5650BCE_val == "Zerg") { + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 19), PointFromId(630)), c_orderQueueAddToEnd); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 19), PointFromId(631)), c_orderQueueAddToEnd); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 19), PointFromId(632)), c_orderQueueAddToEnd); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 19), PointFromId(634)), c_orderQueueAddToEnd); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 19), PointFromId(109)), c_orderQueueAddToEnd); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 19), PointFromId(124)), c_orderQueueAddToEnd); + } + else { + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); UIAlertPoint("Trigger", gv_p01_PLAYER, StringExternal("Param/Value/8403F3B6"), null, UnitGetPosition(UnitFromId(639))); @@ -1278,7 +1416,18 @@ void gt_NewTech01PhoenixQ_Init () { // Trigger: New Tech 02 Void Ray Q //-------------------------------------------------------------------------------------------------- bool gt_NewTech02VoidRayQ_Func (bool testConds, bool runActions) { + // Variable Declarations + unit lv_unit; + unitgroup lv_zergGroundReinforcements; + // Automatic Variable Declarations + string auto33F7953B_val; + unitgroup auto325D2DB4_g; + int auto325D2DB4_u; + + // Variable Initialization + lv_zergGroundReinforcements = UnitGroupEmpty(); + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -1302,15 +1451,75 @@ bool gt_NewTech02VoidRayQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("SuperWarpGateTrain", 12), PointFromId(57)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 8), PointFromId(630)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 8), PointFromId(631)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 8), PointFromId(632)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 8), PointFromId(634)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(675)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(676)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(672)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(678)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(677)), c_orderQueueReplace); + auto33F7953B_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (auto33F7953B_val == "Neut") { + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 8), PointFromId(630)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 8), PointFromId(631)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 8), PointFromId(632)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 8), PointFromId(634)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(675)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(676)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(672)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(678)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(677)), c_orderQueueReplace); + } + else if (auto33F7953B_val == "Terr") { + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 10), PointFromId(630)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 10), PointFromId(631)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 10), PointFromId(632)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 10), PointFromId(634)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 10), PointFromId(109)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 10), PointFromId(124)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(685)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(675)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(676)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(672)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(678)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(677)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(680)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(681)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(682)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(679)), c_orderQueueReplace); + } + else if (auto33F7953B_val == "Zerg") { + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 15), PointFromId(630)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 15), PointFromId(631)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 15), PointFromId(632)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 15), PointFromId(634)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 15), PointFromId(109)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 15), PointFromId(124)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 15), PointFromId(685)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 15), PointFromId(672)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 15), PointFromId(677)), c_orderQueueReplace); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_HydraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(675)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_HydraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(676)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_HydraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(672)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_HydraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(678)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_HydraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(677)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + auto325D2DB4_g = lv_zergGroundReinforcements; + auto325D2DB4_u = UnitGroupCount(auto325D2DB4_g, c_unitCountAll); + for (;; auto325D2DB4_u -= 1) { + lv_unit = UnitGroupUnitFromEnd(auto325D2DB4_g, auto325D2DB4_u); + if (lv_unit == null) { break; } + UnitIssueOrder(lv_unit, Order(AbilityCommand("AP_BurrowHydraliskUp", 0)), c_orderQueueReplace); + UnitSetTeamColorIndex(lv_unit, 7); + UnitSetState(lv_unit, c_unitStateUsingSupply, false); + UnitGroupAdd(gv_reinforcementUnits, lv_unit); + if ((gv_reinforcementAutoMove == true)) { + UnitIssueOrder(lv_unit, OrderTargetingPoint(AbilityCommand("attack", 0), PointWithOffsetPolar(UnitGetPosition(lv_unit), 33.0, 45.0)), c_orderQueueAddToEnd); + } + else { + UnitIssueOrder(lv_unit, OrderTargetingPoint(AbilityCommand("attack", 0), PointWithOffsetPolar(UnitGetPosition(lv_unit), 22.0, 45.0)), c_orderQueueAddToEnd); + } + } + } + else { + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); UIAlertPoint("Trigger", gv_p01_PLAYER, StringExternal("Param/Value/5DAFE246"), null, UnitGetPosition(UnitFromId(639))); @@ -1339,7 +1548,18 @@ void gt_NewTech02VoidRayQ_Init () { // Trigger: New Tech 03 Carriers Q //-------------------------------------------------------------------------------------------------- bool gt_NewTech03CarriersQ_Func (bool testConds, bool runActions) { + // Variable Declarations + unit lv_unit; + unitgroup lv_zergGroundReinforcements; + // Automatic Variable Declarations + string auto32E3E036_val; + unitgroup auto23EE9191_g; + int auto23EE9191_u; + + // Variable Initialization + lv_zergGroundReinforcements = UnitGroupEmpty(); + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -1363,16 +1583,70 @@ bool gt_NewTech03CarriersQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("SuperWarpGateTrain", 13), PointFromId(57)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 6), PointFromId(630)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 6), PointFromId(631)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 6), PointFromId(109)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 6), PointFromId(124)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(675)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(676)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(672)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(678)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 2), PointFromId(681)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 2), PointFromId(682)), c_orderQueueReplace); + auto32E3E036_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (auto32E3E036_val == "Neut") { + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 6), PointFromId(630)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 6), PointFromId(631)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 6), PointFromId(109)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 6), PointFromId(124)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(675)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(676)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(672)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(678)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 2), PointFromId(681)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 2), PointFromId(682)), c_orderQueueReplace); + } + else if (auto32E3E036_val == "Terr") { + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 11), PointFromId(630)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 11), PointFromId(631)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 11), PointFromId(109)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 11), PointFromId(124)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 14), PointFromId(675)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 14), PointFromId(676)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 14), PointFromId(672)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 14), PointFromId(678)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 13), PointFromId(681)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 13), PointFromId(682)), c_orderQueueReplace); + } + else if (auto32E3E036_val == "Zerg") { + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 18), PointFromId(630)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 18), PointFromId(631)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 17), PointFromId(632)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 17), PointFromId(634)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 18), PointFromId(109)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 18), PointFromId(124)), c_orderQueueReplace); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_UltraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(685)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_HydraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(675)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_HydraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(676)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_HydraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(672)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_UltraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(678)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_HydraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(677)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + auto23EE9191_g = lv_zergGroundReinforcements; + auto23EE9191_u = UnitGroupCount(auto23EE9191_g, c_unitCountAll); + for (;; auto23EE9191_u -= 1) { + lv_unit = UnitGroupUnitFromEnd(auto23EE9191_g, auto23EE9191_u); + if (lv_unit == null) { break; } + UnitIssueOrder(lv_unit, Order(AbilityCommand("AP_BurrowHydraliskUp", 0)), c_orderQueueReplace); + UnitIssueOrder(lv_unit, Order(AbilityCommand("AP_BurrowUltraliskUp", 0)), c_orderQueueReplace); + UnitSetTeamColorIndex(lv_unit, 7); + UnitSetState(lv_unit, c_unitStateUsingSupply, false); + UnitGroupAdd(gv_reinforcementUnits, lv_unit); + if ((gv_reinforcementAutoMove == true)) { + UnitIssueOrder(lv_unit, OrderTargetingPoint(AbilityCommand("attack", 0), PointWithOffsetPolar(UnitGetPosition(lv_unit), 33.0, 45.0)), c_orderQueueAddToEnd); + } + else { + UnitIssueOrder(lv_unit, OrderTargetingPoint(AbilityCommand("attack", 0), PointWithOffsetPolar(UnitGetPosition(lv_unit), 22.0, 45.0)), c_orderQueueAddToEnd); + } + } + } + else { + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); UIAlertPoint("Trigger", gv_p01_PLAYER, StringExternal("Param/Value/7D557C0A"), null, UnitGetPosition(UnitFromId(639))); @@ -1403,7 +1677,18 @@ void gt_NewTech03CarriersQ_Init () { // Trigger: New Tech 04 Mothership Q //-------------------------------------------------------------------------------------------------- bool gt_NewTech04MothershipQ_Func (bool testConds, bool runActions) { + // Variable Declarations + unit lv_unit; + unitgroup lv_zergGroundReinforcements; + // Automatic Variable Declarations + string autoF6304625_val; + unitgroup auto57F53579_g; + int auto57F53579_u; + + // Variable Initialization + lv_zergGroundReinforcements = UnitGroupEmpty(); + // Conditions if (testConds) { if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { @@ -1427,21 +1712,91 @@ bool gt_NewTech04MothershipQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); TriggerExecute(gt_MothershipSpawn, true, false); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(630)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(631)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 6), PointFromId(109)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 6), PointFromId(124)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 8), PointFromId(632)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 8), PointFromId(634)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(675)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(676)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(672)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(678)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(677)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 1), PointFromId(680)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 1), PointFromId(681)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 1), PointFromId(682)), c_orderQueueReplace); - UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 1), PointFromId(679)), c_orderQueueReplace); + autoF6304625_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (autoF6304625_val == "Neut") { + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(630)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 7), PointFromId(631)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 6), PointFromId(109)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 6), PointFromId(124)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 8), PointFromId(632)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 8), PointFromId(634)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(675)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(676)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(672)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(678)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 0), PointFromId(677)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 1), PointFromId(680)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 1), PointFromId(681)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 1), PointFromId(682)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 1), PointFromId(679)), c_orderQueueReplace); + } + else if (autoF6304625_val == "Terr") { + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 9), PointFromId(630)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 9), PointFromId(631)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 11), PointFromId(109)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 11), PointFromId(124)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 10), PointFromId(632)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 10), PointFromId(634)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(675)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(675)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(676)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(676)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(672)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(672)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(678)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(678)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(677)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 12), PointFromId(677)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 14), PointFromId(680)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 14), PointFromId(681)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 14), PointFromId(682)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 14), PointFromId(679)), c_orderQueueReplace); + } + else if (autoF6304625_val == "Zerg") { + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 18), PointFromId(630)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 18), PointFromId(631)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 17), PointFromId(632)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 17), PointFromId(634)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 18), PointFromId(109)), c_orderQueueReplace); + UnitIssueOrder(gv_superWarpGate_P10, OrderTargetingPoint(AbilityCommand("AP_SuperWarpGateTrain", 18), PointFromId(124)), c_orderQueueReplace); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_HydraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(675)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_HydraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(676)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_HydraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(672)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_HydraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(678)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_HydraliskBurrowed", 0, gv_p01_PLAYER, PointFromId(677)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_RoachBurrowed", 0, gv_p01_PLAYER, PointFromId(680)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_RoachBurrowed", 0, gv_p01_PLAYER, PointFromId(681)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_RoachBurrowed", 0, gv_p01_PLAYER, PointFromId(682)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_RoachBurrowed", 0, gv_p01_PLAYER, PointFromId(679)); + UnitGroupAdd(lv_zergGroundReinforcements, UnitLastCreated()); + auto57F53579_g = lv_zergGroundReinforcements; + auto57F53579_u = UnitGroupCount(auto57F53579_g, c_unitCountAll); + for (;; auto57F53579_u -= 1) { + lv_unit = UnitGroupUnitFromEnd(auto57F53579_g, auto57F53579_u); + if (lv_unit == null) { break; } + UnitIssueOrder(lv_unit, Order(AbilityCommand("AP_BurrowHydraliskUp", 0)), c_orderQueueReplace); + UnitIssueOrder(lv_unit, Order(AbilityCommand("AP_BurrowRoachUp", 0)), c_orderQueueReplace); + UnitSetTeamColorIndex(lv_unit, 7); + UnitSetState(lv_unit, c_unitStateUsingSupply, false); + UnitGroupAdd(gv_reinforcementUnits, lv_unit); + if ((gv_reinforcementAutoMove == true)) { + UnitIssueOrder(lv_unit, OrderTargetingPoint(AbilityCommand("attack", 0), PointWithOffsetPolar(UnitGetPosition(lv_unit), 33.0, 45.0)), c_orderQueueAddToEnd); + } + else { + UnitIssueOrder(lv_unit, OrderTargetingPoint(AbilityCommand("attack", 0), PointWithOffsetPolar(UnitGetPosition(lv_unit), 22.0, 45.0)), c_orderQueueAddToEnd); + } + } + } + else { + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); UIAlertPoint("Trigger", gv_p01_PLAYER, StringExternal("Param/Value/718CB62A"), null, UnitGetPosition(UnitFromId(639))); @@ -1517,10 +1872,14 @@ bool gt_ReinforcementBehavior_Func (bool testConds, bool runActions) { UnitSetTeamColorIndex(EventUnitProgressUnit(), 6); } - if (((UnitGetType(EventUnitProgressUnit()) == "AP_ZealotAiur") || (UnitGetType(EventUnitProgressUnit()) == "AP_StalkerShakuras") || (UnitGetType(EventUnitProgressUnit()) == "AP_ImmortalAiur") || (UnitGetType(EventUnitProgressUnit()) == "AP_PhoenixAiur") || (UnitGetType(EventUnitProgressUnit()) == "AP_VoidRayShakuras") || (UnitGetType(EventUnitProgressUnit()) == "AP_CarrierAiur"))) { + if (((UnitGetType(EventUnitProgressUnit()) == "AP_ZealotAiur") || (UnitGetType(EventUnitProgressUnit()) == "AP_StalkerShakuras") || (UnitGetType(EventUnitProgressUnit()) == "AP_ImmortalAiur") || (UnitGetType(EventUnitProgressUnit()) == "AP_PhoenixAiur") || (UnitGetType(EventUnitProgressUnit()) == "AP_VoidRayShakuras") || (UnitGetType(EventUnitProgressUnit()) == "AP_CarrierAiur") || (UnitGetType(EventUnitProgressUnit()) == "AP_ValkyrieSCBW") || (UnitGetType(EventUnitProgressUnit()) == "AP_Liberator") || (UnitGetType(EventUnitProgressUnit()) == "AP_Battlecruiser") || (UnitGetType(EventUnitProgressUnit()) == "AP_Marine") || (UnitGetType(EventUnitProgressUnit()) == "AP_Marauder") || (UnitGetType(EventUnitProgressUnit()) == "AP_SiegeTank") || (UnitGetType(EventUnitProgressUnit()) == "AP_Corruptor") || (UnitGetType(EventUnitProgressUnit()) == "AP_DevourerSCBW") || (UnitGetType(EventUnitProgressUnit()) == "AP_Mutalisk") || (UnitGetType(EventUnitProgressUnit()) == "AP_BroodLord") || (UnitGetType(EventUnitProgressUnit()) == "AP_SIQueen"))) { UnitSetOwner(EventUnitProgressUnit(), gv_p01_PLAYER, true); UnitSetTeamColorIndex(EventUnitProgressUnit(), 7); UnitSetState(EventUnitProgressUnit(), c_unitStateUsingSupply, false); + UnitGroupAdd(gv_reinforcementUnits, EventUnitProgressUnit()); + UnitSetPropertyFixed(EventUnitProgressUnit(), c_unitPropLifePercent, 100.0); + UnitSetPropertyFixed(EventUnitProgressUnit(), c_unitPropEnergyPercent, 100.0); + UnitSetPropertyFixed(EventUnitProgressUnit(), c_unitPropShieldsPercent, 100.0); } if ((gv_reinforcementAutoMove == true)) { @@ -1880,6 +2239,33 @@ void gt_ArchivistWarpedin_Init () { TriggerAddEventUnitConstructProgress(gt_ArchivistWarpedin, null, c_unitProgressStageStart); } +//-------------------------------------------------------------------------------------------------- +// Trigger: ReinforcementUnitMorph +//-------------------------------------------------------------------------------------------------- +bool gt_ReinforcementUnitMorph_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + // Conditions + if (testConds) { + if (!((UnitGroupHasUnit(gv_reinforcementUnits, EventUnit()) == true))) { + return false; + } + } + + // Actions + if (!runActions) { + return true; + } + + UnitSetState(EventUnit(), c_unitStateUsingSupply, false); + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_ReinforcementUnitMorph_Init () { + gt_ReinforcementUnitMorph = TriggerCreate("gt_ReinforcementUnitMorph_Func"); + TriggerAddEventUnitAbility(gt_ReinforcementUnitMorph, null, null, c_unitAbilStageAll, false); +} + //-------------------------------------------------------------------------------------------------- // Trigger: Start AI //-------------------------------------------------------------------------------------------------- @@ -5482,7 +5868,12 @@ bool gt_ObjectiveSurviveCreateQ_Func (bool testConds, bool runActions) { lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveKillPrimary, gv_LOCATION_ID_KILLS); lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objectiveKillPrimary, true); libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TZeratul04Objective1, ObjectiveLastCreated(), StringExternal("Param/Value/09C0A593")); - ObjectiveCreate(StringExternal("Param/Value/D6B7F35F"), StringExternal("Param/Value/97923284"), c_objectiveStateHidden, true); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut")) { + ObjectiveCreate(StringExternal("Param/Value/D6B7F35F"), StringExternal("Param/Value/97923284"), c_objectiveStateHidden, true); + } + else { + ObjectiveCreate(StringExternal("Param/Value/5DC2C474"), StringExternal("Param/Value/E0F3C816"), c_objectiveStateHidden, true); + } gv_objectiveSurviveUntilYouDie = ObjectiveLastCreated(); lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objectiveSurviveUntilYouDie, lib5BD4895D_ge_APObjectiveCategory_Primary, false); lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objectiveSurviveUntilYouDie, gv_LOCATION_ID_URUN); @@ -7180,6 +7571,7 @@ void gt_VictoryHybridExplosion_Init () { // Trigger Initialization //-------------------------------------------------------------------------------------------------- void InitTriggers () { + gt_FactionSwapInit_Init(); gt_KillPlayerDead_Init(); gt_RandomizeButtonText_Init(); gt_InitEndGameButton_Init(); @@ -7212,6 +7604,7 @@ void InitTriggers () { gt_HeroCarrierDiesQ_Init(); gt_HeroMothershipDiesQ_Init(); gt_ArchivistWarpedin_Init(); + gt_ReinforcementUnitMorph_Init(); gt_StartAI_Init(); gt_AIUpgradesEN_Init(); gt_AIUpgradesH_Init(); diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Minimap.tga b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Minimap.tga index a964bc1e94cbd7a4ec54c8360bd0e38abbd9c1ca..0d57cbd26a3657009cb8eb2fb01ee183b55b34ac 100644 GIT binary patch delta 268 zcmZ3}z_X@-r(p}@<`ALQ5a0R$uWCQ{QZJWGCtG(t?d?ZH7~e4oH3oS%1bP8cwVy|# zt%Z}8+V-R2j31eJfXacQmA-CKmL}T|MKOM1;;0Mo1d5h=ZQmEm_=8CZ$Zibu_BGaz zvNktXQ&E#sN{a4A z`cq?qxBIp;K4p@Nb=N8g*RD&@Ye+DTvaxV8)B~#UH8BFR{Y;Ig2Xrw?GuI{QY|rar z1$ZcxR906YrE1$#@8H-8q@i9F}5&UsH<+Dx{GnKCfI)KCyd^T%+sQSws*2J HE&c@n#ram5 delta 268 zcmZ3}z_X@-r(p}@<`AKdF#j|M>nvxx8h?)(KM!9cz3oRs7~e4owTJq}+nA?2+B5`u z<-0iqfF!~hKQi&eS(_JoIM@1n0vX#6MKOM1;sBaZ?dMVAxqV+O;}0gGVoztFQSSOW zK1O;X{Ct8uJljtsFdh_VR*{q2-c!L?%*s@ku${4v(VSDXCP||JXo`>mfadMh$dj|tx1$;!0& F7XXvjRP6u& diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Objects b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Objects index 246818d7e..b6bcbf82c 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Objects +++ b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Objects @@ -22,10 +22,10 @@ - + - + @@ -71,13 +71,13 @@ - - - + + + @@ -109,12 +109,12 @@ - + - - + + @@ -151,10 +151,10 @@ - + - + @@ -189,10 +189,10 @@ - + - + @@ -222,10 +222,10 @@ - + - + @@ -269,10 +269,10 @@ - + - + @@ -339,23 +339,23 @@ - - - - - + + - + + + + @@ -399,12 +399,12 @@ - + - - + + @@ -450,12 +450,12 @@ - + - - + + @@ -491,10 +491,10 @@ - + - + @@ -545,12 +545,12 @@ - + - - + + @@ -564,12 +564,12 @@ - + - - + + @@ -577,10 +577,10 @@ - + - + @@ -659,12 +659,12 @@ - + - - + + @@ -711,14 +711,14 @@ + + + - - - @@ -823,14 +823,14 @@ + + + - - - @@ -869,12 +869,12 @@ - + - - + + @@ -903,10 +903,10 @@ - + - + @@ -1055,12 +1055,12 @@ - + - - + + @@ -1076,14 +1076,14 @@ + + + - - - @@ -1171,10 +1171,10 @@ - + - + @@ -1195,10 +1195,10 @@ - + - + @@ -1232,10 +1232,10 @@ - + - + @@ -1337,12 +1337,12 @@ - + - - + + @@ -1415,10 +1415,10 @@ - + - + @@ -1472,10 +1472,10 @@ - + - + @@ -1496,10 +1496,10 @@ - + - + @@ -1524,10 +1524,10 @@ - + - + @@ -1643,24 +1643,24 @@ + + + - - - - + - + @@ -1701,12 +1701,12 @@ - + - - + + @@ -1751,10 +1751,10 @@ - + - + @@ -1944,10 +1944,10 @@ - + - + @@ -1966,10 +1966,10 @@ - + - + @@ -2013,18 +2013,18 @@ - - - - + + + + @@ -2064,12 +2064,12 @@ - + - - + + @@ -2078,10 +2078,10 @@ - + - + @@ -2112,12 +2112,12 @@ - + - - + + @@ -2130,10 +2130,10 @@ - + - + @@ -2237,10 +2237,10 @@ - + - + @@ -2267,10 +2267,10 @@ - + - + @@ -2282,10 +2282,10 @@ + - @@ -2302,8 +2302,8 @@ - + @@ -2320,8 +2320,8 @@ - + @@ -2329,17 +2329,17 @@ - + - + - + @@ -2355,8 +2355,8 @@ - + @@ -2364,10 +2364,10 @@ + - @@ -2375,41 +2375,41 @@ + - + - + - + - - + + - + - @@ -2419,36 +2419,36 @@ - + - + + - - + - - + + - + @@ -2465,32 +2465,32 @@ + - - - - - + + - + + + - + @@ -2503,8 +2503,8 @@ - + @@ -2515,8 +2515,8 @@ - + @@ -2563,6 +2563,17 @@ + + + + + + + + + + + @@ -2575,17 +2586,6 @@ - - - - - - - - - - - @@ -2643,25 +2643,25 @@ - + - - - + + + - + - - - + + + @@ -2743,55 +2743,76 @@ - - - - - - + + - + - + + + - - + - - - - - - + + - + + + + - + + + + + + + + + + + + + + + + - - - + + + + + + + + + + - + + + + @@ -2801,45 +2822,38 @@ - + - - - - - - - + + + + + + + + + + + - - - - - - - + + - + - - - - - + + + + - - - - - @@ -2847,12 +2861,12 @@ - - - + - + + + @@ -2860,85 +2874,70 @@ + + + + + + + - - - - - + + - + - - + - - - - - + + + + + + + + - - - - - - - + - - + - - - - - + - - - - - - - + - - - - - - - - + + + + @@ -2953,20 +2952,25 @@ + + + - - + + + - - - + + + + @@ -2974,20 +2978,24 @@ - + + + - - - - + + + + + + - - - - - + + + + + + - @@ -3002,24 +3010,22 @@ - - + - - - - - - - + + + + + + - - - - - + + + + + @@ -3035,9 +3041,17 @@ - + + + + + + + + + + - @@ -3045,13 +3059,17 @@ - - + + + - - - + + + + + + @@ -3062,22 +3080,12 @@ - + - - - - - - - - - - - + @@ -3086,43 +3094,59 @@ - + + + + - + + + + + + + - - - - - + + + + + + - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + @@ -3133,6 +3157,9 @@ + + + @@ -3152,14 +3179,31 @@ - - + + + + + + + + + + + - - + + + + + + + + + + @@ -3167,20 +3211,809 @@ - + - - + + + + + + + - - - - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Objects.version b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Objects.version index dabad43580728fe15203b2f8358277d0e33b34bc..90736f4d206d2c05f7dbef39865b0615dc3fe4ca 100644 GIT binary patch literal 44 ocmYdJNi9yw&naMHU|^8QWMp6k(jdSK#2~&ZkQTd^n$8HM0jqZgLjV8( literal 44 ocmYdJNi9yw&naMHU|^6)U}Rtg(jdSM#2~&fkdEoSoXQBK0jrb-h5!Hn diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Preload.xml index 05bde4c57..7dfd87008 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Preload.xml +++ b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Preload.xml @@ -34,6 +34,9 @@ + + + @@ -131,7 +134,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -141,6 +169,8 @@ + + @@ -151,4 +181,27 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Regions b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Regions index c69025310..523b2db4f 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Regions +++ b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Regions @@ -615,4 +615,12 @@ + + + +
+ + + + \ No newline at end of file diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Regions.version b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Regions.version index 208e8d07fecf1bd57dc7cb2fec6f0a5b4fdb45a1..5d8d88019c3a0ef9d650e0b11f454748be6803a4 100644 GIT binary patch literal 44 ocmYdJNiEJyPc33%U|^8QWMp6k(jdSK#2`K=kgmCwn$8HM0jzfhhX4Qo literal 44 ocmYdJNiEJyPc33%U|^6)U}Rtg(jdSM#2`Kgkk;zHoXQBK0jQD&K>z>% diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Triggers index 338997b12..402814433 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Triggers @@ -12,10 +12,532 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Zerg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Zerg + + + + + + + + + + + + Terr + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Terr + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Prot + + + + + + false + + + + + + + + + + + + + + + + + Prot + + + + + + false + + + + + + + + + + + + + + + + + Prot + + + + + + false + + + + + + + + + + + + + + + + + Prot + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + Neut + + + + + + + + + + + + + + + + + + + + + + + + + 1.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_CommandCenter + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Nexus + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + @@ -2057,6 +2579,7 @@ + @@ -2065,9 +2588,23 @@ + + + + + + + + + + + + + + @@ -2171,21 +2708,39 @@ 160 + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + @@ -2545,6 +3100,7 @@ + @@ -2665,6 +3221,25 @@ + + + + + + + + + + + + + + + + + + + @@ -3894,6 +4469,9 @@ + + + @@ -4082,7 +4660,7 @@ - HighTemplar + AP_HighTemplar @@ -4148,7 +4726,7 @@ - Phoenix + AP_Infestor @@ -4195,6 +4773,204 @@ 100 + + + + + + + + + + + + + + + + + + + + AP_Ghost + + + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + 100 + + + + + + + + + + + + + + + + + + + + + + AP_Medic + + + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + 100 + + + + + + + + + + + + + + + + + + + + + + AP_Thor + + + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + 100 + + Resources @@ -9686,6 +10462,7 @@ + @@ -9700,6 +10477,19 @@ + + + + + + + + + + + + + @@ -9917,19 +10707,10 @@ - - - - - + - - - - - - + @@ -9946,10 +10727,20 @@ + + + + + + + + + + - + @@ -9972,7 +10763,7 @@ - + @@ -10014,7 +10805,7 @@ - + @@ -10038,7 +10829,7 @@ - + @@ -10080,7 +10871,7 @@ - + @@ -10102,6 +10893,27 @@ 95 + + + + + + + + + + + + + + + + + + Neut + + + @@ -10143,9 +10955,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + Neut + + + - + @@ -10181,7 +11022,7 @@ - + @@ -10217,7 +11058,7 @@ - + @@ -10253,7 +11094,7 @@ - + @@ -10289,7 +11130,7 @@ - + @@ -10325,7 +11166,7 @@ - + @@ -10359,6 +11200,510 @@ + + + + + + + + + + + + + + + Terr + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + Zerg + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + @@ -10653,12 +11998,35 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -10747,15 +12115,7 @@ - - - - - - - - - + @@ -10813,9 +12173,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Neut + + + - + @@ -10851,7 +12243,7 @@ - + @@ -10887,7 +12279,7 @@ - + @@ -10923,7 +12315,7 @@ - + @@ -10959,7 +12351,7 @@ - + @@ -10994,7 +12386,7 @@ - + @@ -11029,7 +12421,7 @@ - + @@ -11064,7 +12456,7 @@ - + @@ -11099,7 +12491,7 @@ - + @@ -11132,1831 +12524,6328 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + Terr + + - - - - + + + + + + - - - + + + - - + + + - - - - - - - - + + + + - - - Trigger - - + + + AP_SuperWarpGateTrain + + + - - - + + + + - - - + + + - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - - - -- - - + + + AP_SuperWarpGateTrain + + + - - - - + + + + - - - TZeratul04Mohandar00004 - + + + - - - - - - - - + + + + + + - - - + + + - - - TZeratul04Mohandar00004 - - + + + - - - + + + + - - - 1.0 - + + + AP_SuperWarpGateTrain + + + - - - + + + + - - - - + + + - - - + + + + + + - - - - - - + + + - - - - + + + - - - TZeratul04Zeratul00005 - + + + + - - - - - - - - + + + AP_SuperWarpGateTrain + + + - - - + + + + - - - TZeratul04Zeratul00005 - - + + + - - - + + + + + + - - - 1.0 - + + + - - - + + + - - - - - - + + + + - - - + + + AP_SuperWarpGateTrain + + + - - - + + + + - - - + + + - - - + + + + + + - - - true - + + + - - - -- - - + + + - - - - + + + + - - - + + + AP_SuperWarpGateTrain + + + - - - Deactivate Hero Way Gate - - + + + + - - - - - + + + - - - + + + + + + - - - + + + - - - - + + + - - - AnimGroupRemove Work - + + + + - - - - - + + + AP_SuperWarpGateTrain + + + - - - 1.0 - + + + + - - - + + + - - - - - - - + + + + + + - - - "StoryTips|Zeratul04_VoidRay" - + + + - - - + + + - - - + + + + - - + + + AP_SuperWarpGateTrain + + + - - - - - + + + + - - - + + + - - - + + + + + + - - - - - - + + + - - - - - + + + - - - + + + + - - - + + + AP_SuperWarpGateTrain + + + - - - + + + + - - - + + + - - + + + + + + - - - true - + + + - - - - - + + + - - - + + + + - - - + + + AP_SuperWarpGateTrain + + + - - - false - + + + + - - - - - + + + - - - + + + + + + - - - - - - - false - + + + - - - - + + + - - - + + + + - - + + + AP_SuperWarpGateTrain + + + - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - - + + + + - + - + - + - + - - + + - + - SuperWarpGateTrain + AP_SuperWarpGateTrain - + + - + - + - + - - - -- - - - - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain - + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain - + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain - + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + Zerg + + + + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain - + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain - + - + - + - + - - - - - - - - + + + + + + - - - - + + + - - - + + + - - + + + + - - - - - - - - + + + AP_SuperWarpGateTrain + + + - - - Trigger - - + + + + - - - + + + - - - + + + + + + - - - + + + - - - + + + - - - + + + + - - - - + + + AP_SuperWarpGateTrain + + + - - - -- - - + + + + - - - - + + + - - - TZeratul04Selendis00006 - + + + + + + - - - - - - - - + + + - - - + + + - - - TZeratul04Selendis00006 - - + + + + - - - + + + AP_SuperWarpGateTrain + + + - - - 1.0 - + + + + - - - + + + - - - - + + + + + + + + - - - + + + 1 + - - - - - - - - + + + + - - - - + + + - - - TZeratul04Zeratul00007 - + + + AP_HydraliskBurrowed + + - - - - - - - - + + + + - - - + + + + + - - - TZeratul04Zeratul00007 - - + + + - - - + + - - - 1.0 - + + + - - - + + + + + + + + - - - - + + + 1 + - - - TZeratul04Selendis00008 - + + + + - - - - - - - - + + + - + + + AP_HydraliskBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_HydraliskBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_HydraliskBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_HydraliskBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_BurrowHydraliskUp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + attack + + + + + + + + + + + + + + + + + + + + + + + + + + + 22.0 + + + + + 45.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + attack + + + + + + + + + + + + + + + + + + + + + + + + + + + 33.0 + + + + + 45.0 + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Trigger + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- + + + + + + + + + + + TZeratul04Mohandar00004 + + + + + + + + + + + + - + + + + + TZeratul04Mohandar00004 + + + + + + + + + + 1.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + TZeratul04Zeratul00005 + + + + + + + + + + + + + + + + + + TZeratul04Zeratul00005 + + + + + + + + + + 1.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + -- + + + + + + + + + + + + + + + Deactivate Hero Way Gate + + + + + + + + + + + + + + + + + + + + + + + + + AnimGroupRemove Work + + + + + + + + + + + 1.0 + + + + + + + + + + + + + + + + + "StoryTips|Zeratul04_VoidRay" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SuperWarpGateTrain + + + + + + + + + + + + + + + -- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Neut + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Terr + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Zerg + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_UltraliskBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_HydraliskBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_HydraliskBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_HydraliskBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_UltraliskBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_HydraliskBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_BurrowHydraliskUp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_BurrowUltraliskUp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + attack + + + + + + + + + + + + + + + + + + + + + + + + + + + 22.0 + + + + + 45.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + attack + + + + + + + + + + + + + + + + + + + + + + + + + + + 33.0 + + + + + 45.0 + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Trigger + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- + + + + + + + + + + + TZeratul04Selendis00006 + + + + + + + + + + + + + + + + + + TZeratul04Selendis00006 + + + + + + + + + + 1.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + TZeratul04Zeratul00007 + + + + + + + + + + + + + + + + + + TZeratul04Zeratul00007 + + + + + + + + + + 1.0 + + + + + + + + + + + + + + TZeratul04Selendis00008 + + + + + + + + + + + + + + + + + + TZeratul04Selendis00008 + + + + + + + + + + 1.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + -- + + + + + + + + + + + + + + + Deactivate Hero Way Gate + + + + + + + + + + + + + + + + + + + + + + + + + AnimGroupRemove Work + + + + + + + + + + + 1.0 + + + + + + + + + + + + + + + + + "StoryTips|Zeratul04_Carrier" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Neut + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Terr + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SuperWarpGateTrain + + + + + + + + - - - TZeratul04Selendis00008 - - + + + - - - + + + + + + - - - 1.0 - + + + - - - + + + - - - - - - + + + + - - - + + + AP_SuperWarpGateTrain + + + - - - + + + + - - - + + + - - - + + + + + + - - - true - + + + - - - -- - - + + + - - - - + + + + - - - + + + AP_SuperWarpGateTrain + + + - - - Deactivate Hero Way Gate - - + + + + - - - - - + + + - - - + + + + + + - - - + + + - - - - + + + - - - AnimGroupRemove Work - + + + + - - - - - + + + AP_SuperWarpGateTrain + + + - - - 1.0 - + + + + - - - + + + - - - - - - - + + + + + + - - - "StoryTips|Zeratul04_Carrier" - + + + - - - + + + - - - + + + + - - + + + AP_SuperWarpGateTrain + + + - - - - - + + + + - - - + + + - - - + + + + + + - - - - - - + + + - - - - - + + + - - - + + + + - - - + + + AP_SuperWarpGateTrain + + + - - - + + + + - - - + + + - - + + + + + + - - - true - + + + - - - - - + + + - - - + + + + - - - + + + AP_SuperWarpGateTrain + + + - - - false - + + + + - - - - - + + + - - - + + + + + + - - - + + + - - - false - + + + - - - - + + + + - - - + + + AP_SuperWarpGateTrain + + + - - + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - + + + - - - + + + - - - + + + + - - - - + + + AP_SuperWarpGateTrain + + + - + + + + + + + + + + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain - + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain - + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain - + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain - + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain - + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain - + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Zerg + + + + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain - + - + - + - + - + - - - - + + + + - + - + - + - + - - + + - + AP_SuperWarpGateTrain - + - + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_HydraliskBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_HydraliskBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_HydraliskBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_HydraliskBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_HydraliskBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_RoachBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_RoachBurrowed + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_RoachBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + AP_RoachBurrowed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_BurrowHydraliskUp + + + + - + + + + + - - - - + + + + - + + + + + + + + + + + AP_BurrowRoachUp + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + - + - AP_SuperWarpGateTrain + attack - - - + - - + - + + + + + + + + + + + + + + + + + + + + + 22.0 + + + + + 45.0 + + + - + - + - - - - + + + + - + - + - + - + - + - - + + - + - AP_SuperWarpGateTrain + attack - - - + - - + - + + + + + + + + + + + + + + + + + + + + + 33.0 + + + + + 45.0 + + + - + + + + + + + + + + + + + + + + + + + + true + @@ -13853,6 +19742,10 @@ + + + + @@ -13863,6 +19756,17 @@ + + + + + + + + + + + @@ -14056,6 +19960,358 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_ValkyrieSCBW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Liberator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Battlecruiser + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Marine + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Marauder + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SiegeTank + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Corruptor + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_DevourerSCBW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Mutalisk + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_BroodLord + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SIQueen + + + @@ -14118,6 +20374,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 100 + + + + + + + + + + + + + + + + + + + + + + + 100 + + + + + + + + + + + + + + + + + + + + + + + 100 + + @@ -16498,6 +22840,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + @@ -65618,7 +72044,7 @@ - + @@ -65776,9 +72202,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -65800,6 +72257,27 @@ + + + + + + + + + + + + + + + + + + Neut + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/Triggers.version index 089f3000e3fa56a931237e49d340679a6837a696..6ddc12990c3b1ea390fe72f9880784b96e787c45 100644 GIT binary patch delta 17 XcmdPVnV`UPh=GB@^KNQ7Baj9FCRqc@ delta 17 XcmdPVnV`TkgMop;|J&*`Mj#CUCf@`E diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt index 0d60ff2ba..ad4d3d600 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -37,6 +37,7 @@ Param/Value/507D82B7=Reinforcements Param/Value/55205F23=Way Gate Activated Param/Value/5B12EC7A=Protoss Research Earned Param/Value/5DAFE246=Reinforcements +Param/Value/5DC2C474=Defend Until the End Param/Value/60E72902= Param/Value/65D79CE4=%NumberKilled% Param/Value/65ED55C7=Hit the Showers @@ -74,6 +75,7 @@ Param/Value/D6D2FF4E=Enemy Units Killed Param/Value/D8F891F9=Kills to Next Achievement Param/Value/DACBA3F9=Selendis has arrived. Param/Value/DB78CF78= +Param/Value/E0F3C816=There is no hope left for the protoss race. Avenge your fallen by slaying zerg and hybrid forces until the last protoss is no more. Param/Value/E35E7BFA=Uh Oh, Artanis! Param/Value/EC556E9B=Do It Param/Value/ECAEF3DC=Can We Hurry This Up? diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index efc841056..d26b60b8d 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -79,6 +79,7 @@ Trigger/Name/42F75997=Intro Hero Gate Trigger/Name/444ED19F=Mid Omegalisk 2 Unburrow Trigger/Name/4534CD62=Intro Sequence Trigger/Name/475DC174=Objective Protect Archive Failed +Trigger/Name/47E75732=ReinforcementUnitMorph Trigger/Name/4B2F3068=Swarm Wave A3 P05 NE Trigger/Name/4BBC4640=Zerg Building replenish Trigger/Name/4BF58E1A=Mid Q @@ -137,6 +138,7 @@ Trigger/Name/BD11E89A=Kill Player Dead Trigger/Name/BD1216FA=Mid Cleanup Trigger/Name/C01527FA=Briefing Q Trigger/Name/C13958E3=Mid Cinematic +Trigger/Name/C310F5DD=Faction Swap Init Trigger/Name/C558413C=Stat -Stargate Unit Built Trigger/Name/C70FBE79=Swarm Wave B3 P05 NE Trigger/Name/CAB9134C=Objective Protect Archive Disable @@ -161,10 +163,13 @@ Trigger/Name/EF3562E3=Mission Event Timing Trigger/Name/F19783D6=Swarm Wave C2 P04 NW Trigger/Name/F24EC2D7=DEBUG - Mid Cine Trigger/Name/FAB99773=Defeat +Variable/Name/000EAD86=unit Variable/Name/0040F439=Region +Variable/Name/04492C85=zergGroundReinforcements Variable/Name/052C04AE=Unit Variable/Name/05B22E2B=ThisAISpawn Variable/Name/0619D68B=IntroCinematicProtossUnits +Variable/Name/08AC5629=zergGroundReinforcements Variable/Name/0DC0FD18=i Variable/Name/0F708381=ThisAIPlayer Variable/Name/10131487=ThisAISpawn @@ -189,7 +194,9 @@ Variable/Name/3A41F758=SPAWN Variable/Name/3C9515DB=ThisAIPlayer Variable/Name/3DCBA75C=ObjectiveProtectArchive Variable/Name/3DD12039=IntroCinematicCompleted +Variable/Name/42091552=ReinforcementUnits Variable/Name/43A9E0F0=WAIT Time +Variable/Name/44AC17CB=unit Variable/Name/453A5F6D=ThisAISpawn Variable/Name/47313365=LOCATION_ID_SELENDIS Variable/Name/47FA6AF7=Colossus_East @@ -216,6 +223,7 @@ Variable/Name/64C88E72=KillCount Variable/Name/64F19968=P01_PLAYER Variable/Name/65185179=P08_ARCHIVE Variable/Name/66DCA0C1=Button Text +Variable/Name/67A09ABD=playerGroup Variable/Name/68E8FA76=ObjectiveSurviveUntilYouDie Variable/Name/69F110D3=ThisAIPlayer Variable/Name/6B09312D=End Game Dialog @@ -232,7 +240,9 @@ Variable/Name/98995F46=ThisAISpawn Variable/Name/9BEA823B=HeroCarrier Variable/Name/9C253C99=category Variable/Name/9C294372=LOCATION_ID_MOHANDAR +Variable/Name/9D9EA564=unit Variable/Name/9F04A2E0=ThisAIPlayer +Variable/Name/A0F7B43A=zergGroundReinforcements Variable/Name/A3054C1D=ThisAIPlayer Variable/Name/A314CCF3=MothershipHeroBorn Variable/Name/A3E1B8EF=DEBUG - Bounds Set @@ -282,6 +292,7 @@ Variable/Name/E8B13B06=P10_REINFORCEMENTPROTOSS Variable/Name/EBBE9FFE=HeroPhoenix Variable/Name/EC8E24B9=Unit Variable/Name/ED6D741E=STAGE_02_KILL_QUOTA +Variable/Name/EF183C79=unit Variable/Name/EFA16570=MidCinematicCompleted Variable/Name/F0830849=PLAYER Variable/Name/F10BC0A0=FadeDuration diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/t3HeightMap b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/t3HeightMap index 4b64e56fef0d217946397cd55f97f0626af79c11..861122da6acedc6311db0dc640d24c5a8c11bba3 100644 GIT binary patch delta 11339 zcmc&)eQZ`&8Rxv+DwJ1g!0v@LD`gGqm>aAT>RcVPOiO46A}UT2Bh@gezyfY8YzVYr zurgo*hj^JXq45Jo2)4cN%cUi}9|gyZ6U-pYIkTtRI)3LJdAGJ= z<~`Khwok4Q!+KH^p3rW1^8<^Il+t3jkn^t{8{&RV~ zIr)co!NonPfyKJp<4d%49SsCIGB+;&UCBdwo=wQ7R%d6sVd|yWCP}zxz9}XgBCmv#U2T=-&z`QjQOx~HaWx~fxYLn5 zkhyxAkxiXrXMyc}6B6z1*!nnC!_fmyiwmEM8bnRHM=BT3ahdm9e=bll1g~AG} zYIMBuAdt0us57A$-zFDrEmi;G^7-~J(~RyT_OMx2c53A1_6E{vc2eg`vIw<2)5~1i z@kO2$VH{EKXUc2B`tmj?qh)|Tc*yJE*EvhW#dcnUvA$VmMYPrggp%t3-y7$+^NJLI|(Cm z?^Vjf@0ZHCTfav_sR-rumxWOeMz0({&5t*4sY-F*s!sAV=u!;IF(LQ8Tq+;m7B^Syi2IjY9;%_1hpLMbLFWkX=BzWAVp2R( zVcb7o443u09wTvZIw($}HuI0We(j$IL#4&rbFBU{T6*H#;-Sdh1(kIQoTOt^q20eK zW~?j|T>NGZBLsOznWIU4*p>it#ANu?p^0o z%>(Omp(8H?M5~a&GpmV*6o(S#od>FJE|)A~lA?2NDm9Wavb|l$;e3bAHaF)^7Q`XX zLM=x+CgRXlV&acdP#P2)r9OfSYf)M8Xm(IXj=>tUs{1q1 zVYz-foC3-jA_A*&t3HH|7Cx7s444vyp%^rqfE_QU1LT$4;;}m?5CugEtSm>38d%;k z0=r(E5Ehj*uH<%E4w@6pkF9EsA1t_y#_vJGMAZ24lp_zsUy7!(^=v|RXUfd znE60fxC#WPu^$=KJZ>kj8k8gRv>)xjcOIB~GmFFWGz=HEAU^rHwkY#_bO!SekD35n za&M+qcApq4v)?W?|8gQ9Pk-FFf*b`fa!t{fW5Kj{W=j}4)UOYGoTX(VL)mwnEIw1g z+RKNVvtc!_P~THzQO5S{wjUW&yI$Ur{Pf8?%<5PFq^2s4*4*~kjGRgB5{{{pobJV?;RjaTQi*~p^@lOxL6I=aUppW6&f!lF zo=(xKV1n`Fi6}>@!uj29~otO7*bF5(ln_C1UT5I-^JJ)r*UI1A!fB{Nz?K zqW9eE$N~W5q&Z|P4}5O$<)mtz#fD);g7j&l<5p24S3EIVR-OC2++Kc*+4ARgu~s*je17l*L76Y5g(~TTca9F; z89MM~=wy*g;goS&PI_w!ONwaf(Mj*8?yuqg@id*Y7dd*n z$kC}bM`uDDr4)2I{vDqG97wzYO5T2qCo}v)`o{sf4A$}UxxbF?9!YGB+ z!w)BnGCv}ya!6?XjFG5{vH9kQ7eE##k0T^V1Wl!*dYzD8>#A4}&7mty$Z_)FFM`0+BL}U-dQ8}S4U-jpfd^Zp zpT)J+I2;wuqqj5KkQg?augYH8b0uNE{vY*ONAtyEj+k=f*M=~xR{?SxxQ-MaIQY$u zE9!mm|A&jm8PQhOiz~m@C&pk2bgg1*cKx@31BRRkyFd8ex31!rY%VGS*m<^ekr zsw&k;UTUt@r!ng{CE{KH;%9)pRxhsI1UKK z07T2;LGhLfffCBGI^=ll05rZjN>uJVS8D8O7IFDVW86?kZ?_JO6r-W1A1<~jt|2cY z*M_R91JQx2aB8^7B?zq=Sqg4`>Y&c~0I%9&z2{(f8NkARNI=>kg(MQ7{DtA7~e~I8Q*B4)pK-Hs;cDCVMPu( z)~c(tfnjNZ#ZHXjkWnZ*TY&O}5Tk|z^OpewmIo9y3QN5on6F0vpwmx3(>m7Zc~3MM z@4hU`jD3}2taW(2csoX`JA?%b&IL;*=fc;uXfAw#fqyQ(qi8f2eT%K1e#m!NfS1)& zBh+VWy=rj4*DpR_7I+{~Mjkrgr>o(i4jv%J{d5t_hOO@(^wZ@uP9c+ec#$x=s$#W9 zbz7{|T2?EzmrT=i;3=KIi-&u8?j44Hy2H>+-jNC#|Yc)<4hhubw05|pc zRYpj~SGMGi!GtlnUUbuy4cnEzo=`}X0kv~l?l@X&)qg>a#%>7Vb_`%c0%tU1#Dn4w z1k4@=Q$*i?@G#LSW~_WnOfwct5mnZ_2Jw810OGn)A4L(LovHSlLCZ*Xl0`C#7&aW9QJkPIn~BuW~e}#r1cv#p}=YiYuyVnr!fz#+4WN zn`V?R5VslK8^l=Icy@UBH&W{dbHyB7(#1sRAxZ2TuzEoILMs7nknbKWm&+cATk4w1 bGw3*AkE|L41-E&IP0uMrR{4V1Q?vdDpWWV> delta 11339 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 gTJ@VdCIr=+}ePnl$pXVexLOJ0n0M#l>h($ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/t3Terrain.version b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/t3Terrain.version index 87842fddbc2b9e08e1ad6d077ff508e21af9d71f..cd96f06be8a395b8c618fb7188fede9673214ed5 100644 GIT binary patch literal 44 ocmYdJNi8laN-bexU|^8QWMp6k(jdSK#2~&LkQQ5$n$8HM0jzumA^-pY literal 44 pcmYdJNi8laN-bexU|^_-V`N|j(jdSM#2~&bkiI0dC4~`40|3AY2SES; diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/t3Terrain.xml b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/t3Terrain.xml index 1a302bb3b..180cf7822 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/t3Terrain.xml +++ b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/t3Terrain.xml @@ -19,7 +19,7 @@ - + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/t3VertCol b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/t3VertCol index 8294e9e38d6ea8016b6319471f40e3e07e629d33..99bb0dced2a5dd3ee8612b5ded0d530d77ea01b3 100644 GIT binary patch delta 55 zcmX^5L*VESfrc%NOMIs*1Tk_=Kj+8jKm9!i6W{htzKlYQlM}eOrZ3=QWNFv-X9QxV K?b`m#Qf~oMdJ@q9 delta 55 zcmX^5L*VESfrc%NOMIul=V0R7&h5u2#5i3ch>>ghI$uWr$q8Is(--hDvb1aaGXgQw Kc5Q!VskZ<(ZW0Or diff --git a/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/t3Water b/Maps/ArchipelagoCampaign/WoL/ap_in_utter_darkness.SC2Map/t3Water index 7a3bda37d7acc96c22faca56346592f07122d048..4392cfe81813e1db44d50e97359b5f1d094f60ae 100644 GIT binary patch literal 928 zcmb7@u?@o@6hwbE$Ox>E4S*3WOKwTwE{;-U07mc#jNlO%A*r%X?hHzm!e{AZ5chQd zf5a5V;cjMU=-)Ta%j0%^&hFAqf4)=OFQ0d4%PpEE=mq6?oGb8C}e9ucFS3~R12^@QK5bN{;m*6j5RpbnHay~g6zdsK@8RjZ^y$!-J6oeleFoIWL1KT4+k!VekjvxvK@CX^f3q)iDkC2hLb1czNaF$N_yHB5A zd=2C9FtaoAYmL+Vyx(4vyBuG?y;FO!zV~q4wZ~{ygIS6Khdx&Vn}fz>u=JVWW8cH& zkRovGbB|=Jz_HJLF1R|8BSWX+W8b<@`Jd!UkK)T<98wW4%*WYy7F*;0KX-B-*^wmr ZniE_RxPpG}zD4B7a=uOA*iYS;;|G_QkKO

+ @@ -2691,6 +2692,7 @@ + @@ -2731,7 +2733,7 @@ - + @@ -3454,12 +3456,13 @@ - - + + + - + @@ -4906,7 +4909,7 @@ - + @@ -6840,7 +6843,7 @@ - + @@ -13946,14 +13949,18 @@ - - - - - - - - + + + + + + + + + + + + @@ -14057,7 +14064,7 @@ - + @@ -21609,7 +21616,7 @@ - + @@ -26668,7 +26675,7 @@ - + @@ -27719,6 +27726,7 @@ + @@ -33725,6 +33733,7 @@ + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml index 642dde932..89228ef08 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml @@ -21058,4 +21058,16 @@ + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index 6b4b00991..0623dc2aa 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -222,6 +222,7 @@ + @@ -543,6 +544,7 @@ + @@ -1400,6 +1402,7 @@ + @@ -2127,6 +2130,7 @@ + @@ -3328,6 +3332,7 @@ + @@ -3511,6 +3516,7 @@ + @@ -12929,6 +12935,7 @@ + @@ -13196,6 +13203,7 @@ + @@ -13272,6 +13280,7 @@ + @@ -22667,6 +22676,7 @@ + @@ -25031,6 +25041,7 @@ + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml index 91b6ffca8..8ce0739cd 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml @@ -7020,4 +7020,19 @@ + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/AbilData.xml index ccc92c62a..90cb2f484 100644 --- a/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/AbilData.xml +++ b/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/AbilData.xml @@ -51,6 +51,60 @@