X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/e7d0872468d9ff54c39ac8a7e64f283ba093c7aa..e3a4e7122f945a204fadfc845e83e0d6d6ad36fa:/sc-units-hots.inc.pl

diff --git a/sc-units-hots.inc.pl b/sc-units-hots.inc.pl
index 3ba370a..8ce7d2c 100644
--- a/sc-units-hots.inc.pl
+++ b/sc-units-hots.inc.pl
@@ -1,7 +1,8 @@
 use utf8;
+use strict;
 
 [
-'patch 2.1.3 BU',
+'patch 2.1.10',
 # http://wiki.teamliquid.net/starcraft2/Unit_Statistics
 # http://wiki.teamliquid.net/starcraft2/User:Roemy/Unit_Statistics_(detailed)
 # http://starcraft.wikia.com/wiki/List_of_StarCraft_II_units
@@ -19,8 +20,10 @@ use utf8;
 	armor => 0,
 	hp => 20,
 	shield => 20,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => 5,
@@ -37,16 +40,17 @@ use utf8;
 	race => 'protoss',
 	cat => 'base',
 	name => 'Photon Cannon',
-	unit => 0,
 	min => 150,
 	gas => 0,
 	build => 40,
-	size => 2x2,
+	size => 2,
 	armor => 1,
 	hp => 150,
 	shield => 150,
-	suit => 3, # armored
-	structure => 1,
+	attr => {
+		armored => 1,
+		structure => 1,
+	},
 	attack => {
 		ground => {
 			damage => 20,
@@ -73,9 +77,11 @@ use utf8;
 	armor => 1,
 	hp => 130,
 	shield => 60,
-	suit => 3, # armored
-	organic => 0, # mech
-	psionic => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		psionic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [8 .. 11],
@@ -101,15 +107,18 @@ use utf8;
 	armor => 2,
 	hp => 350,
 	shield => 350,
-	suit => 3, # armored
-	organic => 0, # mech
-	psionic => 1,
-	massive => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		psionic => 1,
+		massive => 1,
+	},
 	attack => {
 		ground => {
-			damage => [6 .. 9], x6,
+			damage => [6 .. 9],
 			dps => [16.3, 19.0, 21.7, 24.4],
 			cooldown => 2.21,
+			count => 6,
 		},
 		air => 'ground',
 		range => 7,
@@ -122,17 +131,18 @@ use utf8;
 	race => 'protoss',
 	cat => 'base',
 	name => 'Nexus',
-	unit => 0,
 	min => 400,
 	gas => 0,
 	build => 100,
-	size => 5x5,
+	size => 5,
 	cargo => 0,
 	armor => 1,
 	hp => 1000,
 	shield => 1000,
-	suit => 3, # armored
-	structure => 1,
+	attr => {
+		armored => 1,
+		structure => 1,
+	},
 	attack => {
 		ground => {
 			damage => 20,
@@ -160,13 +170,16 @@ use utf8;
 	armor => 1,
 	hp => 100,
 	shield => 50,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
-			damage => [8 .. 11], # x2
+			damage => [8 .. 11],
 			dps => [13.3, 15.0, 16.7, 18.4],
 			cooldown => 1.2,
+			count => 2,
 		},
 		range => 0,
 	},
@@ -193,9 +206,11 @@ use utf8;
 	armor => 1,
 	hp => 40,
 	shield => 40,
-	suit => 1, # light
-	organic => 0, # mech
-	psionic => 1,
+	attr => {
+		light => 1,
+		mech => 1,
+		psionic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [6 .. 9],
@@ -223,8 +238,10 @@ use utf8;
 	armor => 1,
 	hp => 80,
 	shield => 80,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => [10 .. 13],
@@ -254,9 +271,11 @@ use utf8;
 	armor => 0,
 	hp => 40,
 	shield => 40,
-	suit => 1, # light
-	organic => 1,
-	psionic => 1,
+	attr => {
+		light => 1,
+		psionic => 1,
+		organic => 1,
+	},
 	speed => 1.875,
 	sight => 10,
 },
@@ -275,9 +294,11 @@ use utf8;
 	armor => 1,
 	hp => 40,
 	shield => 80,
-	suit => 1, # light
-	organic => 1,
-	psionic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+		psionic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [45, 50, 55, 60],
@@ -304,8 +325,10 @@ use utf8;
 	armor => 0,
 	hp => 10,
 	shield => 350,
-	attr => P,
-	massive => 1,
+	attr => {
+		psionic => 1,
+		massive => 1,
+	},
 	attack => {
 		ground => {
 			damage => [25, 28, 31, 34],
@@ -334,8 +357,10 @@ use utf8;
 	armor => 1,
 	hp => 200,
 	shield => 100,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => [20, 22, 24, 26],
@@ -362,15 +387,18 @@ use utf8;
 	armor => 1,
 	hp => 200,
 	shield => 150,
-	suit => 3, # armored
-	organic => 0, # mech
-	massive => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		massive => 1,
+	},
 	attack => {
 		ground => {
-			damage => [15, 17, 19, 21], # x2
+			damage => [15, 17, 19, 21],
 			dps => [18.2, 20.6, 23.0, 25.4],
 			splash => 'line',
 			cooldown => 1.65,
+			count => 2,
 		},
 		range => 6,
 	},
@@ -396,8 +424,10 @@ use utf8;
 	armor => 0,
 	hp => 40,
 	shield => 20,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	speed => 1.875,
 	upgrade => [
 		{
@@ -420,9 +450,11 @@ use utf8;
 	armor => 0,
 	hp => 100,
 	shield => 100,
-	suit => 3, # armored
-	organic => 0, # mech
-	psionic => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		psionic => 1,
+	},
 	speed => 2.9531,
 	upgrade => [
 		{
@@ -445,15 +477,18 @@ use utf8;
 	armor => 0,
 	hp => 120,
 	shield => 60,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	attack => {
 		air => {
-			damage => [5 .. 8], # x2
+			damage => [5 .. 8],
 			dps => [9, 10.8, 12.6, 14.4],
 			#bonus => +5 L,
 			type => 'projectile',
 			cooldown => 1.11,
+			count => 2,
 		},
 		range => 5,
 	},
@@ -479,8 +514,10 @@ use utf8;
 	armor => 0,
 	hp => 150,
 	shield => 100,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => [6 .. 9],
@@ -508,9 +545,11 @@ use utf8;
 	armor => 0,
 	hp => 100,
 	shield => 60,
-	suit => 1, # light
-	organic => 0, # mech
-	psionic => 1,
+	attr => {
+		light => 1,
+		mech => 1,
+		psionic => 1,
+	},
 	attack => {
 		ground => {
 			name => 'Pulsar Beam',
@@ -539,13 +578,15 @@ use utf8;
 	armor => 2,
 	hp => 120,
 	shield => 60,
-	suit => 3, # armored
-	organic => 0, # mech
-	massive => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		massive => 1,
+	},
 	attack => {
 		ground => {
 			damage => [30, 33, 36, 39],
-			#bonus => +50 (+2) Ma Air,
+			#bonus => +14 Ma Air,
 			dps => [9.1, 10.0, 10.9, 11.8],
 			type => 'projectile',
 			cooldown => 3.3,
@@ -570,9 +611,11 @@ use utf8;
 	armor => 2,
 	hp => 300,
 	shield => 150,
-	suit => 3, # armored
-	organic => 0, # mech
-	massive => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		massive => 1,
+	},
 	attack => {
 		range => 8,
 	},
@@ -590,15 +633,18 @@ use utf8;
 			armor => 0,
 			hp => 40,
 			shield => 40,
-			suit => 1, # light
-			organic => 0, # mech
+			attr => {
+				light => 1,
+				mech => 1,
+			},
 			attack => {
 				ground => {
-					damage => [5 .. 8], # 2x
+					damage => [5 .. 8],
 #					dps => 26.7 (+5.3),
 					dps => [3.3, 4.0, 4.7, 5.4],
 #					cooldown => 0.5 (0.125/ 0.25),
 					cooldown => 3.0,
+					count => 2,
 				},
 				air => 'ground',
 				range => 2,
@@ -623,9 +669,11 @@ use utf8;
 	cargo => 1,
 	armor => 0,
 	hp => 45,
-	suit => 1, # light
-	organic => 1,
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		organic => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => 5,
@@ -648,8 +696,10 @@ use utf8;
 	size => 0.75,
 	armor => 0,
 	hp => 60,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	speed => 2.8,
 	sight => 8,
 },
@@ -658,22 +708,24 @@ use utf8;
 	race => 'terran',
 	cat => 'base',
 	name => 'Missile Turret',
-	unit => 0,
 	min => 100,
 	gas => 0,
 	build => 25,
-	size => 2x2,
+	size => 2,
 	cargo => 0,
 	armor => 0,
 	hp => 250,
-	suit => 3, # armored
-	organic => 0, # mech
-	structure => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		structure => 1,
+	},
 	attack => {
 		air => {
-			damage => 12, # x2
+			damage => 12,
 			dps => 27.9,
 			cooldown => 0.8608,
+			count => 2,
 		},
 		range => 7,
 	},
@@ -693,17 +745,19 @@ use utf8;
 	cat => 'base',
 	name => 'Planetary Fortress',
 	base => ['Command Center'],
-	unit => 0,
+	unit => -11,
 	min => 150,
 	gas => 150,
 	build => 50,
-	size => 5x5,
+	size => 5,
 	cargo => 0,
 	armor => 3,
 	hp => 1500,
-	suit => 3, # armored
-	organic => 0, # mech
-	structure => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		structure => 1,
+	},
 	attack => {
 		ground => {
 			damage => 40,
@@ -739,8 +793,10 @@ use utf8;
 	cargo => 1,
 	armor => 0,
 	hp => 45,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [6 .. 9],
@@ -788,8 +844,10 @@ use utf8;
 	cargo => 2,
 	armor => 1,
 	hp => 125,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [10 .. 13],
@@ -831,13 +889,16 @@ use utf8;
 	cargo => 1,
 	armor => 0,
 	hp => 60,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
-			damage => [4 .. 7], # x2
+			damage => [4 .. 7],
 			dps => [7.3, 9.1, 10.9, 12.7],
 			cooldown => 1.1,
+			count => 2,
 		},
 		range => 4.5,
 	},
@@ -857,8 +918,10 @@ use utf8;
 	cargo => 2,
 	armor => 0,
 	hp => 100,
-	organic => 1,
-	psionic => 1,
+	attr => {
+		organic => 1,
+		psionic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [10 .. 13],
@@ -885,8 +948,10 @@ use utf8;
 	cargo => 2,
 	armor => 0,
 	hp => 90,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => [8 .. 11],
@@ -913,9 +978,11 @@ use utf8;
 	cargo => 4,
 	armor => 0,
 	hp => 135,
-	suit => 1, # light
-	organic => 1,
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		organic => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => [18, 20, 22, 24],
@@ -942,8 +1009,10 @@ use utf8;
 	cargo => 2,
 	armor => 0,
 	hp => 90,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => 125,
@@ -969,8 +1038,10 @@ use utf8;
 	cargo => 4,
 	armor => 1,
 	hp => 160,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => [15, 17, 19, 21],
@@ -1015,25 +1086,29 @@ use utf8;
 	cargo => 8,
 	armor => 1,
 	hp => 400,
-	suit => 3, # armored
-	organic => 0, # mech
-	massive => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		massive => 1,
+	},
 	attack => {
 		ground => {
-			damage => [30, 33, 36, 39], # x2,
+			damage => [30, 33, 36, 39],
 			dps => [46.9, 51.6, 56.3, 61.0],
 			cooldown => 1.28,
 			range => 7,
+			count => 2,
 		},
 		air => {
 			name => 'Explosive Payload',
-			damage => [6 .. 9], # x4
+			damage => [6 .. 9],
 			#bonus => +6 (+1) L Air,
 			dps => [8, 9.3, 10.6, 11.9],
 			splash => 1,
 			type => 'projectile',
 			cooldown => 3,
 			range => 10,
+			count => 4,
 		},
 		air => {
 			name => 'High Impact Payload',
@@ -1059,15 +1134,18 @@ use utf8;
 	cargo => 0,
 	armor => 0,
 	hp => 125,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+	},
 	attack => {
 		air => {
-			damage => [10 .. 13], # x2
+			damage => [10 .. 13],
 			#bonus => +4A,
 			dps => [10 .. 13],
 			type => 'projectile',
 			cooldown => 2,
+			count => 2,
 		},
 		range => 9,
 	},
@@ -1104,8 +1182,10 @@ use utf8;
 	cargo => 0,
 	armor => 1,
 	hp => 150,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+	},
 	speed => 2.5,
 	upgrade => [
 		{
@@ -1127,14 +1207,17 @@ use utf8;
 	cargo => 0,
 	armor => 0,
 	hp => 140,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
-			damage => [12 .. 15], # x2
+			damage => [12 .. 15],
 			dps => [19.2, 20.8, 22.4, 24.0],
 			type => 'projectile',
 			cooldown => 1.25,
+			count => 2,
 		},
 		range => 6,
 	},
@@ -1154,20 +1237,24 @@ use utf8;
 	cargo => 0,
 	armor => 1,
 	hp => 140,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	speed => 2.25,
 	sight => 11,
 	special => [
 		{
 			alt => 'Auto-Turret',
-			size => 2x2,
+			size => 2,
 			cargo => 0,
 			armor => 1,
 			hp => 150,
-			suit => 3, # armored
-			organic => 0, # mech
-			structure => 1,
+			attr => {
+				armored => 1,
+				mech => 1,
+				structure => 1,
+			},
 			attack => {
 				ground => {
 					damage => 8,
@@ -1193,9 +1280,11 @@ use utf8;
 			cargo => 0,
 			armor => 0,
 			hp => 50,
-			suit => 1, # light
-			organic => 0, # mech
-			structure => 1,
+			attr => {
+				light => 1,
+				mech => 1,
+				structure => 1,
+			},
 			cooldown => 0,
 			attack => {
 				range => 8,
@@ -1208,6 +1297,7 @@ use utf8;
 					},
 				},
 			],
+			duration => 20,
 		},
 	],
 },
@@ -1224,9 +1314,11 @@ use utf8;
 	cargo => 0,
 	armor => 3,
 	hp => 550,
-	suit => 3, # armored
-	organic => 0, # mech
-	massive => 1,
+	attr => {
+		armored => 1,
+		mech => 1,
+		massive => 1,
+	},
 	attack => {
 		ground => {
 			damage => [8 .. 11],
@@ -1258,8 +1350,10 @@ use utf8;
 	cargo => 1,
 	armor => 0,
 	hp => 40,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => 5,
@@ -1285,15 +1379,18 @@ use utf8;
 	cargo => 2,
 	armor => 1,
 	hp => 175,
-	organic => 1,
-	psionic => 1,
+	attr => {
+		organic => 1,
+		psionic => 1,
+	},
 	attack => {
 		ground => {
-			damage => [4 .. 7], # x2
+			damage => [4 .. 7],
 			dps => [8, 10, 12, 14],
 			cooldown => 1.0,
 			type => 'projectile',
 			range => 5,
+			count => 2,
 		},
 		air => {
 			damage => [9 .. 12],
@@ -1320,8 +1417,10 @@ use utf8;
 	cargo => -8,
 	armor => 0,
 	hp => 200,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+	},
 	speed => 0.586,
 	creep => 0,
 	sight => 11,
@@ -1345,8 +1444,10 @@ use utf8;
 	cargo => 0,
 	armor => 1,
 	hp => 200,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+	},
 	speed => 1.875,
 	creep => 0,
 	sight => 11,
@@ -1358,8 +1459,10 @@ use utf8;
 			cargo => 0,
 			armor => 0,
 			hp => 5,
-			suit => 1, # light
-			organic => 1,
+			attr => {
+				light => 1,
+				organic => 1,
+			},
 			speed => 2.25,
 			creep => 1.0,
 			sight => 8,
@@ -1382,8 +1485,10 @@ use utf8;
 	cargo => 0,
 	armor => 10,
 	hp => 25,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	speed => 0.5625,
 	creep => 1.0,
 	sight => 5,
@@ -1393,17 +1498,18 @@ use utf8;
 	race => 'zerg',
 	cat => 'creep',
 	name => 'Spine Crawler',
-	unit => 0,
 	min => 100,
 	gas => 0,
 	build => 50,
-	size => 2x2,
+	size => 2,
 	cargo => 0,
 	armor => 2,
 	hp => 300,
-	suit => 3, # armored
-	organic => 1,
-	structure => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		structure => 1,
+	},
 	attack => {
 		ground => {
 			damage => 25,
@@ -1422,17 +1528,18 @@ use utf8;
 	race => 'zerg',
 	cat => 'creep',
 	name => 'Spore Crawler',
-	unit => 0,
 	min => 75,
 	gas => 0,
 	build => 30,
-	size => 2x2,
+	size => 2,
 	cargo => 0,
 	armor => 1,
 	hp => 400,
-	suit => 3, # armored
-	organic => 1,
-	structure => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		structure => 1,
+	},
 	attack => {
 		air => {
 			damage => 15,
@@ -1460,8 +1567,10 @@ use utf8;
 	cargo => 1,
 	armor => 0,
 	hp => 35,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [5 .. 8],
@@ -1501,7 +1610,9 @@ use utf8;
 	cargo => 2,
 	armor => 0,
 	hp => 30,
-	organic => 1,
+	attr => {
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [20, 22, 24, 26],
@@ -1532,8 +1643,10 @@ use utf8;
 	cargo => 2,
 	armor => 1,
 	hp => 145,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [16, 18, 20, 22],
@@ -1564,8 +1677,10 @@ use utf8;
 	cargo => 2,
 	armor => 0,
 	hp => 80,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [12 .. 15],
@@ -1604,9 +1719,11 @@ use utf8;
 	cargo => 2,
 	armor => 0,
 	hp => 90,
-	suit => 3, # armored
-	organic => 1,
-	psionic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		psionic => 1,
+	},
 	speed => 2.25,
 	creep => 1.3,
 	sight => 10,
@@ -1618,8 +1735,10 @@ use utf8;
 			cargo => 0,
 			armor => 0,
 			hp => 50,
-			suit => 1, # light
-			organic => 1,
+			attr => {
+				light => 1,
+				organic => 1,
+			},
 			attack => {
 				ground => {
 					damage => 8,
@@ -1640,17 +1759,18 @@ use utf8;
 	race => 'zerg',
 	cat => 'lair',
 	name => 'Nydus Worm',
-	unit => 0,
 	min => 100,
 	gas => 100,
 	build => 20,
-	size => 3x3,
+	size => 3,
 	cargo => 0,
 	armor => 1,
 	hp => 200,
-	suit => 3, # armored
-	organic => 1,
-	structure => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		structure => 1,
+	},
 	speed => 0,
 	sight => 10,
 },
@@ -1659,16 +1779,18 @@ use utf8;
 	race => 'zerg',
 	cat => 'lair',
 	name => 'Swarm Host',
-	unit => 3,
-	min => 200,
-	gas => 100,
+	unit => 4,
+	min => 100,
+	gas => 200,
 	build => 40,
 	size => 1.625,
 	cargo => 4,
 	armor => 1,
 	hp => 160,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			dps => [27.9, 30.2, 32.5, 34.8],
@@ -1676,7 +1798,7 @@ use utf8;
 			cooldown => 0.86,
 		},
 	},
-	speed => 2.25,
+	speed => 2.95,
 	creep => 1.3,
 	sight => 10,
 	special => [
@@ -1687,20 +1809,23 @@ use utf8;
 			cargo => 0,
 			armor => 0,
 			hp => 65,
-			suit => 1, # light
-			organic => 1,
+			attr => {
+				light => 1,
+				organic => 1,
+			},
 			attack => {
 				ground => {
 					damage => [12 .. 15],
 					dps => [14.0, 15.2, 16.4, 17.6],
 					type => 'projectile',
-					cooldown => 0.86,
+					cooldown => 0.6,
 				},
 				range => 3,
 			},
 			speed => 1.875,
 			creep => 1.4,
 			sight => 6,
+			duration => 25,
 		},
 	],
 },
@@ -1717,8 +1842,10 @@ use utf8;
 	cargo => 0,
 	armor => 0,
 	hp => 120,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [9 .. 12],
@@ -1746,8 +1873,10 @@ use utf8;
 	cargo => 0,
 	armor => 2,
 	hp => 200,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+	},
 	attack => {
 		air => {
 			damage => [14 .. 17],
@@ -1775,9 +1904,11 @@ use utf8;
 	cargo => 0,
 	armor => 1,
 	hp => 225,
-	suit => 3, # armored
-	organic => 1,
-	massive => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		massive => 1,
+	},
 	attack => {
 		ground => {
 			damage => [20, 22, 24, 26],
@@ -1798,8 +1929,10 @@ use utf8;
 			cargo => 0,
 			armor => 0,
 			hp => 30,
-			suit => 1, # light
-			organic => 1,
+			attr => {
+				light => 1,
+				organic => 1,
+			},
 			attack => {
 				ground => {
 					damage => [4 .. 7],
@@ -1827,9 +1960,11 @@ use utf8;
 	cargo => 0,
 	armor => 1,
 	hp => 150,
-	suit => 3, # armored
-	organic => 1,
-	psionic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		psionic => 1,
+	},
 	speed => 2.9531,
 	sight => 11,
 },
@@ -1846,9 +1981,11 @@ use utf8;
 	cargo => 8,
 	armor => 1,
 	hp => 500,
-	suit => 3, # armored
-	organic => 1,
-	massive => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+		massive => 1,
+	},
 	attack => {
 		ground => {
 			damage => [35, 38, 41, 44],