From 805b79bef7a5d688aa2a054b0e0e7387f07b0f6c Mon Sep 17 00:00:00 2001
From: Brandon <brandon.ml@gmail.com>
Date: Fri, 6 Jan 2017 01:32:45 +0100
Subject: [PATCH] balance updates and don't count teleporting bc as dead

---
 src/(attributes)     | Bin 928 -> 928 bytes
 src/DocumentHeader   | Bin 2208 -> 2208 bytes
 src/MapScript.galaxy | 216 ++++--------
 src/Triggers         | 812 +++++++++----------------------------------
 src/Triggers.version | Bin 44 -> 44 bytes
 5 files changed, 218 insertions(+), 810 deletions(-)

diff --git a/src/(attributes) b/src/(attributes)
index 800621596a50c3081703b771638b3bc876bc2b54..16dca1e49fea0e2b515b5b9bacd5a2b48e3b9a31 100644
GIT binary patch
delta 127
zcmV-_0D%9X2cQR#d=RgxsXz4Nyvkc%pCvWN>+z9{C<JQb)333(*a1Kn4?H{Hu@V-P
zGFw1jsrLph@bWoD4_W}tU23SivOzChD41_7z8D)LOWv?YCCjOLr=m88xJE6)629xg
htXaF0&;p<kT!4;iDZwmCL*lQynpE6ylYs*t0RZg*Iy(RW

delta 127
zcmV-_0D%9X2cQR#d=PIt=KA#GyvpO&SAo>~UV)K}C<Omt(oM0r*a1M{e{h}LrjM%B
z1AZqR#jLL`@bWoD4_W}tU23SivOzELa?)h&@GT=7iu;l7Z4@;oTXU|ETqPn-zg{hV
hF0wz9&;p<k#8}(m3qhOUuIzOR7;)U(lYs*t0RWvkKD7V<

diff --git a/src/DocumentHeader b/src/DocumentHeader
index 124ad2d151ef1ababee9451a584bf0f38fe2160f..e73c8dc5f9928e8d473c108f5266bbf5398e3ad4 100644
GIT binary patch
delta 45
vcmZ1=xIj?F!^k<9gMop;D42nPk(raxVLt-{>pq|W5SX17(*og*Dm5GczElX$

delta 45
tcmZ1=xIj?F!^k<9gMop;D42nPk(r5!cPRq{2!jCUY!hn`-l$T;0RXW`2oC@N

diff --git a/src/MapScript.galaxy b/src/MapScript.galaxy
index 4d2a909..a7ac331 100644
--- a/src/MapScript.galaxy
+++ b/src/MapScript.galaxy
@@ -464,56 +464,11 @@ bool auto_gf_Energy_TriggerFunc (bool testConds, bool runActions) {
         UnitSetPropertyFixed(UnitGroupLoopCurrent(), c_unitPropEnergyPercent, 100.0);
     }
     UnitGroupLoopEnd();
-    UnitGroupLoopBegin(UnitGroup("Corruptor", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0));
-    for ( ; !UnitGroupLoopDone() ; UnitGroupLoopStep() ) {
-        libNtve_gf_UnitAbilityRemoveCooldown(UnitGroupLoopCurrent(), "Corruption", "Abil/Corruption");
-    }
-    UnitGroupLoopEnd();
-    UnitGroupLoopBegin(UnitGroup("Stalker", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0));
-    for ( ; !UnitGroupLoopDone() ; UnitGroupLoopStep() ) {
-        libNtve_gf_UnitAbilityRemoveCooldown(UnitGroupLoopCurrent(), "Blink", "Blink");
-    }
-    UnitGroupLoopEnd();
-    UnitGroupLoopBegin(UnitGroup("VoidRay", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0));
-    for ( ; !UnitGroupLoopDone() ; UnitGroupLoopStep() ) {
-        libNtve_gf_UnitAbilityRemoveCooldown(UnitGroupLoopCurrent(), "VoidRaySwarmDamageBoost", "Abil/VoidRaySwarmDamageBoost");
-    }
-    UnitGroupLoopEnd();
-    UnitGroupLoopBegin(UnitGroup("Zealot", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0));
-    for ( ; !UnitGroupLoopDone() ; UnitGroupLoopStep() ) {
-        UnitClearCooldowns(UnitGroupLoopCurrent(), true);
-    }
-    UnitGroupLoopEnd();
-    UnitGroupLoopBegin(UnitGroup("SwarmHostBurrowedMP", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0));
-    for ( ; !UnitGroupLoopDone() ; UnitGroupLoopStep() ) {
-        libNtve_gf_UnitAbilityRemoveCooldown(UnitGroupLoopCurrent(), "SpawnLocustsTargeted", "Abil/SpawnLocustsTargeted");
-    }
-    UnitGroupLoopEnd();
-    UnitGroupLoopBegin(UnitGroup("SwarmHostMP", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0));
-    for ( ; !UnitGroupLoopDone() ; UnitGroupLoopStep() ) {
-        libNtve_gf_UnitAbilityRemoveCooldown(UnitGroupLoopCurrent(), "SpawnLocustsTargeted", "Abil/SpawnLocustsTargeted");
-    }
-    UnitGroupLoopEnd();
-    UnitGroupLoopBegin(UnitGroup("Medivac", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0));
-    for ( ; !UnitGroupLoopDone() ; UnitGroupLoopStep() ) {
-        libNtve_gf_UnitAbilityRemoveCooldown(UnitGroupLoopCurrent(), "MedivacSpeedBoost", "Abil/MedivacSpeedBoost");
-    }
-    UnitGroupLoopEnd();
-    UnitGroupLoopBegin(UnitGroup("Oracle", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0));
+    UnitGroupLoopBegin(UnitGroup(null, c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0));
     for ( ; !UnitGroupLoopDone() ; UnitGroupLoopStep() ) {
         UnitClearCooldowns(UnitGroupLoopCurrent(), true);
     }
     UnitGroupLoopEnd();
-    UnitGroupLoopBegin(UnitGroup("HighTemplar", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0));
-    for ( ; !UnitGroupLoopDone() ; UnitGroupLoopStep() ) {
-        libNtve_gf_UnitAbilityRemoveCooldown(UnitGroupLoopCurrent(), "PsiStorm", "Abil/PsiStorm");
-    }
-    UnitGroupLoopEnd();
-    UnitGroupLoopBegin(UnitGroup("Disruptor", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0));
-    for ( ; !UnitGroupLoopDone() ; UnitGroupLoopStep() ) {
-        libNtve_gf_UnitAbilityRemoveCooldown(UnitGroupLoopCurrent(), "PurificationNovaTargetted", "Abil/PurificationNovaTargetted");
-    }
-    UnitGroupLoopEnd();
     UnitGroupLoopBegin(UnitGroup("Carrier", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0));
     for ( ; !UnitGroupLoopDone() ; UnitGroupLoopStep() ) {
         lv_interceptorcount = UnitMagazineCount(UnitGroupLoopCurrent(), "CarrierHangar");
@@ -535,8 +490,7 @@ void gf_ResetUnits () {
     if ((gv_pause == true)) {
         TriggerExecute(gt_Pause, false, false);
     }
-    else {
-    }
+
     gf_LoadState(0);
     UnitControlGroupAddUnits(1, 1, UnitGroup(null, 9, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0));
     UnitControlGroupAddUnits(gv_player2, 2, UnitGroup(null, 10, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0));
@@ -547,8 +501,7 @@ void gf_ResetUnits () {
         }
         UnitGroupLoopEnd();
     }
-    else {
-    }
+
     UnitGroupLoopBegin(UnitGroup("Carrier", c_playerAny, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0));
     for ( ; !UnitGroupLoopDone() ; UnitGroupLoopStep() ) {
         UnitMagazineArm(UnitGroupLoopCurrent(), AbilityCommand("CarrierHangar", 0), 4);
@@ -559,8 +512,7 @@ void gf_ResetUnits () {
     if ((gv_energy == true)) {
         gf_Energy();
     }
-    else {
-    }
+
     gf_MoveCameras();
     TimerRestart(gv_timer);
 }
@@ -581,8 +533,7 @@ void gf_Revealers () {
     if ((gv_revealers == false)) {
         gf_RevealersOff();
     }
-    else {
-    }
+
 }
 
 void gf_RevealersOn () {
@@ -756,8 +707,7 @@ void gf_DeleteAll () {
                 }
             }
         }
-        else {
-        }
+
         UnitRemove(UnitGroupLoopCurrent());
     }
     UnitGroupLoopEnd();
@@ -817,8 +767,7 @@ void gf_ShowhideOptionsAlliances () {
         if ((DialogIsVisible(gv_dialogCreator, 1) == true)) {
             gf_ShowAllDialogs();
         }
-        else {
-        }
+
     }
     else {
         if ((DialogIsVisible(gv_dialogCreator, 1) == true)) {
@@ -946,8 +895,7 @@ bool gf_UnitDialogActions () {
                 gf_CreateUnit();
                 return true;
             }
-            else {
-            }
+
         }
     }
     auto9F84AB12_ae = 1;
@@ -962,8 +910,7 @@ bool gf_UnitDialogActions () {
                 gf_Races();
                 return true;
             }
-            else {
-            }
+
         }
     }
     auto66A32A41_ae = 1;
@@ -978,8 +925,7 @@ bool gf_UnitDialogActions () {
                 gf_CreateUpgrade();
                 return true;
             }
-            else {
-            }
+
         }
     }
     return false;
@@ -1003,8 +949,7 @@ bool gf_SubmenusActions () {
                 gf_TerrainChanger();
                 return true;
             }
-            else {
-            }
+
         }
     }
     else if ((DialogIsVisible(gv_dialogFilenameSubmenu, 1) == true)) {
@@ -1020,8 +965,7 @@ bool gf_SubmenusActions () {
                 gf_ButtonSave(gv_iSlot);
                 return true;
             }
-            else {
-            }
+
         }
     }
     else if ((DialogIsVisible(gv_dialogLoadSubmenu, 1) == true) && gf_PlayerhasPermission()) {
@@ -1033,8 +977,7 @@ bool gf_SubmenusActions () {
                 gf_ButtonLoad();
                 return true;
             }
-            else {
-            }
+
         }
     }
     else if ((DialogIsVisible(gv_dialogOptions, 1) == true)) {
@@ -1305,13 +1248,14 @@ void gf_DatabaseResearch () {
     gf_GetResearchDataManual("WarpGateResearch", "Assets\\Textures\\btn-building-protoss-warpgate.dds", "ResearchWarpGate", 0, "CyberneticsCoreResearch", "6");
     gf_GetResearchDataManual("Charge", "Assets\\Textures\\btn-ability-protoss-charge-color.dds", "ResearchCharge", 0, "TwilightCouncilResearch", "0");
     gf_GetResearchDataManual("BlinkTech", "Assets\\Textures\\btn-ability-protoss-blink-color.dds", "ResearchStalkerTeleport", 0, "TwilightCouncilResearch", "1");
-    gf_GetResearchDataManual("AdeptPiercingAttack", "Assets\\Textures\\btn-ability-protoss-phasedisruptor.dds", "AdeptResearchPiercingUpgrade", 0, "TwilightCouncilResearch", "2");
+    gf_GetResearchDataManual("AdeptPiercingAttack", "Assets\\Textures\\btn-upgrade-protoss-resonatingglaives.dds", "AdeptResearchPiercingUpgrade", 0, "TwilightCouncilResearch", "2");
     gf_GetResearchDataManual("PsiStormTech", "Assets\\Textures\\btn-ability-protoss-psistorm-color.dds", "ResearchPsiStorm", 0, "TemplarArchivesResearch", "4");
     gf_GetResearchDataManual("ObserverGraviticBooster", "Assets\\Textures\\btn-upgrade-protoss-graviticbooster.dds", "ResearchGraviticBooster", 0, "RoboticsBayResearch", "1");
     gf_GetResearchDataManual("GraviticDrive", "Assets\\Textures\\btn-upgrade-protoss-graviticdrive.dds", "ResearchGraviticDrive", 0, "RoboticsBayResearch", "2");
     gf_GetResearchDataManual("ExtendedThermalLance", "Assets\\Textures\\btn-upgrade-protoss-extendedthermallance.dds", "ResearchExtendedThermalLance", 0, "RoboticsBayResearch", "5");
     gf_GetResearchDataManual("PhoenixRangeUpgrade", "Assets\\Textures\\btn-upgrade-protoss-phoenixrange.dds", "AnionPulseCrystals", 0, "FleetBeaconResearch", "2");
     gf_GetResearchDataManual("CarrierLaunchSpeedUpgrade", "Assets\\Textures\\btn-upgrade-protoss-gravitoncatapult.dds", "ResearchInterceptorLaunchSpeedUpgrade", 0, "FleetBeaconResearch", "1");
+    gf_GetResearchDataManual("DarkTemplarBlinkUpgrade", "Assets\\Textures\\btn-ability-protoss-stealth-blink.dds", "ResearchDarkTemplarBlink", 0, "DarkShrineResearch", "0");
     gv_iUnit += 1;
     gf_GetResearchDataManual("TerranInfantryWeaponsLevel1", "Assets\\Textures\\btn-upgrade-terran-infantryweaponslevel1.dds", "TerranInfantryWeaponsLevel1", 1, "EngineeringBayResearch", "2");
     gf_GetResearchDataManual("TerranInfantryWeaponsLevel2", "Assets\\Textures\\btn-upgrade-terran-infantryweaponslevel2.dds", "TerranInfantryWeaponsLevel2", 2, "EngineeringBayResearch", "3");
@@ -1337,15 +1281,13 @@ void gf_DatabaseResearch () {
     gf_GetResearchDataManual("TerranBuildingArmor", "Assets\\Textures\\btn-upgrade-terran-buildingarmor.dds", "UpgradeBuildingArmorLevel1", 0, "EngineeringBayResearch", "1");
     gf_GetResearchDataManual("HighCapacityBarrels", "Assets\\Textures\\btn-upgrade-terran-infernalpreigniter.dds", "ResearchHighCapacityBarrels", 0, "FactoryTechLabResearch", "1");
     gf_GetResearchDataManual("DrillClaws", "Assets\\Textures\\btn-upgrade-terran-researchdrillingclaws.dds", "ResearchDrillClaws", 0, "FactoryTechLabResearch", "4");
-    gf_GetResearchDataManual("CycloneLockOnDamageUpgrade", "Assets\\Textures\\btn-upgrade-terran-magfieldaccelerator.dds", "CycloneResearchLockOnDamageUpgrade", 0, "FactoryTechLabResearch", "7");
-    gf_GetResearchDataManual("MedivacIncreaseSpeedBoost", "Assets\\Textures\\btn-upgrade-terran-jotunboosters.dds", "ResearchHighCapacityFuelTanks", 0, "StarportTechLabResearch", "2");
-    gf_GetResearchDataManual("RavenDamageUpgrade", "Assets\\Textures\\btn-techupgrade-terran-ripwavemissiles.dds", "ResearchExplosiveShrapnelShells", 0, "StarportTechLabResearch", "7");
+    gf_GetResearchDataManual("MedivacIncreaseSpeedBoost", "Assets\\Textures\\btn-upgrade-terran-highcapacityfueltanks.dds", "ResearchHighCapacityFuelTanks", 0, "StarportTechLabResearch", "2");
+    gf_GetResearchDataManual("RavenRecalibratedExplosives", "Assets\\Textures\\btn-upgrade-terran-recalibratedexplosives.dds", "ResearchRavenRecalibratedExplosives", 0, "StarportTechLabResearch", "15");
     gf_GetResearchDataManual("RavenCorvidReactor", "Assets\\Textures\\btn-upgrade-terran-corvidreactor.dds", "ResearchRavenEnergyUpgrade", 0, "StarportTechLabResearch", "3");
     gf_GetResearchDataManual("BansheeCloak", "Assets\\Textures\\btn-ability-terran-cloak-color.dds", "ResearchBansheeCloak", 0, "StarportTechLabResearch", "0");
-    gf_GetResearchDataManual("BansheeSpeed", "Assets\\Textures\\btn-upgrade-terran-reapernitropacks.dds", "BansheeSpeed", 0, "StarportTechLabResearch", "9");
-    gf_GetResearchDataManual("LiberatorAGRangeUpgrade", "Assets\\Textures\\btn-ability-terran-haleoflead.dds", "ResearchBallisticRange", 0, "StarportTechLabResearch", "10");
+    gf_GetResearchDataManual("BansheeSpeed", "Assets\\Textures\\btn-upgrade-terran-hyperflightrotors.dds", "BansheeSpeed", 0, "StarportTechLabResearch", "9");
+    gf_GetResearchDataManual("LiberatorAGRangeUpgrade", "Assets\\Textures\\btn-upgrade-terran-advanceballistics.dds", "ResearchBallisticRange", 0, "StarportTechLabResearch", "10");
     gf_GetResearchDataManual("BattlecruiserEnableSpecializations", "Assets\\Textures\\btn-ability-terran-yamatogun-color.dds", "ResearchBattlecruiserSpecializations", 0, "FusionCoreResearch", "0");
-    gf_GetResearchDataManual("BattlecruiserBehemothReactor", "Assets\\Textures\\btn-upgrade-terran-behemothreactor.dds", "ResearchBattlecruiserEnergyUpgrade", 0, "FusionCoreResearch", "1");
     gv_iUnit += 1;
     gf_GetResearchDataManual("ZergMeleeWeaponsLevel1", "Assets\\Textures\\btn-upgrade-zerg-meleeattacks-level1.dds", "zergmeleeweapons1", 1, "evolutionchamberresearch", "0");
     gf_GetResearchDataManual("ZergMeleeWeaponsLevel2", "Assets\\Textures\\btn-upgrade-zerg-meleeattacks-level2.dds", "zergmeleeweapons2", 2, "evolutionchamberresearch", "1");
@@ -1368,7 +1310,7 @@ void gf_DatabaseResearch () {
     gf_GetResearchDataManual("GlialReconstitution", "Assets\\Textures\\btn-upgrade-zerg-glialreconstitution.dds", "EvolveGlialRegeneration", 0, "RoachWarrenResearch", "1");
     gf_GetResearchDataManual("TunnelingClaws", "Assets\\Textures\\btn-upgrade-zerg-tunnelingclaws.dds", "EvolveTunnelingClaws", 0, "RoachWarrenResearch", "2");
     gf_GetResearchDataManual("CentrificalHooks", "Assets\\Textures\\btn-upgrade-zerg-centrifugalhooks.dds", "EvolveCentrificalHooks", 0, "BanelingNestResearch", "0");
-    gf_GetResearchDataManual("hydraliskspeed", "Assets\\Textures\\btn-upgrade-zerg-groovedspines.dds", "hydraliskspeed", 0, "HydraliskDenResearch", "2");
+    gf_GetResearchDataManual("EvolveMuscularAugments", "Assets\\Textures\\btn-upgrade-zerg-evolvemuscularaugments.dds", "EvolveMuscularAugments", 0, "HydraliskDenResearch", "1");
     gf_GetResearchDataManual("overlordspeed", "Assets\\Textures\\btn-upgrade-zerg-pneumatizedcarapace.dds", "overlordspeed", 0, "LairResearch", "1");
     gf_GetResearchDataManual("overlordtransport", "Assets\\Textures\\btn-upgrade-zerg-ventralsacs.dds", "EvolveVentralSacks", 0, "LairResearch", "2");
     gf_GetResearchDataManual("InfestorEnergyUpgrade", "Assets\\Textures\\btn-upgrade-zerg-pathogenglands.dds", "EvolveInfestorEnergyUpgrade", 0, "InfestationPitResearch", "2");
@@ -1830,8 +1772,7 @@ void gf_Createbuttonsforunits () {
                 gv_iUnit += 1;
                 return ;
             }
-            else {
-            }
+
             lv_x += gv_buttonWidth;
         }
         lv_y += gv_buttonHeight;
@@ -1884,8 +1825,7 @@ void gf_Createbuttonsforresearch () {
                 gv_iUnit += 1;
                 return ;
             }
-            else {
-            }
+
             lv_x += gv_buttonWidth;
         }
         lv_y += gv_buttonHeight;
@@ -2262,8 +2202,7 @@ int gf_AddLeaderboardRow (string lp_inputUnitName) {
         gv_rowCount += 1;
         BoardSetRowCount(gv_leaderboard, gv_rowCount);
     }
-    else {
-    }
+
     DataTableSetInt(true, lp_inputUnitName, gv_rowCount);
     return gv_rowCount;
 }
@@ -2304,8 +2243,7 @@ bool auto_gf_AddLeaderboardIcon_TriggerFunc (bool testConds, bool runActions) {
                 gv_iconFlag[lp_inputColumn][lp_inputRow] = true;
                 return true;
             }
-            else {
-            }
+
         }
     }
     else {
@@ -2350,8 +2288,7 @@ void gf_SpecialUnitCost (string lp_inputUnitType, int lp_inputColumn, bool lp_de
         lv_mineralsmodifier *= -1;
         lv_vespenemodifer *= -1;
     }
-    else {
-    }
+
     gv_totalMineral[lp_inputColumn] += lv_mineralsmodifier;
     gv_totalVespene[lp_inputColumn] += lv_vespenemodifer;
 }
@@ -2388,32 +2325,28 @@ void gf_FadeButtons () {
         DialogControlFadeTransparency(gv_buttonOptionUpgrade[2], PlayerGroupActive(), 0.0, 75.0);
         DialogControlFadeTransparency(gv_buttonOptionUpgrade[3], PlayerGroupActive(), 0.0, 75.0);
     }
-    else {
-    }
+
     if ((gv_allUpgrades == 1)) {
         DialogControlFadeTransparency(gv_buttonOptionUpgrade[0], PlayerGroupActive(), 0.0, 75.0);
         DialogControlFadeTransparency(gv_buttonOptionUpgrade[1], PlayerGroupActive(), 0.0, 0.0);
         DialogControlFadeTransparency(gv_buttonOptionUpgrade[2], PlayerGroupActive(), 0.0, 75.0);
         DialogControlFadeTransparency(gv_buttonOptionUpgrade[3], PlayerGroupActive(), 0.0, 75.0);
     }
-    else {
-    }
+
     if ((gv_allUpgrades == 2)) {
         DialogControlFadeTransparency(gv_buttonOptionUpgrade[0], PlayerGroupActive(), 0.0, 75.0);
         DialogControlFadeTransparency(gv_buttonOptionUpgrade[1], PlayerGroupActive(), 0.0, 75.0);
         DialogControlFadeTransparency(gv_buttonOptionUpgrade[2], PlayerGroupActive(), 0.0, 0.0);
         DialogControlFadeTransparency(gv_buttonOptionUpgrade[3], PlayerGroupActive(), 0.0, 75.0);
     }
-    else {
-    }
+
     if ((gv_allUpgrades == 3)) {
         DialogControlFadeTransparency(gv_buttonOptionUpgrade[0], PlayerGroupActive(), 0.0, 75.0);
         DialogControlFadeTransparency(gv_buttonOptionUpgrade[1], PlayerGroupActive(), 0.0, 75.0);
         DialogControlFadeTransparency(gv_buttonOptionUpgrade[2], PlayerGroupActive(), 0.0, 75.0);
         DialogControlFadeTransparency(gv_buttonOptionUpgrade[3], PlayerGroupActive(), 0.0, 0.0);
     }
-    else {
-    }
+
     if ((gv_revealers == true)) {
         DialogControlFadeTransparency(gv_buttonOptionVision[0], PlayerGroupActive(), 0.0, 75.0);
         DialogControlFadeTransparency(gv_buttonOptionVision[1], PlayerGroupActive(), 0.0, 0.0);
@@ -2690,8 +2623,7 @@ void gf_ButtonSave (int lp_inputslot) {
         UIClearMessages(PlayerGroupActive(), c_messageAreaSubtitle);
         return ;
     }
-    else {
-    }
+
     if (gf_NoUnitsRed() && gf_NoUnitsBlue()) {
         UIDisplayMessage(PlayerGroupActive(), c_messageAreaSubtitle, (StringExternal("Param/Value/5A4862BF") + IntToText(lp_inputslot) + StringExternal("Param/Value/00A2CB4C")));
         gf_HighlightButton(gv_buttonSave[lp_inputslot], false);
@@ -2740,8 +2672,7 @@ void gf_SaveDescription () {
     if ((EventDialogControl() == gv_buttonOK)) {
         lv_string = libNtve_gf_DialogItemEditValue(gv_editBox, EventPlayer());
     }
-    else {
-    }
+
     libNtve_gf_SetDialogItemTooltip(gv_buttonSave[gv_iSlot], StringToText(lv_string), PlayerGroupActive());
     libNtve_gf_SetDialogItemTooltip(gv_buttonLoad[gv_iSlot], StringToText(lv_string), PlayerGroupActive());
     gf_HideSubmenus();
@@ -2899,8 +2830,7 @@ void gf_ButtonLoad () {
         }
         UnitGroupLoopEnd();
     }
-    else {
-    }
+
     Wait(1.0, c_timeGame);
     UIClearMessages(PlayerGroupActive(), c_messageAreaSubtitle);
 }
@@ -2915,8 +2845,7 @@ void gf_LoadState (int lp_inputslot) {
         gf_UpgradeLvlResetAll();
         gf_LoadUpgrades(gv_stateUpgrades[lp_inputslot]);
     }
-    else {
-    }
+
 }
 
 void gf_LoadTerrain (int lp_inputterrain) {
@@ -2925,8 +2854,7 @@ void gf_LoadTerrain (int lp_inputterrain) {
     if ((gv_iTerrain != gv_terrain) && (gv_iTerrain != 0)) {
         gf_TerrainChanger();
     }
-    else {
-    }
+
 }
 
 trigger auto_gf_LoadUnits_Trigger = null;
@@ -3100,8 +3028,7 @@ void gf_InitializeBank () {
             gf_HighlightButton(gv_buttonLoad[lv_islot], true);
             gf_HighlightButton(gv_buttonSave[lv_islot], true);
         }
-        else {
-        }
+
     }
 }
 
@@ -3344,19 +3271,16 @@ void gf_UpgradeLvl () {
                 gf_UpgradesOn();
                 gf_UpgradeLvlShowNext();
             }
-            else {
-            }
+
             if ((gv_allUpgrades >= 2) && (gv_upgradeLevel[gv_iUnit] == 2)) {
                 gf_UpgradesOn();
                 gf_UpgradeLvlShowNext();
             }
-            else {
-            }
+
             if ((gv_allUpgrades >= 3) && (gv_upgradeLevel[gv_iUnit] == 3)) {
                 gf_UpgradesOn();
             }
-            else {
-            }
+
         }
     }
     UIDisplayMessage(PlayerGroupActive(), c_messageAreaSubtitle, (StringExternal("Param/Value/F24EFF18") + IntToText(gv_allUpgrades) + StringExternal("Param/Value/10AE1931")));
@@ -3410,21 +3334,18 @@ void gf_UpgradeLvlResetAll () {
                 gf_UpgradesOn();
                 gf_UpgradeLvlShowNext();
             }
-            else {
-            }
+
             if ((gv_upgradeLevel[gv_iUnit] == 2)) {
                 gf_UpgradesOn();
                 gf_UpgradeLvlShowNext();
             }
-            else {
-            }
+
             if ((gv_upgradeLevel[gv_iUnit] == 3)) {
                 gf_UpgradesOn();
                 gf_UpgradeLvlReset();
                 gf_UpgradeLvlShowNext();
             }
-            else {
-            }
+
         }
     }
 }
@@ -3448,8 +3369,7 @@ void gf_AllAbilitiesOn () {
             if ((gv_upgradeLevel[gv_iUnit] == 0)) {
                 gf_UpgradesOn();
             }
-            else {
-            }
+
         }
     }
     UIDisplayMessage(PlayerGroupActive(), c_messageAreaSubtitle, StringExternal("Param/Value/7A263E5C"));
@@ -3474,8 +3394,7 @@ void gf_AllAbilitiesOff () {
             if ((gv_upgradeLevel[gv_iUnit] == 0)) {
                 gf_UpgradesOff();
             }
-            else {
-            }
+
         }
     }
     UIDisplayMessage(PlayerGroupActive(), c_messageAreaSubtitle, StringExternal("Param/Value/FA7F6350"));
@@ -3677,8 +3596,7 @@ bool gt_Start_Func (bool testConds, bool runActions) {
     if ((!(gf_NoUnitsRed() || gf_NoUnitsBlue()))) {
         TriggerEnable(gt_Update, true);
     }
-    else {
-    }
+
     Wait(1.0, c_timeGame);
     DialogControlSetEnabled(gv_buttonRedo, PlayerGroupActive(), true);
     DialogControlSetEnabled(gv_buttonLoad[0], PlayerGroupActive(), true);
@@ -3791,8 +3709,7 @@ bool gt_Respawn_Func (bool testConds, bool runActions) {
     if ((!(gf_NoUnitsRed() || gf_NoUnitsBlue()))) {
         TriggerEnable(gt_Update, true);
     }
-    else {
-    }
+
     Wait(1.0, c_timeGame);
     DialogControlSetEnabled(gv_buttonRespawn, PlayerGroupActive(), true);
     UIClearMessages(PlayerGroupActive(), c_messageAreaSubtitle);
@@ -4030,8 +3947,7 @@ bool gt_Delete_Func (bool testConds, bool runActions) {
         if ((libNtve_gf_UnitIsInvulnerable(UnitGroupLoopCurrent()) == false)) {
             UnitKill(UnitGroupLoopCurrent());
         }
-        else {
-        }
+
     }
     UnitGroupLoopEnd();
     return true;
@@ -4090,34 +4006,29 @@ bool gt_Click_Func (bool testConds, bool runActions) {
         if ((gf_AttackActions() == true)) {
             return true;
         }
-        else {
-        }
+
     }
     else if (gf_CreatorMode() && gf_PlayerhasPermission()) {
         if ((gf_UnitDialogActions() == true)) {
             return true;
         }
-        else {
-        }
+
         if ((gf_CreatorActions() == true)) {
             return true;
         }
-        else {
-        }
+
     }
     else if (gf_CreatorMode()) {
         if ((EventDialogControl() == gv_buttonOptionsSubmenu)) {
             gf_ShowhideOptionsAlliances();
             return true;
         }
-        else {
-        }
+
     }
     if ((gf_SubmenusActions() == true)) {
         return true;
     }
-    else {
-    }
+
     return true;
 }
 
@@ -4168,8 +4079,7 @@ bool gt_UnitCreated_Func (bool testConds, bool runActions) {
     if (gf_SpecialUnitType(lv_unittype)) {
         gf_SpecialUnitCost(lv_unittype, lv_column, false);
     }
-    else {
-    }
+
     BoardItemSetText(gv_leaderboard, lv_column, 1, IntToText(gv_totalMineral[lv_column]));
     BoardItemSetText(gv_leaderboard, lv_column, 2, IntToText(gv_totalVespene[lv_column]));
     BoardItemSetText(gv_leaderboard, lv_column, 3, IntToText(PlayerGetPropertyInt(gv_computer, c_playerPropSuppliesUsed)));
@@ -4177,8 +4087,7 @@ bool gt_UnitCreated_Func (bool testConds, bool runActions) {
     if ((gv_iconFlag[lv_column][lv_row] == false)) {
         gf_AddLeaderboardIcon(lv_unittype, lv_column, lv_row);
     }
-    else {
-    }
+
     return true;
 }
 
@@ -4204,6 +4113,10 @@ bool gt_UnitDies_Func (bool testConds, bool runActions) {
 
     // Conditions
     if (testConds) {
+        if (!((EventUnitDamageDeathCheck(c_deathTypeRemove) == false))) {
+            return false;
+        }
+
         if (!(gf_ValidUnitType(lv_unittype))) {
             return false;
         }
@@ -4223,8 +4136,7 @@ bool gt_UnitDies_Func (bool testConds, bool runActions) {
     if (gf_SpecialUnitType(lv_unittype)) {
         gf_SpecialUnitCost(lv_unittype, lv_column, true);
     }
-    else {
-    }
+
     BoardItemSetText(gv_leaderboard, lv_column, 1, IntToText(gv_totalMineral[lv_column]));
     BoardItemSetText(gv_leaderboard, lv_column, 2, IntToText(gv_totalVespene[lv_column]));
     BoardItemSetText(gv_leaderboard, lv_column, 3, IntToText(PlayerGetPropertyInt(gv_computer, c_playerPropSuppliesUsed)));
@@ -4318,8 +4230,7 @@ bool gt_ShiftToggleOff_Func (bool testConds, bool runActions) {
     if (gf_CreatorMode() && gf_PlayerhasPermission()) {
         gv__15 = 1;
     }
-    else {
-    }
+
     gv_shiftToggle = false;
     return true;
 }
@@ -4343,8 +4254,7 @@ bool gt_ShiftToggleOn_Func (bool testConds, bool runActions) {
     if (gf_CreatorMode() && gf_PlayerhasPermission()) {
         gv__15 = 5;
     }
-    else {
-    }
+
     return true;
 }
 
@@ -4404,8 +4314,7 @@ bool gt_InstantConstruction_Func (bool testConds, bool runActions) {
         UnitSetProgressComplete(EventUnitProgressUnit(), 1, 99);
         UnitSetProgressStage(EventUnit(), 1, c_unitProgressStageResume);
     }
-    else {
-    }
+
     if ((gv_zergPlayer != 0) && (UnitGetType(EventUnitProgressUnit()) != "CreepTumor") && (UnitGetType(EventUnitProgressUnit()) != "Lair") && (UnitGetType(EventUnitProgressUnit()) != "Hive") && (UnitGetType(EventUnitProgressUnit()) != "GreaterSpire")) {
         if ((UnitGetOwner(EventUnitProgressUnit()) == 9)) {
             while (!((UnitGetType(gv_zergBuilderRed) != "Drone2"))) {
@@ -4426,8 +4335,7 @@ bool gt_InstantConstruction_Func (bool testConds, bool runActions) {
             UnitSelect(gv_zergBuilderBlue, gv_zergPlayer, true);
         }
     }
-    else {
-    }
+
     return true;
 }
 
diff --git a/src/Triggers b/src/Triggers
index 6c30da2..4aeb073 100644
--- a/src/Triggers
+++ b/src/Triggers
@@ -3615,16 +3615,7 @@
         <FlagCreateThread/>
         <Variable Type="Variable" Id="92BAFBEE"/>
         <FunctionCall Type="FunctionCall" Id="E5F40ACE"/>
-        <FunctionCall Type="FunctionCall" Id="A42B37A3"/>
-        <FunctionCall Type="FunctionCall" Id="3695C72C"/>
-        <FunctionCall Type="FunctionCall" Id="24BC55E4"/>
-        <FunctionCall Type="FunctionCall" Id="11C67935"/>
-        <FunctionCall Type="FunctionCall" Id="DB228A06"/>
-        <FunctionCall Type="FunctionCall" Id="770CBDCF"/>
-        <FunctionCall Type="FunctionCall" Id="B23CCDC2"/>
-        <FunctionCall Type="FunctionCall" Id="9A8A73CB"/>
-        <FunctionCall Type="FunctionCall" Id="7074CCC2"/>
-        <FunctionCall Type="FunctionCall" Id="EDFA9BC0"/>
+        <FunctionCall Type="FunctionCall" Id="E289001F"/>
         <FunctionCall Type="FunctionCall" Id="88460349"/>
     </Element>
     <Element Type="Variable" Id="92BAFBEE">
@@ -3701,670 +3692,64 @@
         <Value>100.0</Value>
         <ValueType Type="fixed"/>
     </Element>
-    <Element Type="FunctionCall" Id="A42B37A3">
+    <Element Type="FunctionCall" Id="E289001F">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="C4DC760C"/>
-        <Parameter Type="Param" Id="3779265E"/>
-        <FunctionCall Type="FunctionCall" Id="57ECC934"/>
+        <Parameter Type="Param" Id="412A14BB"/>
+        <FunctionCall Type="FunctionCall" Id="98AF4D81"/>
     </Element>
-    <Element Type="Param" Id="3779265E">
+    <Element Type="Param" Id="412A14BB">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="F96B466D"/>
-        <FunctionCall Type="FunctionCall" Id="BF3D5361"/>
+        <FunctionCall Type="FunctionCall" Id="19EC899E"/>
     </Element>
-    <Element Type="FunctionCall" Id="BF3D5361">
+    <Element Type="FunctionCall" Id="19EC899E">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
-        <Parameter Type="Param" Id="8B0F4C0C"/>
-        <Parameter Type="Param" Id="4C24B5CD"/>
-        <Parameter Type="Param" Id="EFF1CA7C"/>
-        <Parameter Type="Param" Id="D0E59D19"/>
-        <Parameter Type="Param" Id="CE01F852"/>
+        <Parameter Type="Param" Id="BB01ADD7"/>
+        <Parameter Type="Param" Id="F65C6E41"/>
+        <Parameter Type="Param" Id="564C5A13"/>
+        <Parameter Type="Param" Id="6A4BCF53"/>
+        <Parameter Type="Param" Id="58CE8D99"/>
     </Element>
-    <Element Type="Param" Id="8B0F4C0C">
+    <Element Type="Param" Id="BB01ADD7">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
-        <Value>Corruptor</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Unit"/>
-    </Element>
-    <Element Type="Param" Id="4C24B5CD">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="2999701E"/>
-    </Element>
-    <Element Type="Param" Id="EFF1CA7C">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
-        <FunctionCall Type="FunctionCall" Id="91D5D342"/>
-    </Element>
-    <Element Type="FunctionCall" Id="91D5D342">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
-    </Element>
-    <Element Type="Param" Id="D0E59D19">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
-        <Value>-;Missile,Dead,Hidden,Invulnerable</Value>
-        <ValueType Type="unitfilter"/>
-    </Element>
-    <Element Type="Param" Id="CE01F852">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
-    </Element>
-    <Element Type="FunctionCall" Id="57ECC934">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="DC4D3C51"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="9441B8B5"/>
-        <Parameter Type="Param" Id="CF234521"/>
-        <Parameter Type="Param" Id="18EA2362"/>
-        <Parameter Type="Param" Id="B0843AA4"/>
-    </Element>
-    <Element Type="Param" Id="CF234521">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="3EF4C63A"/>
-        <Value>Corruption</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Abil"/>
-    </Element>
-    <Element Type="Param" Id="18EA2362">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="BAA750A0"/>
-        <Value>Abil/Corruption</Value>
-        <ValueType Type="string"/>
-    </Element>
-    <Element Type="Param" Id="B0843AA4">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="E9B9B1BC"/>
-        <FunctionCall Type="FunctionCall" Id="3627F096"/>
-    </Element>
-    <Element Type="FunctionCall" Id="3627F096">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
-    </Element>
-    <Element Type="FunctionCall" Id="3695C72C">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C4DC760C"/>
-        <Parameter Type="Param" Id="51BFB868"/>
-        <FunctionCall Type="FunctionCall" Id="27445D11"/>
-    </Element>
-    <Element Type="Param" Id="51BFB868">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="F96B466D"/>
-        <FunctionCall Type="FunctionCall" Id="CC859D5D"/>
-    </Element>
-    <Element Type="FunctionCall" Id="CC859D5D">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
-        <Parameter Type="Param" Id="3DB8DF39"/>
-        <Parameter Type="Param" Id="77755DCD"/>
-        <Parameter Type="Param" Id="31A7B817"/>
-        <Parameter Type="Param" Id="09789343"/>
-        <Parameter Type="Param" Id="91C77DDF"/>
-    </Element>
-    <Element Type="Param" Id="3DB8DF39">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
-        <Value>Stalker</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Unit"/>
-    </Element>
-    <Element Type="Param" Id="77755DCD">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="2999701E"/>
-    </Element>
-    <Element Type="Param" Id="31A7B817">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
-        <FunctionCall Type="FunctionCall" Id="29280D71"/>
-    </Element>
-    <Element Type="FunctionCall" Id="29280D71">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
-    </Element>
-    <Element Type="Param" Id="09789343">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
-        <Value>-;Missile,Dead,Hidden,Invulnerable</Value>
-        <ValueType Type="unitfilter"/>
-    </Element>
-    <Element Type="Param" Id="91C77DDF">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
-    </Element>
-    <Element Type="FunctionCall" Id="27445D11">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="DC4D3C51"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="9441B8B5"/>
-        <Parameter Type="Param" Id="A8BCE769"/>
-        <Parameter Type="Param" Id="BF19B144"/>
-        <Parameter Type="Param" Id="567C5331"/>
-    </Element>
-    <Element Type="Param" Id="A8BCE769">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="3EF4C63A"/>
-        <Value>Blink</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Abil"/>
-    </Element>
-    <Element Type="Param" Id="BF19B144">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="BAA750A0"/>
-        <Value>Blink</Value>
-        <ValueType Type="string"/>
-    </Element>
-    <Element Type="Param" Id="567C5331">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="E9B9B1BC"/>
-        <FunctionCall Type="FunctionCall" Id="8EB38925"/>
-    </Element>
-    <Element Type="FunctionCall" Id="8EB38925">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
-    </Element>
-    <Element Type="FunctionCall" Id="24BC55E4">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C4DC760C"/>
-        <Parameter Type="Param" Id="D1BE6C43"/>
-        <FunctionCall Type="FunctionCall" Id="69BA024F"/>
-    </Element>
-    <Element Type="Param" Id="D1BE6C43">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="F96B466D"/>
-        <FunctionCall Type="FunctionCall" Id="B380AAA7"/>
-    </Element>
-    <Element Type="FunctionCall" Id="B380AAA7">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
-        <Parameter Type="Param" Id="1D7EBCBE"/>
-        <Parameter Type="Param" Id="A4D39959"/>
-        <Parameter Type="Param" Id="D8731BA7"/>
-        <Parameter Type="Param" Id="F0170BD3"/>
-        <Parameter Type="Param" Id="9F71BCA4"/>
-    </Element>
-    <Element Type="Param" Id="1D7EBCBE">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
-        <Value>VoidRay</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Unit"/>
-    </Element>
-    <Element Type="Param" Id="A4D39959">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="2999701E"/>
-    </Element>
-    <Element Type="Param" Id="D8731BA7">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
-        <FunctionCall Type="FunctionCall" Id="1D43B8F4"/>
-    </Element>
-    <Element Type="FunctionCall" Id="1D43B8F4">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
-    </Element>
-    <Element Type="Param" Id="F0170BD3">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
-        <Value>-;Missile,Dead,Hidden,Invulnerable</Value>
-        <ValueType Type="unitfilter"/>
-    </Element>
-    <Element Type="Param" Id="9F71BCA4">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
-    </Element>
-    <Element Type="FunctionCall" Id="69BA024F">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="DC4D3C51"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="9441B8B5"/>
-        <Parameter Type="Param" Id="9FEBA8B7"/>
-        <Parameter Type="Param" Id="9EB4BF43"/>
-        <Parameter Type="Param" Id="27F14B03"/>
-    </Element>
-    <Element Type="Param" Id="9FEBA8B7">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="3EF4C63A"/>
-        <Value>VoidRaySwarmDamageBoost</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Abil"/>
-    </Element>
-    <Element Type="Param" Id="9EB4BF43">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="BAA750A0"/>
-        <Value>Abil/VoidRaySwarmDamageBoost</Value>
-        <ValueType Type="cooldown"/>
-    </Element>
-    <Element Type="Param" Id="27F14B03">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="E9B9B1BC"/>
-        <FunctionCall Type="FunctionCall" Id="696A18AE"/>
-    </Element>
-    <Element Type="FunctionCall" Id="696A18AE">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
-    </Element>
-    <Element Type="FunctionCall" Id="11C67935">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C4DC760C"/>
-        <Parameter Type="Param" Id="218DCE75"/>
-        <FunctionCall Type="FunctionCall" Id="F6B0B0E0"/>
-    </Element>
-    <Element Type="Param" Id="218DCE75">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="F96B466D"/>
-        <FunctionCall Type="FunctionCall" Id="2A9D2BBA"/>
-    </Element>
-    <Element Type="FunctionCall" Id="2A9D2BBA">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
-        <Parameter Type="Param" Id="B08249D2"/>
-        <Parameter Type="Param" Id="606CAB80"/>
-        <Parameter Type="Param" Id="D259EEA1"/>
-        <Parameter Type="Param" Id="006B8F47"/>
-        <Parameter Type="Param" Id="BBF41845"/>
-    </Element>
-    <Element Type="Param" Id="B08249D2">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
-        <Value>Zealot</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Unit"/>
-    </Element>
-    <Element Type="Param" Id="606CAB80">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="2999701E"/>
-    </Element>
-    <Element Type="Param" Id="D259EEA1">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
-        <FunctionCall Type="FunctionCall" Id="72B9FEF8"/>
-    </Element>
-    <Element Type="FunctionCall" Id="72B9FEF8">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
-    </Element>
-    <Element Type="Param" Id="006B8F47">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
-        <Value>-;Missile,Dead,Hidden,Invulnerable</Value>
-        <ValueType Type="unitfilter"/>
-    </Element>
-    <Element Type="Param" Id="BBF41845">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
-    </Element>
-    <Element Type="FunctionCall" Id="F6B0B0E0">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="4032C693"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="9441B8B5"/>
-        <Parameter Type="Param" Id="9D96C6A4"/>
-        <Parameter Type="Param" Id="FCEFDA2F"/>
-    </Element>
-    <Element Type="Param" Id="9D96C6A4">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="2F65F3F4"/>
-        <FunctionCall Type="FunctionCall" Id="B163FB3D"/>
-    </Element>
-    <Element Type="FunctionCall" Id="B163FB3D">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
-    </Element>
-    <Element Type="Param" Id="FCEFDA2F">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="EC7DC567"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000071"/>
-    </Element>
-    <Element Type="FunctionCall" Id="DB228A06">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C4DC760C"/>
-        <Parameter Type="Param" Id="A5FE14F1"/>
-        <FunctionCall Type="FunctionCall" Id="4E49660B"/>
-    </Element>
-    <Element Type="Param" Id="A5FE14F1">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="F96B466D"/>
-        <FunctionCall Type="FunctionCall" Id="D8216BF2"/>
-    </Element>
-    <Element Type="FunctionCall" Id="D8216BF2">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
-        <Parameter Type="Param" Id="457C4B90"/>
-        <Parameter Type="Param" Id="D9D1986A"/>
-        <Parameter Type="Param" Id="12E67FDE"/>
-        <Parameter Type="Param" Id="603EE9F4"/>
-        <Parameter Type="Param" Id="D92DAAE6"/>
-    </Element>
-    <Element Type="Param" Id="457C4B90">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
-        <Value>SwarmHostBurrowedMP</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Unit"/>
-    </Element>
-    <Element Type="Param" Id="D9D1986A">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="2999701E"/>
-    </Element>
-    <Element Type="Param" Id="12E67FDE">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
-        <FunctionCall Type="FunctionCall" Id="758FA162"/>
-    </Element>
-    <Element Type="FunctionCall" Id="758FA162">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
-    </Element>
-    <Element Type="Param" Id="603EE9F4">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
-        <Value>-;Missile,Dead,Hidden,Invulnerable</Value>
-        <ValueType Type="unitfilter"/>
-    </Element>
-    <Element Type="Param" Id="D92DAAE6">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
-    </Element>
-    <Element Type="FunctionCall" Id="4E49660B">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="DC4D3C51"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="9441B8B5"/>
-        <Parameter Type="Param" Id="EF768268"/>
-        <Parameter Type="Param" Id="7399FFC6"/>
-        <Parameter Type="Param" Id="481CF018"/>
-    </Element>
-    <Element Type="Param" Id="EF768268">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="3EF4C63A"/>
-        <Value>SpawnLocustsTargeted</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Abil"/>
-    </Element>
-    <Element Type="Param" Id="7399FFC6">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="BAA750A0"/>
-        <Value>Abil/SpawnLocustsTargeted</Value>
-        <ValueType Type="cooldown"/>
-    </Element>
-    <Element Type="Param" Id="481CF018">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="E9B9B1BC"/>
-        <FunctionCall Type="FunctionCall" Id="B0681093"/>
-    </Element>
-    <Element Type="FunctionCall" Id="B0681093">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
-    </Element>
-    <Element Type="FunctionCall" Id="770CBDCF">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C4DC760C"/>
-        <Parameter Type="Param" Id="EEA173F0"/>
-        <FunctionCall Type="FunctionCall" Id="30F64240"/>
-    </Element>
-    <Element Type="Param" Id="EEA173F0">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="F96B466D"/>
-        <FunctionCall Type="FunctionCall" Id="160A929E"/>
-    </Element>
-    <Element Type="FunctionCall" Id="160A929E">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
-        <Parameter Type="Param" Id="1F323515"/>
-        <Parameter Type="Param" Id="7F6A1295"/>
-        <Parameter Type="Param" Id="3C3C62DB"/>
-        <Parameter Type="Param" Id="730A6FB2"/>
-        <Parameter Type="Param" Id="C874C481"/>
-    </Element>
-    <Element Type="Param" Id="1F323515">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
-        <Value>SwarmHostMP</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Unit"/>
-    </Element>
-    <Element Type="Param" Id="7F6A1295">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="2999701E"/>
-    </Element>
-    <Element Type="Param" Id="3C3C62DB">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
-        <FunctionCall Type="FunctionCall" Id="6F5645AB"/>
-    </Element>
-    <Element Type="FunctionCall" Id="6F5645AB">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
-    </Element>
-    <Element Type="Param" Id="730A6FB2">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
-        <Value>-;Missile,Dead,Hidden,Invulnerable</Value>
-        <ValueType Type="unitfilter"/>
-    </Element>
-    <Element Type="Param" Id="C874C481">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
-    </Element>
-    <Element Type="FunctionCall" Id="30F64240">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="DC4D3C51"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="9441B8B5"/>
-        <Parameter Type="Param" Id="970C4327"/>
-        <Parameter Type="Param" Id="6194661C"/>
-        <Parameter Type="Param" Id="6CAEE1DA"/>
-    </Element>
-    <Element Type="Param" Id="970C4327">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="3EF4C63A"/>
-        <Value>SpawnLocustsTargeted</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Abil"/>
-    </Element>
-    <Element Type="Param" Id="6194661C">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="BAA750A0"/>
-        <Value>Abil/SpawnLocustsTargeted</Value>
-        <ValueType Type="cooldown"/>
-    </Element>
-    <Element Type="Param" Id="6CAEE1DA">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="E9B9B1BC"/>
-        <FunctionCall Type="FunctionCall" Id="956904FC"/>
-    </Element>
-    <Element Type="FunctionCall" Id="956904FC">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
-    </Element>
-    <Element Type="FunctionCall" Id="B23CCDC2">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C4DC760C"/>
-        <Parameter Type="Param" Id="CA61DD46"/>
-        <FunctionCall Type="FunctionCall" Id="E27366FB"/>
-    </Element>
-    <Element Type="Param" Id="CA61DD46">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="F96B466D"/>
-        <FunctionCall Type="FunctionCall" Id="0B688A17"/>
-    </Element>
-    <Element Type="FunctionCall" Id="0B688A17">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
-        <Parameter Type="Param" Id="50AB734C"/>
-        <Parameter Type="Param" Id="627AF39E"/>
-        <Parameter Type="Param" Id="DE30FC4C"/>
-        <Parameter Type="Param" Id="30EFDED9"/>
-        <Parameter Type="Param" Id="83297B63"/>
-    </Element>
-    <Element Type="Param" Id="50AB734C">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
-        <Value>Medivac</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Unit"/>
-    </Element>
-    <Element Type="Param" Id="627AF39E">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="2999701E"/>
-    </Element>
-    <Element Type="Param" Id="DE30FC4C">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
-        <FunctionCall Type="FunctionCall" Id="BD185B92"/>
-    </Element>
-    <Element Type="FunctionCall" Id="BD185B92">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
-    </Element>
-    <Element Type="Param" Id="30EFDED9">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
-        <Value>-;Missile,Dead,Hidden,Invulnerable</Value>
-        <ValueType Type="unitfilter"/>
-    </Element>
-    <Element Type="Param" Id="83297B63">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
-    </Element>
-    <Element Type="FunctionCall" Id="E27366FB">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="DC4D3C51"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="9441B8B5"/>
-        <Parameter Type="Param" Id="200323B2"/>
-        <Parameter Type="Param" Id="BD792591"/>
-        <Parameter Type="Param" Id="DC114BB4"/>
-    </Element>
-    <Element Type="Param" Id="200323B2">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="3EF4C63A"/>
-        <Value>MedivacSpeedBoost</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Abil"/>
-    </Element>
-    <Element Type="Param" Id="BD792591">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="BAA750A0"/>
-        <Value>Abil/MedivacSpeedBoost</Value>
-        <ValueType Type="cooldown"/>
-    </Element>
-    <Element Type="Param" Id="DC114BB4">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="E9B9B1BC"/>
-        <FunctionCall Type="FunctionCall" Id="826116E9"/>
-    </Element>
-    <Element Type="FunctionCall" Id="826116E9">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
-    </Element>
-    <Element Type="FunctionCall" Id="9A8A73CB">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C4DC760C"/>
-        <Parameter Type="Param" Id="0B472969"/>
-        <FunctionCall Type="FunctionCall" Id="DF6A0077"/>
-    </Element>
-    <Element Type="Param" Id="0B472969">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="F96B466D"/>
-        <FunctionCall Type="FunctionCall" Id="211601D2"/>
-    </Element>
-    <Element Type="FunctionCall" Id="211601D2">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
-        <Parameter Type="Param" Id="ACB97D8E"/>
-        <Parameter Type="Param" Id="52D42609"/>
-        <Parameter Type="Param" Id="F557EE13"/>
-        <Parameter Type="Param" Id="0CA59445"/>
-        <Parameter Type="Param" Id="5613AF5C"/>
-    </Element>
-    <Element Type="Param" Id="ACB97D8E">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
-        <Value>Oracle</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Unit"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000231"/>
     </Element>
-    <Element Type="Param" Id="52D42609">
+    <Element Type="Param" Id="F65C6E41">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
         <Preset Type="PresetValue" Library="Ntve" Id="2999701E"/>
     </Element>
-    <Element Type="Param" Id="F557EE13">
+    <Element Type="Param" Id="564C5A13">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
-        <FunctionCall Type="FunctionCall" Id="C893F97F"/>
+        <FunctionCall Type="FunctionCall" Id="5BB2752A"/>
     </Element>
-    <Element Type="FunctionCall" Id="C893F97F">
+    <Element Type="FunctionCall" Id="5BB2752A">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
     </Element>
-    <Element Type="Param" Id="0CA59445">
+    <Element Type="Param" Id="6A4BCF53">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
         <Value>-;Missile,Dead,Hidden,Invulnerable</Value>
         <ValueType Type="unitfilter"/>
     </Element>
-    <Element Type="Param" Id="5613AF5C">
+    <Element Type="Param" Id="58CE8D99">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
         <Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
     </Element>
-    <Element Type="FunctionCall" Id="DF6A0077">
+    <Element Type="FunctionCall" Id="98AF4D81">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="4032C693"/>
         <SubFunctionType Type="SubFuncType" Library="Ntve" Id="9441B8B5"/>
-        <Parameter Type="Param" Id="1AD8CE5C"/>
-        <Parameter Type="Param" Id="051857E4"/>
+        <Parameter Type="Param" Id="1D0A26C7"/>
+        <Parameter Type="Param" Id="3ECFCE34"/>
     </Element>
-    <Element Type="Param" Id="1AD8CE5C">
+    <Element Type="Param" Id="1D0A26C7">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="2F65F3F4"/>
-        <FunctionCall Type="FunctionCall" Id="1ED55FF5"/>
+        <FunctionCall Type="FunctionCall" Id="16AE7F95"/>
     </Element>
-    <Element Type="FunctionCall" Id="1ED55FF5">
+    <Element Type="FunctionCall" Id="16AE7F95">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
     </Element>
-    <Element Type="Param" Id="051857E4">
+    <Element Type="Param" Id="3ECFCE34">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="EC7DC567"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000071"/>
     </Element>
-    <Element Type="FunctionCall" Id="7074CCC2">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C4DC760C"/>
-        <Parameter Type="Param" Id="DDF80EA2"/>
-        <FunctionCall Type="FunctionCall" Id="AF61A815"/>
-    </Element>
-    <Element Type="Param" Id="DDF80EA2">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="F96B466D"/>
-        <FunctionCall Type="FunctionCall" Id="4D144832"/>
-    </Element>
-    <Element Type="FunctionCall" Id="4D144832">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
-        <Parameter Type="Param" Id="D71AF14D"/>
-        <Parameter Type="Param" Id="A85A8A07"/>
-        <Parameter Type="Param" Id="C8F1FBFA"/>
-        <Parameter Type="Param" Id="364777C8"/>
-        <Parameter Type="Param" Id="77E5E97B"/>
-    </Element>
-    <Element Type="Param" Id="D71AF14D">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
-        <Value>HighTemplar</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Unit"/>
-    </Element>
-    <Element Type="Param" Id="A85A8A07">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="2999701E"/>
-    </Element>
-    <Element Type="Param" Id="C8F1FBFA">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
-        <FunctionCall Type="FunctionCall" Id="64AC078B"/>
-    </Element>
-    <Element Type="FunctionCall" Id="64AC078B">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
-    </Element>
-    <Element Type="Param" Id="364777C8">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
-        <Value>-;Missile,Dead,Hidden,Invulnerable</Value>
-        <ValueType Type="unitfilter"/>
-    </Element>
-    <Element Type="Param" Id="77E5E97B">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
-    </Element>
-    <Element Type="FunctionCall" Id="AF61A815">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="DC4D3C51"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="9441B8B5"/>
-        <Parameter Type="Param" Id="727866A0"/>
-        <Parameter Type="Param" Id="206E1093"/>
-        <Parameter Type="Param" Id="5C451551"/>
-    </Element>
-    <Element Type="Param" Id="727866A0">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="3EF4C63A"/>
-        <Value>PsiStorm</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Abil"/>
-    </Element>
-    <Element Type="Param" Id="206E1093">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="BAA750A0"/>
-        <Value>Abil/PsiStorm</Value>
-        <ValueType Type="cooldown"/>
-    </Element>
-    <Element Type="Param" Id="5C451551">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="E9B9B1BC"/>
-        <FunctionCall Type="FunctionCall" Id="C232201F"/>
-    </Element>
-    <Element Type="FunctionCall" Id="C232201F">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
-    </Element>
-    <Element Type="FunctionCall" Id="EDFA9BC0">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C4DC760C"/>
-        <Parameter Type="Param" Id="EA5F5A7B"/>
-        <FunctionCall Type="FunctionCall" Id="667A2AE2"/>
-    </Element>
-    <Element Type="Param" Id="EA5F5A7B">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="F96B466D"/>
-        <FunctionCall Type="FunctionCall" Id="B5303161"/>
-    </Element>
-    <Element Type="FunctionCall" Id="B5303161">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000359"/>
-        <Parameter Type="Param" Id="4194B517"/>
-        <Parameter Type="Param" Id="858CFEDA"/>
-        <Parameter Type="Param" Id="55D2EDE6"/>
-        <Parameter Type="Param" Id="8911CB15"/>
-        <Parameter Type="Param" Id="7D336B14"/>
-    </Element>
-    <Element Type="Param" Id="4194B517">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
-        <Value>Disruptor</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Unit"/>
-    </Element>
-    <Element Type="Param" Id="858CFEDA">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="2999701E"/>
-    </Element>
-    <Element Type="Param" Id="55D2EDE6">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000693"/>
-        <FunctionCall Type="FunctionCall" Id="9D8EF52C"/>
-    </Element>
-    <Element Type="FunctionCall" Id="9D8EF52C">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
-    </Element>
-    <Element Type="Param" Id="8911CB15">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
-        <Value>-;Missile,Dead,Hidden,Invulnerable</Value>
-        <ValueType Type="unitfilter"/>
-    </Element>
-    <Element Type="Param" Id="7D336B14">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000694"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="1468BD55"/>
-    </Element>
-    <Element Type="FunctionCall" Id="667A2AE2">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="DC4D3C51"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="9441B8B5"/>
-        <Parameter Type="Param" Id="7AADA8CA"/>
-        <Parameter Type="Param" Id="01D46344"/>
-        <Parameter Type="Param" Id="0D1C119F"/>
-    </Element>
-    <Element Type="Param" Id="7AADA8CA">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="3EF4C63A"/>
-        <Value>PurificationNovaTargetted</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Abil"/>
-    </Element>
-    <Element Type="Param" Id="01D46344">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="BAA750A0"/>
-        <Value>Abil/PurificationNovaTargetted</Value>
-        <ValueType Type="cooldown"/>
-    </Element>
-    <Element Type="Param" Id="0D1C119F">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="E9B9B1BC"/>
-        <FunctionCall Type="FunctionCall" Id="5A4CA0AB"/>
-    </Element>
-    <Element Type="FunctionCall" Id="5A4CA0AB">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19CE733E"/>
-    </Element>
     <Element Type="FunctionCall" Id="88460349">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="C4DC760C"/>
         <Parameter Type="Param" Id="CF3D1294"/>
@@ -14880,6 +14265,7 @@
         <FunctionCall Type="FunctionCall" Id="AFA31CC5"/>
         <FunctionCall Type="FunctionCall" Id="264D5CB1"/>
         <FunctionCall Type="FunctionCall" Id="3AF42287"/>
+        <FunctionCall Type="FunctionCall" Id="B7676440"/>
         <FunctionCall Type="FunctionCall" Id="20CA62F3"/>
         <FunctionCall Type="FunctionCall" Id="2E8C75F2"/>
         <FunctionCall Type="FunctionCall" Id="2F7A51D7"/>
@@ -14920,6 +14306,7 @@
         <FunctionCall Type="FunctionCall" Id="B210A75E"/>
         <FunctionCall Type="FunctionCall" Id="AFE8BE03"/>
         <FunctionCall Type="FunctionCall" Id="0EC6ED08"/>
+        <FunctionCall Type="FunctionCall" Id="E225FD39"/>
         <FunctionCall Type="FunctionCall" Id="C7CE96BE"/>
         <FunctionCall Type="FunctionCall" Id="197C45A6"/>
         <FunctionCall Type="FunctionCall" Id="B2F1B9B7"/>
@@ -15749,7 +15136,7 @@
     </Element>
     <Element Type="Param" Id="295FC715">
         <ParameterDef Type="ParamDef" Id="044E2D9C"/>
-        <Value>Assets\Textures\btn-ability-protoss-phasedisruptor.dds</Value>
+        <Value>Assets\Textures\btn-upgrade-protoss-resonatingglaives.dds</Value>
         <ValueType Type="filepath"/>
         <ValueTypeInfo Value="5"/>
     </Element>
@@ -15999,6 +15386,47 @@
         <ValueType Type="filepath"/>
         <ValueTypeInfo Value="5"/>
     </Element>
+    <Element Type="FunctionCall" Id="B7676440">
+        <FunctionDef Type="FunctionDef" Id="28AC02A4"/>
+        <Parameter Type="Param" Id="96345A43"/>
+        <Parameter Type="Param" Id="D9C2CB15"/>
+        <Parameter Type="Param" Id="043BE30A"/>
+        <Parameter Type="Param" Id="35CD0AEC"/>
+        <Parameter Type="Param" Id="DCDAB90A"/>
+        <Parameter Type="Param" Id="9E7F54FB"/>
+    </Element>
+    <Element Type="Param" Id="96345A43">
+        <ParameterDef Type="ParamDef" Id="B2BC0A10"/>
+        <Value>DarkTemplarBlinkUpgrade</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Upgrade"/>
+    </Element>
+    <Element Type="Param" Id="D9C2CB15">
+        <ParameterDef Type="ParamDef" Id="53C25E0E"/>
+        <Value>ResearchDarkTemplarBlink</Value>
+        <ValueType Type="string"/>
+    </Element>
+    <Element Type="Param" Id="043BE30A">
+        <ParameterDef Type="ParamDef" Id="74A4AE48"/>
+        <Value>0</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Param" Id="35CD0AEC">
+        <ParameterDef Type="ParamDef" Id="7C197A2B"/>
+        <Value>DarkShrineResearch</Value>
+        <ValueType Type="string"/>
+    </Element>
+    <Element Type="Param" Id="DCDAB90A">
+        <ParameterDef Type="ParamDef" Id="B895E5E0"/>
+        <Value>0</Value>
+        <ValueType Type="string"/>
+    </Element>
+    <Element Type="Param" Id="9E7F54FB">
+        <ParameterDef Type="ParamDef" Id="044E2D9C"/>
+        <Value>Assets\Textures\btn-ability-protoss-stealth-blink.dds</Value>
+        <ValueType Type="filepath"/>
+        <ValueTypeInfo Value="5"/>
+    </Element>
     <Element Type="FunctionCall" Id="20CA62F3">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="A0F31305"/>
         <Parameter Type="Param" Id="BC8CEECD"/>
@@ -17427,6 +16855,7 @@
         <ValueTypeInfo Value="5"/>
     </Element>
     <Element Type="FunctionCall" Id="E01B72F0">
+        <Disabled/>
         <FunctionDef Type="FunctionDef" Id="28AC02A4"/>
         <Parameter Type="Param" Id="D12E83C0"/>
         <Parameter Type="Param" Id="B50D9D57"/>
@@ -17588,11 +17017,53 @@
     </Element>
     <Element Type="Param" Id="FC033C73">
         <ParameterDef Type="ParamDef" Id="044E2D9C"/>
-        <Value>Assets\Textures\btn-upgrade-terran-jotunboosters.dds</Value>
+        <Value>Assets\Textures\btn-upgrade-terran-highcapacityfueltanks.dds</Value>
+        <ValueType Type="filepath"/>
+        <ValueTypeInfo Value="5"/>
+    </Element>
+    <Element Type="FunctionCall" Id="E225FD39">
+        <FunctionDef Type="FunctionDef" Id="28AC02A4"/>
+        <Parameter Type="Param" Id="3C0363BD"/>
+        <Parameter Type="Param" Id="6B1D0DA1"/>
+        <Parameter Type="Param" Id="BE7517B5"/>
+        <Parameter Type="Param" Id="8E0173C5"/>
+        <Parameter Type="Param" Id="2828920A"/>
+        <Parameter Type="Param" Id="B80B0B45"/>
+    </Element>
+    <Element Type="Param" Id="3C0363BD">
+        <ParameterDef Type="ParamDef" Id="B2BC0A10"/>
+        <Value>RavenRecalibratedExplosives</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Upgrade"/>
+    </Element>
+    <Element Type="Param" Id="6B1D0DA1">
+        <ParameterDef Type="ParamDef" Id="53C25E0E"/>
+        <Value>ResearchRavenRecalibratedExplosives</Value>
+        <ValueType Type="string"/>
+    </Element>
+    <Element Type="Param" Id="BE7517B5">
+        <ParameterDef Type="ParamDef" Id="74A4AE48"/>
+        <Value>0</Value>
+        <ValueType Type="int"/>
+    </Element>
+    <Element Type="Param" Id="8E0173C5">
+        <ParameterDef Type="ParamDef" Id="7C197A2B"/>
+        <Value>StarportTechLabResearch</Value>
+        <ValueType Type="string"/>
+    </Element>
+    <Element Type="Param" Id="2828920A">
+        <ParameterDef Type="ParamDef" Id="B895E5E0"/>
+        <Value>15</Value>
+        <ValueType Type="string"/>
+    </Element>
+    <Element Type="Param" Id="B80B0B45">
+        <ParameterDef Type="ParamDef" Id="044E2D9C"/>
+        <Value>Assets\Textures\btn-upgrade-terran-recalibratedexplosives.dds</Value>
         <ValueType Type="filepath"/>
         <ValueTypeInfo Value="5"/>
     </Element>
     <Element Type="FunctionCall" Id="C7CE96BE">
+        <Disabled/>
         <FunctionDef Type="FunctionDef" Id="28AC02A4"/>
         <Parameter Type="Param" Id="A9790C98"/>
         <Parameter Type="Param" Id="85A370E5"/>
@@ -17752,7 +17223,7 @@
     </Element>
     <Element Type="Param" Id="42A7CDC1">
         <ParameterDef Type="ParamDef" Id="044E2D9C"/>
-        <Value>Assets\Textures\btn-upgrade-terran-reapernitropacks.dds</Value>
+        <Value>Assets\Textures\btn-upgrade-terran-hyperflightrotors.dds</Value>
         <ValueType Type="filepath"/>
         <ValueTypeInfo Value="5"/>
     </Element>
@@ -17793,7 +17264,7 @@
     </Element>
     <Element Type="Param" Id="D22F8F54">
         <ParameterDef Type="ParamDef" Id="044E2D9C"/>
-        <Value>Assets\Textures\btn-ability-terran-haleoflead.dds</Value>
+        <Value>Assets\Textures\btn-upgrade-terran-advanceballistics.dds</Value>
         <ValueType Type="filepath"/>
         <ValueTypeInfo Value="5"/>
     </Element>
@@ -17839,6 +17310,7 @@
         <ValueType Type="string"/>
     </Element>
     <Element Type="FunctionCall" Id="1125981C">
+        <Disabled/>
         <FunctionDef Type="FunctionDef" Id="28AC02A4"/>
         <Parameter Type="Param" Id="DC418A23"/>
         <Parameter Type="Param" Id="455FF042"/>
@@ -18762,27 +18234,21 @@
     <Element Type="FunctionCall" Id="AC5A5B4B">
         <FunctionDef Type="FunctionDef" Id="28AC02A4"/>
         <Parameter Type="Param" Id="35EF025E"/>
-        <Parameter Type="Param" Id="B71A3617"/>
         <Parameter Type="Param" Id="25DBF128"/>
         <Parameter Type="Param" Id="ABE4C7F3"/>
         <Parameter Type="Param" Id="0FDB2094"/>
         <Parameter Type="Param" Id="1BBFBAA1"/>
+        <Parameter Type="Param" Id="EE96402F"/>
     </Element>
     <Element Type="Param" Id="35EF025E">
         <ParameterDef Type="ParamDef" Id="B2BC0A10"/>
-        <Value>hydraliskspeed</Value>
+        <Value>EvolveMuscularAugments</Value>
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Upgrade"/>
     </Element>
-    <Element Type="Param" Id="B71A3617">
-        <ParameterDef Type="ParamDef" Id="044E2D9C"/>
-        <Value>Assets\Textures\btn-upgrade-zerg-groovedspines.dds</Value>
-        <ValueType Type="filepath"/>
-        <ValueTypeInfo Value="3"/>
-    </Element>
     <Element Type="Param" Id="25DBF128">
         <ParameterDef Type="ParamDef" Id="53C25E0E"/>
-        <Value>hydraliskspeed</Value>
+        <Value>EvolveMuscularAugments</Value>
         <ValueType Type="string"/>
     </Element>
     <Element Type="Param" Id="ABE4C7F3">
@@ -18797,9 +18263,15 @@
     </Element>
     <Element Type="Param" Id="1BBFBAA1">
         <ParameterDef Type="ParamDef" Id="B895E5E0"/>
-        <Value>2</Value>
+        <Value>1</Value>
         <ValueType Type="string"/>
     </Element>
+    <Element Type="Param" Id="EE96402F">
+        <ParameterDef Type="ParamDef" Id="044E2D9C"/>
+        <Value>Assets\Textures\btn-upgrade-zerg-evolvemuscularaugments.dds</Value>
+        <ValueType Type="filepath"/>
+        <ValueTypeInfo Value="5"/>
+    </Element>
     <Element Type="FunctionCall" Id="060478FE">
         <FunctionDef Type="FunctionDef" Id="28AC02A4"/>
         <Parameter Type="Param" Id="4D61C716"/>
@@ -34527,6 +33999,7 @@
         <Variable Type="Variable" Id="0C4789A2"/>
         <Variable Type="Variable" Id="E6E57D8F"/>
         <Event Type="FunctionCall" Id="DDEE5840"/>
+        <Condition Type="FunctionCall" Id="70DEDA79"/>
         <Condition Type="FunctionCall" Id="5EB1AD27"/>
         <Action Type="FunctionCall" Id="4B4DD6C3"/>
         <Action Type="FunctionCall" Id="57F14BCB"/>
@@ -34609,6 +34082,33 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000159"/>
         <Preset Type="PresetValue" Library="Ntve" Id="C84C7A78"/>
     </Element>
+    <Element Type="FunctionCall" Id="70DEDA79">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <Parameter Type="Param" Id="96BBEE95"/>
+        <Parameter Type="Param" Id="06855148"/>
+        <Parameter Type="Param" Id="A598DD56"/>
+    </Element>
+    <Element Type="Param" Id="96BBEE95">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <FunctionCall Type="FunctionCall" Id="8C1B5363"/>
+    </Element>
+    <Element Type="FunctionCall" Id="8C1B5363">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000243"/>
+        <Parameter Type="Param" Id="9DEB4213"/>
+    </Element>
+    <Element Type="Param" Id="9DEB4213">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="61805391"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000201"/>
+    </Element>
+    <Element Type="Param" Id="06855148">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
+    </Element>
+    <Element Type="Param" Id="A598DD56">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
     <Element Type="FunctionCall" Id="5EB1AD27">
         <FunctionDef Type="FunctionDef" Id="149F3D69"/>
         <Parameter Type="Param" Id="7CA3B5AE"/>
diff --git a/src/Triggers.version b/src/Triggers.version
index b0b76a0966c8fd517e568c0f7c4ffa39868ca010..2e8a96b44b917f370cc7c17a275e1c1d535bb39c 100644
GIT binary patch
literal 44
ncmYdJNi9y#EGl7QU|?|A&%nS8q&b0@5z1Et(%Mh*B0ziq#0m#m

literal 44
mcmYdJNi9y#EGl7QU|`@~%D})3q(N*LUlPbZFRdBQ2&4hB*ak-c