diff --git a/Base.SC2Data/GameData/AbilData.xml b/Base.SC2Data/GameData/AbilData.xml
index 0362613..7b25ddc 100644
--- a/Base.SC2Data/GameData/AbilData.xml
+++ b/Base.SC2Data/GameData/AbilData.xml
@@ -50,6 +50,11 @@
+
+
+
+
+
@@ -1214,6 +1219,10 @@
+
+
+
+
@@ -1790,10 +1799,10 @@
-
+
-
+
diff --git a/Base.SC2Data/GameData/ActorData.xml b/Base.SC2Data/GameData/ActorData.xml
index d66803c..9e507f0 100644
--- a/Base.SC2Data/GameData/ActorData.xml
+++ b/Base.SC2Data/GameData/ActorData.xml
@@ -12134,6 +12134,6 @@
-
+
diff --git a/Base.SC2Data/GameData/BehaviorData.xml b/Base.SC2Data/GameData/BehaviorData.xml
index a95c68c..dc6ce1e 100644
--- a/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Base.SC2Data/GameData/BehaviorData.xml
@@ -313,7 +313,7 @@
-
+
@@ -321,14 +321,14 @@
-
+
-
+
diff --git a/Base.SC2Data/GameData/ButtonData.xml b/Base.SC2Data/GameData/ButtonData.xml
index 087339d..dbe53a6 100644
--- a/Base.SC2Data/GameData/ButtonData.xml
+++ b/Base.SC2Data/GameData/ButtonData.xml
@@ -14,6 +14,14 @@
+
+
+
+
+
+
+
+
@@ -758,7 +766,7 @@
-
+
diff --git a/Base.SC2Data/GameData/EffectData.xml b/Base.SC2Data/GameData/EffectData.xml
index 8330a4b..2d8f1fc 100644
--- a/Base.SC2Data/GameData/EffectData.xml
+++ b/Base.SC2Data/GameData/EffectData.xml
@@ -6,6 +6,9 @@
+
+
+
@@ -5905,7 +5908,7 @@
-
+
diff --git a/Base.SC2Data/GameData/RequirementData.xml b/Base.SC2Data/GameData/RequirementData.xml
index 1fe1399..736a139 100644
--- a/Base.SC2Data/GameData/RequirementData.xml
+++ b/Base.SC2Data/GameData/RequirementData.xml
@@ -7,6 +7,10 @@
+
+
+
+
diff --git a/Base.SC2Data/GameData/RequirementNodeData.xml b/Base.SC2Data/GameData/RequirementNodeData.xml
index 822cedb..feae66e 100644
--- a/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -593,6 +593,11 @@
+
+
+
+
+
@@ -659,12 +664,10 @@
-
-
@@ -1914,6 +1917,10 @@
+
+
+
+
@@ -1939,7 +1946,6 @@
-
diff --git a/Base.SC2Data/GameData/UnitData.xml b/Base.SC2Data/GameData/UnitData.xml
index d3658e9..3d27e3a 100644
--- a/Base.SC2Data/GameData/UnitData.xml
+++ b/Base.SC2Data/GameData/UnitData.xml
@@ -269,8 +269,8 @@
-
-
+
+
@@ -466,7 +466,7 @@
-
+
@@ -754,7 +754,7 @@
-
+
@@ -826,7 +826,7 @@
-
+
@@ -3286,17 +3286,18 @@
-
+
+
-
+
-
+
@@ -6703,6 +6704,7 @@
+
@@ -10720,8 +10722,8 @@
-
-
+
+
diff --git a/Base.SC2Data/GameData/UpgradeData.xml b/Base.SC2Data/GameData/UpgradeData.xml
index 1a10f9f..7b8cde2 100644
--- a/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Base.SC2Data/GameData/UpgradeData.xml
@@ -97,6 +97,15 @@
+
+
+
+
+
+
+
+
+
@@ -351,12 +360,6 @@
-
-
-
-
-
-
@@ -910,6 +913,12 @@
+
+
+
+
+
+
diff --git a/Base.SC2Data/GameData/WeaponData.xml b/Base.SC2Data/GameData/WeaponData.xml
index 3fe2e2b..29c5d59 100644
--- a/Base.SC2Data/GameData/WeaponData.xml
+++ b/Base.SC2Data/GameData/WeaponData.xml
@@ -671,7 +671,7 @@
-
+
@@ -683,7 +683,7 @@
-
+
diff --git a/ComponentList.SC2Components b/ComponentList.SC2Components
index c071dc1..1a9dc67 100644
--- a/ComponentList.SC2Components
+++ b/ComponentList.SC2Components
@@ -1,5 +1,6 @@
+
GameData
DocumentInfo
MapInfo
diff --git a/DocumentHeader b/DocumentHeader
index 25f8086..70aacad 100644
Binary files a/DocumentHeader and b/DocumentHeader differ
diff --git a/DocumentInfo b/DocumentInfo
index f468005..69a6d8a 100644
--- a/DocumentInfo
+++ b/DocumentInfo
@@ -193,6 +193,8 @@
1.111
1.114
1.115
+ 1.116
+ 1.117
9/6/2021
@@ -361,6 +363,8 @@
4/14/2024
4/15/2024
4/21/2024
+ 4/22/2024
+ 4/24/2024
1
@@ -529,6 +533,8 @@
772,773
774,775,776,777,778,779,780,781,782,783,784,785
786,787,788,789
+ 790,791
+ 792,793,794,795,796,797
diff --git a/DocumentInfo.version b/DocumentInfo.version
index 6c64d8a..e041652 100644
Binary files a/DocumentInfo.version and b/DocumentInfo.version differ
diff --git a/GameData.version b/GameData.version
index ae155f8..f2f7ae7 100644
Binary files a/GameData.version and b/GameData.version differ
diff --git a/GameText.version b/GameText.version
index 7428628..2d69222 100644
Binary files a/GameText.version and b/GameText.version differ
diff --git a/MapScript.galaxy b/MapScript.galaxy
index e6196dc..406f8b7 100644
--- a/MapScript.galaxy
+++ b/MapScript.galaxy
@@ -1177,7 +1177,9 @@ bool gv_is_setup_phase;
int gv_infestor_dead_count;
bool gv_mass_infestor_death_exception;
int gv_mass_infestor_death_exception_cooldown;
-unitgroup gv_prefuse_infestors;
+int gv_zhg_phase;
+unitgroup gv_zhg_prefuse_infestors;
+unitgroup gv_zhg_hydras;
unitgroup gv_prefuse_infestors_nests;
point[5] gv_prefuse_infestors_nests_coords;
int gv_tbp_dialog;
@@ -1220,6 +1222,8 @@ int gv_tbp_extra_vote_dialog_zterran_vote_no;
int[7] gv_tbp_torment_votes;
int gv_tbp_toplist_frame_dialog;
int gv_ic_unit_count;
+int[7] gv_ic_terran_combat_unit_counts;
+int gv_ic_terran_combat_unit_total_count;
void InitGlobals () {
int init_i;
@@ -1352,7 +1356,8 @@ void InitGlobals () {
}
gv_zerg_drop_cd = 180;
gv_is_setup_phase = true;
- gv_prefuse_infestors = UnitGroupEmpty();
+ gv_zhg_prefuse_infestors = UnitGroupEmpty();
+ gv_zhg_hydras = UnitGroupEmpty();
gv_prefuse_infestors_nests = UnitGroupEmpty();
gv_tbp_dialog = c_invalidDialogId;
gv_tbp_dialog_info = c_invalidDialogId;
@@ -1800,6 +1805,7 @@ void gf_cleanup_prefuse_infestor_group ();
void gf_inject_extra_nest_positions ();
void gf_recruit_defensive_hg_hydras ();
void gf_recruit_defensive_hg_infestors ();
+void gf_order_defensive_hg_hydras ();
void gf_Init_Player_Toplists ();
void gf_Generate_Toplist ();
text gf_generate_name_string_text ();
@@ -1823,6 +1829,7 @@ bool gf_is_zerg_unit_broken (unit lp_u);
bool gf_is_terran_combat_unit_broken (unit lp_u);
bool gf_is_unittype_terran_combat_unit (string lp_ut);
int gf_ic_all_Zerg_unit_count ();
+int gf_ic_update_terran_combat_unit_counts ();
//--------------------------------------------------------------------------------------------------
// Trigger Variables
@@ -1840,7 +1847,8 @@ trigger gt_playercollectsblood;
trigger gt_playercollectsbloodbig;
trigger gt_Manufacturerdies;
trigger gt_Manufacturerfinished;
-trigger gt_BunkerUpgradegotclicked;
+trigger gt_SelectBomberAbilityUsed;
+trigger gt_SelectInfestedMarineAbilityUsed;
trigger gt_Infestedbuildingfinished;
trigger gt_Infestedmaybestuck;
trigger gt_PowerAuraGotClicked;
@@ -2786,6 +2794,7 @@ void gf_apply_support_casual () {
TechTreeAbilityAllow(auto18D3D132_var, AbilityCommand("BarracksTrain2", 14), true);
TechTreeAbilityAllow(auto18D3D132_var, AbilityCommand("BarracksTrain2", 15), true);
TechTreeAbilityAllow(auto18D3D132_var, AbilityCommand("BarracksTrain2", 16), true);
+ TechTreeAbilityAllow(auto18D3D132_var, AbilityCommand("ArmoryResearch2", 24), true);
TechTreeAbilityAllow(auto18D3D132_var, AbilityCommand("BarracksTrain2", 0), false);
TechTreeAbilityAllow(auto18D3D132_var, AbilityCommand("BarracksTrain2", 1), false);
TechTreeAbilityAllow(auto18D3D132_var, AbilityCommand("ArmoryResearch2", 17), false);
@@ -2798,9 +2807,9 @@ void gf_apply_support_casual () {
lv_p = UnitGetPosition(auto376916DE_var);
UnitRemove(auto376916DE_var);
libNtve_gf_CreateUnitsWithDefaultFacing(1, "ChaosCultist", 0, auto18D3D132_var, lv_p);
+ libNtve_gf_CreateUnitsWithDefaultFacing(1, "ChaosSpaceMarine", 0, auto18D3D132_var, lv_p);
+ libNtve_gf_CreateUnitsWithDefaultFacing(1, "ChaosSlave", 0, auto18D3D132_var, lv_p);
}
- libNtve_gf_CreateUnitsWithDefaultFacing(3, "ChaosSpaceMarine", 0, auto18D3D132_var, PointFromName(("Zerg Rally " + IntToString(gv_players[auto18D3D132_var].lv_position))));
- libNtve_gf_CreateUnitsWithDefaultFacing(3, "ChaosSlave", 0, auto18D3D132_var, PointFromName(("Zerg Rally " + IntToString(gv_players[auto18D3D132_var].lv_position))));
CatalogReferenceSet("Button,ResearchOvercharge,AlertTooltip", auto18D3D132_var, "Enables Elite Marines and Chaos Space Marines to use the Overcharge and Stimpack ability.");
CatalogReferenceSet("Button,ResearchOvercharge,Tooltip", auto18D3D132_var, "Enables Elite Marines and Chaos Space Marines to use the Overcharge and Stimpack ability.");
CatalogReferenceSet("Button,ResearchPenetratingLaser,AlertTooltip", auto18D3D132_var, "Upgrades all Marines, Reaper and Bolter weapons to deal +1 damage.");
@@ -5763,6 +5772,7 @@ void gf_disable_non_vanilla_content_for_player (int lp_player) {
TechTreeAbilityAllow(lp_player, AbilityCommand("BarracksTrain2", 15), false);
TechTreeAbilityAllow(lp_player, AbilityCommand("BarracksTrain2", 14), false);
TechTreeAbilityAllow(lp_player, AbilityCommand("BarracksTrain2", 16), false);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("ArmoryResearch2", 24), false);
TechTreeAbilityAllow(lp_player, AbilityCommand("BuildBuilder", 22), false);
TechTreeAbilityAllow(lp_player, AbilityCommand("BuildBuilderScalingStructures", 6), false);
TechTreeAbilityAllow(lp_player, AbilityCommand("ConstructionYardResearch", 10), false);
@@ -15060,7 +15070,7 @@ void gf_attack_highground_invaders () {
}
}
- if ((UnitGroupCount(lv_defender_group, c_unitCountAlive) > 0) && (UnitGroupCount(gv_highground_invaders, c_unitCountAlive) > 0)) {
+ if ((UnitGroupCount(lv_defender_group, c_unitCountAlive) > 0)) {
UnitGroupIssueOrder(lv_defender_group, OrderTargetingPoint(AbilityCommand("attack", 0), UnitGroupCenterOfGroup(gv_highground_invaders)), c_orderQueueReplace);
}
@@ -19745,21 +19755,16 @@ void gf_get_attackup () {
lv_i = 1;
// Implementation
- if ((gf_is_3v3() == true)) {
- lv_interval = 95;
+ if ((gv_difficulty < 4)) {
+ lv_max_upgrade = (10 + (gv_difficulty * 10));
}
else {
- if ((gv_difficulty < 4)) {
- lv_max_upgrade = (10 + (gv_difficulty * 10));
+ if ((gv_difficulty >= 7)) {
+ lv_max_upgrade = (lv_max_upgrade + 10);
}
- else {
- if ((gv_difficulty >= 7)) {
- lv_max_upgrade = (lv_max_upgrade + 10);
- }
- }
}
- if ((lv_time > (25 * 60)) && ((gv_difficulty >= 5) || (gf_is_3v3() == true))) {
+ if ((lv_time > (25 * 60)) && (gv_difficulty >= 5)) {
lv_upcnt = (lv_upcnt + 1);
}
@@ -19769,13 +19774,6 @@ void gf_get_attackup () {
if ((lv_time >= lv_peacetime) && (ModI(lv_time, lv_interval) == 0) && (TechTreeUpgradeCount(7, "ZergAttack", c_techCountQueuedOrBetter) < lv_max_upgrade)) {
TechTreeUpgradeAddLevel(7, "ZergAttack", lv_upcnt);
- if ((gf_is_3v3() == true)) {
- while ((lv_i <= 6)) {
- TechTreeUpgradeAddLevel(gv_players[lv_i].lv__3v3_zerg_pid, "ZergAttack", lv_upcnt);
- lv_i = (lv_i + 1);
- }
- }
-
}
}
@@ -19886,7 +19884,7 @@ void gf_try_prefuse_handler () {
// Implementation
gf_cleanup_prefuse_infestor_group();
- autoB404B500_g = gv_prefuse_infestors;
+ autoB404B500_g = gv_zhg_prefuse_infestors;
autoB404B500_u = UnitGroupCount(autoB404B500_g, c_unitCountAll);
for (;; autoB404B500_u -= 1) {
autoB404B500_var = UnitGroupUnitFromEnd(autoB404B500_g, autoB404B500_u);
@@ -19905,13 +19903,13 @@ void gf_cleanup_prefuse_infestor_group () {
unit autoB688AD86_var;
// Implementation
- autoB688AD86_g = gv_prefuse_infestors;
+ autoB688AD86_g = gv_zhg_prefuse_infestors;
autoB688AD86_u = UnitGroupCount(autoB688AD86_g, c_unitCountAll);
for (;; autoB688AD86_u -= 1) {
autoB688AD86_var = UnitGroupUnitFromEnd(autoB688AD86_g, autoB688AD86_u);
if (autoB688AD86_var == null) { break; }
if ((UnitIsAlive(autoB688AD86_var) == false)) {
- UnitGroupRemove(gv_prefuse_infestors, autoB688AD86_var);
+ UnitGroupRemove(gv_zhg_prefuse_infestors, autoB688AD86_var);
}
}
@@ -20018,6 +20016,18 @@ void gf_recruit_defensive_hg_infestors () {
}
+void gf_order_defensive_hg_hydras () {
+ // Variable Declarations
+ unitgroup lv_ug;
+
+ // Automatic Variable Declarations
+ // Variable Initialization
+ lv_ug = UnitGroupEmpty();
+
+ // Implementation
+ lv_ug = gv_zhg_hydras;
+}
+
void gf_Init_Player_Toplists () {
// Automatic Variable Declarations
playergroup auto9BDC27D7_g;
@@ -20845,6 +20855,53 @@ int gf_ic_all_Zerg_unit_count () {
return lv_r;
}
+int gf_ic_update_terran_combat_unit_counts () {
+ // Variable Declarations
+ unitgroup lv_ug;
+ int lv_ur;
+ int lv_r;
+
+ // Automatic Variable Declarations
+ playergroup autoD410A9A4_g;
+ int autoD410A9A4_var;
+ unitgroup autoFC5191F9_g;
+ int autoFC5191F9_u;
+ unit autoFC5191F9_var;
+ playergroup auto0105CC4B_g;
+ int auto0105CC4B_var;
+
+ // Variable Initialization
+ lv_ug = UnitGroupEmpty();
+
+ // Implementation
+ autoD410A9A4_g = gv_terrans;
+ autoD410A9A4_var = -1;
+ while (true) {
+ autoD410A9A4_var = PlayerGroupNextPlayer(autoD410A9A4_g, autoD410A9A4_var);
+ if (autoD410A9A4_var < 0) { break; }
+ lv_ug = UnitGroupEmpty();
+ autoFC5191F9_g = UnitGroup(null, autoD410A9A4_var, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterStructure) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
+ autoFC5191F9_u = UnitGroupCount(autoFC5191F9_g, c_unitCountAll);
+ for (;; autoFC5191F9_u -= 1) {
+ autoFC5191F9_var = UnitGroupUnitFromEnd(autoFC5191F9_g, autoFC5191F9_u);
+ if (autoFC5191F9_var == null) { break; }
+ if ((gf_is_unittype_terran_combat_unit(UnitGetType(autoFC5191F9_var)) == true)) {
+ UnitGroupAdd(lv_ug, autoFC5191F9_var);
+ }
+
+ }
+ gv_ic_terran_combat_unit_counts[autoD410A9A4_var] = UnitGroupCount(lv_ug, c_unitCountAlive);
+ }
+ auto0105CC4B_g = gv_terrans;
+ auto0105CC4B_var = -1;
+ while (true) {
+ auto0105CC4B_var = PlayerGroupNextPlayer(auto0105CC4B_g, auto0105CC4B_var);
+ if (auto0105CC4B_var < 0) { break; }
+ lv_r = (lv_r + gv_ic_terran_combat_unit_counts[auto0105CC4B_var]);
+ }
+ return lv_r;
+}
+
//--------------------------------------------------------------------------------------------------
// Trigger: Tombstone Mineral Upgrade Finished
//--------------------------------------------------------------------------------------------------
@@ -21433,9 +21490,9 @@ void gt_Manufacturerfinished_Init () {
}
//--------------------------------------------------------------------------------------------------
-// Trigger: Bunker Upgrade got clicked
+// Trigger: Select Bomber Ability Used
//--------------------------------------------------------------------------------------------------
-bool gt_BunkerUpgradegotclicked_Func (bool testConds, bool runActions) {
+bool gt_SelectBomberAbilityUsed_Func (bool testConds, bool runActions) {
// Variable Declarations
unit lv_bunker;
@@ -21453,9 +21510,35 @@ bool gt_BunkerUpgradegotclicked_Func (bool testConds, bool runActions) {
}
//--------------------------------------------------------------------------------------------------
-void gt_BunkerUpgradegotclicked_Init () {
- gt_BunkerUpgradegotclicked = TriggerCreate("gt_BunkerUpgradegotclicked_Func");
- TriggerAddEventPlayerEffectUsed(gt_BunkerUpgradegotclicked, c_playerAny, "AddUpgradedBunker");
+void gt_SelectBomberAbilityUsed_Init () {
+ gt_SelectBomberAbilityUsed = TriggerCreate("gt_SelectBomberAbilityUsed_Func");
+ TriggerAddEventPlayerEffectUsed(gt_SelectBomberAbilityUsed, c_playerAny, "AddUpgradedBunker");
+}
+
+//--------------------------------------------------------------------------------------------------
+// Trigger: Select Infested Marine Ability Used
+//--------------------------------------------------------------------------------------------------
+bool gt_SelectInfestedMarineAbilityUsed_Func (bool testConds, bool runActions) {
+ // Variable Declarations
+ unit lv_bunker;
+
+ // Automatic Variable Declarations
+ // Variable Initialization
+ lv_bunker = EventPlayerEffectUsedUnit(c_effectUnitCaster);
+
+ // Actions
+ if (!runActions) {
+ return true;
+ }
+
+ UnitBehaviorRemove(lv_bunker, "SpawnsBombers", 1);
+ return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+void gt_SelectInfestedMarineAbilityUsed_Init () {
+ gt_SelectInfestedMarineAbilityUsed = TriggerCreate("gt_SelectInfestedMarineAbilityUsed_Func");
+ TriggerAddEventPlayerEffectUsed(gt_SelectInfestedMarineAbilityUsed, c_playerAny, "RemoveBomberSpawn");
}
//--------------------------------------------------------------------------------------------------
@@ -28453,11 +28536,11 @@ bool gt_Terranenterszerghighground_Func (bool testConds, bool runActions) {
// Conditions
if (testConds) {
- if (!((lv_owner != 7))) {
+ if (!((lv_owner > 0))) {
return false;
}
- if (!((lv_owner != 0))) {
+ if (!((lv_owner < 7))) {
return false;
}
@@ -28511,12 +28594,8 @@ bool gt_Terranenterszerghighground_Func (bool testConds, bool runActions) {
return true;
}
- if ((gf_is_pvp() == true)) {
- }
- else {
- UnitGroupAdd(gv_highground_invaders, EventUnit());
- gv_highground_invader_count += 1;
- }
+ UnitGroupAdd(gv_highground_invaders, EventUnit());
+ gv_highground_invader_count += 1;
return true;
}
@@ -28530,61 +28609,9 @@ void gt_Terranenterszerghighground_Init () {
// Trigger: invader leaves zerg highground
//--------------------------------------------------------------------------------------------------
bool gt_invaderleaveszerghighground_Func (bool testConds, bool runActions) {
- // Variable Declarations
- int lv_owner;
- string lv_unit_type;
-
// Automatic Variable Declarations
- // Variable Initialization
- lv_owner = EventPlayer();
- lv_unit_type = UnitGetType(EventUnit());
-
// Conditions
if (testConds) {
- if (!((lv_owner != 7))) {
- return false;
- }
-
- if (!((lv_unit_type != "IonBeam"))) {
- return false;
- }
-
- if (!((lv_unit_type != "IonStorm"))) {
- return false;
- }
-
- if (!((lv_unit_type != "Buggo"))) {
- return false;
- }
-
- if (!((lv_unit_type != "Medivac"))) {
- return false;
- }
-
- if (!((lv_unit_type != "ImmortalShakurasStasisCannonMissile"))) {
- return false;
- }
-
- if (!((lv_unit_type != "KaraxServitorWeaponA"))) {
- return false;
- }
-
- if (!((lv_unit_type != "KaraxServitorWeaponB"))) {
- return false;
- }
-
- if (!((lv_unit_type != "Oracle"))) {
- return false;
- }
-
- if (!((lv_unit_type != gf_get_zerg_rally_point_unit_type()))) {
- return false;
- }
-
- if (!((lv_unit_type != "SiegeTankFragmentBlastFire"))) {
- return false;
- }
-
if (!((UnitGroupHasUnit(gv_highground_invaders, EventUnit()) == true))) {
return false;
}
@@ -28595,12 +28622,8 @@ bool gt_invaderleaveszerghighground_Func (bool testConds, bool runActions) {
return true;
}
- if ((gf_is_pvp() == true)) {
- }
- else {
- UnitGroupRemove(gv_highground_invaders, EventUnit());
- gv_highground_invader_count -= 1;
- }
+ UnitGroupRemove(gv_highground_invaders, EventUnit());
+ gv_highground_invader_count -= 1;
return true;
}
@@ -28617,63 +28640,17 @@ bool gt_invaderdies_Func (bool testConds, bool runActions) {
// Variable Declarations
unit lv_unit;
int lv_owner;
- point lv_unit_position;
// Automatic Variable Declarations
// Variable Initialization
lv_unit = EventUnit();
lv_owner = UnitGetOwner(EventUnit());
- lv_unit_position = UnitGetPosition(lv_unit);
// Conditions
if (testConds) {
- if (!((UnitGetType(lv_unit) != "IonBeam"))) {
- return false;
- }
-
- if (!((UnitGetType(lv_unit) != "IonStorm"))) {
- return false;
- }
-
- if (!((UnitGetType(lv_unit) != "Buggo"))) {
- return false;
- }
-
- if (!((UnitGetType(lv_unit) != "ImmortalShakurasStasisCannonMissile"))) {
- return false;
- }
-
- if (!((UnitGetType(lv_unit) != "Medivac"))) {
- return false;
- }
-
- if (!((UnitGetType(lv_unit) != "KaraxServitorWeaponA"))) {
- return false;
- }
-
- if (!((UnitGetType(lv_unit) != "KaraxServitorWeaponB"))) {
- return false;
- }
-
- if (!((UnitGetType(lv_unit) != "Oracle"))) {
- return false;
- }
-
- if (!((UnitGetType(lv_unit) != gf_get_zerg_rally_point_unit_type()))) {
- return false;
- }
-
- if (!((UnitGetType(lv_unit) != "SiegeTankFragmentBlastFire"))) {
- return false;
- }
-
if (!((UnitGroupHasUnit(gv_highground_invaders, lv_unit) == true))) {
return false;
}
-
- if (!((lv_owner != 7))) {
- return false;
- }
}
// Actions
@@ -28681,12 +28658,8 @@ bool gt_invaderdies_Func (bool testConds, bool runActions) {
return true;
}
- if ((gf_is_pvp() == true)) {
- }
- else {
- UnitGroupRemove(gv_highground_invaders, lv_unit);
- gv_highground_invader_count -= 1;
- }
+ UnitGroupRemove(gv_highground_invaders, lv_unit);
+ gv_highground_invader_count -= 1;
return true;
}
@@ -28904,10 +28877,12 @@ void gt_IonCannonApplyPermaDamage_Init () {
bool gt_hydragotborn_Func (bool testConds, bool runActions) {
// Variable Declarations
string lv_type;
+ point lv_p;
// Automatic Variable Declarations
// Variable Initialization
lv_type = UnitGetType(EventUnitCreatedUnit());
+ lv_p = UnitGetGoalPosition(EventUnitCreatedUnit());
// Conditions
if (testConds) {
@@ -28923,10 +28898,23 @@ bool gt_hydragotborn_Func (bool testConds, bool runActions) {
if ((gv_mutator_mega_mecha_hydras == true)) {
libNtve_gf_ReplaceUnit(EventUnitCreatedUnit(), "MechaHydralisk", libNtve_ge_ReplaceUnitOptions_NewUnitsDefault);
- UnitGroupAdd(gv_hydra_groups[gf_get_new_hydra_groupindex(EventUnitCreatedUnit())].lv_units, libNtve_gf_LastReplacedUnit());
+ }
+
+ if ((RegionContainsPoint(RegionFromId(1), lv_p) == true)) {
+ if ((gv_mutator_mega_mecha_hydras == true)) {
+ UnitGroupAdd(gv_zhg_prefuse_infestors, libNtve_gf_LastReplacedUnit());
+ }
+ else {
+ UnitGroupAdd(gv_zhg_prefuse_infestors, EventUnitCreatedUnit());
+ }
}
else {
- UnitGroupAdd(gv_hydra_groups[gf_get_new_hydra_groupindex(EventUnitCreatedUnit())].lv_units, EventUnitCreatedUnit());
+ if ((gv_mutator_mega_mecha_hydras == true)) {
+ UnitGroupAdd(gv_hydra_groups[gf_get_new_hydra_groupindex(EventUnitCreatedUnit())].lv_units, libNtve_gf_LastReplacedUnit());
+ }
+ else {
+ UnitGroupAdd(gv_hydra_groups[gf_get_new_hydra_groupindex(EventUnitCreatedUnit())].lv_units, EventUnitCreatedUnit());
+ }
}
return true;
}
@@ -29191,13 +29179,18 @@ bool gt_add_infestor_to_group_Func (bool testConds, bool runActions) {
return true;
}
- lv_position = gf_get_infestor_group_i(lv_p);
- UnitGroupAdd(gv_infestors[lv_position].lv_unit_group, EventUnitCreatedUnit());
- if ((gv_difficulty > 6)) {
- PlayerModifyPropertyInt(7, c_playerPropMinerals, c_playerPropOperAdd, 75);
+ if ((RegionContainsPoint(RegionFromId(1), lv_p) == true)) {
+ UnitGroupAdd(gv_zhg_prefuse_infestors, EventUnitCreatedUnit());
}
else {
- PlayerModifyPropertyInt(7, c_playerPropMinerals, c_playerPropOperAdd, 20);
+ lv_position = gf_get_infestor_group_i(lv_p);
+ UnitGroupAdd(gv_infestors[lv_position].lv_unit_group, EventUnitCreatedUnit());
+ if ((gv_difficulty > 6)) {
+ PlayerModifyPropertyInt(7, c_playerPropMinerals, c_playerPropOperAdd, 20);
+ }
+ else {
+ PlayerModifyPropertyInt(7, c_playerPropMinerals, c_playerPropOperAdd, 10);
+ }
}
return true;
}
@@ -31503,7 +31496,6 @@ bool gt_everytenseconds_Func (bool testConds, bool runActions) {
return true;
}
- gv_ic_unit_count = gf_ic_all_Zerg_unit_count();
autoB76A211F_g = gv_terrans;
autoB76A211F_var = -1;
while (true) {
@@ -31587,11 +31579,23 @@ bool gt_every30seconds_Func (bool testConds, bool runActions) {
gf_upgrade_start_spawners();
if ((FixedToInt(GameGetMissionTime()) >= ((60 * 18) + 59)) && (gv_difficulty > 4)) {
- gf_recruit_defensive_hg_hydras();
- if ((gv_difficulty > 5)) {
- gf_recruit_defensive_hg_infestors();
+ if ((gv_zhg_phase == 0)) {
+ if ((UnitGroupCount(gv_zhg_hydras, c_unitCountAlive) < 30)) {
+ gf_recruit_defensive_hg_hydras();
+ }
+
+ gv_zhg_phase = 1;
}
+ else {
+ if ((gv_difficulty > 5)) {
+ if ((UnitGroupCount(gv_zhg_prefuse_infestors, c_unitCountAlive) < 30)) {
+ gf_recruit_defensive_hg_infestors();
+ }
+ }
+
+ gv_zhg_phase = 0;
+ }
}
autoA0501AE3_g = gv_terrans;
@@ -31668,9 +31672,9 @@ bool gt_everyminute_Func (bool testConds, bool runActions) {
}
if ((FixedToInt(GameGetMissionTime()) >= ((60 * 20) + 59))) {
- if ((gv_ic_unit_count >= 600)) {
+ gv_ic_unit_count = (gf_ic_all_Zerg_unit_count() + gf_ic_update_terran_combat_unit_counts());
+ if ((gv_ic_unit_count >= 700)) {
gf_ic_check_zerg_units();
- gv_ic_unit_count = gf_ic_all_Zerg_unit_count();
gf_ic_check_terran_units();
}
@@ -31822,7 +31826,8 @@ void InitTriggers () {
gt_playercollectsbloodbig_Init();
gt_Manufacturerdies_Init();
gt_Manufacturerfinished_Init();
- gt_BunkerUpgradegotclicked_Init();
+ gt_SelectBomberAbilityUsed_Init();
+ gt_SelectInfestedMarineAbilityUsed_Init();
gt_Infestedbuildingfinished_Init();
gt_Infestedmaybestuck_Init();
gt_PowerAuraGotClicked_Init();
diff --git a/PreloadAssetDB.txt b/PreloadAssetDB.txt
index b3233be..bf77a0d 100644
--- a/PreloadAssetDB.txt
+++ b/PreloadAssetDB.txt
@@ -143,6 +143,11 @@ asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,MechUnitFabricationLoop,TerrainMgr
Alert=TrainComplete,TrainError
Unit=Inciter,Mole,Tesla,Torrent,Virtus
+id=SelectInfestedMarineSpawn
+asset=Assets\Textures\WayPointLine.dds
+asset=Assets\UI\Cursors\WayPointAttack_Void\WayPointAttack_Void.m3
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Effect=RemoveBomberSpawn
id=TombstoneResearch
asset=Assets\Textures\WayPointLine.dds
asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
@@ -383,7 +388,7 @@ asset=Assets\Textures\WayPointLine.dds
asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
Alert=Error
-Upgrade=EliteScope,HeavyPlating,HyperElectrodes,InfestedOffense,InfestedSpeedUp,InstantDischarge,MarineConservationL1,MarineConservationL2,MarineConservationL3,MarineMobileSquadTraining,MarineOvercharge,MarinePenetratingLaser,MarineShatteringLaser,MarineShatteringLaserUpgrade,ParalyzingShock,ShockBeam,ShockOverload,SolarWeapons,SpawnBombers,UpgradedCombatShield,WeaponCapacity
+Upgrade=ChaosPowerArmorUpgrade,EliteScope,HeavyPlating,HyperElectrodes,InfestedOffense,InfestedSpeedUp,InstantDischarge,MarineConservationL1,MarineConservationL2,MarineConservationL3,MarineMobileSquadTraining,MarineOvercharge,MarinePenetratingLaser,MarineShatteringLaser,MarineShatteringLaserUpgrade,ParalyzingShock,ShockBeam,ShockOverload,SolarWeapons,SpawnBombers,UpgradedCombatShield,WeaponCapacity
id=BurrowFireling
asset=Assets\Textures\WayPointLine.dds
asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
@@ -567,7 +572,7 @@ asset=Assets\UI\Cursors\WayPointConfirm_Void\WayPointConfirm_Void.m3
Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
Alert=Error
Unit=SiegeTank22
-id=UpgradeBunker
+id=SelectBomberSpawn
asset=Assets\Textures\WayPointLine.dds
asset=Assets\UI\Cursors\WayPointAttack_Void\WayPointAttack_Void.m3
Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -5476,6 +5481,9 @@ Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnes
id=Generator
asset=Assets\Textures\btn-building-genetron-generator.dds
Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=SelectInfestedMarineSpawn
+asset=Assets\Textures\btn-unit-zerg-infestedmarine.dds
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
id=UpgradeTombstoneLevel
asset=Assets\Textures\btn-upgrade-karax-anionpulsecrystals.dds
Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -5833,7 +5841,7 @@ Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnes
id=MobileMode
asset=Assets\Textures\btn-unit-terran-siegetank.dds
Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-id=UpgradeBunker
+id=SelectBomberSpawn
asset=Assets\Textures\btn-unit-zerg-volatileinfested.dds
Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
id=BuildSiegeTank
@@ -6865,6 +6873,9 @@ Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnes
id=heXnab
asset=Assets\Textures\btn-ability-mengsk-ghost-supercloak.dds
Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=ResearchChaosPowerArmorUpgrade
+asset=assets\icon\ICON CSM Armor Lord.dds
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
[Effect]
id=Repair
@@ -6978,6 +6989,8 @@ id=Psythe
Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,PariahAttack,TerrainMgr
id=ShadowCannonImpact
Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=RemoveBomberSpawn
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
id=PhaseoutWallset
Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
Effect=PhaseoutwallAB
@@ -10436,10 +10449,10 @@ id=PickupEnergy100
Abil=PickupHNYgift
Actor=BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,##id##,SalvagedTextAlly,SalvagedTextEnemy,ShieldFizzleModel,ShieldImpact,ShieldImpactBlaze,TerrainMgr,UnitPointsTextAll
id=InfestedBunker
-Abil=BuildInProgress,CopyRally,Demolish,Rally,TrainBomber,TrainInfestedMarine,UpgradeBunker,UpgradeBunkerCapacity,ZergResetRally,que5
+Abil=BuildInProgress,CopyRally,Demolish,Rally,SelectBomberSpawn,SelectInfestedMarineSpawn,TrainBomber,TrainInfestedMarine,UpgradeBunkerCapacity,ZergResetRally,que5
Actor=BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,##id##,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldFizzleModel,ShieldImpact,ShieldImpactBlaze,TerrainMgr,UnitPointsTextAll
Behavior=IsSpawner,UnifiedArmor,UnifiedArmorBeingRepaired
-Button=Cancel,Demolish,InfestedTerranCampaign,SpawnBomber,UpgradeBunker,UpgradeBunkerCapacity
+Button=Cancel,Demolish,InfestedTerranCampaign,SelectBomberSpawn,SelectInfestedMarineSpawn,SpawnBomber,UpgradeBunkerCapacity
id=ZaGara
Abil=AbsorbingCloud,BuildSporeCrawler3v3,Burrow##id##Down,QueenBuild,TransfusionInfestor,##id##DeepTunnel,ZagaraTrain,attack,move,stop
Actor=BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldFizzleModel,ShieldImpact,ShieldImpactBlaze,TerrainMgr,UnitPointsTextAll,##id##
@@ -11133,7 +11146,7 @@ id=Armory2
Abil=ArmoryResearch2,BuildInProgress,Demolish,que5
Actor=##id##,ArmoryRange,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,ConfirmationLocalAirAttack,ConfirmationLocalGroundAttack,ConfirmationSyncAirAttack,ConfirmationSyncGroundAttack,ConstructionRefundTextAlly,ConstructionRefundTextEnemy,FlyerShadow,GroundShadow,MediumTastyCorpseBlip,SalvagedTextAlly,SalvagedTextEnemy,ShieldFizzleModel,ShieldImpact,ShieldImpactBlaze,TerrainMgr,UnitPointsTextAll
Behavior=ArmoryAura
-Button=Cancel,CancelBuilding,Demolish,Halt,InfestedOffense,ResearchBomberSpawns,ResearchConservationL1,ResearchConservationL2,ResearchConservationL3,ResearchDeflectiveShatter,ResearchEliteScope,ResearchHeavyPlating,ResearchHyperElectrodes,ResearchInfestedSpeedUp,ResearchInstantDischarge,ResearchMobileSquadTraining,ResearchOvercharge,ResearchParalyzingShock,ResearchPenetratingLaser,ResearchShatteringLaser,ResearchShockBeam,ResearchShockOverload,SelectBuilder,UpgradeCombatShield
+Button=Cancel,CancelBuilding,Demolish,Halt,InfestedOffense,ResearchBomberSpawns,ResearchChaosPowerArmorUpgrade,ResearchConservationL1,ResearchConservationL2,ResearchConservationL3,ResearchDeflectiveShatter,ResearchEliteScope,ResearchHeavyPlating,ResearchHyperElectrodes,ResearchInfestedSpeedUp,ResearchInstantDischarge,ResearchMobileSquadTraining,ResearchOvercharge,ResearchParalyzingShock,ResearchPenetratingLaser,ResearchShatteringLaser,ResearchShockBeam,ResearchShockOverload,SelectBuilder,UpgradeCombatShield
Unit=Armory
id=ConstructionYard
Abil=BuildInProgress,CashPickupResearch,##id##OrderUpgradeFortification,##id##OrderUpgradeFortificationInfested,##id##Research,##id##Train,ConyardOrderCashUpgrade,Demolish,que5
@@ -12299,6 +12312,10 @@ Alert=UpgradeComplete
id=ZCCEnergyUpgrade
Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
Alert=UpgradeComplete
+id=ZergDefenseDamage
+asset=Assets\Textures\btn-upgrade-zerg-meleeattacks-level2.dds
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
id=ZergSpecialtyPrimalRoachDouble
asset=Assets\Textures\btn-unit-zerg-primalroach.dds
Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
@@ -12323,6 +12340,10 @@ id=ZergTier2
asset=Assets\Textures\btn-upgrade-zerg-evolveincreasedlocustlifetime.dds
Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
Alert=UpgradeComplete
+id=ChaosPowerArmorUpgrade
+asset=assets\icon\ICON CSM Armor Lord.dds
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
[Water]
id=BelShir
diff --git a/Triggers b/Triggers
index 75eea5a..94a4d40 100644
--- a/Triggers
+++ b/Triggers
@@ -11021,13 +11021,12 @@
+
-
-
@@ -11270,6 +11269,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ArmoryResearch2
+
+
+
+
+
+
+
+
+
+
@@ -11372,6 +11395,8 @@
+
+
@@ -11487,159 +11512,77 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
- 3
+ 1
-
+
-
+
+
+
+
+
+
+
+
ChaosSpaceMarine
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Zerg Rally
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
- 3
+ 1
-
+
-
+
+
+
+
+
+
+
+
ChaosSlave
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Zerg Rally
-
-
-
-
-
-
-
-
+
@@ -36764,6 +36707,7 @@