X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/8b42a2ae56db77061abf010b054212ab615e1875..77ac3d52d89913a79cca834d882c54a58c15a488:/sc-units-hots.inc.pl

diff --git a/sc-units-hots.inc.pl b/sc-units-hots.inc.pl
index 42707e7..524ed12 100644
--- a/sc-units-hots.inc.pl
+++ b/sc-units-hots.inc.pl
@@ -11,7 +11,7 @@ use strict;
 	race => 'protoss',
 	cat => 'base',
 	name => 'Probe',
-	unit => 1,
+	pop => 1,
 	min => 50,
 	gas => 0,
 	build => 17,
@@ -24,14 +24,15 @@ use strict;
 		light => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Particle Beam',
 			damage => 5,
-			dps => 3.3,
 			cooldown => 1.5,
+			range => 0,
 		},
-		range => 0,
-	},
+	],
 	speed => 2.8125,
 	sight => 8,
 },
@@ -51,15 +52,16 @@ use strict;
 		armored => 1,
 		structure => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
+			name => 'Phase Disruptor',
 			damage => 20,
-			dps => 16,
 			cooldown => 1.25,
+			type => 'projectile',
+			range => 7,
 		},
-		air => 'ground',
-		range => 7,
-	},
+	],
 	speed => 0,
 	sight => 11,
 	detect => 1,
@@ -69,7 +71,7 @@ use strict;
 	race => 'protoss',
 	cat => 'base',
 	name => 'Mothership Core',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 100,
 	build => 30,
@@ -82,19 +84,23 @@ use strict;
 		armored => 1,
 		mech => 1,
 		psionic => 1,
+		flying => 1,
 	},
-	attack => {
-		ground => {
-			damage => [8 .. 11],
-			dps => [9.4, 10.6, 11.8, 13.0],
+	attack => [
+		{
+			anti => 1,
+			name => 'Repulsor Cannon',
+			damage => 8,
+			upgrade => 1,
 			type => 'projectile',
 			cooldown => 0.85,
+			range => 5,
 		},
-		range => 5,
-	},
+	],
 	speed => 1.875,
 	sight => 9,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Photon Overcharge',
@@ -118,7 +124,7 @@ use strict;
 			cost => 100,
 			radius => 3.5,
 			range => 9,
-			duration => 30,
+			duration => 10,
 		},
 	],
 },
@@ -127,7 +133,7 @@ use strict;
 	race => 'protoss',
 	cat => 'base',
 	name => 'Mothership',
-	unit => 8,
+	pop => 8,
 	min => 300,
 	gas => 300,
 	build => 100,
@@ -140,20 +146,23 @@ use strict;
 		mech => 1,
 		psionic => 1,
 		massive => 1,
+		flying => 1,
 	},
-	attack => {
-		ground => {
-			damage => [6 .. 9],
-			dps => [16.3, 19.0, 21.7, 24.4],
+	attack => [
+		{
+			anti => 3,
+			name => 'Purifier Beams',
+			damage => 6,
+			upgrade => 1,
 			cooldown => 2.21,
 			count => 6,
+			range => 7,
 		},
-		air => 'ground',
-		range => 7,
-	},
+	],
 	speed => 1.4062,
 	sight => 14,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Cloaking Field',
@@ -198,18 +207,20 @@ use strict;
 		armored => 1,
 		structure => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
+			name => 'Photon Overcharge',
 			damage => 20,
-			dps => 16,
 			cooldown => 1.25,
+			type => 'projectile',
+			range => 13,
 		},
-		air => 'ground',
-		range => 13,
-	},
+	],
 	speed => 0,
 	sight => 11,
-	energy => 100,
+	energy => 0,
+	capacity => 100,
 	special => [
 		{
 			name => 'Chrono Boost',
@@ -225,7 +236,7 @@ use strict;
 	race => 'protoss',
 	cat => 'gateway',
 	name => 'Zealot',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 0,
 	build => 38,
@@ -239,15 +250,17 @@ use strict;
 		light => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
-			damage => [8 .. 11],
-			dps => [13.3, 15.0, 16.7, 18.4],
+	attack => [
+		{
+			anti => 1,
+			name => 'Psi Blades',
+			damage => 8,
+			upgrade => 1,
 			cooldown => 1.2,
 			count => 2,
+			range => 0,
 		},
-		range => 0,
-	},
+	],
 	speed => 2.25,
 	sight => 9,
 	special => [
@@ -270,7 +283,7 @@ use strict;
 	race => 'protoss',
 	cat => 'gateway',
 	name => 'Sentry',
-	unit => 2,
+	pop => 2,
 	min => 50,
 	gas => 100,
 	build => 37,
@@ -285,18 +298,20 @@ use strict;
 		mech => 1,
 		psionic => 1,
 	},
-	attack => {
-		ground => {
-			damage => [6 .. 9],
-			dps => [6 .. 9],
+	attack => [
+		{
+			anti => 3,
+			name => 'Disruption Beam',
+			damage => 6,
+			upgrade => 1,
 			cooldown => 1.0,
+			range => 5,
 		},
-		air => 'ground',
-	},
+	],
 	speed => 2.25,
-	range => 5,
 	sight => 10,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Force Field',
@@ -330,7 +345,7 @@ use strict;
 	race => 'protoss',
 	cat => 'gateway',
 	name => 'Stalker',
-	unit => 2,
+	pop => 2,
 	min => 125,
 	gas => 50,
 	build => 42,
@@ -344,17 +359,20 @@ use strict;
 		armored => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
-			damage => [10 .. 13],
-			dps => [6.9, 7.6, 8.3, 9.0],
-			#bonus => +4 A,
+	attack => [
+		{
+			anti => 3,
+			name => 'Particle Disruptors',
+			damage => 10,
+			upgrade => 1,
+			bonus => {
+				armored => 4,
+			},
 			type => 'projectile',
 			cooldown => 1.44,
+			range => 6,
 		},
-		air => 'ground',
-		range => 6,
-	},
+	],
 	speed => 2.9531,
 	sight => 10,
 	special => [
@@ -375,7 +393,7 @@ use strict;
 	race => 'protoss',
 	cat => 'gateway',
 	name => 'High Templar',
-	unit => 2,
+	pop => 2,
 	min => 50,
 	gas => 150,
 	build => 55,
@@ -392,7 +410,8 @@ use strict;
 	},
 	speed => 1.875,
 	sight => 10,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Feedback',
@@ -421,7 +440,7 @@ use strict;
 	race => 'protoss',
 	cat => 'gateway',
 	name => 'Dark Templar',
-	unit => 2,
+	pop => 2,
 	min => 125,
 	gas => 125,
 	build => 55,
@@ -436,14 +455,16 @@ use strict;
 		organic => 1,
 		psionic => 1,
 	},
-	attack => {
-		ground => {
-			damage => [45, 50, 55, 60],
-			dps => [26.6, 29.6, 32.6, 35.6],
+	attack => [
+		{
+			anti => 1,
+			name => 'Warp Blade',
+			damage => 45,
+			upgrade => 5,
 			cooldown => 1.694,
+			range => 0,
 		},
-		range => 0,
-	},
+	],
 	speed => 2.8125,
 	sight => 8,
 	special => [
@@ -462,7 +483,7 @@ use strict;
 	name => 'Archon',
 	min => 100, # or 175 or 250
 	gas => 300, # or 275 or 250
-	unit => 4,
+	pop => 4,
 	build => 12,
 	base => ['Templar', 'Templar'],
 	size => 1.5,
@@ -474,17 +495,21 @@ use strict;
 		psionic => 1,
 		massive => 1,
 	},
-	attack => {
-		ground => {
-			damage => [25, 28, 31, 34],
-			dps => [14.3, 16.0, 17.7, 19.4],
-			#bonus => +10 (+1) B,
+	attack => [
+		{
+			anti => 3,
+			name => 'Psionic Shockwave',
+			damage => 25,
+			upgrade => 3,
+			bonus => {
+				organic => 10,
+				-organic => 1,
+			},
 			splash => 1,
 			cooldown => 1.754,
+			range => 3,
 		},
-		air => 'ground',
-		range => 3,
-	},
+	],
 	speed => 2.8125,
 	sight => 9,
 },
@@ -493,7 +518,7 @@ use strict;
 	race => 'protoss',
 	cat => 'robotic',
 	name => 'Immortal',
-	unit => 4,
+	pop => 4,
 	min => 250,
 	gas => 100,
 	build => 55,
@@ -506,15 +531,20 @@ use strict;
 		armored => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
-			damage => [20, 22, 24, 26],
-			#bonus => +30 (+3) A,
-			dps => [13.8, 15.2, 16.6, 18.0],
+	attack => [
+		{
+			anti => 1,
+			name => 'Phase Disruptors',
+			damage => 20,
+			upgrade => 2,
+			bonus => {
+				armored => 30,
+				-armored => 3,
+			},
 			cooldown => 1.45,
+			range => 6,
 		},
-		range => 6,
-	},
+	],
 	speed => 2.25,
 	sight => 9,
 	special => [
@@ -531,7 +561,7 @@ use strict;
 	race => 'protoss',
 	cat => 'robotic',
 	name => 'Colossus',
-	unit => 6,
+	pop => 6,
 	min => 300,
 	gas => 200,
 	build => 75,
@@ -546,16 +576,18 @@ use strict;
 		massive => 1,
 		jump => 'Cliff Walk',
 	},
-	attack => {
-		ground => {
-			damage => [15, 17, 19, 21],
-			dps => [18.2, 20.6, 23.0, 25.4],
+	attack => [
+		{
+			anti => 1,
+			name => 'Thermal Lances',
+			damage => 15,
+			upgrade => 2,
 			splash => 'line',
 			cooldown => 1.65,
 			count => 2,
+			range => 6,
 		},
-		range => 6,
-	},
+	],
 	speed => 2.25,
 	sight => 10,
 	upgrade => [
@@ -564,9 +596,11 @@ use strict;
 			min => 200,
 			gas => 200,
 			build => 140,
-			attack => {
-				range => 3,
-			},
+			attack => [
+				{
+					range => 3,
+				},
+			],
 		},
 	],
 },
@@ -575,7 +609,7 @@ use strict;
 	race => 'protoss',
 	cat => 'robotic',
 	name => 'Observer',
-	unit => 1,
+	pop => 1,
 	min => 25,
 	gas => 75,
 	build => 30,
@@ -587,6 +621,7 @@ use strict;
 	attr => {
 		light => 1,
 		mech => 1,
+		flying => 1,
 	},
 	speed => 1.875,
 	sight => 11,
@@ -614,7 +649,7 @@ use strict;
 	race => 'protoss',
 	cat => 'robotic',
 	name => 'Warp Prism',
-	unit => 2,
+	pop => 2,
 	min => 200,
 	gas => 0,
 	build => 50,
@@ -627,6 +662,7 @@ use strict;
 		armored => 1,
 		mech => 1,
 		psionic => 1,
+		flying => 1,
 	},
 	speed => 2.9531,
 	sight => 10,
@@ -652,7 +688,7 @@ use strict;
 	race => 'protoss',
 	cat => 'stargate',
 	name => 'Phoenix',
-	unit => 2,
+	pop => 2,
 	min => 150,
 	gas => 100,
 	build => 35,
@@ -664,21 +700,27 @@ use strict;
 	attr => {
 		light => 1,
 		mech => 1,
+		flying => 1,
 	},
-	attack => {
-		air => {
-			damage => [5 .. 8],
-			dps => [9, 10.8, 12.6, 14.4],
-			#bonus => +5 L,
+	attack => [
+		{
+			anti => 2,
+			name => 'Ion Cannons',
+			damage => 5,
+			upgrade => 1,
+			bonus => {
+				light => 5,
+			},
 			type => 'projectile',
 			cooldown => 1.11,
 			count => 2,
+			range => 5,
 		},
-		range => 5,
-	},
+	],
 	speed => 4.25,
 	sight => 10,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Graviton Beam',
@@ -695,9 +737,11 @@ use strict;
 			min => 150,
 			gas => 150,
 			build => 90,
-			attack => {
-				range => 2,
-			},
+			attack => [
+				{
+					range => 2,
+				},
+			],
 		},
 	],
 },
@@ -706,7 +750,7 @@ use strict;
 	race => 'protoss',
 	cat => 'stargate',
 	name => 'Void Ray',
-	unit => 4,
+	pop => 4,
 	min => 250,
 	gas => 150,
 	build => 60,
@@ -718,17 +762,22 @@ use strict;
 	attr => {
 		armored => 1,
 		mech => 1,
+		flying => 1,
 	},
-	attack => {
-		ground => {
-			damage => [6 .. 9],
-			#bonus => +4 (+1), +10 (+1) A,
-			dps => [12, 14, 16, 18],
+	attack => [
+		{
+			anti => 3,
+			name => 'Prismatic Beam',
+			damage => 6,
+			upgrade => 1,
+			bonus => {
+				armored => 4,
+				-armored => 1,
+			},
 			cooldown => 0.5,
+			range => 6, # keeps firing until range 8
 		},
-		air => 'ground',
-		range => 6, # keeps firing until range 8
-	},
+	],
 	speed => 2.25,
 	sight => 10,
 	special => [
@@ -738,6 +787,13 @@ use strict;
 			desc => 'increases damage to armored by 6 for 20 seconds',
 			duration => 20,
 			cooldown => 60,
+			attack => [
+				{
+					bonus => {
+						armored => 6,
+					},
+				},
+			],
 		},
 	],
 },
@@ -746,7 +802,7 @@ use strict;
 	race => 'protoss',
 	cat => 'stargate',
 	name => 'Oracle',
-	unit => 3,
+	pop => 3,
 	min => 150,
 	gas => 150,
 	build => 50,
@@ -759,23 +815,27 @@ use strict;
 		light => 1,
 		mech => 1,
 		psionic => 1,
+		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			name => 'Pulsar Beam',
 			damage => 15,
 			# costs energy
-			#bonus => +10 L,
-			dps => 17.4,
+			bonus => {
+				light => 10,
+			},
 			cooldown => 0.86,
 			cost => 25,
 			maint => 1.4,
+			range => 5, #XXX 4?
 		},
-		range => 5, #XXX 4?
-	},
+	],
 	speed => 4,
 	sight => 10,
-	energy => 200,
+	energy => 50, #XXX
+	capacity => 200,
 	special => [
 		{
 			name => 'Revelation',
@@ -802,7 +862,7 @@ use strict;
 	race => 'protoss',
 	cat => 'stargate',
 	name => 'Tempest',
-	unit => 4,
+	pop => 4,
 	min => 300,
 	gas => 200,
 	build => 60,
@@ -815,18 +875,32 @@ use strict;
 		armored => 1,
 		mech => 1,
 		massive => 1,
+		flying => 1,
 	},
-	attack => {
-		ground => {
-			damage => [30, 33, 36, 39],
-			#bonus => +14 Ma Air,
-			dps => [9.1, 10.0, 10.9, 11.8],
+	attack => [
+		{
+			anti => 2,
+			name => 'Kinetic Overload',
+			damage => 30,
+			upgrade => 3,
+			bonus => {
+				massive => 14,
+				-massive => 2,
+			},
 			type => 'projectile',
 			cooldown => 3.3,
+			range => 15,
 		},
-		air => 'ground',
-		range => 15,
-	},
+		{
+			anti => 1,
+			name => 'Resonance Coil',
+			damage => 30,
+			upgrade => 3,
+			type => 'projectile',
+			cooldown => 3.3,
+			range => 15,
+		},
+	],
 	speed => 1.875,
 	sight => 12,
 },
@@ -835,7 +909,7 @@ use strict;
 	race => 'protoss',
 	cat => 'stargate',
 	name => 'Carrier',
-	unit => 6,
+	pop => 6,
 	min => 350,
 	gas => 250,
 	build => 120,
@@ -848,16 +922,23 @@ use strict;
 		armored => 1,
 		mech => 1,
 		massive => 1,
+		flying => 1,
 	},
-	attack => {
-		range => 8, # leash range 14
-	},
+	attack => [
+		{
+			anti => 3,
+			count => 8,
+			range => 8, # leash range 14
+			dps => [26.7, undef, undef, 42.6],
+			cooldown => 0.5,
+		},
+	],
 	speed => 1.875,
 	sight => 12,
 	special => [
 		{
 			alt => 'Interceptor',
-			unit => 0,
+			pop => 0,
 			min => 25,
 			gas => 0,
 			build => 8,
@@ -869,30 +950,35 @@ use strict;
 			attr => {
 				light => 1,
 				mech => 1,
+				flying => 1,
 			},
-			attack => {
-				ground => {
-					damage => [5 .. 8],
-#					dps => 26.7 (+5.3),
-					dps => [3.3, 4.0, 4.7, 5.4],
-#					cooldown => 0.5 (0.125/ 0.25),
+			attack => [
+				{
+					anti => 3,
+					name => 'Interceptor Beams',
+					damage => 5,
+					upgrade => 1,
 					cooldown => 3.0,
 					count => 2,
+					range => 2,
 				},
-				air => 'ground',
-				range => 2,
-			},
+			],
 			speed => 7.5,
 			sight => 7,
 		},
 	],
-	update => [
+	upgrade => [
 		{
 			name => 'Graviton Catapult',
 			min => 150,
 			gas => 150,
 			build => 80,
 			desc => 'increases Interceptor launch speed from 2/s to 4-8/s',
+			attack => [
+				{
+					cooldown => -0.375, # -0.25
+				},
+			],
 		},
 	],
 },
@@ -902,8 +988,8 @@ use strict;
 {
 	race => 'terran',
 	cat => 'base',
-	name => 'SCV',
-	unit => 1,
+	name => 'SCV', # T-280 Space Construction Vehicle
+	pop => 1,
 	min => 50,
 	gas => 0,
 	build => 17,
@@ -916,14 +1002,15 @@ use strict;
 		organic => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Fusion Cutter',
 			damage => 5,
-			dps => 3.3,
 			cooldown => 1.5,
+			range => 0,
 		},
-		range => 0,
-	},
+	],
 	speed => 2.8125,
 	sight => 8,
 },
@@ -932,7 +1019,8 @@ use strict;
 	race => 'terran',
 	cat => 'base',
 	name => 'Mule',
-	unit => 0,
+	pop => 0,
+	cargo => 0,
 	min => 0,
 	build => 0,
 	size => 0.75,
@@ -962,15 +1050,17 @@ use strict;
 		mech => 1,
 		structure => 1,
 	},
-	attack => {
-		air => {
+	attack => [
+		{
+			anti => 2,
+			name => 'Longbolt Missiles',
 			damage => 12,
-			dps => 27.9,
 			cooldown => 0.8608,
 			count => 2,
+			type => 'projectile',
+			range => 7,
 		},
-		range => 7,
-	},
+	],
 	speed => 0,
 	sight => 11,
 	detect => 1,
@@ -980,9 +1070,11 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 80,
-			attack => {
-				range => 1,
-			},
+			attack => [
+				{
+					range => 1,
+				},
+			],
 		},
 		{
 			name => 'Building Armor',
@@ -999,7 +1091,7 @@ use strict;
 	cat => 'base',
 	name => 'Planetary Fortress',
 	base => ['Command Center'],
-	unit => -11,
+	pop => -11,
 	min => 150,
 	gas => 150,
 	build => 50,
@@ -1012,15 +1104,16 @@ use strict;
 		mech => 1,
 		structure => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Ibiks Cannon',
 			damage => 40,
-			dps => 20,
 			splash => 1,
 			cooldown => 2,
+			range => 6,
 		},
-		range => 6,
-	},
+	],
 	speed => 0,
 	sight => 11,
 	upgrade => [
@@ -1043,9 +1136,11 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 80,
-			attack => {
-				range => 1,
-			},
+			attack => [
+				{
+					range => 1,
+				},
+			],
 		},
 	],
 },
@@ -1054,7 +1149,7 @@ use strict;
 	race => 'terran',
 	cat => 'barracks',
 	name => 'Marine',
-	unit => 1,
+	pop => 1,
 	min => 50,
 	gas => 0,
 	build => 25,
@@ -1066,16 +1161,16 @@ use strict;
 		light => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
-			name => 'C-14 rifle',
-			damage => [6 .. 9],
-			dps => [7, 8.2, 9.4, 10.6],
+	attack => [
+		{
+			anti => 3,
+			name => 'C-14 Rifle',
+			damage => 6,
+			upgrade => 1,
 			cooldown => 0.8608,
+			range => 5,
 		},
-		air => 'ground',
-		range => 5,
-	},
+	],
 	speed => 2.25,
 	upgrade => [
 		{
@@ -1090,19 +1185,20 @@ use strict;
 		{
 			name => 'Stim Pack',
 			abbr => 'sp',
-			alt => 'Stimmed Marine',
 			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],
+			attack => [
+				{
+					anti => 3,
+					damage => 6,
+					upgrade => 1,
 					cooldown => 0.5739,
+					range => 5,
 				},
-				air => 'ground',
-			},
+			],
 			duration => 15,
 		},
 	],
@@ -1113,7 +1209,7 @@ use strict;
 	race => 'terran',
 	cat => 'barracks',
 	name => 'Marauder',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 25,
 	build => 30,
@@ -1125,37 +1221,48 @@ use strict;
 		armored => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
-			damage => [10 .. 13],
-			#bonus => +10 (+1) A,
-			dps => [6.7, 7.4, 8.1, 8.8],
+	attack => [
+		{
+			anti => 1,
+			name => 'Punisher Grenades',
+			damage => 10,
+			upgrade => 1,
+			bonus => {
+				armored => 10,
+				-armored => 1,
+			},
 			type => 'projectile',
 			cooldown => 1.5,
+			range => 6,
 		},
-		range => 6,
-	},
+	],
 	special => [
 		{
 			name => 'Stim Pack',
 			abbr => 'sp',
-			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],
+			attack => [
+				{
+					anti => 1,
+					damage => 10,
+					upgrade => 1,
+					bonus => {
+						armored => 10,
+						-armored => 1,
+					},
+					type => 'projectile',
 					cooldown => 1.0,
+					range => 6,
 				},
-				air => 'ground',
-			},
+			],
 			duration => 15,
 		},
 	],
-	update => [
+	upgrade => [
 		{
 			name => 'Concussive Shells',
 			abbr => 'cs',
@@ -1174,7 +1281,7 @@ use strict;
 	race => 'terran',
 	cat => 'barracks',
 	name => 'Reaper',
-	unit => 1,
+	pop => 1,
 	min => 50,
 	gas => 50,
 	build => 40,
@@ -1187,15 +1294,17 @@ use strict;
 		organic => 1,
 		jump => 'Jet Pack',
 	},
-	attack => {
-		ground => {
-			damage => [4 .. 7],
-			dps => [7.3, 9.1, 10.9, 12.7],
+	attack => [
+		{
+			anti => 1,
+			name => 'P-45 Reaper Pistol',
+			damage => 4,
+			upgrade => 1,
 			cooldown => 1.1,
 			count => 2,
+			range => 4.5,
 		},
-		range => 4.5,
-	},
+	],
 	speed => 3.75,
 	sight => 9,
 	special => [
@@ -1212,7 +1321,7 @@ use strict;
 	race => 'terran',
 	cat => 'barracks',
 	name => 'Ghost',
-	unit => 2,
+	pop => 2,
 	min => 200,
 	gas => 100,
 	build => 40,
@@ -1224,19 +1333,24 @@ use strict;
 		organic => 1,
 		psionic => 1,
 	},
-	attack => {
-		ground => {
-			damage => [10 .. 13],
-			#bonus => +10 (+1) L,
-			dps => [6.7, 7.4, 8.1, 8.8],
+	attack => [
+		{
+			anti => 3,
+			name => 'C-10 Rifle',
+			damage => 10,
+			upgrade => 1,
+			bonus => {
+				light => 10,
+				-light => 1,
+			},
 			cooldown => 1.5,
+			range => 6,
 		},
-		air => 'ground',
-		range => 6,
-	},
+	],
 	speed => 2.25,
 	sight => 11,
-	energy => 200,
+	energy => 75,
+	capacity => 200,
 	special => [
 		{
 			name => 'Sniper Round',
@@ -1277,7 +1391,7 @@ use strict;
 	race => 'terran',
 	cat => 'factory',
 	name => 'Hellion',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 0,
 	build => 30,
@@ -1289,15 +1403,21 @@ use strict;
 		light => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
-			damage => [8 .. 11],
-			dps => [3.2, 3.6, 4.0, 4.4],
+	attack => [
+		{
+			anti => 1,
+			name => 'Infernal Flamethrower',
+			damage => 8,
+			upgrade => 1,
+			bonus => {
+				light => 6,
+				-light => 1,
+			},
 			splash => 'line',
 			cooldown => 2.5,
+			range => 5,
 		},
-		range => 5,
-	},
+	],
 	speed => 4.25,
 	sight => 10,
 	special => [
@@ -1308,17 +1428,22 @@ use strict;
 			duration => 4,
 		},
 	],
-	update => [
+	upgrade => [
 		{
 			name => 'Infernal Pre-Igniter',
 			min => 150,
 			gas => 150,
 			build => 110,
-			attack => {
-				ground => {
-					#bonus => +6 (+1), +11 (+1) L,
+			attack => [
+				{
+					damage => 6,
+					upgrade => 1,
+					bonus => {
+						light => 5,
+						-light => 0,
+					},
 				},
-			},
+			],
 		},
 	],
 },
@@ -1327,7 +1452,7 @@ use strict;
 	race => 'terran',
 	cat => 'factory',
 	name => 'Hellbat',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 0,
 	build => 30,
@@ -1340,15 +1465,17 @@ use strict;
 		organic => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
-			damage => [18, 20, 22, 24],
-			dps => [9 .. 12],
+	attack => [
+		{
+			anti => 1,
+			name => 'Napalm Spray',
+			damage => 18,
+			upgrade => 2,
 			splash => 1,
 			cooldown => 2,
+			range => 2,
 		},
-		range => 2,
-	},
+	],
 	speed => 2.25,
 	sight => 10,
 	special => [
@@ -1359,17 +1486,20 @@ use strict;
 			duration => 4,
 		},
 	],
-	update => [
+	upgrade => [
 		{
 			name => 'Infernal Pre-Igniter',
 			min => 150,
 			gas => 150,
 			build => 110,
-			attack => {
-				ground => {
-					#bonus => +12 (+1) L,
+			attack => [
+				{
+					bonus => {
+						light => 12,
+						-light => 1,
+					},
 				},
-			},
+			],
 		},
 	],
 },
@@ -1378,7 +1508,7 @@ use strict;
 	race => 'terran',
 	cat => 'factory',
 	name => 'Widow Mine',
-	unit => 2,
+	pop => 2,
 	min => 75,
 	gas => 25,
 	build => 40,
@@ -1390,18 +1520,22 @@ use strict;
 		light => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
+			name => 'Sentinel Missiles',
 			damage => 125,
-			#bonus => +35 Shield,
+			bonus => {
+				shields => 40,
+			},
 			splash => 1,
 			cooldown => 40,
+			range => 5,
 		},
-		range => 5,
-	},
+	],
 	speed => 2.8125,
 	sight => 7,
-	update => [
+	upgrade => [
 		{
 			name => 'Drilling Claws',
 			abbr => 'dc',
@@ -1417,7 +1551,7 @@ use strict;
 	race => 'terran',
 	cat => 'factory',
 	name => 'Siege Tank',
-	unit => 3,
+	pop => 3,
 	min => 150,
 	gas => 125,
 	build => 45,
@@ -1429,31 +1563,41 @@ use strict;
 		armored => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
-			damage => [15, 17, 19, 21],
-			#bonus => +10 (+1)A,
-			dps => [14.4, 16.3, 18.2, 20.1],
+	attack => [
+		{
+			anti => 1,
+			name => '90 mm Twin Cannon',
+			damage => 15,
+			upgrade => 2,
+			bonus => {
+				armored => 10,
+				-armored => 1,
+			},
 			cooldown => 1.04,
+			range => 7,
 		},
-		range => 7,
-	},
+	],
 	special => [
 		{
 			name => 'siege mode',
 			abbr => 'sg',
 			alt => 'Sieged Tank',
 			cargo => 0,
-			attack => {
-				ground => {
-					damage => [35, 38, 41, 44],
-					#bonus => 15 (+2)A,
-					dps => [11.7, 12.7, 13.7, 14.7],
+			attack => [
+				{
+					anti => 1,
+					name => '120 mm Shock Cannon',
+					damage => 35,
+					upgrade => 3,
+					bonus => {
+						armored => 15,
+						-armored => 2,
+					},
 					splash => 1,
 					cooldown => 3,
+					range => 13,
 				},
-				range => 13,
-			},
+			],
 			speed => 0,
 			duration => 4,
 		},
@@ -1466,7 +1610,7 @@ use strict;
 	race => 'terran',
 	cat => 'factory',
 	name => 'Thor',
-	unit => 6,
+	pop => 6,
 	min => 300,
 	gas => 200,
 	build => 60,
@@ -1479,33 +1623,42 @@ use strict;
 		mech => 1,
 		massive => 1,
 	},
-	attack => {
-		ground => {
-			damage => [30, 33, 36, 39],
-			dps => [46.9, 51.6, 56.3, 61.0],
+	attack => [
+		{
+			anti => 1,
+			name => "Thor's Hammer",
+			damage => 30,
+			upgrade => 3,
 			cooldown => 1.28,
 			range => 7,
 			count => 2,
 		},
-		air => {
-			name => 'Explosive Payload',
-			damage => [6 .. 9],
-			#bonus => +6 (+1) L Air,
-			dps => [8, 9.3, 10.6, 11.9],
+		{
+			anti => 2,
+			name => 'Javelin Missiles',
+#			name => 'Explosive Payload',
+			damage => 6,
+			upgrade => 1,
+			bonus => {
+				light => 6,
+				-light => 1,
+			},
 			splash => 1,
 			type => 'projectile',
 			cooldown => 3,
 			range => 10,
 			count => 4,
 		},
-		air => {
-			name => 'High Impact Payload',
-			damage => [24, 26, 28, 30],
-			dps => [12 .. 15],
+		{
+			anti => 2,
+			name => 'Punisher Cannons',
+#			name => 'High Impact Payload',
+			damage => 24,
+			upgrade => 2,
 			cooldown => 2,
 			range => 10,
 		},
-	},
+	],
 	speed => 1.875,
 	sight => 11,
 },
@@ -1514,7 +1667,7 @@ use strict;
 	race => 'terran',
 	cat => 'starport',
 	name => 'Viking',
-	unit => 2,
+	pop => 2,
 	min => 150,
 	gas => 75,
 	build => 42,
@@ -1525,33 +1678,40 @@ use strict;
 	attr => {
 		armored => 1,
 		mech => 1,
+		flying => 1,
 	},
-	attack => {
-		air => {
-			damage => [10 .. 13],
-			#bonus => +4A,
-			dps => [10 .. 13],
+	attack => [
+		{
+			anti => 2,
+			name => 'Lanzer Torpedoes',
+			damage => 10,
+			upgrade => 1,
+			bonus => {
+				armored => 4,
+			},
 			type => 'projectile',
 			cooldown => 2,
 			count => 2,
+			range => 9,
 		},
-		range => 9,
-	},
+	],
 	special => [
 		{
+			name => 'Assault Mode',
+			abbr => 'am',
+			build => 3, # transformation time
+			alt => 'Landed Viking',
 			cargo => 2,
-			attack => {
-				name => 'Assault Mode',
-				abbr => 'am',
-				build => 3, # transformation time
-				alt => 'Landed Viking',
-				ground => {
-					damage => [12 .. 15],
-					dps => [12 .. 15],
+			attack => [
+				{
+					anti => 1,
+					name => 'Twin Gatling Cannon',
+					damage => 12,
+					upgrade => 1,
 					cooldown => 1,
+					range => 6,
 				},
-				range => 6,
-			},
+			],
 		},
 	],
 	speed => 2.75,
@@ -1562,7 +1722,7 @@ use strict;
 	race => 'terran',
 	cat => 'starport',
 	name => 'Medivac',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 100,
 	build => 42,
@@ -1573,9 +1733,11 @@ use strict;
 	attr => {
 		armored => 1,
 		mech => 1,
+		flying => 1,
 	},
 	speed => 2.5,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Heal',
@@ -1600,7 +1762,7 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 80,
-			starting_energy => 25,
+			energy => 25,
 		},
 	],
 },
@@ -1608,8 +1770,8 @@ use strict;
 {
 	race => 'terran',
 	cat => 'starport',
-	name => 'Banshee',
-	unit => 3,
+	name => 'Banshee', # AH/G-24
+	pop => 3,
 	min => 150,
 	gas => 100,
 	build => 60,
@@ -1620,20 +1782,24 @@ use strict;
 	attr => {
 		light => 1,
 		mech => 1,
+		flying => 1,
 	},
-	attack => {
-		ground => {
-			damage => [12 .. 15],
-			dps => [19.2, 20.8, 22.4, 24.0],
+	attack => [
+		{
+			anti => 1,
+			name => 'Backlash Rockets',
+			damage => 12,
+			upgrade => 1,
 			type => 'projectile',
 			cooldown => 1.25,
 			count => 2,
+			range => 6,
 		},
-		range => 6,
-	},
+	],
 	speed => 2.75,
 	sight => 10,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Cloak',
@@ -1652,7 +1818,7 @@ use strict;
 	race => 'terran',
 	cat => 'starport',
 	name => 'Raven',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 200,
 	build => 60,
@@ -1663,11 +1829,13 @@ use strict;
 	attr => {
 		light => 1,
 		mech => 1,
+		flying => 1,
 	},
 	speed => 2.25,
 	sight => 11,
 	detect => 1,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			alt => 'Auto-Turret',
@@ -1682,15 +1850,15 @@ use strict;
 				mech => 1,
 				structure => 1,
 			},
-			attack => {
-				ground => {
+			attack => [
+				{
+					anti => 3,
+					name => '12 mm Gauss Cannon',
 					damage => 8,
-					dps => 10,
 					cooldown => 0.8,
+					range => 6,
 				},
-				air => 'ground',
-				range => 6,
-			},
+			],
 			speed => 0,
 			sight => 7,
 			upgrade => [
@@ -1699,9 +1867,11 @@ use strict;
 					min => 100,
 					gas => 100,
 					build => 80,
-					attack => {
-						range => 1,
-					},
+					attack => [
+						{
+							range => 1,
+						},
+					],
 				},
 				{
 					name => 'Building Armor',
@@ -1724,11 +1894,15 @@ use strict;
 				light => 1,
 				mech => 1,
 				structure => 1,
+				flying => 1,
 			},
 			cooldown => 0,
-			attack => {
-				range => 8,
-			},
+			attack => [
+				{
+					name => 'Point Defense Laser',
+					range => 8,
+				},
+			],
 			sight => 7,
 			upgrade => [
 				{
@@ -1736,9 +1910,11 @@ use strict;
 					min => 100,
 					gas => 100,
 					build => 80,
-					attack => {
-						range => 1,
-					},
+					attack => [
+						{
+							range => 1,
+						},
+					],
 				},
 				{
 					name => 'Building Armor',
@@ -1756,34 +1932,36 @@ use strict;
 			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,
-			},
+			attack => [
+				{
+					damage => 100,
+					splash => 1,
+				},
+			],
 			cost => 75,
 		},
 	],
-	update => [
+	upgrade => [
 		{
 			name => 'Durable Materials',
 			min => 150,
 			gas => 150,
 			build => 110,
-			special => {
-				at => {
-					duration => 240,
-				},
-				pd => {
-					duration => 30,
-				},
-			},
+#			special => {
+#				at => {
+#					duration => 240,
+#				},
+#				pd => {
+#					duration => 30,
+#				},
+#			},
 		},
 		{
 			name => 'Corvid Reactor',
 			min => 150,
 			gas => 150,
 			build => 110,
-			starting_energy => 25,
+			energy => 25,
 		},
 	],
 },
@@ -1792,7 +1970,7 @@ use strict;
 	race => 'terran',
 	cat => 'starport',
 	name => 'Battlecruiser',
-	unit => 6,
+	pop => 6,
 	min => 400,
 	gas => 300,
 	build => 90,
@@ -1804,23 +1982,32 @@ use strict;
 		armored => 1,
 		mech => 1,
 		massive => 1,
+		flying => 1,
 	},
-	attack => {
-		ground => {
-			damage => [8 .. 11],
-			dps => [35.6, 40.0, 44.4, 48.8],
+	attack => [
+		{
+			anti => 1,
+			name => 'ATS Laser Batteries',
+			damage => 8,
+			upgrade => 1,
 			cooldown => 0.225,
+			type => 'projectile',
+			range => 6,
 		},
-		air => {
-			damage => [6 .. 9],
-			dps => [26.7, 31.1, 35.5, 39.9],
+		{
+			anti => 2,
+			name => 'ATS Laser Batteries',
+			damage => 6,
+			upgrade => 1,
 			cooldown => 0.225,
+			type => 'projectile',
+			range => 6,
 		},
-		range => 6,
-	},
+	],
 	speed => 1.875,
 	sight => 12,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Yamato Cannon',
@@ -1832,18 +2019,20 @@ use strict;
 			duration => 3,
 			range => 10,
 			cost => 100,
-			attack => {
-				damage => 300,
-			},
+			attack => [
+				{
+					damage => 300,
+				},
+			],
 		},
 	],
-	update => [
+	upgrade => [
 		{
 			name => 'Behemoth Reactor',
 			min => 150,
 			gas => 150,
 			build => 80,
-			starting_energy => 25,
+			energy => 25,
 		},
 	],
 },
@@ -1854,7 +2043,7 @@ use strict;
 	race => 'zerg',
 	cat => 'base',
 	name => 'Drone',
-	unit => 1,
+	pop => 1,
 	min => 50,
 	gas => 0,
 	build => 17,
@@ -1866,14 +2055,15 @@ use strict;
 		light => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Claws',
 			damage => 5,
-			dps => 3.3,
 			cooldown => 1.5,
+			range => 0,
 		},
-		range => 0,
-	},
+	],
 	speed => 2.8125,
 	creep => 1.0,
 	sight => 8,
@@ -1883,7 +2073,7 @@ use strict;
 	race => 'zerg',
 	cat => 'base',
 	name => 'Queen',
-	unit => 2,
+	pop => 2,
 	min => 150,
 	gas => 0,
 	build => 50,
@@ -1895,27 +2085,32 @@ use strict;
 		organic => 1,
 		psionic => 1,
 	},
-	attack => {
-		ground => {
-			damage => [4 .. 7],
-			dps => [8, 10, 12, 14],
+	attack => [
+		{
+			anti => 1,
+			name => 'Claws',
+			damage => 4,
+			upgrade => 1,
 			cooldown => 1.0,
-			type => 'projectile',
+			type => 'projectile', # except if range < 3
 			range => 5,
 			count => 2,
 		},
-		air => {
-			damage => [9 .. 12],
-			dps => [9 .. 12],
+		{
+			anti => 2,
+			name => 'Acid Spines',
+			damage => 9,
+			upgrade => 1,
 			cooldown => 1.0,
-			type => 'projectile',
+			type => 'projectile', # except if range < 3
 			range => 7,
 		},
-	},
+	],
 	speed => 0.9375,
 	creep => 2.7,
 	sight => 9,
-	energy => 200,
+	energy => 25,
+	capacity => 200,
 	special => [
 		{
 			name => 'Spawn Larva',
@@ -1949,7 +2144,7 @@ use strict;
 	race => 'zerg',
 	cat => 'base',
 	name => 'Overlord',
-	unit => -9,
+	pop => -9,
 	min => 100,
 	gas => 0,
 	build => 25,
@@ -1960,9 +2155,9 @@ use strict;
 	attr => {
 		armored => 1,
 		organic => 1,
+		flying => 1,
 	},
 	speed => 0.586,
-	creep => 0,
 	sight => 11,
 	special => [
 		{
@@ -1998,7 +2193,7 @@ use strict;
 	cat => 'base',
 	name => 'Overseer',
 	base => ['Overlord'],
-	unit => -9,
+	pop => -9,
 	min => 100+50,
 	gas => 50,
 	build => 17,
@@ -2009,12 +2204,13 @@ use strict;
 	attr => {
 		armored => 1,
 		organic => 1,
+		flying => 1,
 	},
 	speed => 1.875,
-	creep => 0,
 	sight => 11,
 	detect => 1,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Spawn Changeling',
@@ -2049,7 +2245,7 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 60,
-			speed => 0.875,
+			speed => 3.375 - 1.875,
 		},
 	],
 },
@@ -2058,7 +2254,7 @@ use strict;
 	race => 'zerg',
 	cat => 'creep',
 	name => 'Larva',
-	unit => 0,
+	pop => 0,
 	build => 15,
 	size => 0.25,
 	cargo => 0,
@@ -2102,15 +2298,18 @@ use strict;
 		organic => 1,
 		structure => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Impaler Tentacle',
 			damage => 25,
-			#bonus => +5A,
-			dps => 13.5,
+			bonus => {
+				armored => 5,
+			},
 			cooldown => 1.85,
+			range => 7,
 		},
-		range => 7,
-	},
+	],
 	speed => (1.0),
 	creep => 2.5,
 	sight => 11,
@@ -2132,16 +2331,19 @@ use strict;
 		organic => 1,
 		structure => 1,
 	},
-	attack => {
-		air => {
+	attack => [
+		{
+			anti => 2,
+			name => 'Seeker Spores',
 			damage => 15,
-			#bonus => + 30 B,
-			dps => 17.4,
+			bonus => {
+				organic => 30,
+			},
 			type => 'projectile',
 			cooldown => 0.8608,
+			range => 7,
 		},
-		range => 7,
-	},
+	],
 	speed => (1.0),
 	creep => 2.5,
 	sight => 11,
@@ -2152,7 +2354,7 @@ use strict;
 	race => 'zerg',
 	cat => 'hatchery',
 	name => 'Zergling',
-	unit => 0.5,
+	pop => 0.5,
 	min => 25,
 	gas => 0,
 	build => 24,
@@ -2164,13 +2366,15 @@ use strict;
 		light => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
-			damage => [5 .. 8],
-			dps => [7.2, 8.6, 10.0, 11.4],
+	attack => [
+		{
+			anti => 1,
+			name => 'Claws',
+			damage => 5,
+			upgrade => 1,
 			cooldown => 0.696,
 		},
-	},
+	],
 	speed => 2.9531,
 	creep => 1.3,
 	range => 0,
@@ -2181,12 +2385,12 @@ use strict;
 			min => 200,
 			gas => 200,
 			build => 130,
-			attack => {
-				ground => {
-					dps => [8.5, 10.2, 11.9, 13.6],
+			attack => [
+				{
+					anti => 1,
 					cooldown => -0.109,
 				},
-			},
+			],
 			req => 'Hive',
 		},
 		{
@@ -2204,7 +2408,7 @@ use strict;
 	cat => 'hatchery',
 	name => 'Baneling',
 	base => ['Zergling'],
-	unit => 0.5,
+	pop => 0.5,
 	min => 25+25,
 	gas => 25,
 	build => 20,
@@ -2215,14 +2419,22 @@ use strict;
 	attr => {
 		organic => 1,
 	},
-	attack => {
-		ground => {
-			damage => [20, 22, 24, 26],
-			#bonus => +15 (+2)L / +60 (+3)S,
+	attack => [
+		{
+			anti => 1,
+			name => 'Volatile Burst',
+			damage => 20,
+			upgrade => 2,
+			bonus => {
+				light => 15,
+				-light => 2,
+				structure => 60,
+				-structure => 3,
+			},
 			splash => 1,
+			range => 0,
 		},
-		range => 0,
-	},
+	],
 	speed => 2.5,
 	creep => 1.3,
 	sight => 8,
@@ -2242,7 +2454,7 @@ use strict;
 	race => 'zerg',
 	cat => 'hatchery',
 	name => 'Roach',
-	unit => 2,
+	pop => 2,
 	min => 75,
 	gas => 25,
 	build => 27,
@@ -2254,13 +2466,15 @@ use strict;
 		armored => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
-			damage => [16, 18, 20, 22],
-			dps => [8 .. 11],
+	attack => [
+		{
+			anti => 1,
+			name => 'Acid Saliva', # Claws melee
+			damage => 16,
+			upgrade => 2,
 			cooldown => 2.0,
 		},
-	},
+	],
 	speed => 2.25,
 	creep => 1.3,
 	range => 4,
@@ -2299,7 +2513,7 @@ use strict;
 	race => 'zerg',
 	cat => 'lair',
 	name => 'Hydralisk',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 50,
 	build => 33,
@@ -2311,16 +2525,17 @@ use strict;
 		light => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
-			damage => [12 .. 15],
-			dps => [16, 17.3, 18.6, 19.9],
-			type => 'projectile',
+	attack => [
+		{
+			anti => 3,
+			name => 'Needle Spines', # Scythe melee
+			damage => 12,
+			upgrade => 1,
+			type => 'projectile', # except melee
 			cooldown => 0.75,
+			range => 5,
 		},
-		air => 'ground',
-		range => 5,
-	},
+	],
 	speed => 2.25,
 	creep => 1.5,
 	sight => 9,
@@ -2330,9 +2545,11 @@ use strict;
 			min => 150,
 			gas => 150,
 			build => 80,
-			attack => {
-				range => 1,
-			},
+			attack => [
+				{
+					range => 1,
+				},
+			],
 		},
 		{
 			name => 'Muscular Augments',
@@ -2349,7 +2566,7 @@ use strict;
 	race => 'zerg',
 	cat => 'lair',
 	name => 'Infestor',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 150,
 	build => 50,
@@ -2365,7 +2582,8 @@ use strict;
 	speed => 2.25,
 	creep => 1.3,
 	sight => 10,
-	energy => 200,
+	energy => 50,
+	capacity => 200,
 	special => [
 		{
 			name => 'Neural Parasite',
@@ -2401,27 +2619,26 @@ use strict;
 				light => 1,
 				organic => 1,
 			},
-			attack => {
-				ground => {
+			attack => [
+				{
+					anti => 3,
 					damage => 8,
-					dps => 9.3,
 					cooldown => 0.8608,
+					range => 5,
 				},
-				air => 'ground',
-				range => 5,
-			},
+			],
 			speed => 0.9375,
 			creep => 1.3,
 			sight => 9,
 		},
 	],
-	update => [
+	upgrade => [
 		{
 			name => 'Pathogen Glands',
 			min => 150,
 			gas => 150,
 			build => 80,
-			starting_energy => 25,
+			energy => 25,
 		},
 	],
 },
@@ -2450,7 +2667,7 @@ use strict;
 	race => 'zerg',
 	cat => 'lair',
 	name => 'Swarm Host',
-	unit => 4,
+	pop => 4,
 	min => 100,
 	gas => 200,
 	build => 40,
@@ -2462,13 +2679,17 @@ use strict;
 		armored => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
-			dps => [27.9, 30.2, 32.5, 34.8],
+	attack => [
+		{
+			anti => 1,
+			dps => [16.7, undef, undef, 20.8], # 20/.6 * 2 /60*25
 			type => 'projectile',
-			cooldown => 0.86,
+			count => 2,
+			cooldown => 60,
+			duration => 25,
+			range => 3*25, # locust speed * duration = theoretical walk limit
 		},
-	},
+	],
 	speed => 2.95,
 	creep => 1.3,
 	sight => 10,
@@ -2484,15 +2705,17 @@ use strict;
 				light => 1,
 				organic => 1,
 			},
-			attack => {
-				ground => {
-					damage => [12 .. 15],
-					dps => [14.0, 15.2, 16.4, 17.6],
+			attack => [
+				{
+					anti => 1,
+					name => 'Acid Spit',
+					damage => 12,
+					upgrade => 1,
 					type => 'projectile',
 					cooldown => 0.6,
+					range => 3,
 				},
-				range => 3,
-			},
+			],
 			speed => 1.875,
 			creep => 1.4,
 			sight => 6,
@@ -2501,12 +2724,15 @@ use strict;
 			count => 2,
 		},
 	],
-	update => [
+	upgrade => [
 		{
 			name => 'Flying Locusts',
 			min => 200,
 			gas => 200,
 			build => 160,
+			attr => {
+				flying => 1,
+			},
 		},
 	],
 },
@@ -2515,7 +2741,7 @@ use strict;
 	race => 'zerg',
 	cat => 'lair',
 	name => 'Mutalisk',
-	unit => 2,
+	pop => 2,
 	min => 100,
 	gas => 100,
 	build => 33,
@@ -2526,21 +2752,24 @@ use strict;
 	attr => {
 		light => 1,
 		organic => 1,
+		flying => 1,
 	},
-	attack => {
-		ground => {
-			damage => [9 .. 12],
-			dps => [5.9, 6.6, 7.3, 8.0],
+	attack => [
+		{
+			anti => 3,
+			name => 'Glaive Wurm',
+			damage => 9,
+			upgrade => 1,
 			splash => 'bounce',
+			type => 'projectile',
 			psionic => 1,
 			cooldown => 1.5246,
+			range => 3,
 		},
-		air => 'ground',
-		range => 3,
-	},
+	],
 	speed => 4,
 	sight => 11,
-	update => [
+	upgrade => [
 		{
 			name => 'Tissue Regeneration',
 			abbr => 'tr',
@@ -2553,7 +2782,7 @@ use strict;
 	race => 'zerg',
 	cat => 'lair',
 	name => 'Corruptor',
-	unit => 2,
+	pop => 2,
 	min => 150,
 	gas => 100,
 	build => 40,
@@ -2564,17 +2793,23 @@ use strict;
 	attr => {
 		armored => 1,
 		organic => 1,
+		flying => 1,
 	},
-	attack => {
-		air => {
-			damage => [14 .. 17],
-			#bonus => +6 (+1)Ma,
-			dps => [7.4, 7.9, 8.4, 8.9],
+	attack => [
+		{
+			anti => 2,
+			name => 'Parasite Spores',
+			damage => 14,
+			upgrade => 1,
+			bonus => {
+				massive => 6,
+				-massive => 1,
+			},
 			type => 'projectile',
 			cooldown => 1.9,
+			range => 6,
 		},
-		range => 6,
-	},
+	],
 	speed => 2.9531,
 	sight => 10,
 	special => [
@@ -2593,7 +2828,7 @@ use strict;
 	cat => 'hive',
 	name => 'Brood Lord',
 	base => ['Corruptor'],
-	unit => 4,
+	pop => 4,
 	min => 150+150,
 	gas => 100+150,
 	build => 34,
@@ -2605,15 +2840,18 @@ use strict;
 		armored => 1,
 		organic => 1,
 		massive => 1,
+		flying => 1,
 	},
-	attack => {
-		ground => {
-			damage => [20, 22, 24, 26],
-			dps => [8.0, 8.8, 9.6, 10.4],
+	attack => [
+		{
+			anti => 1,
+			name => 'Broodling Strike',
+			damage => 20,
+			upgrade => 2,
 			cooldown => 2.5,
+			range => 9.5,
 		},
-		range => 9.5,
-	},
+	],
 	speed => 1.4062,
 	sight => 12,
 	special => [
@@ -2623,7 +2861,7 @@ use strict;
 			desc => 'Broodlings are spawned upon each attack',
 			duration => -1,
 			alt => 'Broodling',
-			unit => 0,
+			pop => 0,
 #			build => 1,
 			size => 0.75,
 			cargo => 0,
@@ -2633,14 +2871,16 @@ use strict;
 				light => 1,
 				organic => 1,
 			},
-			attack => {
-				ground => {
-					damage => [4 .. 7],
-					dps => [6.2, 7.7, 9.2, 10.7],
+			attack => [
+				{
+					anti => 1,
+					name => 'Claws',
+					damage => 4,
+					upgrade => 1,
 					cooldown => 0.6455,
+					range => 0,
 				},
-				range => 0,
-			},
+			],
 			speed => 3.836,
 			creep => 1.0,
 			sight => 7,
@@ -2658,7 +2898,7 @@ use strict;
 	race => 'zerg',
 	cat => 'hive',
 	name => 'Viper',
-	unit => 3,
+	pop => 3,
 	min => 100,
 	gas => 200,
 	build => 40,
@@ -2670,10 +2910,12 @@ use strict;
 		armored => 1,
 		organic => 1,
 		psionic => 1,
+		flying => 1,
 	},
 	speed => 2.9531,
 	sight => 11,
-	energy => 200,
+	energy => 50, #XXX
+	capacity => 200,
 	special => [
 		{
 			name => 'Blinding Cloud',
@@ -2696,6 +2938,7 @@ use strict;
 			name => 'Consume',
 			abbr => 'cs',
 			desc => 'leaches 200 life of friendly building over 20s to gain 50 energy',
+			cost => -50,
 			duration => 20,
 			range => 7,
 			cooldown => 1,
@@ -2707,7 +2950,7 @@ use strict;
 	race => 'zerg',
 	cat => 'hive',
 	name => 'Ultralisk',
-	unit => 6,
+	pop => 6,
 	min => 300,
 	gas => 200,
 	build => 55,
@@ -2720,15 +2963,17 @@ use strict;
 		organic => 1,
 		massive => 1,
 	},
-	attack => {
-		ground => {
-			damage => [35, 38, 41, 44],
-			dps => [40.7, 44.2, 47.7, 51.2],
+	attack => [
+		{
+			anti => 1,
+			name => 'Kaiser Blades',
+			damage => 35,
+			upgrade => 3,
 			splash => 1,
 			cooldown => 0.861,
+			range => 1,
 		},
-		range => 1,
-	},
+	],
 	speed => 2.9531,
 	creep => 1.3,
 	sight => 9,