X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/1de61e5745ecf3dd1a41e1e932bae2f7568353a4..536a6bc00a62877d179932e9455511e0e4c7d59a:/sc-units-hots.inc.pl

diff --git a/sc-units-hots.inc.pl b/sc-units-hots.inc.pl
index c1d84ce..cdce16d 100644
--- a/sc-units-hots.inc.pl
+++ b/sc-units-hots.inc.pl
@@ -1,4 +1,8 @@
+use utf8;
+use strict;
+
 [
+'patch 2.1.10',
 # http://wiki.teamliquid.net/starcraft2/Unit_Statistics
 # http://wiki.teamliquid.net/starcraft2/User:Roemy/Unit_Statistics_(detailed)
 # http://starcraft.wikia.com/wiki/List_of_StarCraft_II_units
@@ -16,8 +20,10 @@
 	armor => 0,
 	hp => 20,
 	shield => 20,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => 5,
@@ -34,16 +40,17 @@
 	race => 'protoss',
 	cat => 'base',
 	name => 'Photon Cannon',
-	unit => 0,
 	min => 150,
 	gas => 0,
 	build => 40,
-	size => 2x2,
+	size => 2,
 	armor => 1,
 	hp => 150,
 	shield => 150,
-	suit => 3, # armored
-	structure => 1,
+	attr => {
+		armored => 1,
+		structure => 1,
+	},
 	attack => {
 		ground => {
 			damage => 20,
@@ -55,6 +62,7 @@
 	},
 	speed => 0,
 	sight => 11,
+	detect => 1,
 },
 
 {
@@ -70,9 +78,12 @@
 	armor => 1,
 	hp => 130,
 	shield => 60,
-	suit => 3, # armored
-	organic => 0, # mech
-	psionic => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		psionic => 1,
+		flying => 1,
+	},
 	attack => {
 		ground => {
 			damage => [8 .. 11],
@@ -84,6 +95,33 @@
 	},
 	speed => 1.875,
 	sight => 9,
+	energy => 200,
+	special => [
+		{
+			name => 'Photon Overcharge',
+			abbr => 'po',
+			desc => 'activate Nexus weapon for 1 minute',
+			cost => 100,
+			range => 10,
+		},
+		{
+			name => 'Mass Recall',
+			abbr => 'mr',
+			desc => 'teleports itself and nearby units to targeted Nexus',
+			cost => 100,
+			duration => 2,
+			radius => 7,
+		},
+		{
+			name => 'Time Warp',
+			abbr => 'tw',
+			desc => 'create a temporal field which slows ground units by 50%',
+			cost => 100,
+			radius => 3.5,
+			range => 9,
+			duration => 30,
+		},
+	],
 },
 
 {
@@ -98,38 +136,70 @@
 	armor => 2,
 	hp => 350,
 	shield => 350,
-	suit => 3, # armored
-	organic => 0, # mech
-	psionic => 1,
-	massive => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		psionic => 1,
+		massive => 1,
+		flying => 1,
+	},
 	attack => {
 		ground => {
-			damage => [6 .. 9], x6,
+			damage => [6 .. 9],
 			dps => [16.3, 19.0, 21.7, 24.4],
 			cooldown => 2.21,
+			count => 6,
 		},
 		air => 'ground',
 		range => 7,
 	},
 	speed => 1.4062,
 	sight => 14,
+	energy => 200,
+	special => [
+		{
+			name => 'Cloaking Field',
+			abbr => 'cf',
+			desc => 'cloaks all nearby friendly units and buildings',
+			radius => 5,
+			duration => -1,
+		},
+		{
+			name => 'Mass Recall',
+			abbr => 'mr',
+			desc => 'teleports itself and nearby units to targeted Nexus',
+			cost => 100,
+			duration => 2,
+			radius => 7,
+		},
+		{
+			name => 'Time Warp',
+			abbr => 'tw',
+			desc => 'create a temporal field which slows ground units by 50%',
+			cost => 100,
+			radius => 3.5,
+			range => 9,
+			duration => 30,
+		},
+	],
 },
 
 {
 	race => 'protoss',
 	cat => 'base',
 	name => 'Nexus',
-	unit => 0,
 	min => 400,
 	gas => 0,
 	build => 100,
-	size => 5x5,
+	size => 5,
 	cargo => 0,
 	armor => 1,
 	hp => 1000,
 	shield => 1000,
-	suit => 3, # armored
-	structure => 1,
+	attr => {
+		armored => 1,
+		structure => 1,
+	},
 	attack => {
 		ground => {
 			damage => 20,
@@ -141,6 +211,16 @@
 	},
 	speed => 0,
 	sight => 11,
+	energy => 100,
+	special => [
+		{
+			name => 'Chrono Boost',
+			abbr => 'cb',
+			desc => '50% faster production speed at a targeted building',
+			cost => 25,
+			duration => 20,
+		},
+	],
 },
 
 {
@@ -157,23 +237,35 @@
 	armor => 1,
 	hp => 100,
 	shield => 50,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
-			damage => [8 .. 11], # x2
+			damage => [8 .. 11],
 			dps => [13.3, 15.0, 16.7, 18.4],
 			cooldown => 1.2,
+			count => 2,
 		},
 		range => 0,
 	},
 	speed => 2.25,
-	upgrade => [
+	sight => 9,
+	special => [
 		{
+			name => 'Charge',
+			abbr => 'ch',
+			desc => 'on attack, increases movement speed to 6.05 for 3.5s',
+			min => 200,
+			gas => 200,
+			build => 140,
 			speed => .5,
+			range => 4,
+			duration => 3.5,
+			cooldown => 10,
 		},
 	],
-	sight => 9,
 },
 
 {
@@ -190,9 +282,11 @@
 	armor => 1,
 	hp => 40,
 	shield => 40,
-	suit => 1, # light
-	organic => 0, # mech
-	psionic => 1,
+	attr => {
+		light => 1,
+		mech => 1,
+		psionic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [6 .. 9],
@@ -204,6 +298,34 @@
 	speed => 2.25,
 	range => 5,
 	sight => 10,
+	energy => 200,
+	special => [
+		{
+			name => 'Force Field',
+			abbr => 'ff',
+			desc => 'erect a barries that impedes ground movement for 15s',
+			cost => 50,
+			range => 9,
+			radius => 1.7,
+			duration => 15,
+		},
+		{
+			name => 'Guardian Shield',
+			abbr => 'gs',
+			desc => 'reduces ranged damage by 2 for friendly units within 4 radius',
+			cost => 75,
+			radius => 4,
+			duration => 15,
+		},
+		{
+			name => 'Hallucination',
+			abbr => 'hl',
+			desc => 'create fake replica of a protoss unit for one minute',
+			cost => 100,
+			duration => 60,
+			range => 0,
+		},
+	],
 },
 
 {
@@ -220,8 +342,10 @@
 	armor => 1,
 	hp => 80,
 	shield => 80,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => [10 .. 13],
@@ -235,6 +359,18 @@
 	},
 	speed => 2.9531,
 	sight => 10,
+	special => [
+		{
+			name => 'Blink',
+			abbr => 'bl',
+			desc => 'teleport to visible location',
+			min => 150,
+			gas => 150,
+			build => 170,
+			range => 8,
+			cooldown => 10,
+		},
+	],
 },
 
 {
@@ -251,11 +387,36 @@
 	armor => 0,
 	hp => 40,
 	shield => 40,
-	suit => 1, # light
-	organic => 1,
-	psionic => 1,
+	attr => {
+		light => 1,
+		psionic => 1,
+		organic => 1,
+	},
 	speed => 1.875,
 	sight => 10,
+	energy => 200,
+	special => [
+		{
+			name => 'Feedback',
+			abbr => 'fb',
+			desc => 'target will lose its energy and receive damage equal to that amount',
+			cost => 50,
+			range => 9,
+		},
+		{
+			name => 'Psionic Storm',
+			abbr => 'ps',
+			desc => 'deals 80 damage over 4 seconds to units in targeted area',
+			cost => 75,
+			cooldown => 2,
+			duration => 4,
+			radius => 1.5,
+			range => 9,
+			min => 200,
+			gas => 200,
+			build => 110,
+		},
+	],
 },
 
 {
@@ -272,9 +433,11 @@
 	armor => 1,
 	hp => 40,
 	shield => 80,
-	suit => 1, # light
-	organic => 1,
-	psionic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+		psionic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [45, 50, 55, 60],
@@ -285,14 +448,22 @@
 	},
 	speed => 2.8125,
 	sight => 8,
+	special => [
+		{
+			name => 'Permanent Cloak',
+			abbr => 'cl',
+			desc => 'cloaked at all times',
+			duration => -1,
+		},
+	],
 },
 
 {
 	race => 'protoss',
 	cat => 'gateway',
 	name => 'Archon',
-	min => 100,
-	gas => 300,
+	min => 100, # or 175 or 250
+	gas => 300, # or 275 or 250
 	unit => 4,
 	build => 12,
 	base => ['Templar', 'Templar'],
@@ -301,8 +472,10 @@
 	armor => 0,
 	hp => 10,
 	shield => 350,
-	attr => P,
-	massive => 1,
+	attr => {
+		psionic => 1,
+		massive => 1,
+	},
 	attack => {
 		ground => {
 			damage => [25, 28, 31, 34],
@@ -331,8 +504,10 @@
 	armor => 1,
 	hp => 200,
 	shield => 100,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => [20, 22, 24, 26],
@@ -344,6 +519,14 @@
 	},
 	speed => 2.25,
 	sight => 9,
+	special => [
+		{
+			name => 'Hardened Shield',
+			abbr => 'hs',
+			desc => 'reduce all damage on shields to a maximum of 10',
+			duration => -1,
+		},
+	],
 },
 
 {
@@ -359,25 +542,35 @@
 	armor => 1,
 	hp => 200,
 	shield => 150,
-	suit => 3, # armored
-	organic => 0, # mech
-	massive => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		massive => 1,
+		jump => 'Cliff Walk',
+	},
 	attack => {
 		ground => {
-			damage => [15, 17, 19, 21], # x2
+			damage => [15, 17, 19, 21],
 			dps => [18.2, 20.6, 23.0, 25.4],
 			splash => 'line',
 			cooldown => 1.65,
+			count => 2,
 		},
 		range => 6,
 	},
+	speed => 2.25,
+	sight => 10,
 	upgrade => [
 		{
-			range => 3,
+			name => 'Extended Thermal Lance',
+			min => 200,
+			gas => 200,
+			build => 140,
+			attack => {
+				range => 3,
+			},
 		},
 	],
-	speed => 2.25,
-	sight => 10,
 },
 
 {
@@ -393,15 +586,31 @@
 	armor => 0,
 	hp => 40,
 	shield => 20,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+		flying => 1,
+	},
 	speed => 1.875,
+	sight => 11,
+	detect => 1,
+	special => [
+		{
+			name => 'Permanent Cloak',
+			abbr => 'cl',
+			desc => 'cloaked at all times',
+			duration => -1,
+		},
+	],
 	upgrade => [
 		{
+			name => 'Gravitic Boosters',
+			min => 100,
+			gas => 100,
+			build => 80,
 			speed => 0.9375,
 		},
 	],
-	sight => 11,
 },
 
 {
@@ -413,20 +622,34 @@
 	gas => 0,
 	build => 50,
 	size => 1.75,
-	cargo => 0,
+	cargo => -8,
 	armor => 0,
 	hp => 100,
 	shield => 100,
-	suit => 3, # armored
-	organic => 0, # mech
-	psionic => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		psionic => 1,
+		flying => 1,
+	},
 	speed => 2.9531,
+	sight => 10,
+	special => [
+		{
+			name => 'Phasing Mode',
+			abbr => 'pm',
+			desc => 'basically transforms into a hovering pylon',
+		},
+	],
 	upgrade => [
 		{
+			name => 'Gravitic Drive',
+			min => 100,
+			gas => 100,
+			build => 80,
 			speed => 0.422,
 		},
 	],
-	sight => 10,
 },
 
 {
@@ -442,23 +665,44 @@
 	armor => 0,
 	hp => 120,
 	shield => 60,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+		flying => 1,
+	},
 	attack => {
 		air => {
-			damage => [5 .. 8], # x2
+			damage => [5 .. 8],
 			dps => [9, 10.8, 12.6, 14.4],
 			#bonus => +5 L,
 			type => 'projectile',
 			cooldown => 1.11,
+			count => 2,
 		},
 		range => 5,
 	},
 	speed => 4.25,
 	sight => 10,
+	energy => 200,
+	special => [
+		{
+			name => 'Graviton Beam',
+			abbr => 'gb',
+			desc => 'lifts a ground unit into the air for 10s',
+			cost => 50,
+			range => 4,
+			duration => 10,
+		},
+	],
 	upgrade => [
 		{
-			range => 2,
+			name => 'Anion Pulse-Crystals',
+			min => 150,
+			gas => 150,
+			build => 90,
+			attack => {
+				range => 2,
+			},
 		},
 	],
 },
@@ -476,8 +720,11 @@
 	armor => 0,
 	hp => 150,
 	shield => 100,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+		flying => 1,
+	},
 	attack => {
 		ground => {
 			damage => [6 .. 9],
@@ -486,10 +733,19 @@
 			cooldown => 0.5,
 		},
 		air => 'ground',
-		range => 6,
+		range => 6, # keeps firing until range 8
 	},
 	speed => 2.25,
 	sight => 10,
+	special => [
+		{
+			name => 'Prismatic Alignment',
+			abbr => 'pa',
+			desc => 'increases damage to armored by 6 for 20 seconds',
+			duration => 20,
+			cooldown => 60,
+		},
+	],
 },
 
 {
@@ -505,9 +761,12 @@
 	armor => 0,
 	hp => 100,
 	shield => 60,
-	suit => 1, # light
-	organic => 0, # mech
-	psionic => 1,
+	attr => {
+		light => 1,
+		mech => 1,
+		psionic => 1,
+		flying => 1,
+	},
 	attack => {
 		ground => {
 			name => 'Pulsar Beam',
@@ -516,11 +775,34 @@
 			#bonus => +10 L,
 			dps => 17.4,
 			cooldown => 0.86,
+			cost => 25,
+			maint => 1.4,
 		},
-		range => 5,
+		range => 5, #XXX 4?
 	},
 	speed => 4,
 	sight => 10,
+	energy => 200,
+	special => [
+		{
+			name => 'Revelation',
+			abbr => 'rv',
+			desc => 'hit enemy units and buildings are revealed for 1 minute',
+			cost => 75,
+			range => 9,
+			cooldown => 3,
+			duration => 60,
+			radius => 6,
+		},
+		{
+			name => 'Envision',
+			abbr => 'ev',
+			desc => 'temporary detection within sight range',
+			cost => 50,
+			range => 14,
+			duration => 60,
+		},
+	],
 },
 
 {
@@ -536,13 +818,16 @@
 	armor => 2,
 	hp => 120,
 	shield => 60,
-	suit => 3, # armored
-	organic => 0, # mech
-	massive => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		massive => 1,
+		flying => 1,
+	},
 	attack => {
 		ground => {
 			damage => [30, 33, 36, 39],
-			#bonus => +50 (+2) Ma Air,
+			#bonus => +14 Ma Air,
 			dps => [9.1, 10.0, 10.9, 11.8],
 			type => 'projectile',
 			cooldown => 3.3,
@@ -567,11 +852,14 @@
 	armor => 2,
 	hp => 300,
 	shield => 150,
-	suit => 3, # armored
-	organic => 0, # mech
-	massive => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		massive => 1,
+		flying => 1,
+	},
 	attack => {
-		range => 8,
+		range => 8, # leash range 14
 	},
 	speed => 1.875,
 	sight => 12,
@@ -587,15 +875,19 @@
 			armor => 0,
 			hp => 40,
 			shield => 40,
-			suit => 1, # light
-			organic => 0, # mech
+			attr => {
+				light => 1,
+				mech => 1,
+				flying => 1,
+			},
 			attack => {
 				ground => {
-					damage => [5 .. 8], # 2x
+					damage => [5 .. 8],
 #					dps => 26.7 (+5.3),
 					dps => [3.3, 4.0, 4.7, 5.4],
 #					cooldown => 0.5 (0.125/ 0.25),
 					cooldown => 3.0,
+					count => 2,
 				},
 				air => 'ground',
 				range => 2,
@@ -604,6 +896,15 @@
 			sight => 7,
 		},
 	],
+	update => [
+		{
+			name => 'Graviton Catapult',
+			min => 150,
+			gas => 150,
+			build => 80,
+			desc => 'increases Interceptor launch speed from 2/s to 4-8/s',
+		},
+	],
 },
 
 # terran
@@ -620,9 +921,11 @@
 	cargo => 1,
 	armor => 0,
 	hp => 45,
-	suit => 1, # light
-	organic => 1,
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		organic => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => 5,
@@ -645,8 +948,10 @@
 	size => 0.75,
 	armor => 0,
 	hp => 60,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	speed => 2.8,
 	sight => 8,
 },
@@ -655,33 +960,47 @@
 	race => 'terran',
 	cat => 'base',
 	name => 'Missile Turret',
-	unit => 0,
 	min => 100,
 	gas => 0,
 	build => 25,
-	size => 2x2,
+	size => 2,
 	cargo => 0,
 	armor => 0,
 	hp => 250,
-	suit => 3, # armored
-	organic => 0, # mech
-	structure => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		structure => 1,
+	},
 	attack => {
 		air => {
-			damage => 12, # x2
+			damage => 12,
 			dps => 27.9,
 			cooldown => 0.8608,
+			count => 2,
 		},
 		range => 7,
 	},
 	speed => 0,
 	sight => 11,
+	detect => 1,
 	upgrade => [
 		{
+			name => 'Hi-Sec Auto Tracking',
+			min => 100,
+			gas => 100,
+			build => 80,
 			attack => {
 				range => 1,
 			},
 		},
+		{
+			name => 'Building Armor',
+			min => 150,
+			gas => 150,
+			build => 140,
+			armor => 2,
+		},
 	],
 },
 
@@ -690,17 +1009,19 @@
 	cat => 'base',
 	name => 'Planetary Fortress',
 	base => ['Command Center'],
-	unit => 0,
+	unit => -11,
 	min => 150,
 	gas => 150,
 	build => 50,
-	size => 5x5,
+	size => 5,
 	cargo => 0,
 	armor => 3,
 	hp => 1500,
-	suit => 3, # armored
-	organic => 0, # mech
-	structure => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		structure => 1,
+	},
 	attack => {
 		ground => {
 			damage => 40,
@@ -714,9 +1035,24 @@
 	sight => 11,
 	upgrade => [
 		{
+			name => 'Neosteel Frame',
+			min => 100,
+			gas => 100,
+			build => 110,
+			desc => 'increase load space by 5',
+		},
+		{
+			name => 'Building Armor',
+			min => 150,
+			gas => 150,
+			build => 140,
 			armor => 2,
 		},
 		{
+			name => 'Hi-Sec Auto Tracking',
+			min => 100,
+			gas => 100,
+			build => 80,
 			attack => {
 				range => 1,
 			},
@@ -736,10 +1072,13 @@
 	cargo => 1,
 	armor => 0,
 	hp => 45,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
+			name => 'C-14 rifle',
 			damage => [6 .. 9],
 			dps => [7, 8.2, 9.4, 10.6],
 			cooldown => 0.8608,
@@ -750,16 +1089,23 @@
 	speed => 2.25,
 	upgrade => [
 		{
+			name => 'Combat Shield',
+			min => 100,
+			gas => 100,
+			build => 110,
 			hp => 10,
 		},
 	],
 	special => [
 		{
-			name => 'stim pack',
+			name => 'Stim Pack',
 			abbr => 'sp',
 			alt => 'Stimmed Marine',
-			desc => 'increases attack and movement speed for a few seconds at the cost of 10 health',
-			speed => 2.25 + 1.125,
+			desc => 'increases attack and movement speed by 50% for 15s at the cost of 10 health',
+			speed => 1.125,
+			min => 100,
+			gas => 100,
+			build => 170,
 			attack => {
 				ground => {
 					dps => [10.5, 12.2, 13.9, 15.6],
@@ -767,7 +1113,7 @@
 				},
 				air => 'ground',
 			},
-			duration => undef, #XXX
+			duration => 15,
 		},
 	],
 	sight => 9,
@@ -785,8 +1131,10 @@
 	cargo => 2,
 	armor => 1,
 	hp => 125,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [10 .. 13],
@@ -799,17 +1147,33 @@
 	},
 	special => [
 		{
-			name => 'stim pack',
+			name => 'Stim Pack',
 			abbr => 'sp',
-			desc => 'increases attack and movement speed for a few seconds at the cost of 10 health',
-			speed => 2.25 + 1.125,
+			alt => 'Stimmed Marauder',
+			desc => 'increases attack and movement speed by 50% for 15s at the cost of 10 health',
+			speed => 1.125,
+			min => 100,
+			gas => 100,
+			build => 170,
 			attack => {
 				ground => {
 					dps => [10 .. 13],
 					cooldown => 1.0,
 				},
+				air => 'ground',
 			},
-			duration => undef, #XXX
+			duration => 15,
+		},
+	],
+	update => [
+		{
+			name => 'Concussive Shells',
+			abbr => 'cs',
+			desc => 'slows non-massive enemy movement speed by 50% for 1.5s when hit',
+			min => 50,
+			gas => 50,
+			build => 60,
+			duration => -1,
 		},
 	],
 	speed => 2.25,
@@ -828,18 +1192,30 @@
 	cargo => 1,
 	armor => 0,
 	hp => 60,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+		jump => 'Jet Pack',
+	},
 	attack => {
 		ground => {
-			damage => [4 .. 7], # x2
+			damage => [4 .. 7],
 			dps => [7.3, 9.1, 10.9, 12.7],
 			cooldown => 1.1,
+			count => 2,
 		},
 		range => 4.5,
 	},
 	speed => 3.75,
 	sight => 9,
+	special => [
+		{
+			name => 'Combat Drugs',
+			abbr => 'cd',
+			desc => 'heal 2 HP per second after 10 seconds out of combat',
+			duration => -1,
+		},
+	],
 },
 
 {
@@ -854,8 +1230,10 @@
 	cargo => 2,
 	armor => 0,
 	hp => 100,
-	organic => 1,
-	psionic => 1,
+	attr => {
+		organic => 1,
+		psionic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [10 .. 13],
@@ -868,6 +1246,41 @@
 	},
 	speed => 2.25,
 	sight => 11,
+	energy => 200,
+	special => [
+		{
+			name => 'Sniper Round',
+			abbr => 'sr',
+			desc => '25 damage to a single biological unit, or 50 to psionic',
+			cost => 25,
+			range => 10,
+		},
+		{
+			name => 'EMP Round',
+			abbr => 'ep',
+			desc => 'reveals cloaked units and removes up to 100 shields and energy',
+			cost => 75,
+			range => 10,
+			radius => 1.5,
+		},
+		{
+			name => 'Personal Cloaking',
+			abbr => 'cl',
+			desc => 'has the ability to cloak',
+			cost => 25,
+			maint => .9, # /s
+			min => 150,
+			gas => 150,
+			build => 120,
+		},
+		{
+			name => 'Nuclear Strike',
+			abbr => 'ns',
+			desc => 'guides a nuclear missile which will do 300 damage plus 200 to buildings',
+			duration => 20,
+			range => 12,
+		},
+	],
 },
 
 {
@@ -882,13 +1295,14 @@
 	cargo => 2,
 	armor => 0,
 	hp => 90,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => [8 .. 11],
 			dps => [3.2, 3.6, 4.0, 4.4],
-			#bonus => +6 (+1), +11 (+1) L,
 			splash => 'line',
 			cooldown => 2.5,
 		},
@@ -896,6 +1310,27 @@
 	},
 	speed => 4.25,
 	sight => 10,
+	special => [
+		{
+			name => 'Hellbat Mode',
+			abbr => 'hm',
+			desc => 'transform to Hellbat',
+			duration => 4,
+		},
+	],
+	update => [
+		{
+			name => 'Infernal Pre-Igniter',
+			min => 150,
+			gas => 150,
+			build => 110,
+			attack => {
+				ground => {
+					#bonus => +6 (+1), +11 (+1) L,
+				},
+			},
+		},
+	],
 },
 
 {
@@ -910,13 +1345,14 @@
 	cargo => 4,
 	armor => 0,
 	hp => 135,
-	suit => 1, # light
-	organic => 1,
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		organic => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => [18, 20, 22, 24],
-			#bonus => +12 (+1) L,
 			dps => [9 .. 12],
 			splash => 1,
 			cooldown => 2,
@@ -925,6 +1361,27 @@
 	},
 	speed => 2.25,
 	sight => 10,
+	special => [
+		{
+			name => 'Hellion Mode',
+			abbr => 'hm',
+			desc => 'transform to Hellion',
+			duration => 4,
+		},
+	],
+	update => [
+		{
+			name => 'Infernal Pre-Igniter',
+			min => 150,
+			gas => 150,
+			build => 110,
+			attack => {
+				ground => {
+					#bonus => +12 (+1) L,
+				},
+			},
+		},
+	],
 },
 
 {
@@ -939,8 +1396,10 @@
 	cargo => 2,
 	armor => 0,
 	hp => 90,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => 125,
@@ -952,6 +1411,16 @@
 	},
 	speed => 2.8125,
 	sight => 7,
+	update => [
+		{
+			name => 'Drilling Claws',
+			abbr => 'dc',
+			desc => 'decreases burrow time from 3 to 1 second',
+			min => 150,
+			gas => 150,
+			build => 110,
+		},
+	],
 },
 
 {
@@ -966,8 +1435,10 @@
 	cargo => 4,
 	armor => 1,
 	hp => 160,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => [15, 17, 19, 21],
@@ -994,6 +1465,7 @@
 				range => 13,
 			},
 			speed => 0,
+			duration => 4,
 		},
 	],
 	speed => 2.25,
@@ -1012,25 +1484,29 @@
 	cargo => 8,
 	armor => 1,
 	hp => 400,
-	suit => 3, # armored
-	organic => 0, # mech
-	massive => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		massive => 1,
+	},
 	attack => {
 		ground => {
-			damage => [30, 33, 36, 39], # x2,
+			damage => [30, 33, 36, 39],
 			dps => [46.9, 51.6, 56.3, 61.0],
 			cooldown => 1.28,
 			range => 7,
+			count => 2,
 		},
 		air => {
 			name => 'Explosive Payload',
-			damage => [6 .. 9], # x4
+			damage => [6 .. 9],
 			#bonus => +6 (+1) L Air,
 			dps => [8, 9.3, 10.6, 11.9],
 			splash => 1,
 			type => 'projectile',
 			cooldown => 3,
 			range => 10,
+			count => 4,
 		},
 		air => {
 			name => 'High Impact Payload',
@@ -1056,15 +1532,19 @@
 	cargo => 0,
 	armor => 0,
 	hp => 125,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+		flying => 1,
+	},
 	attack => {
 		air => {
-			damage => [10 .. 13], # x2
+			damage => [10 .. 13],
 			#bonus => +4A,
 			dps => [10 .. 13],
 			type => 'projectile',
 			cooldown => 2,
+			count => 2,
 		},
 		range => 9,
 	},
@@ -1098,18 +1578,43 @@
 	gas => 100,
 	build => 42,
 	size => 1.5,
-	cargo => 0,
+	cargo => -8,
 	armor => 1,
 	hp => 150,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+		flying => 1,
+	},
 	speed => 2.5,
-	upgrade => [
+	energy => 200,
+	special => [
 		{
+			name => 'Heal',
+			abbr => 'hl',
+			desc => 'automatically heals nearby biological allies for 9 HP per second',
+			range => 4,
+			cost => 3,
+		},
+		{
+			name => 'Ignite Afterburners',
+			abbr => 'ia',
+			desc => 'boost speed and accelleration to 4.25 for 8s',
 			speed => 4.25,
+			duration => 8,
+			cooldown => 20,
 		},
 	],
 	sight => 11,
+	upgrade => [
+		{
+			name => 'Caduceus Reactor',
+			min => 100,
+			gas => 100,
+			build => 80,
+			starting_energy => 25,
+		},
+	],
 },
 
 {
@@ -1124,19 +1629,36 @@
 	cargo => 0,
 	armor => 0,
 	hp => 140,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+		flying => 1,
+	},
 	attack => {
 		ground => {
-			damage => [12 .. 15], # x2
+			damage => [12 .. 15],
 			dps => [19.2, 20.8, 22.4, 24.0],
 			type => 'projectile',
 			cooldown => 1.25,
+			count => 2,
 		},
 		range => 6,
 	},
 	speed => 2.75,
 	sight => 10,
+	energy => 200,
+	special => [
+		{
+			name => 'Cloak',
+			abbr => 'cl',
+			desc => 'has the ability to cloak',
+			cost => 25,
+			maint => .9,
+			min => 100,
+			gas => 100,
+			build => 110,
+		},
+	],
 },
 
 {
@@ -1151,20 +1673,29 @@
 	cargo => 0,
 	armor => 1,
 	hp => 140,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+		flying => 1,
+	},
 	speed => 2.25,
 	sight => 11,
+	detect => 1,
+	energy => 200,
 	special => [
 		{
 			alt => 'Auto-Turret',
-			size => 2x2,
+#			abbr => 'at',
+			cost => 50,
+			size => 2,
 			cargo => 0,
 			armor => 1,
 			hp => 150,
-			suit => 3, # armored
-			organic => 0, # mech
-			structure => 1,
+			attr => {
+				armored => 1,
+				mech => 1,
+				structure => 1,
+			},
 			attack => {
 				ground => {
 					damage => 8,
@@ -1178,21 +1709,37 @@
 			sight => 7,
 			upgrade => [
 				{
+					name => 'Hi-Sec Auto Tracking',
+					min => 100,
+					gas => 100,
+					build => 80,
 					attack => {
 						range => 1,
 					},
 				},
+				{
+					name => 'Building Armor',
+					min => 150,
+					gas => 150,
+					build => 140,
+					armor => 2,
+				},
 			],
 		},
 		{
 			alt => 'Point Defense Drone',
+#			abbr => 'pd',
+			cost => 100,
 			size => 1.2,
 			cargo => 0,
 			armor => 0,
 			hp => 50,
-			suit => 1, # light
-			organic => 0, # mech
-			structure => 1,
+			attr => {
+				light => 1,
+				mech => 1,
+				structure => 1,
+				flying => 1,
+			},
 			cooldown => 0,
 			attack => {
 				range => 8,
@@ -1200,11 +1747,58 @@
 			sight => 7,
 			upgrade => [
 				{
+					name => 'Hi-Sec Auto Tracking',
+					min => 100,
+					gas => 100,
+					build => 80,
 					attack => {
 						range => 1,
 					},
 				},
+				{
+					name => 'Building Armor',
+					min => 150,
+					gas => 150,
+					build => 140,
+					armor => 2,
+				},
 			],
+			duration => 20,
+		},
+		{
+			name => 'Seeker Missile',
+			abbr => 'sm',
+			desc => 'launches missile to do 100 damage plus splash'
+				. ' unless targeted unit moves to 13 range within 5 seconds of charging',
+			range => 10,
+			attack => {
+				damage => 100,
+				splash => 1,
+			},
+			cost => 75,
+		},
+	],
+	update => [
+		{
+			name => 'Durable Materials',
+			min => 150,
+			gas => 150,
+			build => 110,
+			special => {
+				at => {
+					duration => 240,
+				},
+				pd => {
+					duration => 30,
+				},
+			},
+		},
+		{
+			name => 'Corvid Reactor',
+			min => 150,
+			gas => 150,
+			build => 110,
+			starting_energy => 25,
 		},
 	],
 },
@@ -1221,9 +1815,12 @@
 	cargo => 0,
 	armor => 3,
 	hp => 550,
-	suit => 3, # armored
-	organic => 0, # mech
-	massive => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		massive => 1,
+		flying => 1,
+	},
 	attack => {
 		ground => {
 			damage => [8 .. 11],
@@ -1239,6 +1836,32 @@
 	},
 	speed => 1.875,
 	sight => 12,
+	energy => 200,
+	special => [
+		{
+			name => 'Yamato Cannon',
+			abbr => 'yc',
+			desc => '300 damage to a single target',
+			min => 150,
+			gas => 150,
+			build => 60,
+			duration => 3,
+			range => 10,
+			cost => 100,
+			attack => {
+				damage => 300,
+			},
+		},
+	],
+	update => [
+		{
+			name => 'Behemoth Reactor',
+			min => 150,
+			gas => 150,
+			build => 80,
+			starting_energy => 25,
+		},
+	],
 },
 
 # zerg
@@ -1255,8 +1878,10 @@
 	cargo => 1,
 	armor => 0,
 	hp => 40,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => 5,
@@ -1282,15 +1907,18 @@
 	cargo => 2,
 	armor => 1,
 	hp => 175,
-	organic => 1,
-	psionic => 1,
+	attr => {
+		organic => 1,
+		psionic => 1,
+	},
 	attack => {
 		ground => {
-			damage => [4 .. 7], # x2
+			damage => [4 .. 7],
 			dps => [8, 10, 12, 14],
 			cooldown => 1.0,
 			type => 'projectile',
 			range => 5,
+			count => 2,
 		},
 		air => {
 			damage => [9 .. 12],
@@ -1303,6 +1931,34 @@
 	speed => 0.9375,
 	creep => 2.7,
 	sight => 9,
+	energy => 200,
+	special => [
+		{
+			name => 'Spawn Larva',
+			abbr => 'sl',
+			desc => 'injects a Hatchery to produce 4 Larvae after 40 seconds',
+			cost => 25,
+			range => 1,
+			cooldown => 2.5,
+			duration => 40,
+		},
+		{
+			name => 'Spawn Creep Tumor',
+			abbr => 'sc',
+			desc => 'place a tumor on creep which will expand it',
+			cost => 25,
+			range => 1,
+			duration => 15,
+		},
+		{
+			name => 'Transfusion',
+			abbr => 'tf',
+			desc => 'heal a friendly biological unit or building for 125 HP',
+			cost => 50,
+			range => 7,
+			cooldown => 1,
+		},
+	],
 },
 
 {
@@ -1314,18 +1970,43 @@
 	gas => 0,
 	build => 25,
 	size => 0,
-	cargo => -8,
+	cargo => 0,
 	armor => 0,
 	hp => 200,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		flying => 1,
+	},
 	speed => 0.586,
 	creep => 0,
 	sight => 11,
+	special => [
+		{
+			name => 'Generate Creep',
+			abbr => 'gc',
+			desc => 'place Zerg creep at current location',
+			duration => 15,
+			radius => 2,
+			req => 'Lair',
+		},
+	],
 	upgrade => [
 		{
+			name => 'Pneumatized Carapace',
+			min => 100,
+			gas => 100,
+			build => 60,
 			speed => 1.294,
 		},
+		{
+			name => 'Ventral Sacs',
+			min => 200,
+			gas => 200,
+			build => 130,
+			cargo => -8,
+			req => 'Lair',
+		},
 	],
 },
 
@@ -1342,28 +2023,50 @@
 	cargo => 0,
 	armor => 1,
 	hp => 200,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		flying => 1,
+	},
 	speed => 1.875,
 	creep => 0,
 	sight => 11,
+	detect => 1,
+	energy => 200,
 	special => [
 		{
+			name => 'Spawn Changeling',
 			alt => 'Changeling',
+			cost => 50,
+			duration => 150,
 			build => 1,
 			size => 0.75,
 			cargo => 0,
 			armor => 0,
 			hp => 5,
-			suit => 1, # light
-			organic => 1,
+			attr => {
+				light => 1,
+				organic => 1,
+			},
 			speed => 2.25,
 			creep => 1.0,
 			sight => 8,
 		},
+		{
+			name => 'Contaminate',
+			abbr => 'ct',
+			desc => 'covers an enemy structure in slime, preventing production and research for 30 seconds',
+			cost => 125,
+			range => 3,
+			duration => 30,
+		},
 	],
 	upgrade => [
 		{
+			name => 'Pneumatized Carapace',
+			min => 100,
+			gas => 100,
+			build => 60,
 			speed => 0.875,
 		},
 	],
@@ -1379,28 +2082,44 @@
 	cargo => 0,
 	armor => 10,
 	hp => 25,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	speed => 0.5625,
 	creep => 1.0,
 	sight => 5,
+	special => [
+		{
+			alt => 'Cocoon',
+			attr => {
+				organic => 1,
+			},
+			hp => 200,
+			armor => 10,
+			size => 0.75,
+			sight => 5,
+			speed => 0,
+		},
+	],
 },
 
 {
 	race => 'zerg',
 	cat => 'creep',
 	name => 'Spine Crawler',
-	unit => 0,
 	min => 100,
 	gas => 0,
 	build => 50,
-	size => 2x2,
+	size => 2,
 	cargo => 0,
 	armor => 2,
 	hp => 300,
-	suit => 3, # armored
-	organic => 1,
-	structure => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		structure => 1,
+	},
 	attack => {
 		ground => {
 			damage => 25,
@@ -1419,17 +2138,18 @@
 	race => 'zerg',
 	cat => 'creep',
 	name => 'Spore Crawler',
-	unit => 0,
 	min => 75,
 	gas => 0,
 	build => 30,
-	size => 2x2,
+	size => 2,
 	cargo => 0,
 	armor => 1,
 	hp => 400,
-	suit => 3, # armored
-	organic => 1,
-	structure => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		structure => 1,
+	},
 	attack => {
 		air => {
 			damage => 15,
@@ -1443,6 +2163,7 @@
 	speed => (1.0),
 	creep => 2.5,
 	sight => 11,
+	detect => 1,
 },
 
 {
@@ -1457,8 +2178,10 @@
 	cargo => 1,
 	armor => 0,
 	hp => 35,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [5 .. 8],
@@ -1472,14 +2195,23 @@
 	sight => 8,
 	upgrade => [
 		{
+			name => 'Adrenal Glands',
+			min => 200,
+			gas => 200,
+			build => 130,
 			attack => {
 				ground => {
 					dps => [8.5, 10.2, 11.9, 13.6],
-					cooldown => 0.587,
+					cooldown => -0.109,
 				},
 			},
+			req => 'Hive',
 		},
 		{
+			name => 'Metabolic Boost',
+			min => 100,
+			gas => 100,
+			build => 110,
 			speed => 1.746,
 		},
 	],
@@ -1498,7 +2230,9 @@
 	cargo => 2,
 	armor => 0,
 	hp => 30,
-	organic => 1,
+	attr => {
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [20, 22, 24, 26],
@@ -1512,7 +2246,12 @@
 	sight => 8,
 	upgrade => [
 		{
+			name => 'Centrifugal Hooks',
+			min => 150,
+			gas => 150,
+			build => 110,
 			speed => 0.4531,
+			req => 'Lair',
 		},
 	],
 },
@@ -1529,8 +2268,10 @@
 	cargo => 2,
 	armor => 1,
 	hp => 145,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [16, 18, 20, 22],
@@ -1542,9 +2283,32 @@
 	creep => 1.3,
 	range => 4,
 	sight => 9,
+	special => [
+		{
+			name => 'Rapid Regeneration',
+			abbr => 'rr',
+			desc => 'regenerates health at 5 HP/s while burrowed',
+			duration => -1,
+		},
+		{
+			name => 'Tunneling Claws',
+			min => 150,
+			gas => 150,
+			build => 110,
+			abbr => 'tc',
+			desc => 'move while burrowed at speed of 2.0 and increase regeneration to 10 HP/s',
+			duration => -1,
+			req => 'Lair',
+		},
+	],
 	upgrade => [
 		{
+			name => 'Glial Reconstitution',
+			min => 100,
+			gas => 100,
+			build => 110,
 			speed => 0.75,
+			req => 'Lair',
 		},
 	],
 },
@@ -1561,8 +2325,10 @@
 	cargo => 2,
 	armor => 0,
 	hp => 80,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [12 .. 15],
@@ -1578,14 +2344,22 @@
 	sight => 9,
 	upgrade => [
 		{
-			speed => 0.5625,
-			creep => -0.302,
-		},
-		{
+			name => 'Grooved Spines',
+			min => 150,
+			gas => 150,
+			build => 80,
 			attack => {
 				range => 1,
 			},
 		},
+		{
+			name => 'Muscular Augments',
+			min => 150,
+			gas => 150,
+			build => 100,
+			speed => 0.5625,
+			creep => -0.302,
+		},
 	],
 },
 
@@ -1601,22 +2375,50 @@
 	cargo => 2,
 	armor => 0,
 	hp => 90,
-	suit => 3, # armored
-	organic => 1,
-	psionic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		psionic => 1,
+	},
 	speed => 2.25,
 	creep => 1.3,
 	sight => 10,
+	energy => 200,
 	special => [
+		{
+			name => 'Neural Parasite',
+			abbr => 'np',
+			desc => 'take control of target enemy unit for 15s (while within 14 range)',
+			cost => 100,
+			range => 7,
+			duration => 15,
+			min => 150,
+			gas => 150,
+			build => 110,
+		},
+		{
+			name => 'Fungal Growth',
+			abbr => 'fg',
+			desc => 'for 4 seconds, immobilize enemy units in target area and deal 30 damage',
+			cost => 75,
+			range => 10,
+			duration => 4,
+			radius => 2.0,
+		},
 		{
 			alt => 'Infested Terran',
+			cost => 25,
+			range => 9,
+			duration => 30,
 			build => 5,
 			size => 0.75,
 			cargo => 0,
 			armor => 0,
 			hp => 50,
-			suit => 1, # light
-			organic => 1,
+			attr => {
+				light => 1,
+				organic => 1,
+			},
 			attack => {
 				ground => {
 					damage => 8,
@@ -1631,23 +2433,33 @@
 			sight => 9,
 		},
 	],
+	update => [
+		{
+			name => 'Pathogen Glands',
+			min => 150,
+			gas => 150,
+			build => 80,
+			starting_energy => 25,
+		},
+	],
 },
 
 {
 	race => 'zerg',
 	cat => 'lair',
 	name => 'Nydus Worm',
-	unit => 0,
 	min => 100,
 	gas => 100,
 	build => 20,
-	size => 3x3,
+	size => 3,
 	cargo => 0,
 	armor => 1,
 	hp => 200,
-	suit => 3, # armored
-	organic => 1,
-	structure => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		structure => 1,
+	},
 	speed => 0,
 	sight => 10,
 },
@@ -1656,16 +2468,18 @@
 	race => 'zerg',
 	cat => 'lair',
 	name => 'Swarm Host',
-	unit => 3,
-	min => 200,
-	gas => 100,
+	unit => 4,
+	min => 100,
+	gas => 200,
 	build => 40,
 	size => 1.625,
 	cargo => 4,
 	armor => 1,
 	hp => 160,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			dps => [27.9, 30.2, 32.5, 34.8],
@@ -1673,7 +2487,7 @@
 			cooldown => 0.86,
 		},
 	},
-	speed => 2.25,
+	speed => 2.95,
 	creep => 1.3,
 	sight => 10,
 	special => [
@@ -1684,20 +2498,36 @@
 			cargo => 0,
 			armor => 0,
 			hp => 65,
-			suit => 1, # light
-			organic => 1,
+			attr => {
+				light => 1,
+				organic => 1,
+			},
 			attack => {
 				ground => {
 					damage => [12 .. 15],
 					dps => [14.0, 15.2, 16.4, 17.6],
 					type => 'projectile',
-					cooldown => 0.86,
+					cooldown => 0.6,
 				},
 				range => 3,
 			},
 			speed => 1.875,
 			creep => 1.4,
 			sight => 6,
+			duration => 25,
+			cooldown => 60,
+			count => 2,
+		},
+	],
+	update => [
+		{
+			name => 'Flying Locusts',
+			min => 200,
+			gas => 200,
+			build => 160,
+			attr => {
+				flying => 1,
+			},
 		},
 	],
 },
@@ -1714,8 +2544,11 @@
 	cargo => 0,
 	armor => 0,
 	hp => 120,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+		flying => 1,
+	},
 	attack => {
 		ground => {
 			damage => [9 .. 12],
@@ -1729,6 +2562,13 @@
 	},
 	speed => 4,
 	sight => 11,
+	update => [
+		{
+			name => 'Tissue Regeneration',
+			abbr => 'tr',
+			desc => 'health regeneration rate increased to 1 HP per second',
+		},
+	],
 },
 
 {
@@ -1743,8 +2583,11 @@
 	cargo => 0,
 	armor => 2,
 	hp => 200,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		flying => 1,
+	},
 	attack => {
 		air => {
 			damage => [14 .. 17],
@@ -1757,6 +2600,15 @@
 	},
 	speed => 2.9531,
 	sight => 10,
+	special => [
+		{
+			name => 'Corruption',
+			desc => 'target unit takes 20% more damage for 30 seconds',
+			cooldown => 45,
+			range => 6,
+			duration => 40,
+		},
+	],
 },
 
 {
@@ -1772,9 +2624,12 @@
 	cargo => 0,
 	armor => 1,
 	hp => 225,
-	suit => 3, # armored
-	organic => 1,
-	massive => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		massive => 1,
+		flying => 1,
+	},
 	attack => {
 		ground => {
 			damage => [20, 22, 24, 26],
@@ -1787,16 +2642,21 @@
 	sight => 12,
 	special => [
 		{
+			name => 'Swarm Seeds',
+			abbr => 'ss',
+			desc => 'Broodlings are spawned upon each attack',
+			duration => -1,
 			alt => 'Broodling',
 			unit => 0,
-			min => 0,
-			build => 1,
+#			build => 1,
 			size => 0.75,
 			cargo => 0,
 			armor => 0,
 			hp => 30,
-			suit => 1, # light
-			organic => 1,
+			attr => {
+				light => 1,
+				organic => 1,
+			},
 			attack => {
 				ground => {
 					damage => [4 .. 7],
@@ -1809,6 +2669,12 @@
 			creep => 1.0,
 			sight => 7,
 		},
+		{
+			name => 'Frenzied',
+			abbr => 'fz',
+			desc => 'immune to snare, stun, mind control, and movement altering effects',
+			duration => -1,
+		},
 	],
 },
 
@@ -1824,11 +2690,42 @@
 	cargo => 0,
 	armor => 1,
 	hp => 150,
-	suit => 3, # armored
-	organic => 1,
-	psionic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		psionic => 1,
+		flying => 1,
+	},
 	speed => 2.9531,
 	sight => 11,
+	energy => 200,
+	special => [
+		{
+			name => 'Blinding Cloud',
+			abbr => 'bc',
+			desc => 'all attacks from within cloud are reduced to melee range',
+			cost => 100,
+			range => 11,
+			duration => 14,
+			radius => 2,
+		},
+		{
+			name => 'Abduct',
+			abbr => 'ad',
+			desc => 'pull target unit to Viper\'s location',
+			cost => 75,
+			range => 9,
+			duration => 10,
+		},
+		{
+			name => 'Consume',
+			abbr => 'cs',
+			desc => 'leaches 200 life of friendly building over 20s to gain 50 energy',
+			duration => 20,
+			range => 7,
+			cooldown => 1,
+		},
+	],
 },
 
 {
@@ -1843,9 +2740,11 @@
 	cargo => 8,
 	armor => 1,
 	hp => 500,
-	suit => 3, # armored
-	organic => 1,
-	massive => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		massive => 1,
+	},
 	attack => {
 		ground => {
 			damage => [35, 38, 41, 44],
@@ -1858,8 +2757,20 @@
 	speed => 2.9531,
 	creep => 1.3,
 	sight => 9,
+	special => [
+		{
+			name => 'Frenzied',
+			abbr => 'fz',
+			desc => 'immune to snare, stun, mind control, and movement altering effects',
+			duration => -1,
+		},
+	],
 	upgrade => [
 		{
+			name => 'Chitinous Plating',
+			min => 150,
+			gas => 150,
+			build => 110,
 			armor => 2,
 		},
 	],