X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/16f2a98583d7b012ef0b488dac24a5dc99b161c1..0b17bd18ae642a22d7c9fd5411d85ab08f36b61d:/sc-units-hots.inc.pl

diff --git a/sc-units-hots.inc.pl b/sc-units-hots.inc.pl
index c0b7452..2e5d251 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,
 			damage => 5,
 			dps => 3.3,
 			cooldown => 1.5,
+			range => 0,
 		},
-		range => 0,
-	},
+	],
 	speed => 2.8125,
 	sight => 8,
 },
@@ -51,16 +52,16 @@ use strict;
 		armored => 1,
 		structure => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
 			damage => 20,
 			dps => 16,
 			cooldown => 1.25,
 			type => 'projectile',
+			range => 7,
 		},
-		air => 'ground',
-		range => 7,
-	},
+	],
 	speed => 0,
 	sight => 11,
 	detect => 1,
@@ -85,15 +86,16 @@ use strict;
 		psionic => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			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,
@@ -144,16 +146,16 @@ use strict;
 		massive => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
 			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 +203,16 @@ use strict;
 		armored => 1,
 		structure => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
 			damage => 20,
 			dps => 16,
 			cooldown => 1.25,
 			type => 'projectile',
+			range => 13,
 		},
-		air => 'ground',
-		range => 13,
-	},
+	],
 	speed => 0,
 	sight => 11,
 	energy => 100,
@@ -243,15 +245,16 @@ use strict;
 		light => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			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 +292,16 @@ use strict;
 		mech => 1,
 		psionic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
 			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 +351,17 @@ use strict;
 		armored => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
 			damage => [10 .. 13],
 			dps => [6.9, 7.6, 8.3, 9.0],
 			#bonus => +4 A,
 			type => 'projectile',
 			cooldown => 1.44,
+			range => 6,
 		},
-		air => 'ground',
-		range => 6,
-	},
+	],
 	speed => 2.9531,
 	sight => 10,
 	special => [
@@ -440,14 +443,15 @@ use strict;
 		organic => 1,
 		psionic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			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 +482,17 @@ use strict;
 		psionic => 1,
 		massive => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
 			damage => [25, 28, 31, 34],
 			dps => [14.3, 16.0, 17.7, 19.4],
 			#bonus => +10 (+1) B,
 			splash => 1,
 			cooldown => 1.754,
+			range => 3,
 		},
-		air => 'ground',
-		range => 3,
-	},
+	],
 	speed => 2.8125,
 	sight => 9,
 },
@@ -510,15 +514,16 @@ use strict;
 		armored => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			damage => [20, 22, 24, 26],
 			#bonus => +30 (+3) A,
 			dps => [13.8, 15.2, 16.6, 18.0],
 			cooldown => 1.45,
+			range => 6,
 		},
-		range => 6,
-	},
+	],
 	speed => 2.25,
 	sight => 9,
 	special => [
@@ -550,16 +555,17 @@ use strict;
 		massive => 1,
 		jump => 'Cliff Walk',
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			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 +574,11 @@ use strict;
 			min => 200,
 			gas => 200,
 			build => 140,
-			attack => {
-				range => 3,
-			},
+			attack => [
+				{
+					range => 3,
+				},
+			],
 		},
 	],
 },
@@ -672,17 +680,18 @@ use strict;
 		mech => 1,
 		flying => 1,
 	},
-	attack => {
-		air => {
+	attack => [
+		{
+			anti => 2,
 			damage => [5 .. 8],
 			dps => [9, 10.8, 12.6, 14.4],
 			#bonus => +5 L,
 			type => 'projectile',
 			cooldown => 1.11,
 			count => 2,
+			range => 5,
 		},
-		range => 5,
-	},
+	],
 	speed => 4.25,
 	sight => 10,
 	energy => 200,
@@ -702,9 +711,11 @@ use strict;
 			min => 150,
 			gas => 150,
 			build => 90,
-			attack => {
-				range => 2,
-			},
+			attack => [
+				{
+					range => 2,
+				},
+			],
 		},
 	],
 },
@@ -727,16 +738,16 @@ use strict;
 		mech => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
 			damage => [6 .. 9],
 			#bonus => +4 (+1), +10 (+1) A,
 			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 => [
@@ -769,8 +780,9 @@ use strict;
 		psionic => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			name => 'Pulsar Beam',
 			damage => 15,
 			# costs energy
@@ -779,9 +791,9 @@ use strict;
 			cooldown => 0.86,
 			cost => 25,
 			maint => 1.4,
+			range => 5, #XXX 4?
 		},
-		range => 5, #XXX 4?
-	},
+	],
 	speed => 4,
 	sight => 10,
 	energy => 200,
@@ -826,17 +838,17 @@ use strict;
 		massive => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
 			damage => [30, 33, 36, 39],
 			#bonus => +14 Ma Air,
 			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 +872,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,18 +896,18 @@ use strict;
 				mech => 1,
 				flying => 1,
 			},
-			attack => {
-				ground => {
+			attack => [
+				{
+					anti => 3,
 					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,
 		},
@@ -928,14 +942,15 @@ use strict;
 		organic => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			damage => 5,
 			dps => 3.3,
 			cooldown => 1.5,
+			range => 0,
 		},
-		range => 0,
-	},
+	],
 	speed => 2.8125,
 	sight => 8,
 },
@@ -974,16 +989,17 @@ use strict;
 		mech => 1,
 		structure => 1,
 	},
-	attack => {
-		air => {
+	attack => [
+		{
+			anti => 2,
 			damage => 12,
 			dps => 27.9,
 			cooldown => 0.8608,
 			count => 2,
 			type => 'projectile',
+			range => 7,
 		},
-		range => 7,
-	},
+	],
 	speed => 0,
 	sight => 11,
 	detect => 1,
@@ -993,9 +1009,11 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 80,
-			attack => {
-				range => 1,
-			},
+			attack => [
+				{
+					range => 1,
+				},
+			],
 		},
 		{
 			name => 'Building Armor',
@@ -1025,15 +1043,16 @@ use strict;
 		mech => 1,
 		structure => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			damage => 40,
 			dps => 20,
 			splash => 1,
 			cooldown => 2,
+			range => 6,
 		},
-		range => 6,
-	},
+	],
 	speed => 0,
 	sight => 11,
 	upgrade => [
@@ -1056,9 +1075,11 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 80,
-			attack => {
-				range => 1,
-			},
+			attack => [
+				{
+					range => 1,
+				},
+			],
 		},
 	],
 },
@@ -1079,16 +1100,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 => [
 		{
@@ -1109,13 +1130,14 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 170,
-			attack => {
-				ground => {
+			attack => [
+				{
+					anti => 3,
 					dps => [10.5, 12.2, 13.9, 15.6],
 					cooldown => 0.5739,
+					range => 5,
 				},
-				air => 'ground',
-			},
+			],
 			duration => 15,
 		},
 	],
@@ -1138,16 +1160,17 @@ use strict;
 		armored => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			damage => [10 .. 13],
 			#bonus => +10 (+1) A,
 			dps => [6.7, 7.4, 8.1, 8.8],
 			type => 'projectile',
 			cooldown => 1.5,
+			range => 6,
 		},
-		range => 6,
-	},
+	],
 	special => [
 		{
 			name => 'Stim Pack',
@@ -1158,13 +1181,15 @@ use strict;
 			min => 100,
 			gas => 100,
 			build => 170,
-			attack => {
-				ground => {
+			attack => [
+				{
+					anti => 3,
 					dps => [10 .. 13],
+					type => 'projectile',
 					cooldown => 1.0,
+					range => 6,
 				},
-				air => 'ground',
-			},
+			],
 			duration => 15,
 		},
 	],
@@ -1200,15 +1225,16 @@ use strict;
 		organic => 1,
 		jump => 'Jet Pack',
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			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 +1263,16 @@ use strict;
 		organic => 1,
 		psionic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
 			damage => [10 .. 13],
 			#bonus => +10 (+1) L,
 			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 +1328,16 @@ use strict;
 		light => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			damage => [8 .. 11],
 			dps => [3.2, 3.6, 4.0, 4.4],
 			splash => 'line',
 			cooldown => 2.5,
+			range => 5,
 		},
-		range => 5,
-	},
+	],
 	speed => 4.25,
 	sight => 10,
 	special => [
@@ -1327,11 +1354,11 @@ use strict;
 			min => 150,
 			gas => 150,
 			build => 110,
-			attack => {
-				ground => {
+			attack => [
+				{
 					#bonus => +6 (+1), +11 (+1) L,
 				},
-			},
+			],
 		},
 	],
 },
@@ -1353,15 +1380,16 @@ use strict;
 		organic => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			damage => [18, 20, 22, 24],
 			dps => [9 .. 12],
 			splash => 1,
 			cooldown => 2,
+			range => 2,
 		},
-		range => 2,
-	},
+	],
 	speed => 2.25,
 	sight => 10,
 	special => [
@@ -1378,11 +1406,11 @@ use strict;
 			min => 150,
 			gas => 150,
 			build => 110,
-			attack => {
-				ground => {
+			attack => [
+				{
 					#bonus => +12 (+1) L,
 				},
-			},
+			],
 		},
 	],
 },
@@ -1403,15 +1431,16 @@ use strict;
 		light => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
 			damage => 125,
 			#bonus => +35 Shield,
 			splash => 1,
 			cooldown => 40,
+			range => 5,
 		},
-		range => 5,
-	},
+	],
 	speed => 2.8125,
 	sight => 7,
 	update => [
@@ -1442,31 +1471,33 @@ use strict;
 		armored => 1,
 		mech => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			damage => [15, 17, 19, 21],
 			#bonus => +10 (+1)A,
 			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,
 					damage => [35, 38, 41, 44],
 					#bonus => 15 (+2)A,
 					dps => [11.7, 12.7, 13.7, 14.7],
 					splash => 1,
 					cooldown => 3,
+					range => 13,
 				},
-				range => 13,
-			},
+			],
 			speed => 0,
 			duration => 4,
 		},
@@ -1492,15 +1523,17 @@ use strict;
 		mech => 1,
 		massive => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			damage => [30, 33, 36, 39],
 			dps => [46.9, 51.6, 56.3, 61.0],
 			cooldown => 1.28,
 			range => 7,
 			count => 2,
 		},
-		air => {
+		{
+			anti => 2,
 			name => 'Explosive Payload',
 			damage => [6 .. 9],
 			#bonus => +6 (+1) L Air,
@@ -1511,14 +1544,15 @@ use strict;
 			range => 10,
 			count => 4,
 		},
-		air => {
+		{
+			anti => 2,
 			name => 'High Impact Payload',
 			damage => [24, 26, 28, 30],
 			dps => [12 .. 15],
 			cooldown => 2,
 			range => 10,
 		},
-	},
+	],
 	speed => 1.875,
 	sight => 11,
 },
@@ -1540,32 +1574,34 @@ use strict;
 		mech => 1,
 		flying => 1,
 	},
-	attack => {
-		air => {
+	attack => [
+		{
+			anti => 2,
 			damage => [10 .. 13],
 			#bonus => +4A,
 			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,
 					damage => [12 .. 15],
 					dps => [12 .. 15],
 					cooldown => 1,
+					range => 6,
 				},
-				range => 6,
-			},
+			],
 		},
 	],
 	speed => 2.75,
@@ -1637,16 +1673,17 @@ use strict;
 		mech => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			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 +1736,15 @@ use strict;
 				mech => 1,
 				structure => 1,
 			},
-			attack => {
-				ground => {
+			attack => [
+				{
+					anti => 3,
 					damage => 8,
 					dps => 10,
 					cooldown => 0.8,
+					range => 6,
 				},
-				air => 'ground',
-				range => 6,
-			},
+			],
 			speed => 0,
 			sight => 7,
 			upgrade => [
@@ -1716,9 +1753,11 @@ use strict;
 					min => 100,
 					gas => 100,
 					build => 80,
-					attack => {
-						range => 1,
-					},
+					attack => [
+						{
+							range => 1,
+						},
+					],
 				},
 				{
 					name => 'Building Armor',
@@ -1744,9 +1783,11 @@ use strict;
 				flying => 1,
 			},
 			cooldown => 0,
-			attack => {
-				range => 8,
-			},
+			attack => [
+				{
+					range => 8,
+				},
+			],
 			sight => 7,
 			upgrade => [
 				{
@@ -1754,9 +1795,11 @@ use strict;
 					min => 100,
 					gas => 100,
 					build => 80,
-					attack => {
-						range => 1,
-					},
+					attack => [
+						{
+							range => 1,
+						},
+					],
 				},
 				{
 					name => 'Building Armor',
@@ -1774,10 +1817,12 @@ 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,
 		},
 	],
@@ -1824,21 +1869,24 @@ use strict;
 		massive => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			damage => [8 .. 11],
 			dps => [35.6, 40.0, 44.4, 48.8],
 			cooldown => 0.225,
 			type => 'projectile',
+			range => 6,
 		},
-		air => {
+		{
+			anti => 2,
 			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,9 +1901,11 @@ use strict;
 			duration => 3,
 			range => 10,
 			cost => 100,
-			attack => {
-				damage => 300,
-			},
+			attack => [
+				{
+					damage => 300,
+				},
+			],
 		},
 	],
 	update => [
@@ -1887,14 +1937,15 @@ use strict;
 		light => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			damage => 5,
 			dps => 3.3,
 			cooldown => 1.5,
+			range => 0,
 		},
-		range => 0,
-	},
+	],
 	speed => 2.8125,
 	creep => 1.0,
 	sight => 8,
@@ -1916,8 +1967,9 @@ use strict;
 		organic => 1,
 		psionic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			damage => [4 .. 7],
 			dps => [8, 10, 12, 14],
 			cooldown => 1.0,
@@ -1925,14 +1977,15 @@ use strict;
 			range => 5,
 			count => 2,
 		},
-		air => {
+		{
+			anti => 2,
 			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,
@@ -2125,15 +2178,16 @@ use strict;
 		organic => 1,
 		structure => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			damage => 25,
 			#bonus => +5A,
 			dps => 13.5,
 			cooldown => 1.85,
+			range => 7,
 		},
-		range => 7,
-	},
+	],
 	speed => (1.0),
 	creep => 2.5,
 	sight => 11,
@@ -2155,16 +2209,17 @@ use strict;
 		organic => 1,
 		structure => 1,
 	},
-	attack => {
-		air => {
+	attack => [
+		{
+			anti => 2,
 			damage => 15,
 			#bonus => + 30 B,
 			dps => 17.4,
 			type => 'projectile',
 			cooldown => 0.8608,
+			range => 7,
 		},
-		range => 7,
-	},
+	],
 	speed => (1.0),
 	creep => 2.5,
 	sight => 11,
@@ -2187,13 +2242,14 @@ use strict;
 		light => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			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 +2260,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 +2295,15 @@ use strict;
 	attr => {
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			damage => [20, 22, 24, 26],
 			#bonus => +15 (+2)L / +60 (+3)S,
 			splash => 1,
+			range => 0,
 		},
-		range => 0,
-	},
+	],
 	speed => 2.5,
 	creep => 1.3,
 	sight => 8,
@@ -2277,13 +2335,14 @@ use strict;
 		armored => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			damage => [16, 18, 20, 22],
 			dps => [8 .. 11],
 			cooldown => 2.0,
 		},
-	},
+	],
 	speed => 2.25,
 	creep => 1.3,
 	range => 4,
@@ -2334,16 +2393,16 @@ use strict;
 		light => 1,
 		organic => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
 			damage => [12 .. 15],
 			dps => [16, 17.3, 18.6, 19.9],
 			type => 'projectile', # except meelee
 			cooldown => 0.75,
+			range => 5,
 		},
-		air => 'ground',
-		range => 5,
-	},
+	],
 	speed => 2.25,
 	creep => 1.5,
 	sight => 9,
@@ -2353,9 +2412,11 @@ use strict;
 			min => 150,
 			gas => 150,
 			build => 80,
-			attack => {
-				range => 1,
-			},
+			attack => [
+				{
+					range => 1,
+				},
+			],
 		},
 		{
 			name => 'Muscular Augments',
@@ -2424,15 +2485,15 @@ 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,
@@ -2485,13 +2546,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 +2569,16 @@ use strict;
 				light => 1,
 				organic => 1,
 			},
-			attack => {
-				ground => {
+			attack => [
+				{
+					anti => 1,
 					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,
@@ -2554,17 +2617,17 @@ use strict;
 		organic => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 3,
 			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 => [
@@ -2593,16 +2656,17 @@ use strict;
 		organic => 1,
 		flying => 1,
 	},
-	attack => {
-		air => {
+	attack => [
+		{
+			anti => 2,
 			damage => [14 .. 17],
 			#bonus => +6 (+1)Ma,
 			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 +2699,15 @@ use strict;
 		massive => 1,
 		flying => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			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 +2727,15 @@ use strict;
 				light => 1,
 				organic => 1,
 			},
-			attack => {
-				ground => {
+			attack => [
+				{
+					anti => 1,
 					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,
@@ -2750,15 +2816,16 @@ use strict;
 		organic => 1,
 		massive => 1,
 	},
-	attack => {
-		ground => {
+	attack => [
+		{
+			anti => 1,
 			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,