diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/Assets/StoryModeCharacters/Zerg/SMX1_EvolutionMaster/SMX1_EvolutionMaster.m3 b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/Assets/StoryModeCharacters/Zerg/SMX1_EvolutionMaster/SMX1_EvolutionMaster.m3 new file mode 100644 index 000000000..80ca6ac8c Binary files /dev/null and b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/Assets/StoryModeCharacters/Zerg/SMX1_EvolutionMaster/SMX1_EvolutionMaster.m3 differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/Assets/StoryModeCharacters/Zerg/SMX1_EvolutionMaster_Background_Portrait/SMX1_EvolutionMaster_Background_Portrait.m3 b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/Assets/StoryModeCharacters/Zerg/SMX1_EvolutionMaster_Background_Portrait/SMX1_EvolutionMaster_Background_Portrait.m3 new file mode 100644 index 000000000..a1dc9bfba Binary files /dev/null and b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/Assets/StoryModeCharacters/Zerg/SMX1_EvolutionMaster_Background_Portrait/SMX1_EvolutionMaster_Background_Portrait.m3 differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/Assets/StoryModeCharacters/Zerg/SMX1_EvolutionMaster_FacialAnims/SMX1_EvolutionMaster_FacialAnims.m3a b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/Assets/StoryModeCharacters/Zerg/SMX1_EvolutionMaster_FacialAnims/SMX1_EvolutionMaster_FacialAnims.m3a new file mode 100644 index 000000000..f4be24465 Binary files /dev/null and b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/Assets/StoryModeCharacters/Zerg/SMX1_EvolutionMaster_FacialAnims/SMX1_EvolutionMaster_FacialAnims.m3a differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/Assets/StoryModeCharacters/Zerg/SMX1_EvolutionMaster_RequiredAnims_Portrait/SMX1_EvolutionMaster_RequiredAnims_Portrait.m3a b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/Assets/StoryModeCharacters/Zerg/SMX1_EvolutionMaster_RequiredAnims_Portrait/SMX1_EvolutionMaster_RequiredAnims_Portrait.m3a new file mode 100644 index 000000000..05e320c8c Binary files /dev/null and b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/Assets/StoryModeCharacters/Zerg/SMX1_EvolutionMaster_RequiredAnims_Portrait/SMX1_EvolutionMaster_RequiredAnims_Portrait.m3a differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/Assets/Textures/smx1_evolutionmasterportrait_static.dds b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/Assets/Textures/smx1_evolutionmasterportrait_static.dds new file mode 100644 index 000000000..618f81903 Binary files /dev/null and b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/Assets/Textures/smx1_evolutionmasterportrait_static.dds differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/ActorData.xml b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/ActorData.xml new file mode 100644 index 000000000..77f8ddac0 --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/ActorData.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/CharacterData.xml b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/CharacterData.xml new file mode 100644 index 000000000..7c4a64979 --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/CharacterData.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/ConversationData.xml b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/ConversationData.xml new file mode 100644 index 000000000..b535f9cfc --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/ConversationData.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/LightData.xml b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/LightData.xml new file mode 100644 index 000000000..c44d5c900 --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/LightData.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/ModelData.xml b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/ModelData.xml new file mode 100644 index 000000000..1e945f03c --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/ModelData.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/SoundData.xml b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/SoundData.xml new file mode 100644 index 000000000..da30b32b8 --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/SoundData.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/ComponentList.SC2Components index 499d1d464..d8b75c013 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/ComponentList.SC2Components @@ -1,6 +1,5 @@ - GameData DocumentInfo MapInfo diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/DocumentHeader index e3ce76ee3..60cba81b0 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/DocumentHeader differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/GameData.version b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/GameData.version index ecd4fa31a..1bd4ae94c 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/GameData.version and b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/GameData.version differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/MapScript.galaxy index 17f037fa1..a219ff365 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/MapScript.galaxy @@ -224,6 +224,7 @@ trigger gt_NorthHive; trigger gt_EastHive; trigger gt_SouthHive; trigger gt_ArchInit; +trigger gt_FactionSwapInit; trigger gt_Initialization; trigger gt_Init01Technology; trigger gt_Init02Players; @@ -1363,6 +1364,7 @@ bool gt_ArchInit_Func (bool testConds, bool runActions) { lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p01_USER, lib5BD4895D_gv_aP_Core_Faction_RAYNORS_RAIDERS); lib5BD4895D_gf_AP_Core_MapConfig_setMapInit(gt_Initialization); libABFE498B_gf_AP_Triggers_MapConfig_setDifficultySetup(gt_onDifficultyCasual, gt_onDifficultyNormal, gt_onDifficultyHard, gt_onDifficultyBrutal); + libABFE498B_gv_aP_Triggers_Option_overridePlayerRace = "Zerg"; lib5BD4895D_gf_AP_Core_initObjectivePanel(); return true; } @@ -1373,6 +1375,76 @@ void gt_ArchInit_Init () { TriggerAddEventMapInit(gt_ArchInit); } +//-------------------------------------------------------------------------------------------------- +// Trigger: Faction Swap Init +//-------------------------------------------------------------------------------------------------- +bool gt_FactionSwapInit_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + unitgroup autoE89A680B_g; + int autoE89A680B_u; + unit autoE89A680B_var; + unitgroup autoF7078C34_g; + int autoF7078C34_u; + unit autoF7078C34_var; + + // Actions + if (!runActions) { + return true; + } + + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut")) { + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), "Terr"); + } + else { + libABFE498B_gv_aP_Triggers_skipCutscenes = true; + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace); + libLbty_gf_OrderWorkerstoGatherNearbyResources(RegionEntireMap(), gv_p01_USER); + lib15EF4C78_gf_AP_Player_UtilTownHallAutoRally(gv_p01_USER); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) { + UnitSetPropertyFixed(UnitFromId(237324189), c_unitPropEnergyPercent, 100.0); + autoE89A680B_g = UnitGroup("AP_Lair", gv_p01_USER, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + autoE89A680B_u = UnitGroupCount(autoE89A680B_g, c_unitCountAll); + for (;; autoE89A680B_u -= 1) { + autoE89A680B_var = UnitGroupUnitFromEnd(autoE89A680B_g, autoE89A680B_u); + if (autoE89A680B_var == null) { break; } + libNtve_gf_ReplaceUnit(autoE89A680B_var, "AP_Hive", libNtve_ge_ReplaceUnitOptions_OldUnitsRelative); + autoF7078C34_g = UnitGroup("AP_Larva", c_playerAny, RegionCircle(UnitGetPosition(libNtve_gf_LastReplacedUnit()), 5.0), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + autoF7078C34_u = UnitGroupCount(autoF7078C34_g, c_unitCountAll); + for (;; autoF7078C34_u -= 1) { + autoF7078C34_var = UnitGroupUnitFromEnd(autoF7078C34_g, autoF7078C34_u); + if (autoF7078C34_var == null) { break; } + UnitRemove(autoF7078C34_var); + } + lib15EF4C78_gf_AP_Player_SpawnLarvaForHatchery(libNtve_gf_LastReplacedUnit(), 3); + } + PlayerSetRace(gv_p01_USER, "Zerg"); + lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p01_USER, lib5BD4895D_gv_aP_Core_Faction_KERRIGAN_SWARM); + } + else { + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) { + PlayerSetRace(gv_p01_USER, "Prot"); + lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p01_USER, lib5BD4895D_gv_aP_Core_Faction_DAELAAM); + if ((libABFE498B_gv_aP_Triggers_Option_SoAPresence == 2)) { + lib15EF4C78_gf_AP_Player_CreateSoAUnit(gv_p01_USER); + } + + if ((libABFE498B_gv_aP_Triggers_Option_SoAPresenceAutocasts == 2)) { + lib15EF4C78_gf_AP_Player_CreateSoAAutonomousCasterUnit(gv_p01_USER); + } + + } + + } + } + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_FactionSwapInit_Init () { + gt_FactionSwapInit = TriggerCreate("gt_FactionSwapInit_Func"); + TriggerAddEventGeneric(gt_FactionSwapInit, lib5BD4895D_gv_aP_Core_LOAD_FINISHED_EVENT); +} + //-------------------------------------------------------------------------------------------------- // Trigger: Initialization //-------------------------------------------------------------------------------------------------- @@ -1652,7 +1724,10 @@ bool gt_Init05Environment_Func (bool testConds, bool runActions) { libLbty_gf_AutoRevealRegion(RegionFromId(64), RegionFromId(66), gv_p01_USER); libLbty_gf_AutoRevealRegion(RegionFromId(63), RegionFromId(8), gv_p01_USER); libLbty_gf_AutoRevealRegion(RegionFromId(62), RegionFromId(67), gv_p01_USER); - CreepSetSpeed(c_creepSpeedDecay, 200.0); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace != "Zerg")) { + CreepSetSpeed(c_creepSpeedDecay, 200.0); + } + libCamp_gf_ChangeAmbience("Ambience_Hanson03bRain"); return true; } @@ -3314,12 +3389,24 @@ bool gt_TransmissionMissionStartQ_Func (bool testConds, bool runActions) { TriggerQueueEnter(); libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); - // Transmission - SoundLink("THanson03BRaynor00017", -1) - libCamp_gf_SendTransmissionCampaign(null, SoundLink("THanson03BRaynor00017", -1), c_transmissionDurationAdd, 0.0, true); - // Transmission - SoundLink("THanson03BTychus00030", -1) - libCamp_gf_SendTransmissionCampaign(null, SoundLink("THanson03BTychus00030", -1), c_transmissionDurationAdd, 0.0, true); - // Transmission - SoundLink("THanson03BRaynor00038", -1) - libCamp_gf_SendTransmissionCampaign(null, SoundLink("THanson03BRaynor00038", -1), c_transmissionDurationAdd, 0.0, true); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) { + libCamp_gf_SendTransmissionCampaign(null, SoundLink("zEvoMission_Mutalisk_EvolutionMaster_020", -1), c_transmissionDurationAdd, 0.0, true); + libCamp_gf_SendTransmissionCampaign(null, SoundLink("zEvoMission_Mutalisk_EvolutionMaster_051", -1), c_transmissionDurationAdd, 0.0, true); + } + else { + // Transmission - SoundLink("THanson03BRaynor00017", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("THanson03BRaynor00017", -1), c_transmissionDurationAdd, 0.0, true); + // Transmission - SoundLink("THanson03BTychus00030", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("THanson03BTychus00030", -1), c_transmissionDurationAdd, 0.0, true); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) { + // Transmission - SoundLink("TZeratul01Zeratul00060", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("TZeratul01Zeratul00060", -1), c_transmissionDurationAdd, 0.0, true); + } + else { + // Transmission - SoundLink("THanson03BRaynor00038", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("THanson03BRaynor00038", -1), c_transmissionDurationAdd, 0.0, true); + } + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game); TriggerQueueExit(); return true; @@ -5336,6 +5423,7 @@ void InitTriggers () { gt_EastHive_Init(); gt_SouthHive_Init(); gt_ArchInit_Init(); + gt_FactionSwapInit_Init(); gt_Initialization_Init(); gt_Init01Technology_Init(); gt_Init02Players_Init(); diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Minimap.tga b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Minimap.tga index b4e8ed8a4..7172916b2 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Minimap.tga and b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Minimap.tga differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Objects b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Objects index 207bec119..c561f65d0 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Objects +++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Objects @@ -698,10 +698,10 @@ - + - + @@ -769,12 +769,12 @@ - + - - + + @@ -832,10 +832,10 @@ - + - + @@ -873,19 +873,19 @@ + + + - + - - - @@ -898,10 +898,10 @@ - + - + @@ -947,10 +947,10 @@ - + - + @@ -1003,12 +1003,12 @@ - + - - + + @@ -1037,10 +1037,10 @@ - + - + @@ -1152,10 +1152,10 @@ - + - + @@ -1254,10 +1254,10 @@ - + - + @@ -1300,10 +1300,10 @@ - + - + @@ -1467,13 +1467,13 @@ - - - + + + @@ -1762,10 +1762,10 @@ - + - + @@ -1798,10 +1798,10 @@ - + - + @@ -1844,13 +1844,13 @@ - - - + + + @@ -1881,10 +1881,10 @@ - + - + @@ -1941,10 +1941,10 @@ - + - + @@ -2047,10 +2047,10 @@ - + - + @@ -2124,10 +2124,10 @@ - + - + @@ -2148,10 +2148,10 @@ - + - + @@ -2227,10 +2227,10 @@ - + - + @@ -2251,10 +2251,10 @@ - + - + @@ -2303,10 +2303,10 @@ - + - + @@ -2335,10 +2335,10 @@ - + - + @@ -2360,10 +2360,10 @@ - + - + @@ -2406,10 +2406,10 @@ - + - + @@ -2418,10 +2418,10 @@ - + - + @@ -2461,12 +2461,12 @@ - + - - + + @@ -2523,10 +2523,10 @@ - + - + @@ -2583,20 +2583,20 @@ - + - - + + - + - + @@ -2633,10 +2633,10 @@ - + - + @@ -2654,10 +2654,10 @@ - + - + @@ -2714,20 +2714,20 @@ - - + - + + - + - + @@ -2821,10 +2821,10 @@ - + - + @@ -3050,13 +3050,13 @@ - - - + + + @@ -3515,13 +3515,13 @@ - - - + + + @@ -3569,10 +3569,10 @@ - + - + @@ -3682,10 +3682,10 @@ - + - + @@ -3712,10 +3712,10 @@ - + - + @@ -3796,13 +3796,13 @@ - - - + + + @@ -3825,10 +3825,10 @@ - + - + @@ -3913,10 +3913,10 @@ - + - + @@ -3937,10 +3937,10 @@ - + - + @@ -5018,10 +5018,10 @@ - + - + @@ -5113,10 +5113,10 @@ - + - + @@ -5147,12 +5147,12 @@ - + - - + + @@ -5195,12 +5195,12 @@ - + - - + + @@ -5211,10 +5211,10 @@ - + - + @@ -5250,12 +5250,12 @@ - + - - + + @@ -5328,12 +5328,12 @@ - + - - + + @@ -5423,10 +5423,10 @@ - + - + @@ -5447,12 +5447,12 @@ - + - - + + @@ -5703,13 +5703,13 @@ - - - + + + @@ -5944,10 +5944,10 @@ - + - + @@ -6233,18 +6233,18 @@ - - - - + + + + @@ -6273,10 +6273,10 @@ - + - + @@ -6345,19 +6345,19 @@ - + - + - + - + @@ -6418,13 +6418,13 @@ - - - + + + @@ -6468,19 +6468,19 @@ + + + - + - - - @@ -6540,12 +6540,12 @@ - + - - + + @@ -6631,19 +6631,19 @@ - - - - + + + + @@ -6689,10 +6689,10 @@ - + - + @@ -6723,10 +6723,10 @@ - + - + @@ -6738,13 +6738,13 @@ - - - + + + @@ -6796,10 +6796,10 @@ - + - + @@ -6822,19 +6822,19 @@ - + - + - + - + @@ -6861,18 +6861,18 @@ - - - - + + + + @@ -6942,10 +6942,10 @@ - + - + @@ -6997,13 +6997,13 @@ - - - + + + @@ -7034,10 +7034,10 @@ - + - + @@ -7055,11 +7055,11 @@ - - + - + + @@ -7110,13 +7110,13 @@ - - - + + + @@ -7141,13 +7141,13 @@ - - - + + + @@ -7186,10 +7186,10 @@ - + - + @@ -7202,10 +7202,10 @@ - + - + @@ -7316,10 +7316,10 @@ - + - + @@ -7786,10 +7786,10 @@ - + - + @@ -7807,10 +7807,10 @@ - + - + @@ -7875,10 +7875,10 @@ - + - + @@ -8050,10 +8050,10 @@ - + - + @@ -8296,12 +8296,12 @@ - + - - + + @@ -8353,12 +8353,12 @@ - + - - + + @@ -9034,30 +9034,30 @@ - - - - + + + + - - + - - + - + + + - + @@ -9066,63 +9066,63 @@ - + - - + - + + - - - + - + + + - + - + - - - + + + - + - - - + + + - + @@ -9184,17 +9184,6 @@ - - - - - - - - - - - @@ -9207,6 +9196,17 @@ + + + + + + + + + + + @@ -9229,25 +9229,25 @@ - + - + - - - + + + - + - + - - - + + + @@ -9312,21 +9312,21 @@ - - + + + - - + + - @@ -9339,6 +9339,7 @@ + @@ -9353,11 +9354,6 @@ - - - - - @@ -9365,6 +9361,11 @@ + + + + + @@ -9377,6 +9378,9 @@ + + + @@ -9384,14 +9388,17 @@ - - + + + + - + + @@ -9404,6 +9411,10 @@ + + + + @@ -9411,10 +9422,6 @@ - - - - @@ -9482,22 +9489,15 @@ - - - - - - - - - - + + + @@ -9505,6 +9505,13 @@ + + + + + + + @@ -9540,6 +9547,9 @@ + + + @@ -9547,9 +9557,6 @@ - - - @@ -9557,13 +9564,6 @@ - - - - - - - @@ -9571,7 +9571,13 @@ - + + + + + + + @@ -9579,6 +9585,7 @@ + @@ -9659,11 +9666,13 @@ + + @@ -9672,14 +9681,14 @@ - - + - + + @@ -9695,6 +9704,10 @@ + + + + @@ -9702,24 +9715,21 @@ - - - - - + - + + @@ -9736,6 +9746,10 @@ + + + + @@ -9743,13 +9757,6 @@ - - - - - - - @@ -9757,9 +9764,13 @@ + + + + @@ -9794,21 +9805,22 @@ - - + + + - - + + - + @@ -9856,14 +9868,14 @@ - - + - + + @@ -9914,6 +9926,7 @@ + @@ -9921,6 +9934,11 @@ + + + + + @@ -9928,11 +9946,6 @@ - - - - - @@ -9942,6 +9955,7 @@ + @@ -9949,12 +9963,11 @@ - - + - + @@ -9970,19 +9983,27 @@ - - + + + + + - + + - + + + + + @@ -9991,11 +10012,10 @@ - - - + + + - @@ -10009,6 +10029,7 @@ + @@ -10017,9 +10038,6 @@ - - - @@ -10027,6 +10045,9 @@ + + + @@ -10039,10 +10060,6 @@ - - - - @@ -10050,6 +10067,10 @@ + + + + @@ -10057,6 +10078,7 @@ + @@ -10078,20 +10100,13 @@ - - - - - - - - - + + @@ -10104,6 +10119,13 @@ + + + + + + + @@ -10140,14 +10162,18 @@ - + + + + + @@ -10155,21 +10181,12 @@ - - - - - - - - - @@ -10177,6 +10194,11 @@ + + + + + @@ -10186,11 +10208,6 @@ - - - - - @@ -10198,6 +10215,11 @@ + + + + + @@ -10206,6 +10228,7 @@ + @@ -10225,6 +10248,7 @@ + @@ -10232,9 +10256,7 @@ - - @@ -10242,14 +10264,15 @@ - - + + - + + @@ -10273,6 +10296,7 @@ + @@ -10304,6 +10328,10 @@ + + + + @@ -10367,6 +10395,7 @@ + @@ -10378,6 +10407,7 @@ + @@ -10431,13 +10461,14 @@ - + + @@ -10472,6 +10503,7 @@ + @@ -10485,13 +10517,16 @@ - - + + + + + @@ -10499,6 +10534,7 @@ + @@ -10515,14 +10551,14 @@ - - + - + + @@ -10563,6 +10599,7 @@ + @@ -10584,8 +10621,8 @@ - + @@ -10612,11 +10649,6 @@ - - - - - @@ -10624,6 +10656,11 @@ + + + + + @@ -10648,7 +10685,6 @@ - @@ -10656,7 +10692,9 @@ + + @@ -10723,6 +10761,7 @@ + @@ -10744,12 +10783,6 @@ - - - - - - @@ -10757,6 +10790,12 @@ + + + + + + @@ -10794,19 +10833,19 @@ - - + + - + + - @@ -10814,8 +10853,8 @@ - + @@ -10823,19 +10862,19 @@ - - + + - + + - @@ -10872,6 +10911,7 @@ + @@ -10906,6 +10946,7 @@ + @@ -10933,19 +10974,19 @@ - - + + - + + - @@ -10984,6 +11025,7 @@ + @@ -11008,6 +11050,7 @@ + @@ -11064,6 +11107,7 @@ + @@ -11093,7 +11137,13 @@ - + + + + + + + @@ -11104,26 +11154,20 @@ - - - - - - - - + + - + + - @@ -11213,16 +11257,17 @@ - + - + + @@ -11235,12 +11280,12 @@ - + @@ -11253,6 +11298,10 @@ + + + + @@ -11276,7 +11325,6 @@ - @@ -11284,6 +11332,7 @@ + @@ -11311,6 +11360,12 @@ + + + + + + @@ -11318,29 +11373,23 @@ - - - - - - - - + + - + + - @@ -11372,11 +11421,6 @@ - - - - - @@ -11384,6 +11428,11 @@ + + + + + @@ -11394,12 +11443,6 @@ - - - - - - @@ -11407,6 +11450,12 @@ + + + + + + @@ -11435,6 +11484,7 @@ + @@ -11442,6 +11492,7 @@ + @@ -11449,7 +11500,6 @@ - @@ -11511,9 +11561,6 @@ - - - @@ -11521,6 +11568,9 @@ + + + @@ -11529,7 +11579,6 @@ - @@ -11537,6 +11586,7 @@ + @@ -11550,6 +11600,12 @@ + + + + + + @@ -11557,22 +11613,12 @@ - - - - - - - - - - @@ -11580,10 +11626,15 @@ + + + + + @@ -11608,11 +11659,6 @@ - - - - - @@ -11620,18 +11666,23 @@ + + + + + - - + + @@ -11639,12 +11690,12 @@ - + + - @@ -11661,13 +11712,13 @@ + - @@ -11705,6 +11756,7 @@ + @@ -11714,11 +11766,14 @@ + - + + + @@ -11734,11 +11789,11 @@ + - @@ -11746,6 +11801,7 @@ + @@ -11753,7 +11809,6 @@ - @@ -11812,6 +11867,7 @@ + @@ -11819,7 +11875,6 @@ - @@ -11835,25 +11890,20 @@ - + - + - - - - - @@ -11861,6 +11911,11 @@ + + + + + @@ -11893,6 +11948,7 @@ + @@ -11913,11 +11969,6 @@ - - - - - @@ -11925,6 +11976,11 @@ + + + + + @@ -11936,10 +11992,6 @@ - - - - @@ -11947,6 +11999,11 @@ + + + + + @@ -11954,14 +12011,14 @@ - - + - + + @@ -12009,11 +12066,13 @@ + + + - @@ -12021,6 +12080,7 @@ + @@ -12030,13 +12090,19 @@ + + + + + + + - - + @@ -12049,11 +12115,8 @@ - - - - - + + @@ -12062,9 +12125,6 @@ - - - @@ -12105,6 +12165,11 @@ + + + + + @@ -12112,11 +12177,6 @@ - - - - - @@ -12145,10 +12205,14 @@ + - + + + + @@ -12156,10 +12220,7 @@ - - - - + @@ -12181,23 +12242,24 @@ + + + + + + - - - - - + - @@ -12238,6 +12300,13 @@ + + + + + + + @@ -12245,13 +12314,6 @@ - - - - - - - @@ -12265,11 +12327,6 @@ - - - - - @@ -12277,7 +12334,11 @@ - + + + + + @@ -12285,6 +12346,7 @@ + @@ -12292,14 +12354,14 @@ - - + - + + @@ -12533,5 +12595,74 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Objects.version b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Objects.version index 96b5c8f86..9b53e553b 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Objects.version and b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Objects.version differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Preload.xml index a3d6a9aee..fb4310543 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Preload.xml +++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Preload.xml @@ -76,6 +76,9 @@ + + + @@ -88,6 +91,7 @@ + @@ -120,6 +124,8 @@ + + @@ -195,7 +201,23 @@ + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/PreloadAssetDB.txt b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/PreloadAssetDB.txt index 6bb8f0c69..c0f48144a 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/PreloadAssetDB.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/PreloadAssetDB.txt @@ -1,15 +1,80 @@ +[Actor] +id=AP_EvolutionMasterPortraitAddition +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Model +id=AP_EvolutionMasterPortrait +Actor=##id##Addition,AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Model + +[Character] +id=Abathur +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr + +[Conversation] +id=zEvoMission_Mutalisk +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Character=Abathur +ConversationState=Cameras,Characters,Credits,MissionAvailable,MissionCompleted,MissionCompletedCount,MissionLast,TechState +Sound=##id##_EvolutionMaster_020,##id##_EvolutionMaster_051 + [Game] id=Dflt -Abil=stop +Abil=LoadOutSpray,stop +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr Behavior=AttackReveal +Button=LoadOutSpray@1,LoadOutSpray@10,LoadOutSpray@11,LoadOutSpray@12,LoadOutSpray@13,LoadOutSpray@14,LoadOutSpray@2,LoadOutSpray@3,LoadOutSpray@4,LoadOutSpray@5,LoadOutSpray@6,LoadOutSpray@7,LoadOutSpray@8,LoadOutSpray@9 Effect=SplashDamage +Race=Prot,Terr,Zerg Sound=Zerg_CreepDecay,Zerg_CreepGrow -Unit=BeaconAttack,BeaconDefend,BeaconDetect,BeaconExpand,BeaconHarass,BeaconRally,BeaconScout + +[Light] +id=AP_EvolutionMasterPortrait +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr + +[Model] +id=AP_EvolutionMasterPortraitAddition +asset=Assets\Textures\##id##_Static.dds +asset=LocalizedData\Facial\SMX1_EvolutionMaster.fxa +asset=Assets\StoryModeCharacters\Zerg\SMX1_EvolutionMaster_FacialAnims\SMX1_EvolutionMaster_FacialAnims.m3a +asset=Assets\StoryModeCharacters\Zerg\SMX1_EvolutionMaster_RequiredAnims_Portrait\SMX1_EvolutionMaster_RequiredAnims_Portrait.m3a +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +id=AP_EvolutionMasterPortrait +asset=Assets\Textures\SMX1_EvolutionMasterPortrait_Static.dds +asset=LocalizedData\Facial\SMX1_EvolutionMaster.fxa +asset=Assets\StoryModeCharacters\Zerg\SMX1_EvolutionMaster_Background_Portrait\SMX1_EvolutionMaster_Background_Portrait.m3 +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Light +id=AP_EvolutionMasterPortrait3D +asset=Assets\Textures\SMX1_EvolutionMasterPortrait_Static.dds +asset=LocalizedData\Facial\SMX1_EvolutionMaster.fxa +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +id=AP_EvolutionMasterPortrait3DAddition +asset=Assets\Textures\##id##_Static.dds +asset=LocalizedData\Facial\SMX1_EvolutionMaster.fxa +asset=Assets\StoryModeCharacters\Zerg\SMX1_EvolutionMaster_FacialAnims\SMX1_EvolutionMaster_FacialAnims.m3a +asset=Assets\StoryModeCharacters\Zerg\SMX1_EvolutionMaster_RequiredAnims_Portrait\SMX1_EvolutionMaster_RequiredAnims_Portrait.m3a +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr + +[Sound] +default=HoS_World +asset=LocalizedData\Sounds\VO\##id##.fxe +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +id=zEvoMission_Mutalisk_EvolutionMaster_020 +asset=LocalizedData\Sounds\VO\##id##.fxe +0=LocalizedData\Sounds\VO\##id##.ogg +Actor=AP_EvolutionMasterPortrait,AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Model=AP_EvolutionMasterPortrait +id=zEvoMission_Mutalisk_EvolutionMaster_051 +asset=LocalizedData\Sounds\VO\##id##.fxe +0=LocalizedData\Sounds\VO\##id##.ogg +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Model=AbathurPortraitEx3 [Terrain] id=Haven path=Assets\Textures\.dds asset=CreepEdgeNormal,CreepHeight,CreepNoise,CreepSpecularMask,Creep_##id## +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr Light Soundtrack=Ambience_##id## TerrainTex=##id##Dirt,##id##Grass,##id##GrassDark,##id##GrassLight,##id##GrassRocky,##id##Leaves,##id##RockRough,##id##RockSmooth @@ -17,40 +82,60 @@ TerrainTex=##id##Dirt,##id##Grass,##id##GrassDark,##id##GrassLight,##id##GrassRo [Unit] id=InfestedArmory Abil=BuildInProgress,InfestedMonsterTrain,Rally,que5 -Actor=BlipVisual,ConfirmationLocalAir,ConfirmationLocalGround,ConfirmationSyncAir,ConfirmationSyncGround,FlyerShadow,GroundShadow,##id##,ShieldImpact +Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll Button=Cancel,InfestedAbomination,InfestedCivilian,InfestedTerranCampaign,Rally id=InfestedBarracks Abil=BuildInProgress,InfestedMonsterTrain,Rally,que5 -Actor=BlipVisual,ConfirmationLocalAir,ConfirmationLocalGround,ConfirmationSyncAir,ConfirmationSyncGround,FlyerShadow,GroundShadow,##id##,ShieldImpact +Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll Button=Cancel,InfestedAbomination,InfestedCivilian,InfestedTerranCampaign,Rally id=InfestedBunker Abil=BuildInProgress,BunkerTransport,InfestedMonsterTrain,Rally,que1 -Actor=BlipVisual,ConfirmationLocalAir,ConfirmationLocalGround,ConfirmationSyncAir,ConfirmationSyncGround,FlyerShadow,GroundShadow,##id##,ShieldImpact +Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll Button=BunkerLoad,BunkerUnloadAll,Cancel,InfestedAbomination,InfestedCivilian,InfestedTerranCampaign id=InfestedCC Abil=BuildInProgress,InfestedMonsterTrain,Rally,que5 -Actor=BlipVisual,ConfirmationLocalAir,ConfirmationLocalGround,ConfirmationSyncAir,ConfirmationSyncGround,FlyerShadow,GroundShadow,##id##,ShieldImpact +Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll Button=Cancel,InfestedAbomination,InfestedCivilian,InfestedTerranCampaign,Rally id=InfestedEngBay Abil=BuildInProgress,InfestedMonsterTrain,Rally,que5 -Actor=BlipVisual,ConfirmationLocalAir,ConfirmationLocalGround,ConfirmationSyncAir,ConfirmationSyncGround,FlyerShadow,GroundShadow,##id##,ShieldImpact +Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll Button=Cancel,InfestedAbomination,InfestedCivilian,InfestedTerranCampaign,Rally id=InfestedFactory Abil=BuildInProgress,InfestedMonsterTrain,Rally,que5 -Actor=BlipVisual,ConfirmationLocalAir,ConfirmationLocalGround,ConfirmationSyncAir,ConfirmationSyncGround,FlyerShadow,GroundShadow,##id##,ShieldImpact +Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll Button=Cancel,InfestedAbomination,InfestedCivilian,InfestedTerranCampaign,Rally id=InfestedRefinery Abil=BuildInProgress,InfestedMonsterTrain,Rally,que5 -Actor=BlipVisual,ConfirmationLocalAir,ConfirmationLocalGround,ConfirmationSyncAir,ConfirmationSyncGround,FlyerShadow,GroundShadow,##id##,ShieldImpact +Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll Button=Cancel,InfestedAbomination,InfestedCivilian,InfestedTerranCampaign,Rally id=InfestedStarport Abil=BuildInProgress,InfestedMonsterTrain,Rally,que5 -Actor=BlipVisual,ConfirmationLocalAir,ConfirmationLocalGround,ConfirmationSyncAir,ConfirmationSyncGround,FlyerShadow,GroundShadow,##id##,ShieldImpact +Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll Button=Cancel,InfestedAbomination,InfestedCivilian,InfestedTerranCampaign,Rally id=InfestedSupply Abil=BuildInProgress,InfestedMonsterTrain,Rally,que5 -Actor=BlipVisual,ConfirmationLocalAir,ConfirmationLocalGround,ConfirmationSyncAir,ConfirmationSyncGround,FlyerShadow,GroundShadow,##id##,ShieldImpact +Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,SalvagedTextAlly,SalvagedTextEnemy,ShieldImpact,TerrainMgr,UnitPointsTextAll Button=Cancel,InfestedAbomination,InfestedCivilian,InfestedTerranCampaign,Rally [Water] +id=Template 2 +asset=Assets\Textures\DefaultWater.dds +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Model=BelShirCliffShoreline,DefaultLava,HavenBeachShoreline +Sound=Emitter_WaterCalm +id=Template 3 +asset=Assets\Textures\DefaultWater.dds +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Model=BelShirCliffShoreline,DefaultLava,HavenBeachShoreline +Sound=Emitter_WaterCalm +id=Template 6 +asset=Assets\Textures\DefaultWater.dds +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Model=BelShirBeachShoreline,BelShirCliffShoreline,DefaultLava +Sound=Emitter_WaterCalm +id=Template 8 +asset=Assets\Textures\DefaultWater.dds +Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Model=DefaultLava +Sound=Emitter_WaterCalm diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers index 4b7207dcc..e35a5ee52 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers @@ -15,6 +15,7 @@ + @@ -1668,6 +1669,7 @@ + @@ -1760,9 +1762,518 @@ + + + + + + + + + + + + Zerg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 100 + + + + + + + + + + + + + + + + + + + + + + + + + AP_Lair + + + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Hive + + + + + + + + + + + + + + + + + + + + + + + + AP_Larva + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5.0 + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + + + + + + + + + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + + + + + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + + + + + + Zerg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Zerg + + + + + + + + + + + + + + + + + Terr + + + + + + + + + + + + + + + + + + + + + Neut + + + @@ -4308,7 +4819,7 @@ - + @@ -4672,8 +5183,14 @@ Bridges, Gates, etc + + + + + + @@ -4686,6 +5203,27 @@ 200.0 + + + + + + + + + + + + + + + + + + Zerg + + + @@ -27467,12 +28005,7 @@ - - - - - - + @@ -27496,9 +28029,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + zEvoMission_Mutalisk_EvolutionMaster_020 + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + zEvoMission_Mutalisk_EvolutionMaster_051 + + - + @@ -27508,7 +28115,7 @@ - + @@ -27539,7 +28146,7 @@ - + @@ -27549,7 +28156,7 @@ - + @@ -27578,47 +28185,139 @@ THanson03BTychus00030 - + + + + + + + + + + - - + + - + + + TZeratul01Zeratul00060 + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + TZeratul01Zeratul00060 + + + + + + + + THanson03BRaynor00038 - + - - - - - - + + + + + + - + - + - + 0 - + - + THanson03BRaynor00038 + + + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + + + + + + + + + + + Zerg + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers.version index bd816704e..3341ca3f2 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Triggers.version differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/ConversationStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/ConversationStrings.txt new file mode 100644 index 000000000..37da99ace --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/ConversationStrings.txt @@ -0,0 +1,5 @@ +Character/Name/EvolutionMaster=Abathur +Conversation/zEvoMission_Mutalisk/Line00020=Viper. Strategic asset. Abducts targets. Pulls to its location. Useable on ally or foe. +Conversation/zEvoMission_Mutalisk/Line00051=Aberrations unable to scale vertical surface. Vipers must abduct, pull upwards. +Conversation/zEvoMission_Mutalisk2/Line00020=Viper. Strategic asset. Abducts targets. Pulls to its location. Useable on ally or foe. +Conversation/zEvoMission_Mutalisk2/Line00051=Aberrations unable to scale vertical surface. Vipers must abduct, pull upwards. diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/Facial/SMX1_EvolutionMaster.fxa b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/Facial/SMX1_EvolutionMaster.fxa new file mode 100644 index 000000000..ff3bbe920 Binary files /dev/null and b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/Facial/SMX1_EvolutionMaster.fxa differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/Sounds/VO/zEvoMission_Mutalisk_EvolutionMaster_020.ogg b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/Sounds/VO/zEvoMission_Mutalisk_EvolutionMaster_020.ogg new file mode 100644 index 000000000..ba9736b8d Binary files /dev/null and b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/Sounds/VO/zEvoMission_Mutalisk_EvolutionMaster_020.ogg differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/Sounds/VO/zEvoMission_Mutalisk_EvolutionMaster_051.ogg b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/Sounds/VO/zEvoMission_Mutalisk_EvolutionMaster_051.ogg new file mode 100644 index 000000000..6c35c8a50 Binary files /dev/null and b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/Sounds/VO/zEvoMission_Mutalisk_EvolutionMaster_051.ogg differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 43e369d73..c8578285e 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -184,6 +184,7 @@ Trigger/Name/68BA4EE4=Colony Cleansed Q Trigger/Name/6A854F86=DEBUG - Spots Trigger/Name/6BAAE3E8=Colonist Walk Dont Run Trigger/Name/6D29AB9E=Intro Q +Trigger/Name/6F1211F5=Faction Swap Init Trigger/Name/7069625E=Objective Gas Pickups Create Q Trigger/Name/75F24FE7=Intro Feederling Mover Trigger/Name/76A0540E=DEBUG - green diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml index 54185ec10..8bc14df87 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml @@ -10651,7 +10651,7 @@ - +