From 9085444da936ce96e73f375691a0ee42300651e8 Mon Sep 17 00:00:00 2001 From: EnvyDragon <138727357+EnvyDragon@users.noreply.github.com> Date: Fri, 22 Nov 2024 09:51:29 -0500 Subject: [PATCH 1/2] supernova raceswaps initial --- .../GameData/ConversationData.xml | 21 + .../Base.SC2Data/GameData/SoundData.xml | 15 + .../ComponentList.SC2Components | 1 - .../WoL/ap_supernova.SC2Map/DocumentHeader | Bin 6732 -> 6732 bytes .../WoL/ap_supernova.SC2Map/GameData.version | Bin 40 -> 44 bytes .../WoL/ap_supernova.SC2Map/MapScript.galaxy | 293 +- .../WoL/ap_supernova.SC2Map/Objects | 314 +- .../WoL/ap_supernova.SC2Map/Objects.version | Bin 44 -> 44 bytes .../WoL/ap_supernova.SC2Map/Preload.xml | 24 + .../ap_supernova.SC2Map/PreloadAssetDB.txt | 37 + .../WoL/ap_supernova.SC2Map/Triggers | 2939 +++++++++++++++-- .../WoL/ap_supernova.SC2Map/Triggers.version | Bin 44 -> 44 bytes .../LocalizedData/TriggerStrings.txt | 5 + 13 files changed, 3337 insertions(+), 312 deletions(-) create mode 100644 Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Base.SC2Data/GameData/ConversationData.xml create mode 100644 Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Base.SC2Data/GameData/SoundData.xml diff --git a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Base.SC2Data/GameData/ConversationData.xml b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Base.SC2Data/GameData/ConversationData.xml new file mode 100644 index 000000000..84199a65c --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Base.SC2Data/GameData/ConversationData.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Base.SC2Data/GameData/SoundData.xml b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Base.SC2Data/GameData/SoundData.xml new file mode 100644 index 000000000..0f1169b7a --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Base.SC2Data/GameData/SoundData.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/ComponentList.SC2Components index e6bcfc267..010746340 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/ComponentList.SC2Components @@ -1,6 +1,5 @@ - GameData DocumentInfo MapInfo diff --git a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/DocumentHeader index 149905bf7747ef0812f1f66f0e42d9df1dd04bab..0d88d2380ba3f9353809466caba3a53689f4279b 100644 GIT binary patch delta 19 YcmX?Oa>itW42Rw!!zd8msG=bS07~5k!TitW42RR~JwYJ6QAI-v08#G;q5uE@ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/GameData.version b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/GameData.version index 844a221908766cca06d64e5457ed4b891f43d5c2..30fcc6d0d5292d08b09ecf87102ef2d50dfcd8cb 100644 GIT binary patch literal 44 ncmYdJNi9xHNla&AU|^8QWMp6k(jdSK#2`K+ke0b^pAMn{q;du1 literal 40 lcmYdJNi9xHNla&CU|{$jz`y{aS%DY?#DMsyqk=z33;?4@1_uBD diff --git a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/MapScript.galaxy index 85a195766..18f00d8d1 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/MapScript.galaxy @@ -47,6 +47,10 @@ const int gv_LOCATION_ID_SOUTHEAST_BASE = 7; //-------------------------------------------------------------------------------------------------- // Global Variables //-------------------------------------------------------------------------------------------------- +unit gv_banshee1; +unit gv_banshee2; +unit gv_banshee3; +unit gv_banshee4; playergroup gv_protossPlayers; unitgroup gv_stage1Enemies; bool gv_gameOver; @@ -104,6 +108,10 @@ bool gv_victoryCinematicCompleted; unitgroup gv_victoryHiddenUnitGroup; void InitGlobals () { + gv_banshee1 = UnitFromId(358); + gv_banshee2 = UnitFromId(356); + gv_banshee3 = UnitFromId(357); + gv_banshee4 = UnitFromId(397); gv_protossPlayers = PlayerGroupEmpty(); gv_stage1Enemies = UnitGroupEmpty(); gv_wall_of_Fire_Lighting = TimerCreate(); @@ -217,6 +225,7 @@ trigger gt_onDifficultyNormal; trigger gt_onDifficultyHard; trigger gt_onDifficultyBrutal; trigger gt_ArchInit; +trigger gt_FactionSwapInit; trigger gt_ObjectiveDestroyProtossBasesatResourceSpotsCreateQ; trigger gt_ObjectiveDestroyProtossBasesatResourceSpotsUpdate; trigger gt_ObjectiveDestroyProtossBasesatResourceSpotsComplete; @@ -396,6 +405,18 @@ bool gt_Init03Units_Func (bool testConds, bool runActions) { unitgroup auto05F95C0A_g; int auto05F95C0A_u; unit auto05F95C0A_var; + unitgroup autoA82DD660_g; + int autoA82DD660_u; + unit autoA82DD660_var; + unitgroup auto2EEBCCC5_g; + int auto2EEBCCC5_u; + unit auto2EEBCCC5_var; + unitgroup autoA8D6B796_g; + int autoA8D6B796_u; + unit autoA8D6B796_var; + unitgroup auto3C1A9524_g; + int auto3C1A9524_u; + unit auto3C1A9524_var; unitgroup autoA72E00D6_g; int autoA72E00D6_u; unit autoA72E00D6_var; @@ -498,6 +519,35 @@ bool gt_Init03Units_Func (bool testConds, bool runActions) { UnitGroupAdd(gv_bansheeGroup, auto05F95C0A_var); UnitSetPropertyFixed(auto05F95C0A_var, c_unitPropEnergyPercent, 100.0); } + autoA82DD660_g = UnitGroup("AP_CarrierPurifier", gv_pLAYER01_USER, RegionPlayableMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + autoA82DD660_u = UnitGroupCount(autoA82DD660_g, c_unitCountAll); + for (;; autoA82DD660_u -= 1) { + autoA82DD660_var = UnitGroupUnitFromEnd(autoA82DD660_g, autoA82DD660_u); + if (autoA82DD660_var == null) { break; } + UnitGroupAdd(gv_bansheeGroup, autoA82DD660_var); + } + auto2EEBCCC5_g = UnitGroup("AP_ScoutMP", gv_pLAYER01_USER, RegionPlayableMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + auto2EEBCCC5_u = UnitGroupCount(auto2EEBCCC5_g, c_unitCountAll); + for (;; auto2EEBCCC5_u -= 1) { + auto2EEBCCC5_var = UnitGroupUnitFromEnd(auto2EEBCCC5_g, auto2EEBCCC5_u); + if (auto2EEBCCC5_var == null) { break; } + UnitGroupAdd(gv_bansheeGroup, auto2EEBCCC5_var); + } + autoA8D6B796_g = UnitGroup("AP_Mutalisk", gv_pLAYER01_USER, RegionPlayableMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + autoA8D6B796_u = UnitGroupCount(autoA8D6B796_g, c_unitCountAll); + for (;; autoA8D6B796_u -= 1) { + autoA8D6B796_var = UnitGroupUnitFromEnd(autoA8D6B796_g, autoA8D6B796_u); + if (autoA8D6B796_var == null) { break; } + UnitGroupAdd(gv_bansheeGroup, autoA8D6B796_var); + } + auto3C1A9524_g = UnitGroup("AP_Viper", gv_pLAYER01_USER, RegionPlayableMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + auto3C1A9524_u = UnitGroupCount(auto3C1A9524_g, c_unitCountAll); + for (;; auto3C1A9524_u -= 1) { + auto3C1A9524_var = UnitGroupUnitFromEnd(auto3C1A9524_g, auto3C1A9524_u); + if (auto3C1A9524_var == null) { break; } + UnitGroupAdd(gv_bansheeGroup, auto3C1A9524_var); + UnitSetPropertyFixed(auto3C1A9524_var, c_unitPropEnergyPercent, 100.0); + } autoA72E00D6_g = UnitGroup("HighTemplar", gv_pLAYER02_PROTOSS, RegionPlayableMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); autoA72E00D6_u = UnitGroupCount(autoA72E00D6_g, c_unitCountAll); for (;; autoA72E00D6_u -= 1) { @@ -764,10 +814,10 @@ bool gt_IntroSequence_Func (bool testConds, bool runActions) { if (auto4F79FA65_var == null) { break; } UnitSelect(auto4F79FA65_var, gv_pLAYER01_USER, true); } - UnitIssueOrder(UnitFromId(358), OrderTargetingPoint(AbilityCommand("move", 0), PointFromId(394)), c_orderQueueReplace); - UnitIssueOrder(UnitFromId(356), OrderTargetingPoint(AbilityCommand("move", 0), PointFromId(395)), c_orderQueueReplace); - UnitIssueOrder(UnitFromId(357), OrderTargetingPoint(AbilityCommand("move", 0), PointFromId(396)), c_orderQueueReplace); - UnitIssueOrder(UnitFromId(397), OrderTargetingPoint(AbilityCommand("move", 0), PointFromId(400)), c_orderQueueReplace); + UnitIssueOrder(gv_banshee1, OrderTargetingPoint(AbilityCommand("move", 0), PointFromId(394)), c_orderQueueReplace); + UnitIssueOrder(gv_banshee2, OrderTargetingPoint(AbilityCommand("move", 0), PointFromId(395)), c_orderQueueReplace); + UnitIssueOrder(gv_banshee3, OrderTargetingPoint(AbilityCommand("move", 0), PointFromId(396)), c_orderQueueReplace); + UnitIssueOrder(gv_banshee4, OrderTargetingPoint(AbilityCommand("move", 0), PointFromId(400)), c_orderQueueReplace); UIAlertPoint("Trigger", gv_pLAYER01_USER, StringToText(""), null, PointFromId(359)); libNtve_gf_CinematicMode(false, PlayerGroupAll(), 1.5); libNtve_gf_GlobalCinematicSetting(false); @@ -1017,7 +1067,7 @@ bool gt_PingDetectorCannon_Func (bool testConds, bool runActions) { return false; } - if (!((UnitGetType(EventUnit()) == "AP_Banshee"))) { + if (!(((UnitGetType(EventUnit()) == "AP_Banshee") || (UnitGetType(EventUnit()) == "AP_StukovInfestedBanshee") || (UnitGetType(EventUnit()) == "AP_Viper") || (UnitGetType(EventUnit()) == "AP_ScoutMP") || (UnitGetType(EventUnit()) == "AP_CarrierPurifier")))) { return false; } } @@ -2025,6 +2075,8 @@ void gt_AIGiveGas_Init () { //-------------------------------------------------------------------------------------------------- bool gt_TransmissionIntroBansheesQ_Func (bool testConds, bool runActions) { // Automatic Variable Declarations + string auto7D877B00_val; + // Conditions if (testConds) { if (!((gv_gameOver == false))) { @@ -2049,12 +2101,29 @@ bool gt_TransmissionIntroBansheesQ_Func (bool testConds, bool runActions) { TriggerQueueEnter(); libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); - // Transmission - SoundLink("TTychus04Swann00017", -1) - libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus04Swann00017", -1), c_transmissionDurationAdd, 0.0, true); - // Transmission - SoundLink("TTychus04Raynor00018", -1) - libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus04Raynor00018", -1), c_transmissionDurationAdd, 0.0, true); - // Transmission - SoundLink("TTychus04Swann00019", -1) - libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus04Swann00019", -1), c_transmissionDurationAdd, 0.0, true); + auto7D877B00_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (auto7D877B00_val == "Zerg") { + // Transmission - SoundLink("CantinafidgetsTrophyTHanson03BRaynor00001", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("CantinafidgetsTrophyTHanson03BRaynor00001", -1), c_transmissionDurationAdd, 0.0, true); + // Transmission - SoundLink("TTychus04Swann00019", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus04Swann00019", -1), c_transmissionDurationAdd, 0.0, true); + // Transmission - SoundLink("CantinafidgetsTrophyTHanson03A2Raynor00002", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("CantinafidgetsTrophyTHanson03A2Raynor00002", -1), c_transmissionDurationAdd, 0.0, true); + } + else if (auto7D877B00_val == "Prot") { + // Transmission - SoundLink("ArmorySwannSwann00090", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("ArmorySwannSwann00090", -1), c_transmissionDurationAdd, 0.0, true); + // Transmission - SoundLink("ArmorySwannRaynor00058", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("ArmorySwannRaynor00058", -1), c_transmissionDurationAdd, 0.0, true); + } + else { + // Transmission - SoundLink("TTychus04Swann00017", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus04Swann00017", -1), c_transmissionDurationAdd, 0.0, true); + // Transmission - SoundLink("TTychus04Raynor00018", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus04Raynor00018", -1), c_transmissionDurationAdd, 0.0, true); + // Transmission - SoundLink("TTychus04Swann00019", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus04Swann00019", -1), c_transmissionDurationAdd, 0.0, true); + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game); TriggerQueueExit(); return true; @@ -2090,8 +2159,14 @@ bool gt_TransmissionCloakDetectorsQ_Func (bool testConds, bool runActions) { TriggerQueueEnter(); libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); - // Transmission - SoundLink("TTychus04Swann00022", -1) - libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus04Swann00022", -1), c_transmissionDurationAdd, 0.0, true); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) { + // Transmission - SoundLink("TZeratul01Zeratul00073", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("TZeratul01Zeratul00073", -1), c_transmissionDurationAdd, 0.0, true); + } + else { + // Transmission - SoundLink("TTychus04Swann00022", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus04Swann00022", -1), c_transmissionDurationAdd, 0.0, true); + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game); TriggerQueueExit(); return true; @@ -2975,6 +3050,22 @@ bool gt_DefeatBansheeGroupDead_Func (bool testConds, bool runActions) { if (!((UnitGroupCount(UnitGroup("AP_Banshee", gv_pLAYER01_USER, null, UnitFilter(0, 0, 0, 0), 0), c_unitCountAlive) == 0))) { return false; } + + if (!((UnitGroupCount(UnitGroup("AP_ScoutMP", gv_pLAYER01_USER, null, UnitFilter(0, 0, 0, 0), 0), c_unitCountAlive) == 0))) { + return false; + } + + if (!((UnitGroupCount(UnitGroup("AP_CarrierPurifier", gv_pLAYER01_USER, null, UnitFilter(0, 0, 0, 0), 0), c_unitCountAlive) == 0))) { + return false; + } + + if (!((UnitGroupCount(UnitGroup("AP_Mutalisk", gv_pLAYER01_USER, null, UnitFilter(0, 0, 0, 0), 0), c_unitCountAlive) == 0))) { + return false; + } + + if (!((UnitGroupCount(UnitGroup("AP_Viper", gv_pLAYER01_USER, null, UnitFilter(0, 0, 0, 0), 0), c_unitCountAlive) == 0))) { + return false; + } } // Actions @@ -3559,6 +3650,160 @@ void gt_ArchInit_Init () { TriggerAddEventMapInit(gt_ArchInit); } +//-------------------------------------------------------------------------------------------------- +// Trigger: Faction Swap Init +//-------------------------------------------------------------------------------------------------- +bool gt_FactionSwapInit_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + unitgroup autoE48F6FA0_g; + int autoE48F6FA0_u; + unit autoE48F6FA0_var; + unitgroup autoBA967C10_g; + int autoBA967C10_u; + unit autoBA967C10_var; + unitgroup auto4DCE3CAD_g; + int auto4DCE3CAD_u; + unit auto4DCE3CAD_var; + unitgroup auto606CDFF4_g; + int auto606CDFF4_u; + unit auto606CDFF4_var; + unitgroup autoD4E3561E_g; + int autoD4E3561E_u; + unit autoD4E3561E_var; + unitgroup autoB2FA2630_g; + int autoB2FA2630_u; + unit autoB2FA2630_var; + unitgroup autoB269BF4C_g; + int autoB269BF4C_u; + unit autoB269BF4C_var; + unitgroup auto38EBA84A_g; + int auto38EBA84A_u; + unit auto38EBA84A_var; + unitgroup autoE6B2C464_g; + int autoE6B2C464_u; + unit autoE6B2C464_var; + + // Actions + if (!runActions) { + return true; + } + + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut")) { + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), "Terr", true); + } + else { + libABFE498B_gv_aP_Triggers_skipCutscenes = true; + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace, true); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) { + libNtve_gf_ReplaceUnit(gv_banshee1, "AP_StukovInfestedBanshee", libNtve_ge_ReplaceUnitOptions_OldUnitsRelative); + gv_banshee1 = libNtve_gf_LastReplacedUnit(); + libNtve_gf_ReplaceUnit(gv_banshee2, "AP_StukovInfestedBanshee", libNtve_ge_ReplaceUnitOptions_OldUnitsRelative); + gv_banshee2 = libNtve_gf_LastReplacedUnit(); + libNtve_gf_ReplaceUnit(gv_banshee3, "AP_StukovInfestedBanshee", libNtve_ge_ReplaceUnitOptions_OldUnitsRelative); + gv_banshee3 = libNtve_gf_LastReplacedUnit(); + libNtve_gf_ReplaceUnit(gv_banshee4, "AP_Viper", libNtve_ge_ReplaceUnitOptions_OldUnitsRelative); + gv_banshee4 = libNtve_gf_LastReplacedUnit(); + autoE48F6FA0_g = UnitGroup("AP_Mutalisk", gv_pLAYER01_USER, RegionPlayableMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + autoE48F6FA0_u = UnitGroupCount(autoE48F6FA0_g, c_unitCountAll); + for (;; autoE48F6FA0_u -= 1) { + autoE48F6FA0_var = UnitGroupUnitFromEnd(autoE48F6FA0_g, autoE48F6FA0_u); + if (autoE48F6FA0_var == null) { break; } + UnitGroupAdd(gv_bansheeGroup, autoE48F6FA0_var); + } + autoBA967C10_g = UnitGroup("AP_Viper", gv_pLAYER01_USER, RegionPlayableMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + autoBA967C10_u = UnitGroupCount(autoBA967C10_g, c_unitCountAll); + for (;; autoBA967C10_u -= 1) { + autoBA967C10_var = UnitGroupUnitFromEnd(autoBA967C10_g, autoBA967C10_u); + if (autoBA967C10_var == null) { break; } + UnitGroupAdd(gv_bansheeGroup, autoBA967C10_var); + UnitSetPropertyFixed(autoBA967C10_var, c_unitPropEnergyPercent, 100.0); + } + PlayerSetRace(gv_pLAYER01_USER, "Zerg"); + lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_pLAYER01_USER, lib5BD4895D_gv_aP_Core_Faction_KERRIGAN_SWARM_SWITCHABLE_TO_PRIMAL_ZERG); + auto4DCE3CAD_g = UnitGroup("AP_Larva", gv_pLAYER01_USER, RegionFromId(9), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + auto4DCE3CAD_u = UnitGroupCount(auto4DCE3CAD_g, c_unitCountAll); + for (;; auto4DCE3CAD_u -= 1) { + auto4DCE3CAD_var = UnitGroupUnitFromEnd(auto4DCE3CAD_g, auto4DCE3CAD_u); + if (auto4DCE3CAD_var == null) { break; } + UnitRemove(auto4DCE3CAD_var); + } + auto606CDFF4_g = UnitGroup("AP_Hive", gv_pLAYER01_USER, RegionFromId(9), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + auto606CDFF4_u = UnitGroupCount(auto606CDFF4_g, c_unitCountAll); + for (;; auto606CDFF4_u -= 1) { + auto606CDFF4_var = UnitGroupUnitFromEnd(auto606CDFF4_g, auto606CDFF4_u); + if (auto606CDFF4_var == null) { break; } + UnitGroupAdd(gv_playerP01Base, auto606CDFF4_var); + libNtve_gf_PauseUnit(auto606CDFF4_var, true); + libNtve_gf_ShowHideUnit(auto606CDFF4_var, false); + CreepModify(UnitGetPosition(auto606CDFF4_var), 12.0, false, false); + } + autoD4E3561E_g = UnitGroup("AP_Drone", gv_pLAYER01_USER, RegionFromId(9), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + autoD4E3561E_u = UnitGroupCount(autoD4E3561E_g, c_unitCountAll); + for (;; autoD4E3561E_u -= 1) { + autoD4E3561E_var = UnitGroupUnitFromEnd(autoD4E3561E_g, autoD4E3561E_u); + if (autoD4E3561E_var == null) { break; } + UnitGroupAdd(gv_playerP01Base, autoD4E3561E_var); + libNtve_gf_PauseUnit(autoD4E3561E_var, true); + libNtve_gf_ShowHideUnit(autoD4E3561E_var, false); + } + } + else { + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) { + libNtve_gf_ReplaceUnit(gv_banshee1, "AP_ScoutMP", libNtve_ge_ReplaceUnitOptions_OldUnitsRelative); + gv_banshee1 = libNtve_gf_LastReplacedUnit(); + libNtve_gf_ReplaceUnit(gv_banshee2, "AP_ScoutMP", libNtve_ge_ReplaceUnitOptions_OldUnitsRelative); + gv_banshee2 = libNtve_gf_LastReplacedUnit(); + libNtve_gf_ReplaceUnit(gv_banshee3, "AP_ScoutMP", libNtve_ge_ReplaceUnitOptions_OldUnitsRelative); + gv_banshee3 = libNtve_gf_LastReplacedUnit(); + libNtve_gf_ReplaceUnit(gv_banshee4, "AP_CarrierPurifier", libNtve_ge_ReplaceUnitOptions_OldUnitsRelative); + gv_banshee4 = libNtve_gf_LastReplacedUnit(); + autoB2FA2630_g = UnitGroup("AP_CarrierPurifier", gv_pLAYER01_USER, RegionPlayableMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + autoB2FA2630_u = UnitGroupCount(autoB2FA2630_g, c_unitCountAll); + for (;; autoB2FA2630_u -= 1) { + autoB2FA2630_var = UnitGroupUnitFromEnd(autoB2FA2630_g, autoB2FA2630_u); + if (autoB2FA2630_var == null) { break; } + UnitGroupAdd(gv_bansheeGroup, autoB2FA2630_var); + } + autoB269BF4C_g = UnitGroup("AP_ScoutMP", gv_pLAYER01_USER, RegionPlayableMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + autoB269BF4C_u = UnitGroupCount(autoB269BF4C_g, c_unitCountAll); + for (;; autoB269BF4C_u -= 1) { + autoB269BF4C_var = UnitGroupUnitFromEnd(autoB269BF4C_g, autoB269BF4C_u); + if (autoB269BF4C_var == null) { break; } + UnitGroupAdd(gv_bansheeGroup, autoB269BF4C_var); + } + PlayerSetRace(gv_pLAYER01_USER, "Prot"); + lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_pLAYER01_USER, lib5BD4895D_gv_aP_Core_Faction_DAELAAM); + auto38EBA84A_g = UnitGroup("AP_Nexus", gv_pLAYER01_USER, RegionFromId(9), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + auto38EBA84A_u = UnitGroupCount(auto38EBA84A_g, c_unitCountAll); + for (;; auto38EBA84A_u -= 1) { + auto38EBA84A_var = UnitGroupUnitFromEnd(auto38EBA84A_g, auto38EBA84A_u); + if (auto38EBA84A_var == null) { break; } + UnitGroupAdd(gv_playerP01Base, auto38EBA84A_var); + libNtve_gf_PauseUnit(auto38EBA84A_var, true); + libNtve_gf_ShowHideUnit(auto38EBA84A_var, false); + } + autoE6B2C464_g = UnitGroup("AP_Probe", gv_pLAYER01_USER, RegionFromId(9), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); + autoE6B2C464_u = UnitGroupCount(autoE6B2C464_g, c_unitCountAll); + for (;; autoE6B2C464_u -= 1) { + autoE6B2C464_var = UnitGroupUnitFromEnd(autoE6B2C464_g, autoE6B2C464_u); + if (autoE6B2C464_var == null) { break; } + UnitGroupAdd(gv_playerP01Base, autoE6B2C464_var); + libNtve_gf_PauseUnit(autoE6B2C464_var, true); + libNtve_gf_ShowHideUnit(autoE6B2C464_var, false); + } + } + + } + } + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_FactionSwapInit_Init () { + gt_FactionSwapInit = TriggerCreate("gt_FactionSwapInit_Func"); + TriggerAddEventGeneric(gt_FactionSwapInit, lib5BD4895D_gv_aP_Core_LOAD_FINISHED_EVENT); +} + //-------------------------------------------------------------------------------------------------- // Trigger: Objective Destroy Protoss Bases at Resource Spots Create Q //-------------------------------------------------------------------------------------------------- @@ -4288,6 +4533,7 @@ bool gt_MidCleanup_Func (bool testConds, bool runActions) { fixed lv_fadeDuration; // Automatic Variable Declarations + string auto6E81367B_val; unitgroup autoE4241DE8_g; int autoE4241DE8_u; unit autoE4241DE8_var; @@ -4320,8 +4566,19 @@ bool gt_MidCleanup_Func (bool testConds, bool runActions) { PingDestroyAll(); UnitRemove(gv_geyser01); UnitRemove(gv_geyser02); - libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Refinery", 0, gv_pLAYER01_USER, PointFromId(1379)); - libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Refinery", 0, gv_pLAYER01_USER, PointFromId(1380)); + auto6E81367B_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (auto6E81367B_val == "Zerg") { + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Extractor", 0, gv_pLAYER01_USER, PointFromId(1379)); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Extractor", 0, gv_pLAYER01_USER, PointFromId(1380)); + } + else if (auto6E81367B_val == "Prot") { + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Assimilator", 0, gv_pLAYER01_USER, PointFromId(1379)); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Assimilator", 0, gv_pLAYER01_USER, PointFromId(1380)); + } + else { + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Refinery", 0, gv_pLAYER01_USER, PointFromId(1379)); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Refinery", 0, gv_pLAYER01_USER, PointFromId(1380)); + } autoE4241DE8_g = gv_midCineTempPlayerGroup; autoE4241DE8_u = UnitGroupCount(autoE4241DE8_g, c_unitCountAll); for (;; autoE4241DE8_u -= 1) { @@ -4335,6 +4592,11 @@ bool gt_MidCleanup_Func (bool testConds, bool runActions) { auto4473E405_var = UnitGroupUnitFromEnd(auto4473E405_g, auto4473E405_u); if (auto4473E405_var == null) { break; } libNtve_gf_ShowHideUnit(auto4473E405_var, true); + if ((UnitGetType(auto4473E405_var) == "AP_Hive")) { + CreepModify(UnitGetPosition(auto4473E405_var), 12.0, true, false); + lib15EF4C78_gf_AP_Player_SpawnLarvaForHatchery(auto4473E405_var, 3); + } + } auto4DD33441_g = gv_relic01AreaGroup; auto4DD33441_u = UnitGroupCount(auto4DD33441_g, c_unitCountAll); @@ -4741,6 +5003,7 @@ void InitTriggers () { gt_onDifficultyHard_Init(); gt_onDifficultyBrutal_Init(); gt_ArchInit_Init(); + gt_FactionSwapInit_Init(); gt_ObjectiveDestroyProtossBasesatResourceSpotsCreateQ_Init(); gt_ObjectiveDestroyProtossBasesatResourceSpotsUpdate_Init(); gt_ObjectiveDestroyProtossBasesatResourceSpotsComplete_Init(); diff --git a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Objects b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Objects index 7a0bc68d1..7f498de5b 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Objects +++ b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Objects @@ -3098,8 +3098,8 @@ - + @@ -3108,22 +3108,22 @@ - - - + + + - + - - - + + + @@ -3132,12 +3132,12 @@ - + - + @@ -3145,8 +3145,8 @@ - + @@ -3154,12 +3154,12 @@ - - + + - + @@ -3167,11 +3167,11 @@ - - - + + + @@ -3180,19 +3180,19 @@ - + - - - + + + - + @@ -3245,6 +3245,17 @@ + + + + + + + + + + + @@ -3257,17 +3268,6 @@ - - - - - - - - - - - @@ -3347,6 +3347,17 @@ + + + + + + + + + + + @@ -3359,17 +3370,9 @@ - - - - - - - - - - - + + + @@ -3380,6 +3383,8 @@ + + @@ -3398,6 +3403,7 @@ + @@ -3409,11 +3415,11 @@ - + @@ -3427,6 +3433,7 @@ + @@ -3470,6 +3477,7 @@ + @@ -3477,7 +3485,6 @@ - @@ -3553,11 +3560,11 @@ + - @@ -3575,6 +3582,9 @@ + + + @@ -3610,11 +3620,11 @@ - + @@ -3631,6 +3641,7 @@ + @@ -3679,8 +3690,8 @@ - + @@ -3714,6 +3725,7 @@ + @@ -3761,6 +3773,9 @@ + + + @@ -3770,8 +3785,9 @@ - + + @@ -3785,10 +3801,6 @@ - - - - @@ -3796,17 +3808,22 @@ + + + + + + - @@ -3819,10 +3836,11 @@ + - + @@ -3842,11 +3860,11 @@ - + @@ -3866,11 +3884,12 @@ - + + @@ -3880,11 +3899,13 @@ - + + + @@ -3907,21 +3928,22 @@ - + - + - + + @@ -3941,6 +3963,9 @@ + + + @@ -3971,8 +3996,8 @@ - + @@ -4005,12 +4030,12 @@ - + + - - + @@ -4040,12 +4065,12 @@ - - + - + + @@ -4071,17 +4096,18 @@ + - + @@ -4096,6 +4122,7 @@ + @@ -4103,11 +4130,11 @@ - + @@ -4121,11 +4148,11 @@ - + - + @@ -4142,11 +4169,11 @@ - + @@ -4160,13 +4187,14 @@ - - + + + - - + + @@ -4188,24 +4216,24 @@ - + - + + + + + - - - - @@ -4246,11 +4274,12 @@ - + + @@ -4270,12 +4299,12 @@ - - + - + + @@ -4283,20 +4312,20 @@ + - + - @@ -4322,12 +4351,11 @@ - - - + + - + @@ -4336,6 +4364,10 @@ + + + + @@ -4370,21 +4402,23 @@ + + + + + + + - - - - - @@ -4392,6 +4426,7 @@ + @@ -4401,18 +4436,24 @@ + - + + + + + + @@ -4420,11 +4461,6 @@ - - - - - @@ -4449,11 +4485,11 @@ + - @@ -4486,11 +4522,11 @@ - + @@ -4588,11 +4624,11 @@ - + @@ -4624,6 +4660,7 @@ + @@ -4718,11 +4755,11 @@ + - @@ -4759,7 +4796,6 @@ - @@ -4767,6 +4803,7 @@ + @@ -4885,10 +4922,12 @@ + + @@ -4896,6 +4935,9 @@ + + + @@ -4906,11 +4948,11 @@ - + - + @@ -5004,4 +5046,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Objects.version b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Objects.version index fc49916b476129f6a5c29ee6a1fa08b822841d04..3979ee8e51c9d0e18051762fa6f28fe03e43859a 100644 GIT binary patch literal 44 qcmYdJNi9yw&naMHU|^8QWMp6k(jdSK#324l76t~H+xF> + + + + + + @@ -67,7 +73,9 @@ + + @@ -113,19 +121,35 @@ + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/PreloadAssetDB.txt b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/PreloadAssetDB.txt index 914002051..32e7a45c7 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/PreloadAssetDB.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/PreloadAssetDB.txt @@ -1,9 +1,46 @@ +[Conversation] +id=CantinafidgetsTrophyTHanson03A2 +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +ConversationState=Cameras,Characters,Credits,MissionAvailable,MissionCompleted,MissionCompletedCount,MissionLast,TechState +Sound=##id##Cooper00003,##id##Cooper00004,##id##Raynor00001,##id##Raynor00002,##id##Raynor00005,##id##Ybarra00006,##id##Ybarra00007 +id=ArmorySwann +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +ConversationState=Cameras,Characters,Credits,MissionAvailable,MissionCompleted,MissionCompletedCount,MissionLast,TechState +Sound=##id##Raynor00013,##id##Raynor00017,##id##Raynor00018,##id##Raynor00020,##id##Raynor00023,##id##Raynor00025,##id##Raynor00030,##id##Raynor00042,##id##Raynor00044,##id##Raynor00046,##id##Raynor00047,##id##Raynor00048,##id##Raynor00050,##id##Raynor00056,##id##Raynor00058,##id##Raynor00059,##id##Raynor00060,##id##Raynor00062,##id##Raynor00066,##id##Raynor00068,##id##Raynor00070,##id##Raynor00077,##id##Raynor00079,##id##Raynor00080,##id##Raynor00082,##id##Raynor00091,##id##Raynor00093,##id##Raynor00094,##id##Raynor00102,##id##Raynor00104,##id##Raynor00107,##id##Raynor00116,##id##Raynor00118,##id##Raynor00119,##id##Raynor00121,##id##Swann00008,##id##Swann00019,##id##Swann00021,##id##Swann00024,##id##Swann00026,##id##Swann00040,##id##Swann00041,##id##Swann00043,##id##Swann00045,##id##Swann00049,##id##Swann00055,##id##Swann00057,##id##Swann00061,##id##Swann00063,##id##Swann00064,##id##Swann00065,##id##Swann00067,##id##Swann00069,##id##Swann00071,##id##Swann00076,##id##Swann00078,##id##Swann00081,##id##Swann00083,##id##Swann00087,##id##Swann00090,##id##Swann00092,##id##Swann00101,##id##Swann00103,##id##Swann00106,##id##Swann00114,##id##Swann00115,##id##Swann00117,##id##Swann00120,##id##Swann00122,##id##Swann00144 +id=CantinafidgetsTrophyTHanson03B +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +ConversationState=Cameras,Characters,Credits,MissionAvailable,MissionCompleted,MissionCompletedCount,MissionLast,TechState +Sound=##id##Hill00007,##id##Hill00008,##id##Raynor00001,##id##Raynor00002,##id##Raynor00003,##id##Raynor00004,##id##Ybarra00005,##id##Ybarra00006 + [Light] +id=Typhon +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +id=TyphonFirewallLighting +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr + +[Sound] +id=CantinafidgetsTrophyTHanson03A2Raynor00002 +0=LocalizedData\Sounds\TerranVO\CampaignVO\##id##.ogg +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Model=RaynorCommanderPortrait +id=ArmorySwannRaynor00058 +0=LocalizedData\Sounds\TerranVO\CampaignVO\##id##.ogg +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Model=RaynorCommanderPortrait +id=ArmorySwannSwann00090 +0=LocalizedData\Sounds\TerranVO\CampaignVO\##id##.ogg +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Model=SwannPortrait +id=CantinafidgetsTrophyTHanson03BRaynor00001 +0=LocalizedData\Sounds\TerranVO\CampaignVO\##id##.ogg +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Model=RaynorCommanderPortrait [Terrain] id=Typhon path=Assets\Textures\.dds asset=Creep,CreepEdgeNormal,CreepHeight,CreepNoise,CreepSpecularMask +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr Light Soundtrack=Ambience_##id## TerrainTex=##id##1,##id##2,##id##3,##id##4,##id##5,##id##6,##id##7,##id##8 diff --git a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Triggers index 492e85351..26ee14ad8 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Triggers @@ -14,6 +14,10 @@ + + + + @@ -48,6 +52,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1253,6 +1297,10 @@ + + + + @@ -2109,6 +2157,270 @@ 100 + + + + + + + + + + + + + + + + + + + + AP_CarrierPurifier + + + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_ScoutMP + + + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Mutalisk + + + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Viper + + + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 100 + + @@ -4786,8 +5098,7 @@ - - + @@ -4820,8 +5131,7 @@ - - + @@ -4854,8 +5164,7 @@ - - + @@ -4888,8 +5197,7 @@ - - + @@ -6742,7 +7050,7 @@ - + @@ -6833,97 +7141,234 @@ - + + + + + + + + + - - - + + + + - + - + - + - + - + - + - + - + - + AP_Banshee - - - - + + + + + + - - - + + + - - + + + - - - + + + - - - - - - + + - - - + + + - - + + + AP_StukovInfestedBanshee + + - - - + + + + + + - - - + + + - - - - + + + - - - 6.0 - + + + - - - 255,255,0,0 - + + - - - - - - - + + + + + + + AP_Viper + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_ScoutMP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_CarrierPurifier + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 6.0 + + + + + 255,255,0,0 + + + + + + + + + @@ -16124,12 +16569,7 @@ - - - - - - + @@ -16153,9 +16593,26 @@ + + + + + + + + + + + + + + + + + - + @@ -16165,7 +16622,7 @@ - + @@ -16196,7 +16653,7 @@ - + @@ -16206,7 +16663,7 @@ - + @@ -16237,7 +16694,7 @@ - + @@ -16247,7 +16704,7 @@ - + @@ -16276,6 +16733,243 @@ + + + + + + + + + + + + + + Zerg + + + + + + + + + + + CantinafidgetsTrophyTHanson03BRaynor00001 + + + + + + + + + + + + + + + + + + CantinafidgetsTrophyTHanson03BRaynor00001 + + + + + + + + + 0 + + + + + + + + + + + + + + TTychus04Swann00019 + + + + + + + + + + + + + + + + + + TTychus04Swann00019 + + + + + + + + + 0 + + + + + + + + + + + + + + CantinafidgetsTrophyTHanson03A2Raynor00002 + + + + + + + + + + + + + + + + + + CantinafidgetsTrophyTHanson03A2Raynor00002 + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + ArmorySwannSwann00090 + + + + + + + + + + + + + + + + + + ArmorySwannSwann00090 + + + + + + + + + 0 + + + + + + + + + + + + + + ArmorySwannRaynor00058 + + + + + + + + + + + + + + + + + + ArmorySwannRaynor00058 + + + + + + + + + 0 + + + + + + @@ -16349,8 +17043,7 @@ - - + @@ -16374,22 +17067,72 @@ - - + + - + + + + + - + + + + + + - TTychus04Swann00022 + TZeratul01Zeratul00073 - + - - - - + + + + + + + + + + + + + + TZeratul01Zeratul00073 + + + + + + + + + 0 + + + + + + + + + + + + + + TTychus04Swann00022 + + + + + + + + @@ -16415,6 +17158,27 @@ + + + + + + + + + + + + + + + + + + Prot + + + @@ -21296,6 +22060,10 @@ + + + + @@ -21427,6 +22195,254 @@ 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_ScoutMP + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_CarrierPurifier + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Mutalisk + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Viper + + + + + + + + + + + + + + + + + + + + + + 0 + + @@ -23365,6 +24381,7 @@ + @@ -23605,116 +24622,1401 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_StukovInfestedBanshee + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_StukovInfestedBanshee + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_StukovInfestedBanshee + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Viper + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Mutalisk + + + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Viper + + + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 100 + + + + + + + + + + + + + + + Zerg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Larva + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Hive + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 12.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Drone + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_ScoutMP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_ScoutMP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_ScoutMP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_CarrierPurifier + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_CarrierPurifier + + + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_ScoutMP + + + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Nexus + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Probe + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - - - - - + + + - - + + + + + - - - - - + + + - - - + + - - - + + + - - - - + + + + + + - - - - - + + + - - - + + + - - - + + + Prot + + - - - - + + + + + + - - - + + + - - - - + + + - - - - + + + Zerg + + - - - + + + + + + - - - + + + + - - - - - - + + + Terr + + - - - - + + + true + - - - - + + + + + + - - - - + + + - - - - + + + - - + + + Neut + + @@ -30735,8 +33037,7 @@ - - + @@ -30802,8 +33103,21 @@ + + + + + + + + + + + + + @@ -30837,6 +33151,7 @@ + @@ -30868,6 +33183,168 @@ + + + + + + + + + + Zerg + + + + + + + + + + + + + + + 1 + + + + + + + + + AP_Extractor + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + AP_Extractor + + + + + + + + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + + + + + 1 + + + + + + + + + AP_Assimilator + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + AP_Assimilator + + + + + + + + + + + + + @@ -30893,6 +33370,7 @@ + @@ -30915,6 +33393,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 12.0 + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Hive + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_supernova.SC2Map/Triggers.version index 9f2506d9a52509dc370de3c5c1f17f8c2067f69b..5f77a10a0d2603e55fcd130e1aa9af457a79d202 100644 GIT binary patch delta 17 YcmdPVnV`V)go%N{@t%D;BLf2i04C}K!2kdN delta 17 YcmdPVnV`V)h>3y0 Date: Fri, 22 Nov 2024 16:25:39 -0500 Subject: [PATCH 2/2] fixing SI infested prio --- .../Base.SC2Data/GameData/UnitData.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index 150d18018..028c6f24f 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -26741,7 +26741,7 @@ - + @@ -27124,7 +27124,7 @@ - + @@ -27175,7 +27175,7 @@ - + @@ -27198,7 +27198,7 @@ - + @@ -27257,7 +27257,7 @@ - + @@ -27315,7 +27315,7 @@ - + @@ -27340,7 +27340,7 @@ - + @@ -27388,7 +27388,7 @@ - +