X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/66a41581a76e6f875c2700890156b13460673c05..bb11561d64e299ad7f4a25e689063b99264a16fb:/sc-units-hots.inc.pl

diff --git a/sc-units-hots.inc.pl b/sc-units-hots.inc.pl
index e514eff..022b69c 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,
@@ -41,11 +44,13 @@ use utf8;
 	min => 150,
 	gas => 0,
 	build => 40,
-	size => 2x2,
+	size => 2,
 	armor => 1,
 	hp => 150,
 	shield => 150,
-	suit => 3, # armored
+	attr => {
+		armored => 1,
+	},
 	structure => 1,
 	attack => {
 		ground => {
@@ -73,9 +78,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,10 +108,12 @@ 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],
@@ -127,12 +136,14 @@ use utf8;
 	min => 400,
 	gas => 0,
 	build => 100,
-	size => 5x5,
+	size => 5,
 	cargo => 0,
 	armor => 1,
 	hp => 1000,
 	shield => 1000,
-	suit => 3, # armored
+	attr => {
+		armored => 1,
+	},
 	structure => 1,
 	attack => {
 		ground => {
@@ -161,8 +172,10 @@ use utf8;
 	armor => 1,
 	hp => 100,
 	shield => 50,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [8 .. 11],
@@ -195,9 +208,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],
@@ -225,8 +240,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],
@@ -256,9 +273,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,
 },
@@ -277,9 +296,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],
@@ -306,8 +327,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],
@@ -336,8 +359,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],
@@ -364,9 +389,11 @@ 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],
@@ -399,8 +426,10 @@ use utf8;
 	armor => 0,
 	hp => 40,
 	shield => 20,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	speed => 1.875,
 	upgrade => [
 		{
@@ -423,9 +452,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 => [
 		{
@@ -448,8 +479,10 @@ use utf8;
 	armor => 0,
 	hp => 120,
 	shield => 60,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	attack => {
 		air => {
 			damage => [5 .. 8],
@@ -483,8 +516,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],
@@ -512,9 +547,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',
@@ -543,13 +580,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,
@@ -574,9 +613,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,
 	},
@@ -594,8 +635,10 @@ use utf8;
 			armor => 0,
 			hp => 40,
 			shield => 40,
-			suit => 1, # light
-			organic => 0, # mech
+			attr => {
+				light => 1,
+				mech => 1,
+			},
 			attack => {
 				ground => {
 					damage => [5 .. 8],
@@ -628,9 +671,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,
@@ -653,8 +698,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,
 },
@@ -667,12 +714,14 @@ use utf8;
 	min => 100,
 	gas => 0,
 	build => 25,
-	size => 2x2,
+	size => 2,
 	cargo => 0,
 	armor => 0,
 	hp => 250,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+	},
 	structure => 1,
 	attack => {
 		air => {
@@ -703,12 +752,14 @@ use utf8;
 	min => 150,
 	gas => 150,
 	build => 50,
-	size => 5x5,
+	size => 5,
 	cargo => 0,
 	armor => 3,
 	hp => 1500,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+	},
 	structure => 1,
 	attack => {
 		ground => {
@@ -745,8 +796,10 @@ use utf8;
 	cargo => 1,
 	armor => 0,
 	hp => 45,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [6 .. 9],
@@ -794,8 +847,10 @@ use utf8;
 	cargo => 2,
 	armor => 1,
 	hp => 125,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [10 .. 13],
@@ -837,8 +892,10 @@ use utf8;
 	cargo => 1,
 	armor => 0,
 	hp => 60,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [4 .. 7],
@@ -864,8 +921,10 @@ use utf8;
 	cargo => 2,
 	armor => 0,
 	hp => 100,
-	organic => 1,
-	psionic => 1,
+	attr => {
+		organic => 1,
+		psionic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [10 .. 13],
@@ -892,8 +951,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],
@@ -920,9 +981,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],
@@ -949,8 +1012,10 @@ use utf8;
 	cargo => 2,
 	armor => 0,
 	hp => 90,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => 125,
@@ -976,8 +1041,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],
@@ -1022,9 +1089,11 @@ 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],
@@ -1068,8 +1137,10 @@ use utf8;
 	cargo => 0,
 	armor => 0,
 	hp => 125,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+	},
 	attack => {
 		air => {
 			damage => [10 .. 13],
@@ -1114,8 +1185,10 @@ use utf8;
 	cargo => 0,
 	armor => 1,
 	hp => 150,
-	suit => 3, # armored
-	organic => 0, # mech
+	attr => {
+		armored => 1,
+		mech => 1,
+	},
 	speed => 2.5,
 	upgrade => [
 		{
@@ -1137,8 +1210,10 @@ use utf8;
 	cargo => 0,
 	armor => 0,
 	hp => 140,
-	suit => 1, # light
-	organic => 0, # mech
+	attr => {
+		light => 1,
+		mech => 1,
+	},
 	attack => {
 		ground => {
 			damage => [12 .. 15],
@@ -1165,19 +1240,23 @@ 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
+			attr => {
+				armored => 1,
+				mech => 1,
+			},
 			structure => 1,
 			attack => {
 				ground => {
@@ -1204,8 +1283,10 @@ use utf8;
 			cargo => 0,
 			armor => 0,
 			hp => 50,
-			suit => 1, # light
-			organic => 0, # mech
+			attr => {
+				light => 1,
+				mech => 1,
+			},
 			structure => 1,
 			cooldown => 0,
 			attack => {
@@ -1219,6 +1300,7 @@ use utf8;
 					},
 				},
 			],
+			duration => 20,
 		},
 	],
 },
@@ -1235,9 +1317,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],
@@ -1269,8 +1353,10 @@ use utf8;
 	cargo => 1,
 	armor => 0,
 	hp => 40,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => 5,
@@ -1296,8 +1382,10 @@ use utf8;
 	cargo => 2,
 	armor => 1,
 	hp => 175,
-	organic => 1,
-	psionic => 1,
+	attr => {
+		organic => 1,
+		psionic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [4 .. 7],
@@ -1332,8 +1420,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,
@@ -1357,8 +1447,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,
@@ -1370,8 +1462,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,
@@ -1394,8 +1488,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,
@@ -1409,12 +1505,14 @@ use utf8;
 	min => 100,
 	gas => 0,
 	build => 50,
-	size => 2x2,
+	size => 2,
 	cargo => 0,
 	armor => 2,
 	hp => 300,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+	},
 	structure => 1,
 	attack => {
 		ground => {
@@ -1438,12 +1536,14 @@ use utf8;
 	min => 75,
 	gas => 0,
 	build => 30,
-	size => 2x2,
+	size => 2,
 	cargo => 0,
 	armor => 1,
 	hp => 400,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+	},
 	structure => 1,
 	attack => {
 		air => {
@@ -1472,8 +1572,10 @@ use utf8;
 	cargo => 1,
 	armor => 0,
 	hp => 35,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [5 .. 8],
@@ -1513,7 +1615,9 @@ use utf8;
 	cargo => 2,
 	armor => 0,
 	hp => 30,
-	organic => 1,
+	attr => {
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [20, 22, 24, 26],
@@ -1544,8 +1648,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],
@@ -1576,8 +1682,10 @@ use utf8;
 	cargo => 2,
 	armor => 0,
 	hp => 80,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [12 .. 15],
@@ -1616,9 +1724,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,
@@ -1630,8 +1740,10 @@ use utf8;
 			cargo => 0,
 			armor => 0,
 			hp => 50,
-			suit => 1, # light
-			organic => 1,
+			attr => {
+				light => 1,
+				organic => 1,
+			},
 			attack => {
 				ground => {
 					damage => 8,
@@ -1656,12 +1768,14 @@ use utf8;
 	min => 100,
 	gas => 100,
 	build => 20,
-	size => 3x3,
+	size => 3,
 	cargo => 0,
 	armor => 1,
 	hp => 200,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+	},
 	structure => 1,
 	speed => 0,
 	sight => 10,
@@ -1671,16 +1785,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],
@@ -1688,7 +1804,7 @@ use utf8;
 			cooldown => 0.86,
 		},
 	},
-	speed => 2.25,
+	speed => 2.95,
 	creep => 1.3,
 	sight => 10,
 	special => [
@@ -1699,20 +1815,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,
 		},
 	],
 },
@@ -1729,8 +1848,10 @@ use utf8;
 	cargo => 0,
 	armor => 0,
 	hp => 120,
-	suit => 1, # light
-	organic => 1,
+	attr => {
+		light => 1,
+		organic => 1,
+	},
 	attack => {
 		ground => {
 			damage => [9 .. 12],
@@ -1758,8 +1879,10 @@ use utf8;
 	cargo => 0,
 	armor => 2,
 	hp => 200,
-	suit => 3, # armored
-	organic => 1,
+	attr => {
+		armored => 1,
+		organic => 1,
+	},
 	attack => {
 		air => {
 			damage => [14 .. 17],
@@ -1787,9 +1910,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],
@@ -1810,8 +1935,10 @@ use utf8;
 			cargo => 0,
 			armor => 0,
 			hp => 30,
-			suit => 1, # light
-			organic => 1,
+			attr => {
+				light => 1,
+				organic => 1,
+			},
 			attack => {
 				ground => {
 					damage => [4 .. 7],
@@ -1839,9 +1966,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,
 },
@@ -1858,9 +1987,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],