diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy index 4bfa915b0..cab9912a8 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/MapScript.galaxy @@ -1371,6 +1371,9 @@ bool gt_Init03Units_Func (bool testConds, bool runActions) { else if (auto1A1E4CE8_val == "AP_Roach") { UnitBehaviorAdd(autoFD5DAF59_var, "FlashFreeze", autoFD5DAF59_var, 1); } + else if (auto1A1E4CE8_val == "AP_ZergMercenaryCompound") { + UnitBehaviorAdd(autoFD5DAF59_var, "FlashFreeze", autoFD5DAF59_var, 1); + } else { } } diff --git a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers index 65187ce0b..b158b38df 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/HotS/ap_harvest_of_screams.SC2Map/Triggers @@ -2650,6 +2650,7 @@ + @@ -3766,6 +3767,51 @@ + + + + + + + + + AP_ZergMercenaryCompound + + + + + + + + + + + + + + 1 + + + + + FlashFreeze + + + + + + + + + + + + + + + + + Setup Protoss Player Units diff --git a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/MapScript.galaxy index 3dd0ac7fd..d33d76be3 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/MapScript.galaxy @@ -2196,7 +2196,7 @@ bool gt_DEBUGYagdraBoss_Func (bool testConds, bool runActions) { if ((lv_friendlyRoaches >= 6)) { } else { - libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); + libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "AP_PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); } UnitAbilityShow(gv_kerrigan, "PsiStrikeWalk", true); UnitAbilityShow(gv_kerrigan, "PrimalSlash", true); @@ -2283,12 +2283,12 @@ bool gt_DEBUGKraithBoss_Func (bool testConds, bool runActions) { if ((lv_friendlyRoaches >= 6)) { } else { - libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); + libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "AP_PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); } if ((lv_friendlyHydras >= 4)) { } else { - libNtve_gf_CreateUnitsAtPoint2((4 - lv_friendlyHydras), "PrimalHydralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); + libNtve_gf_CreateUnitsAtPoint2((4 - lv_friendlyHydras), "AP_PrimalHydralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); } UnitAbilityShow(gv_kerrigan, "PsiStrikeWalk", true); UnitAbilityShow(gv_kerrigan, "PrimalSlash", true); @@ -2409,17 +2409,17 @@ bool gt_DEBUGSlivanBoss_Func (bool testConds, bool runActions) { if ((lv_friendlyRoaches >= 6)) { } else { - libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); + libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "AP_PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); } if ((lv_friendlyHydras >= 4)) { } else { - libNtve_gf_CreateUnitsAtPoint2((4 - lv_friendlyHydras), "PrimalHydralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); + libNtve_gf_CreateUnitsAtPoint2((4 - lv_friendlyHydras), "AP_PrimalHydralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); } if ((lv_friendlyUltras >= 1)) { } else { - libNtve_gf_CreateUnitsAtPoint2((1 - lv_friendlyUltras), "PrimalUltralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); + libNtve_gf_CreateUnitsAtPoint2((1 - lv_friendlyUltras), "AP_PrimalUltralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); } UnitAbilityShow(gv_kerrigan, "PsiStrikeWalk", true); UnitAbilityShow(gv_kerrigan, "PrimalSlash", true); @@ -2555,17 +2555,17 @@ bool gt_DEBUGZurvanBoss_Func (bool testConds, bool runActions) { if ((lv_friendlyRoaches >= 6)) { } else { - libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); + libNtve_gf_CreateUnitsAtPoint2((6 - lv_friendlyRoaches), "AP_PrimalRoach", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); } if ((lv_friendlyHydras >= 4)) { } else { - libNtve_gf_CreateUnitsAtPoint2((4 - lv_friendlyHydras), "PrimalHydralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); + libNtve_gf_CreateUnitsAtPoint2((4 - lv_friendlyHydras), "AP_PrimalHydralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); } if ((lv_friendlyUltras >= 1)) { } else { - libNtve_gf_CreateUnitsAtPoint2((1 - lv_friendlyUltras), "PrimalUltralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); + libNtve_gf_CreateUnitsAtPoint2((1 - lv_friendlyUltras), "AP_PrimalUltralisk", 0, gv_pLAYER_01_USER, UnitGetPosition(gv_kerrigan)); } UnitAbilityShow(gv_kerrigan, "PsiStrikeWalk", true); UnitAbilityShow(gv_kerrigan, "PrimalSlash", true); @@ -12251,13 +12251,13 @@ bool gt_ZurvanIntroSetup_Func (bool testConds, bool runActions) { auto169FED01_var = UnitGroupUnitFromEnd(auto169FED01_g, auto169FED01_u); if (auto169FED01_var == null) { break; } auto38344B2C_val = UnitGetType(auto169FED01_var); - if (auto38344B2C_val == "PrimalRoachBurrowed") { + if (auto38344B2C_val == "AP_PrimalRoachBurrowed") { UnitIssueOrder(auto169FED01_var, Order(AbilityCommand("BurrowPrimalRoachUp", 0)), c_orderQueueReplace); } - else if (auto38344B2C_val == "PrimalHydraliskBurrowed") { + else if (auto38344B2C_val == "AP_PrimalHydraliskBurrowed") { UnitIssueOrder(auto169FED01_var, Order(AbilityCommand("BurrowPrimalHydraliskUp", 0)), c_orderQueueReplace); } - else if (auto38344B2C_val == "PrimalUltraliskBurrowed") { + else if (auto38344B2C_val == "AP_PrimalUltraliskBurrowed") { UnitIssueOrder(auto169FED01_var, Order(AbilityCommand("BurrowPrimalUltraliskUp", 0)), c_orderQueueReplace); } else { @@ -12727,7 +12727,7 @@ bool gt_ZurvanReinforcements_Func (bool testConds, bool runActions) { } else { lv_friendlyHydras = (4 - lv_friendlyHydras); - UnitCreate(lv_friendlyHydras, "PrimalHydralisk", 0, gv_pLAYER_01_USER, RegionGetCenter(RegionFromId(156)), 315.0); + UnitCreate(lv_friendlyHydras, "AP_PrimalHydralisk", 0, gv_pLAYER_01_USER, RegionGetCenter(RegionFromId(156)), 315.0); auto1F2D5D87_g = UnitLastCreatedGroup(); auto1F2D5D87_u = UnitGroupCount(auto1F2D5D87_g, c_unitCountAll); for (;; auto1F2D5D87_u -= 1) { @@ -12747,7 +12747,7 @@ bool gt_ZurvanReinforcements_Func (bool testConds, bool runActions) { } else { lv_friendlyRoaches = (6 - lv_friendlyRoaches); - UnitCreate(lv_friendlyRoaches, "PrimalRoach", 0, gv_pLAYER_01_USER, RegionGetCenter(RegionFromId(156)), 315.0); + UnitCreate(lv_friendlyRoaches, "AP_PrimalRoach", 0, gv_pLAYER_01_USER, RegionGetCenter(RegionFromId(156)), 315.0); autoB8B38C45_g = UnitLastCreatedGroup(); autoB8B38C45_u = UnitGroupCount(autoB8B38C45_g, c_unitCountAll); for (;; autoB8B38C45_u -= 1) { @@ -12767,7 +12767,7 @@ bool gt_ZurvanReinforcements_Func (bool testConds, bool runActions) { } else { lv_friendlyUltras = (1 - lv_friendlyUltras); - UnitCreate(lv_friendlyUltras, "PrimalUltralisk", 0, gv_pLAYER_01_USER, RegionGetCenter(RegionFromId(156)), 315.0); + UnitCreate(lv_friendlyUltras, "AP_PrimalUltralisk", 0, gv_pLAYER_01_USER, RegionGetCenter(RegionFromId(156)), 315.0); auto48AF143C_g = UnitLastCreatedGroup(); auto48AF143C_u = UnitGroupCount(auto48AF143C_g, c_unitCountAll); for (;; auto48AF143C_u -= 1) { diff --git a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers index e3dac6e52..2b72a7677 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/HotS/ap_supreme.SC2Map/Triggers @@ -4242,7 +4242,7 @@ - PrimalRoach + AP_PrimalRoach @@ -4844,7 +4844,7 @@ - PrimalRoach + AP_PrimalRoach @@ -4928,7 +4928,7 @@ - PrimalHydralisk + AP_PrimalHydralisk @@ -5912,7 +5912,7 @@ - PrimalRoach + AP_PrimalRoach @@ -5996,7 +5996,7 @@ - PrimalHydralisk + AP_PrimalHydralisk @@ -6081,7 +6081,7 @@ - PrimalUltralisk + AP_PrimalUltralisk @@ -7206,7 +7206,7 @@ - PrimalRoach + AP_PrimalRoach @@ -7290,7 +7290,7 @@ - PrimalHydralisk + AP_PrimalHydralisk @@ -7375,7 +7375,7 @@ - PrimalUltralisk + AP_PrimalUltralisk @@ -20423,20 +20423,16 @@ - + 1 - - - - @@ -20453,6 +20449,11 @@ + + + + + @@ -109859,7 +109860,7 @@ - PrimalRoachBurrowed + AP_PrimalRoachBurrowed @@ -109903,7 +109904,7 @@ - PrimalHydraliskBurrowed + AP_PrimalHydraliskBurrowed @@ -109948,7 +109949,7 @@ - PrimalUltraliskBurrowed + AP_PrimalUltraliskBurrowed @@ -115889,7 +115890,7 @@ - PrimalHydralisk + AP_PrimalHydralisk @@ -116189,7 +116190,7 @@ - PrimalRoach + AP_PrimalRoach @@ -116488,7 +116489,7 @@ - PrimalUltralisk + AP_PrimalUltralisk diff --git a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/Base.SC2Data/GameData/UnitData.xml b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/Base.SC2Data/GameData/UnitData.xml index ef218cba9..2b9407069 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/Base.SC2Data/GameData/UnitData.xml +++ b/Maps/ArchipelagoCampaign/WoL/ap_a_sinister_turn.SC2Map/Base.SC2Data/GameData/UnitData.xml @@ -13,4 +13,8 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/btn-ability-terran-widow-mine-building.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/btn-ability-terran-widow-mine-building.dds new file mode 100644 index 000000000..385c7a0e7 Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/btn-ability-terran-widow-mine-building.dds differ diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/btn-upgrade-zerg-concentrated-spew.dds b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/btn-upgrade-zerg-concentrated-spew.dds new file mode 100644 index 000000000..5d0b33309 Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/btn-upgrade-zerg-concentrated-spew.dds differ diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml index 7a29ab76b..52b66f9fa 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml @@ -1963,17 +1963,19 @@ - + - + + + @@ -11069,8 +11071,6 @@ - - @@ -11086,6 +11086,7 @@