X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/0a04287fe0f0cb5e175043187fc2f44001c344a2..803059fa9104398d4cdc539ae29bb281925d4d4e:/sc-units-hots.inc.pl

diff --git a/sc-units-hots.inc.pl b/sc-units-hots.inc.pl
index c0b7452..107f103 100644
--- a/sc-units-hots.inc.pl
+++ b/sc-units-hots.inc.pl
@@ -24,14 +24,16 @@ 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,16 +53,17 @@ 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,
@@ -85,15 +88,17 @@ use strict;
 		psionic => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Repulsor Cannon',
 			damage => [8 .. 11],
 			dps => [9.4, 10.6, 11.8, 13.0],
 			type => 'projectile',
 			cooldown => 0.85,
+			range => 5,
 		},
-		range => 5,
-	},
+	],
 	speed => 1.875,
 	sight => 9,
 	energy => 200,
@@ -120,7 +125,7 @@ use strict;
 			cost => 100,
 			radius => 3.5,
 			range => 9,
-			duration => 30,
+			duration => 10,
 		},
 	],
 },
@@ -144,16 +149,17 @@ use strict;
 		massive => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
+			name => 'Purifier beams',
 			damage => [6 .. 9],
 			dps => [16.3, 19.0, 21.7, 24.4],
 			cooldown => 2.21,
 			count => 6,
+			range => 7,
 		},
-		air => 'ground',
-		range => 7,
-	},
+	],
 	speed => 1.4062,
 	sight => 14,
 	energy => 200,
@@ -201,16 +207,17 @@ 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,
@@ -243,15 +250,17 @@ use strict;
 		light => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Psi blades',
 			damage => [8 .. 11],
 			dps => [13.3, 15.0, 16.7, 18.4],
 			cooldown => 1.2,
 			count => 2,
+			range => 0,
 		},
-		range => 0,
-	},
+	],
 	speed => 2.25,
 	sight => 9,
 	special => [
@@ -289,16 +298,17 @@ use strict;
 		mech => 1,
 		psionic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
+			name => 'Disruption beam',
 			damage => [6 .. 9],
 			dps => [6 .. 9],
 			cooldown => 1.0,
+			range => 5,
 		},
-		air => 'ground',
-	},
+	],
 	speed => 2.25,
-	range => 5,
 	sight => 10,
 	energy => 200,
 	special => [
@@ -348,17 +358,20 @@ use strict;
 		armored => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
+			name => 'Particle disruptors',
 			damage => [10 .. 13],
 			dps => [6.9, 7.6, 8.3, 9.0],
-			#bonus => +4 A,
+			bonus => {
+				armored => 4,
+			},
 			type => 'projectile',
 			cooldown => 1.44,
+			range => 6,
 		},
-		air => 'ground',
-		range => 6,
-	},
+	],
 	speed => 2.9531,
 	sight => 10,
 	special => [
@@ -440,14 +453,16 @@ use strict;
 		organic => 1,
 		psionic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Warp blade',
 			damage => [45, 50, 55, 60],
 			dps => [26.6, 29.6, 32.6, 35.6],
 			cooldown => 1.694,
+			range => 0,
 		},
-		range => 0,
-	},
+	],
 	speed => 2.8125,
 	sight => 8,
 	special => [
@@ -478,17 +493,20 @@ use strict;
 		psionic => 1,
 		massive => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
+			name => 'Psionic shockwave',
 			damage => [25, 28, 31, 34],
 			dps => [14.3, 16.0, 17.7, 19.4],
-			#bonus => +10 (+1) B,
+			bonus => {
+				organic => [10 .. 13],
+			},
 			splash => 1,
 			cooldown => 1.754,
+			range => 3,
 		},
-		air => 'ground',
-		range => 3,
-	},
+	],
 	speed => 2.8125,
 	sight => 9,
 },
@@ -510,15 +528,19 @@ use strict;
 		armored => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Phase disruptors',
 			damage => [20, 22, 24, 26],
-			#bonus => +30 (+3) A,
+			bonus => {
+				armored => [30, 33, 36, 39],
+			},
 			dps => [13.8, 15.2, 16.6, 18.0],
 			cooldown => 1.45,
+			range => 6,
 		},
-		range => 6,
-	},
+	],
 	speed => 2.25,
 	sight => 9,
 	special => [
@@ -550,16 +572,18 @@ use strict;
 		massive => 1,
 		jump => 'Cliff Walk',
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Thermal Lances',
 			damage => [15, 17, 19, 21],
 			dps => [18.2, 20.6, 23.0, 25.4],
 			splash => 'line',
 			cooldown => 1.65,
 			count => 2,
+			range => 6,
 		},
-		range => 6,
-	},
+	],
 	speed => 2.25,
 	sight => 10,
 	upgrade => [
@@ -568,9 +592,11 @@ use strict;
 			min => 200,
 			gas => 200,
 			build => 140,
-			attack => {
-				range => 3,
-			},
+			attack => [
+				{
+					range => 3,
+				},
+			],
 		},
 	],
 },
@@ -672,17 +698,21 @@ use strict;
 		mech => 1,
 		flying => 1,
 	},
-	attack => {
-		air => {
+	attack => [
+		{
+			anti => 2,
+			name => 'Ion Cannons',
 			damage => [5 .. 8],
 			dps => [9, 10.8, 12.6, 14.4],
-			#bonus => +5 L,
+			bonus => {
+				light => 5,
+			},
 			type => 'projectile',
 			cooldown => 1.11,
 			count => 2,
+			range => 5,
 		},
-		range => 5,
-	},
+	],
 	speed => 4.25,
 	sight => 10,
 	energy => 200,
@@ -702,9 +732,11 @@ use strict;
 			min => 150,
 			gas => 150,
 			build => 90,
-			attack => {
-				range => 2,
-			},
+			attack => [
+				{
+					range => 2,
+				},
+			],
 		},
 	],
 },
@@ -727,16 +759,19 @@ use strict;
 		mech => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
+			name => 'Prismatic beam',
 			damage => [6 .. 9],
-			#bonus => +4 (+1), +10 (+1) A,
+			bonus => {
+				armored => [4 .. 7],
+			},
 			dps => [12, 14, 16, 18],
 			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 => [
@@ -746,6 +781,13 @@ use strict;
 			desc => 'increases damage to armored by 6 for 20 seconds',
 			duration => 20,
 			cooldown => 60,
+			attack => [
+				{
+					bonus => {
+						armored => 6, # total +10 .. 13
+					},
+				},
+			],
 		},
 	],
 },
@@ -769,19 +811,22 @@ use strict;
 		psionic => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			name => 'Pulsar Beam',
 			damage => 15,
 			# costs energy
-			#bonus => +10 L,
+			bonus => {
+				light => 10,
+			},
 			dps => 17.4,
 			cooldown => 0.86,
 			cost => 25,
 			maint => 1.4,
+			range => 5, #XXX 4?
 		},
-		range => 5, #XXX 4?
-	},
+	],
 	speed => 4,
 	sight => 10,
 	energy => 200,
@@ -826,17 +871,20 @@ use strict;
 		massive => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
+			name => 'Kinetic Overload',
 			damage => [30, 33, 36, 39],
-			#bonus => +14 Ma Air,
+			bonus => {
+				'massive air' => 14,
+			},
 			dps => [9.1, 10.0, 10.9, 11.8],
 			type => 'projectile',
 			cooldown => 3.3,
+			range => 15,
 		},
-		air => 'ground',
-		range => 15,
-	},
+	],
 	speed => 1.875,
 	sight => 12,
 },
@@ -860,9 +908,11 @@ use strict;
 		massive => 1,
 		flying => 1,
 	},
-	attack => {
-		range => 8, # leash range 14
-	},
+	attack => [
+		{
+			range => 8, # leash range 14
+		},
+	],
 	speed => 1.875,
 	sight => 12,
 	special => [
@@ -882,23 +932,24 @@ use strict;
 				mech => 1,
 				flying => 1,
 			},
-			attack => {
-				ground => {
+			attack => [
+				{
+					anti => 3,
+					name => 'Interceptor Beams',
 					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,
+					range => 2,
 				},
-				air => 'ground',
-				range => 2,
-			},
+			],
 			speed => 7.5,
 			sight => 7,
 		},
 	],
-	update => [
+	upgrade => [
 		{
 			name => 'Graviton Catapult',
 			min => 150,
@@ -914,7 +965,7 @@ use strict;
 {
 	race => 'terran',
 	cat => 'base',
-	name => 'SCV',
+	name => 'SCV', # T-280 Space Construction Vehicle
 	unit => 1,
 	min => 50,
 	gas => 0,
@@ -928,14 +979,16 @@ 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,
 },
@@ -974,16 +1027,18 @@ 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,
@@ -993,9 +1048,11 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 80,
-			attack => {
-				range => 1,
-			},
+			attack => [
+				{
+					range => 1,
+				},
+			],
 		},
 		{
 			name => 'Building Armor',
@@ -1025,15 +1082,17 @@ 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 => [
@@ -1056,9 +1115,11 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 80,
-			attack => {
-				range => 1,
-			},
+			attack => [
+				{
+					range => 1,
+				},
+			],
 		},
 	],
 },
@@ -1079,16 +1140,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],
 			cooldown => 0.8608,
+			range => 5,
 		},
-		air => 'ground',
-		range => 5,
-	},
+	],
 	speed => 2.25,
 	upgrade => [
 		{
@@ -1103,19 +1164,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 => {
+			attack => [
+				{
+					anti => 3,
+					damage => [6 .. 9],
 					dps => [10.5, 12.2, 13.9, 15.6],
 					cooldown => 0.5739,
+					range => 5,
 				},
-				air => 'ground',
-			},
+			],
 			duration => 15,
 		},
 	],
@@ -1138,37 +1200,46 @@ use strict;
 		armored => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Punisher grenades',
 			damage => [10 .. 13],
-			#bonus => +10 (+1) A,
+			bonus => {
+				armored => [10 .. 13],
+			},
 			dps => [6.7, 7.4, 8.1, 8.8],
 			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 => {
+			attack => [
+				{
+					anti => 1,
+					damage => [10 .. 13],
+					bonus => {
+						armored => [10 .. 13],
+					},
 					dps => [10 .. 13],
+					type => 'projectile',
 					cooldown => 1.0,
+					range => 6,
 				},
-				air => 'ground',
-			},
+			],
 			duration => 15,
 		},
 	],
-	update => [
+	upgrade => [
 		{
 			name => 'Concussive Shells',
 			abbr => 'cs',
@@ -1200,15 +1271,17 @@ use strict;
 		organic => 1,
 		jump => 'Jet Pack',
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'P-45 Reaper pistol',
 			damage => [4 .. 7],
 			dps => [7.3, 9.1, 10.9, 12.7],
 			cooldown => 1.1,
 			count => 2,
+			range => 4.5,
 		},
-		range => 4.5,
-	},
+	],
 	speed => 3.75,
 	sight => 9,
 	special => [
@@ -1237,16 +1310,19 @@ use strict;
 		organic => 1,
 		psionic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
+			name => 'C-10 rifle',
 			damage => [10 .. 13],
-			#bonus => +10 (+1) L,
+			bonus => {
+				light => [10 .. 13],
+			},
 			dps => [6.7, 7.4, 8.1, 8.8],
 			cooldown => 1.5,
+			range => 6,
 		},
-		air => 'ground',
-		range => 6,
-	},
+	],
 	speed => 2.25,
 	sight => 11,
 	energy => 200,
@@ -1302,15 +1378,20 @@ use strict;
 		light => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Infernal flamethrower',
 			damage => [8 .. 11],
+			bonus => {
+				light => [6 .. 9],
+			},
 			dps => [3.2, 3.6, 4.0, 4.4],
 			splash => 'line',
 			cooldown => 2.5,
+			range => 5,
 		},
-		range => 5,
-	},
+	],
 	speed => 4.25,
 	sight => 10,
 	special => [
@@ -1321,17 +1402,20 @@ 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 .. 9],
+					bonus => {
+						light => [5, 5, 5, 5], # total [11 .. 14]
+					},
 				},
-			},
+			],
 		},
 	],
 },
@@ -1353,15 +1437,17 @@ use strict;
 		organic => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Napalm Spray',
 			damage => [18, 20, 22, 24],
 			dps => [9 .. 12],
 			splash => 1,
 			cooldown => 2,
+			range => 2,
 		},
-		range => 2,
-	},
+	],
 	speed => 2.25,
 	sight => 10,
 	special => [
@@ -1372,17 +1458,19 @@ 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 .. 15],
+					},
 				},
-			},
+			],
 		},
 	],
 },
@@ -1403,18 +1491,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',
@@ -1442,31 +1534,39 @@ use strict;
 		armored => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => '90 mm twin cannon',
 			damage => [15, 17, 19, 21],
-			#bonus => +10 (+1)A,
+			bonus => {
+				armored => [10 .. 13],
+			},
 			dps => [14.4, 16.3, 18.2, 20.1],
 			cooldown => 1.04,
+			range => 7,
 		},
-		range => 7,
-	},
+	],
 	special => [
 		{
 			name => 'siege mode',
 			abbr => 'sg',
 			alt => 'Sieged Tank',
 			cargo => 0,
-			attack => {
-				ground => {
+			attack => [
+				{
+					anti => 1,
+					name => '120 mm shock cannon',
 					damage => [35, 38, 41, 44],
-					#bonus => 15 (+2)A,
+					bonus => {
+						armored => [15, 17, 19, 21],
+					},
 					dps => [11.7, 12.7, 13.7, 14.7],
 					splash => 1,
 					cooldown => 3,
+					range => 13,
 				},
-				range => 13,
-			},
+			],
 			speed => 0,
 			duration => 4,
 		},
@@ -1492,18 +1592,24 @@ use strict;
 		mech => 1,
 		massive => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => "Thor's Hammer",
 			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',
+		{
+			anti => 2,
+			name => 'Javelin Missiles',
+#			name => 'Explosive Payload',
 			damage => [6 .. 9],
-			#bonus => +6 (+1) L Air,
+			bonus => {
+				'light air' => [6 .. 9],
+			},
 			dps => [8, 9.3, 10.6, 11.9],
 			splash => 1,
 			type => 'projectile',
@@ -1511,14 +1617,16 @@ use strict;
 			range => 10,
 			count => 4,
 		},
-		air => {
-			name => 'High Impact Payload',
+		{
+			anti => 2,
+			name => 'Punisher Cannons',
+#			name => 'High Impact Payload',
 			damage => [24, 26, 28, 30],
 			dps => [12 .. 15],
 			cooldown => 2,
 			range => 10,
 		},
-	},
+	],
 	speed => 1.875,
 	sight => 11,
 },
@@ -1540,32 +1648,38 @@ use strict;
 		mech => 1,
 		flying => 1,
 	},
-	attack => {
-		air => {
+	attack => [
+		{
+			anti => 2,
+			name => 'Lanzer torpedoes',
 			damage => [10 .. 13],
-			#bonus => +4A,
+			bonus => {
+				armored => 4,
+			},
 			dps => [10 .. 13],
 			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 => {
+			attack => [
+				{
+					anti => 1,
+					name => 'Twin gatling cannon',
 					damage => [12 .. 15],
 					dps => [12 .. 15],
 					cooldown => 1,
+					range => 6,
 				},
-				range => 6,
-			},
+			],
 		},
 	],
 	speed => 2.75,
@@ -1623,7 +1737,7 @@ use strict;
 {
 	race => 'terran',
 	cat => 'starport',
-	name => 'Banshee',
+	name => 'Banshee', # AH/G-24
 	unit => 3,
 	min => 150,
 	gas => 100,
@@ -1637,16 +1751,18 @@ use strict;
 		mech => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Backlash rockets',
 			damage => [12 .. 15],
 			dps => [19.2, 20.8, 22.4, 24.0],
 			type => 'projectile',
 			cooldown => 1.25,
 			count => 2,
+			range => 6,
 		},
-		range => 6,
-	},
+	],
 	speed => 2.75,
 	sight => 10,
 	energy => 200,
@@ -1699,15 +1815,16 @@ 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 => [
@@ -1716,9 +1833,11 @@ use strict;
 					min => 100,
 					gas => 100,
 					build => 80,
-					attack => {
-						range => 1,
-					},
+					attack => [
+						{
+							range => 1,
+						},
+					],
 				},
 				{
 					name => 'Building Armor',
@@ -1744,9 +1863,12 @@ use strict;
 				flying => 1,
 			},
 			cooldown => 0,
-			attack => {
-				range => 8,
-			},
+			attack => [
+				{
+					name => 'Point defense laser',
+					range => 8,
+				},
+			],
 			sight => 7,
 			upgrade => [
 				{
@@ -1754,9 +1876,11 @@ use strict;
 					min => 100,
 					gas => 100,
 					build => 80,
-					attack => {
-						range => 1,
-					},
+					attack => [
+						{
+							range => 1,
+						},
+					],
 				},
 				{
 					name => 'Building Armor',
@@ -1774,27 +1898,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',
@@ -1824,21 +1950,26 @@ use strict;
 		massive => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'ATS laser batteries',
 			damage => [8 .. 11],
 			dps => [35.6, 40.0, 44.4, 48.8],
 			cooldown => 0.225,
 			type => 'projectile',
+			range => 6,
 		},
-		air => {
+		{
+			anti => 2,
+			name => 'ATS laser batteries',
 			damage => [6 .. 9],
 			dps => [26.7, 31.1, 35.5, 39.9],
 			cooldown => 0.225,
 			type => 'projectile',
+			range => 6,
 		},
-		range => 6,
-	},
+	],
 	speed => 1.875,
 	sight => 12,
 	energy => 200,
@@ -1853,12 +1984,14 @@ use strict;
 			duration => 3,
 			range => 10,
 			cost => 100,
-			attack => {
-				damage => 300,
-			},
+			attack => [
+				{
+					damage => 300,
+				},
+			],
 		},
 	],
-	update => [
+	upgrade => [
 		{
 			name => 'Behemoth Reactor',
 			min => 150,
@@ -1887,14 +2020,16 @@ 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,
@@ -1916,8 +2051,10 @@ use strict;
 		organic => 1,
 		psionic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Claws',
 			damage => [4 .. 7],
 			dps => [8, 10, 12, 14],
 			cooldown => 1.0,
@@ -1925,14 +2062,16 @@ use strict;
 			range => 5,
 			count => 2,
 		},
-		air => {
+		{
+			anti => 2,
+			name => 'Acid Spines',
 			damage => [9 .. 12],
 			dps => [9 .. 12],
 			cooldown => 1.0,
 			type => 'projectile', # except if range < 3
 			range => 7,
 		},
-	},
+	],
 	speed => 0.9375,
 	creep => 2.7,
 	sight => 9,
@@ -2072,7 +2211,7 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 60,
-			speed => 0.875,
+			speed => 3.375 - 1.875,
 		},
 	],
 },
@@ -2125,15 +2264,19 @@ use strict;
 		organic => 1,
 		structure => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Impaler Tentacle',
 			damage => 25,
-			#bonus => +5A,
+			bonus => {
+				armored => 5,
+			},
 			dps => 13.5,
 			cooldown => 1.85,
+			range => 7,
 		},
-		range => 7,
-	},
+	],
 	speed => (1.0),
 	creep => 2.5,
 	sight => 11,
@@ -2155,16 +2298,20 @@ use strict;
 		organic => 1,
 		structure => 1,
 	},
-	attack => {
-		air => {
+	attack => [
+		{
+			anti => 2,
+			name => 'Seeker Spores',
 			damage => 15,
-			#bonus => + 30 B,
+			bonus => {
+				organic => 30,
+			},
 			dps => 17.4,
 			type => 'projectile',
 			cooldown => 0.8608,
+			range => 7,
 		},
-		range => 7,
-	},
+	],
 	speed => (1.0),
 	creep => 2.5,
 	sight => 11,
@@ -2187,13 +2334,15 @@ use strict;
 		light => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Claws',
 			damage => [5 .. 8],
 			dps => [7.2, 8.6, 10.0, 11.4],
 			cooldown => 0.696,
 		},
-	},
+	],
 	speed => 2.9531,
 	creep => 1.3,
 	range => 0,
@@ -2204,12 +2353,13 @@ use strict;
 			min => 200,
 			gas => 200,
 			build => 130,
-			attack => {
-				ground => {
+			attack => [
+				{
+					anti => 1,
 					dps => [8.5, 10.2, 11.9, 13.6],
 					cooldown => -0.109,
 				},
-			},
+			],
 			req => 'Hive',
 		},
 		{
@@ -2238,14 +2388,19 @@ use strict;
 	attr => {
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Volatile Burst',
 			damage => [20, 22, 24, 26],
-			#bonus => +15 (+2)L / +60 (+3)S,
+			bonus => {
+				light => [15, 17, 19, 21],
+				structure => [60, 63, 66, 69],
+			},
 			splash => 1,
+			range => 0,
 		},
-		range => 0,
-	},
+	],
 	speed => 2.5,
 	creep => 1.3,
 	sight => 8,
@@ -2277,13 +2432,15 @@ use strict;
 		armored => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Acid Saliva', # Claws melee
 			damage => [16, 18, 20, 22],
 			dps => [8 .. 11],
 			cooldown => 2.0,
 		},
-	},
+	],
 	speed => 2.25,
 	creep => 1.3,
 	range => 4,
@@ -2334,16 +2491,17 @@ use strict;
 		light => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
+			name => 'Needle spines', # Scythe melee
 			damage => [12 .. 15],
 			dps => [16, 17.3, 18.6, 19.9],
-			type => 'projectile', # except meelee
+			type => 'projectile', # except melee
 			cooldown => 0.75,
+			range => 5,
 		},
-		air => 'ground',
-		range => 5,
-	},
+	],
 	speed => 2.25,
 	creep => 1.5,
 	sight => 9,
@@ -2353,9 +2511,11 @@ use strict;
 			min => 150,
 			gas => 150,
 			build => 80,
-			attack => {
-				range => 1,
-			},
+			attack => [
+				{
+					range => 1,
+				},
+			],
 		},
 		{
 			name => 'Muscular Augments',
@@ -2424,21 +2584,21 @@ 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,
@@ -2485,13 +2645,14 @@ use strict;
 		armored => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			dps => [27.9, 30.2, 32.5, 34.8],
 			type => 'projectile',
 			cooldown => 0.86,
 		},
-	},
+	],
 	speed => 2.95,
 	creep => 1.3,
 	sight => 10,
@@ -2507,15 +2668,17 @@ use strict;
 				light => 1,
 				organic => 1,
 			},
-			attack => {
-				ground => {
+			attack => [
+				{
+					anti => 1,
+					name => 'Acid Spit',
 					damage => [12 .. 15],
 					dps => [14.0, 15.2, 16.4, 17.6],
 					type => 'projectile',
 					cooldown => 0.6,
+					range => 3,
 				},
-				range => 3,
-			},
+			],
 			speed => 1.875,
 			creep => 1.4,
 			sight => 6,
@@ -2524,7 +2687,7 @@ use strict;
 			count => 2,
 		},
 	],
-	update => [
+	upgrade => [
 		{
 			name => 'Flying Locusts',
 			min => 200,
@@ -2554,20 +2717,21 @@ use strict;
 		organic => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
+			name => 'Glaive Wurm',
 			damage => [9 .. 12],
 			dps => [5.9, 6.6, 7.3, 8.0],
 			splash => 'bounce',
 			psionic => 1,
 			cooldown => 1.5246,
+			range => 3,
 		},
-		air => 'ground',
-		range => 3,
-	},
+	],
 	speed => 4,
 	sight => 11,
-	update => [
+	upgrade => [
 		{
 			name => 'Tissue Regeneration',
 			abbr => 'tr',
@@ -2593,16 +2757,20 @@ use strict;
 		organic => 1,
 		flying => 1,
 	},
-	attack => {
-		air => {
+	attack => [
+		{
+			anti => 2,
+			name => 'Parasite Spores',
 			damage => [14 .. 17],
-			#bonus => +6 (+1)Ma,
+			bonus => {
+				massive => [6 .. 9],
+			},
 			dps => [7.4, 7.9, 8.4, 8.9],
 			type => 'projectile',
 			cooldown => 1.9,
+			range => 6,
 		},
-		range => 6,
-	},
+	],
 	speed => 2.9531,
 	sight => 10,
 	special => [
@@ -2635,14 +2803,16 @@ use strict;
 		massive => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Broodling Strike',
 			damage => [20, 22, 24, 26],
 			dps => [8.0, 8.8, 9.6, 10.4],
 			cooldown => 2.5,
+			range => 9.5,
 		},
-		range => 9.5,
-	},
+	],
 	speed => 1.4062,
 	sight => 12,
 	special => [
@@ -2662,14 +2832,16 @@ use strict;
 				light => 1,
 				organic => 1,
 			},
-			attack => {
-				ground => {
+			attack => [
+				{
+					anti => 1,
+					name => 'Claws',
 					damage => [4 .. 7],
 					dps => [6.2, 7.7, 9.2, 10.7],
 					cooldown => 0.6455,
+					range => 0,
 				},
-				range => 0,
-			},
+			],
 			speed => 3.836,
 			creep => 1.0,
 			sight => 7,
@@ -2726,6 +2898,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,
@@ -2750,15 +2923,17 @@ use strict;
 		organic => 1,
 		massive => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
+			name => 'Kaiser Blades',
 			damage => [35, 38, 41, 44],
 			dps => [40.7, 44.2, 47.7, 51.2],
 			splash => 1,
 			cooldown => 0.861,
+			range => 1,
 		},
-		range => 1,
-	},
+	],
 	speed => 2.9531,
 	creep => 1.3,
 	sight => 9,