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

diff --git a/sc-units-hots.inc.pl b/sc-units-hots.inc.pl
index cdce16d..5d558d1 100644
--- a/sc-units-hots.inc.pl
+++ b/sc-units-hots.inc.pl
@@ -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,
@@ -84,15 +86,17 @@ use strict;
 		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,
@@ -119,7 +123,7 @@ use strict;
 			cost => 100,
 			radius => 3.5,
 			range => 9,
-			duration => 30,
+			duration => 10,
 		},
 	],
 },
@@ -143,16 +147,17 @@ use strict;
 		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,
@@ -200,15 +205,16 @@ 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,
@@ -241,15 +247,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 => [
@@ -287,16 +295,17 @@ 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,
 	special => [
@@ -346,17 +355,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 => [
@@ -438,14 +450,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 => [
@@ -476,17 +490,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,
 },
@@ -508,15 +526,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 => [
@@ -548,16 +571,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 => [
@@ -566,9 +591,11 @@ use strict;
 			min => 200,
 			gas => 200,
 			build => 140,
-			attack => {
-				range => 3,
-			},
+			attack => [
+				{
+					range => 3,
+				},
+			],
 		},
 	],
 },
@@ -670,17 +697,21 @@ use strict;
 		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,
@@ -700,9 +731,11 @@ use strict;
 			min => 150,
 			gas => 150,
 			build => 90,
-			attack => {
-				range => 2,
-			},
+			attack => [
+				{
+					range => 2,
+				},
+			],
 		},
 	],
 },
@@ -725,16 +758,20 @@ use strict;
 		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 => [
@@ -744,6 +781,13 @@ use strict;
 			desc => 'increases damage to armored by 6 for 20 seconds',
 			duration => 20,
 			cooldown => 60,
+			attack => [
+				{
+					bonus => {
+						armored => 6,
+					},
+				},
+			],
 		},
 	],
 },
@@ -767,19 +811,21 @@ use strict;
 		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,
@@ -824,17 +870,30 @@ use strict;
 		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,
 },
@@ -858,9 +917,15 @@ use strict;
 		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 => [
@@ -880,29 +945,33 @@ use strict;
 				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
+				},
+			],
 		},
 	],
 },
@@ -912,7 +981,7 @@ use strict;
 {
 	race => 'terran',
 	cat => 'base',
-	name => 'SCV',
+	name => 'SCV', # T-280 Space Construction Vehicle
 	unit => 1,
 	min => 50,
 	gas => 0,
@@ -926,14 +995,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,
 },
@@ -972,15 +1042,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,
@@ -990,9 +1062,11 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 80,
-			attack => {
-				range => 1,
-			},
+			attack => [
+				{
+					range => 1,
+				},
+			],
 		},
 		{
 			name => 'Building Armor',
@@ -1022,15 +1096,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 => [
@@ -1053,9 +1128,11 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 80,
-			attack => {
-				range => 1,
-			},
+			attack => [
+				{
+					range => 1,
+				},
+			],
 		},
 	],
 },
@@ -1076,16 +1153,16 @@ use strict;
 		light => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
 			name => 'C-14 rifle',
-			damage => [6 .. 9],
-			dps => [7, 8.2, 9.4, 10.6],
+			damage => 6,
+			upgrade => 1,
 			cooldown => 0.8608,
+			range => 5,
 		},
-		air => 'ground',
-		range => 5,
-	},
+	],
 	speed => 2.25,
 	upgrade => [
 		{
@@ -1100,19 +1177,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,
 		},
 	],
@@ -1135,37 +1213,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',
@@ -1197,15 +1286,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 => [
@@ -1234,16 +1325,20 @@ 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,
@@ -1299,15 +1394,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 => [
@@ -1318,17 +1419,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,
+					},
 				},
-			},
+			],
 		},
 	],
 },
@@ -1350,15 +1456,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 => [
@@ -1369,17 +1477,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,
+					},
 				},
-			},
+			],
 		},
 	],
 },
@@ -1400,18 +1511,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',
@@ -1439,31 +1554,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,
 		},
@@ -1489,33 +1614,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,
 },
@@ -1537,32 +1671,38 @@ use strict;
 		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,
@@ -1620,7 +1760,7 @@ use strict;
 {
 	race => 'terran',
 	cat => 'starport',
-	name => 'Banshee',
+	name => 'Banshee', # AH/G-24
 	unit => 3,
 	min => 150,
 	gas => 100,
@@ -1634,16 +1774,18 @@ use strict;
 		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,
@@ -1696,15 +1838,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 => [
@@ -1713,9 +1855,11 @@ use strict;
 					min => 100,
 					gas => 100,
 					build => 80,
-					attack => {
-						range => 1,
-					},
+					attack => [
+						{
+							range => 1,
+						},
+					],
 				},
 				{
 					name => 'Building Armor',
@@ -1741,9 +1885,12 @@ use strict;
 				flying => 1,
 			},
 			cooldown => 0,
-			attack => {
-				range => 8,
-			},
+			attack => [
+				{
+					name => 'Point defense laser',
+					range => 8,
+				},
+			],
 			sight => 7,
 			upgrade => [
 				{
@@ -1751,9 +1898,11 @@ use strict;
 					min => 100,
 					gas => 100,
 					build => 80,
-					attack => {
-						range => 1,
-					},
+					attack => [
+						{
+							range => 1,
+						},
+					],
 				},
 				{
 					name => 'Building Armor',
@@ -1771,27 +1920,29 @@ 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',
@@ -1821,19 +1972,26 @@ use strict;
 		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,
@@ -1848,12 +2006,14 @@ use strict;
 			duration => 3,
 			range => 10,
 			cost => 100,
-			attack => {
-				damage => 300,
-			},
+			attack => [
+				{
+					damage => 300,
+				},
+			],
 		},
 	],
-	update => [
+	upgrade => [
 		{
 			name => 'Behemoth Reactor',
 			min => 150,
@@ -1882,14 +2042,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,
@@ -1911,23 +2072,27 @@ 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,
@@ -2067,7 +2232,7 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 60,
-			speed => 0.875,
+			speed => 3.375 - 1.875,
 		},
 	],
 },
@@ -2120,15 +2285,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,
@@ -2150,16 +2318,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,
@@ -2182,13 +2353,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,
@@ -2199,12 +2372,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',
 		},
 		{
@@ -2233,14 +2406,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,
@@ -2272,13 +2453,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,
@@ -2329,16 +2512,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,
@@ -2348,9 +2532,11 @@ use strict;
 			min => 150,
 			gas => 150,
 			build => 80,
-			attack => {
-				range => 1,
-			},
+			attack => [
+				{
+					range => 1,
+				},
+			],
 		},
 		{
 			name => 'Muscular Augments',
@@ -2419,21 +2605,20 @@ 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,
@@ -2480,13 +2665,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,
@@ -2502,15 +2691,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,
@@ -2519,7 +2710,7 @@ use strict;
 			count => 2,
 		},
 	],
-	update => [
+	upgrade => [
 		{
 			name => 'Flying Locusts',
 			min => 200,
@@ -2549,20 +2740,21 @@ use strict;
 		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',
 			psionic => 1,
 			cooldown => 1.5246,
+			range => 3,
 		},
-		air => 'ground',
-		range => 3,
-	},
+	],
 	speed => 4,
 	sight => 11,
-	update => [
+	upgrade => [
 		{
 			name => 'Tissue Regeneration',
 			abbr => 'tr',
@@ -2588,16 +2780,21 @@ use strict;
 		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 => [
@@ -2630,14 +2827,16 @@ use strict;
 		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 => [
@@ -2657,14 +2856,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,
@@ -2721,6 +2922,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,
@@ -2745,15 +2947,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,