X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/962d9b682969c139ab48ad8158adcaf01fef7730..HEAD:/sc-units-bw.inc.pl

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index 678646e..8d490d4 100644
--- a/sc-units-bw.inc.pl
+++ b/sc-units-bw.inc.pl
@@ -1,10 +1,12 @@
 use utf8;
 use strict;
 
-# time in fastest game seconds
-my $FPS = 24;  # frames per second
-# toss shield += .65 per second
-# zerg regen  += .37 per second
+my $PPT = 32;  # tile size in pixels
+my $FPS = 1000 / 56;  # frames per second on fast
+# energy      += 8HP/frame ≈ .74 per second
+# toss shield += 7HP/frame ≈ .65/s
+# zerg regen  += 4HP/frame ≈ .37/s
+my $SM = $FPS / $PPT;  # pixels per frame to tiles per second multiplication
 
 [
 '<span title="no known changes as of v1.16.1">version≥1.08</span>',
@@ -19,6 +21,7 @@ min => 50,
 gas => 0,
 build => 20,
 suit => 1,
+size => 23 / $PPT,
 pop => 1,
 cargo => 1,
 race => 'protoss',
@@ -34,12 +37,19 @@ attack => [
 		name => "Particle Beam",
 		damage => 5,
 		cooldown => 22 / $FPS,
-		range => 0,
+		range => 1,
 	},
 ],
 sight => 8,
-speed => 14,
+speed => 4.92 * $SM,
 counter => ['vulture', 'dark templar'],
+special => [
+	{
+		name => 'worker',
+		abbr => '⚒',
+		desc => "warp-in buildings and gather minerals (65/minute) or gas (103/minute)",
+	},
+],
 },
 
 {
@@ -53,6 +63,7 @@ min => 150,
 gas => 0,
 build => 50,
 suit => 3,
+size => 2, # 41x33
 race => 'protoss',
 attr => {
 	structure => 1,
@@ -63,6 +74,7 @@ armor => 0,
 attack => [
 	{
 		anti => 3,
+		name => 'STS/A Photon Cannon',
 		damage => 20,
 		cooldown => 22 / $FPS,
 		range => 7,
@@ -85,6 +97,7 @@ min => 100,
 gas => 0,
 build => 40,
 suit => 1,
+size => 23 / $PPT, # x19
 pop => 2,
 cargo => 2,
 race => 'protoss',
@@ -98,18 +111,19 @@ attack => [
 	{
 		anti => 1,
 		name => "Psi Blades",
-		damage => 16,
-		upgrade => 2,
+		damage => 8,
+		count => 2,
+		upgrade => 1,
 		cooldown => 22 / $FPS,
-		range => 0,
+		range => 15 / $PPT,
 	},
 ],
 sight => 7,
-speed => 11,
+speed => 4 * $SM,
 upgrade => [
 	{
 		name => 'Leg Enhancements',
-		speed => 16 - 11,
+		speed => (6 - 4) * $SM,
 		min => 150,
 		gas => 150,
 		build => 133,
@@ -129,6 +143,7 @@ min => 125,
 gas => 50,
 build => 50,
 suit => 3,
+size => 32 / $PPT,
 pop => 2,
 cargo => 4,
 race => 'protoss',
@@ -150,7 +165,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 15,
+speed => 5 * $SM,
 upgrade => [
 	{
 		name => 'Singularity Charge',
@@ -178,6 +193,7 @@ min => 50,
 gas => 150,
 build => 50,
 suit => 1,
+size => 24 / $PPT,
 pop => 2,
 cargo => 2,
 race => 'protoss',
@@ -188,7 +204,7 @@ hp => 40,
 shield => 40,
 armor => 0,
 sight => 7,
-speed => 9,
+speed => 3.2 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -238,6 +254,7 @@ min => 125,
 gas => 100,
 build => 50,
 suit => 1,
+size => 25 / $PPT, # 24x26
 pop => 2,
 cargo => 2,
 race => 'protoss',
@@ -254,11 +271,11 @@ attack => [
 		damage => 40,
 		upgrade => 3,
 		cooldown => 30 / $FPS,
-		range => 0,
+		range => 15 / $PPT,
 	},
 ],
 sight => 7,
-speed => 15,
+speed => 4.92 * $SM,
 special => [
 	{
 		name => 'Cloaked',
@@ -281,6 +298,7 @@ gas => 300,
 build => 20,
 base => ['templar', 'templar'],
 suit => 3,
+size => 32 / $PPT,
 pop => 4,
 cargo => 4,
 race => 'protoss',
@@ -302,7 +320,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 14,
+speed => 4.92 * $SM,
 },
 
 {
@@ -317,6 +335,7 @@ gas => 200,
 build => 20,
 base => ['dark templar', 'dark templar'],
 suit => 3,
+size => 32 / $PPT,
 pop => 4,
 cargo => 4,
 race => 'protoss',
@@ -327,7 +346,7 @@ hp => 25,
 shield => 200,
 armor => 1,
 sight => 10,
-speed => 14,
+speed => 4.92 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -384,6 +403,7 @@ min => 275,
 gas => 125,
 build => 80,
 suit => 3,
+size => 36 / $PPT, # x32
 pop => 3,
 race => 'protoss',
 attr => {
@@ -397,6 +417,7 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
+		name => 'Dual Photon Blasters',
 		damage => 8,
 		upgrade => 1,
 		cooldown => 30 / $FPS,
@@ -404,15 +425,17 @@ attack => [
 	},
 	{
 		anti => 2,
-		damage => 28,
-		upgrade => 2,
+		name => 'Anti-Matter Missiles',
+		damage => 14,
+		count => 2,
+		upgrade => 1,
 		type => 'explosive',
 		cooldown => 22 / $FPS,
 		range => 4,
 	},
 ],
 sight => 8,
-speed => 13,
+speed => 5 * $SM,
 upgrade => [
 	{
 		name => 'Apial Sensors',
@@ -426,7 +449,7 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 166,
-		speed => 18 - 13,
+		speed => (6.67 - 5) * $SM,
 	},
 ],
 },
@@ -441,6 +464,7 @@ min => 150,
 gas => 100,
 build => 40,
 suit => 2,
+size => 36 / $PPT, # x32
 pop => 2,
 race => 'protoss',
 attr => {
@@ -454,6 +478,7 @@ armor => 1,
 attack => [
 	{
 		anti => 2,
+		name => 'Neutron Flare',
 		damage => 5,
 		upgrade => 1,
 		cooldown => 8 / $FPS,
@@ -463,7 +488,7 @@ attack => [
 	},
 ],
 sight => 9,
-speed => 17,
+speed => 6.67 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -478,15 +503,15 @@ upgrade => [
 ],
 special => [
 	{
-		name => 'Disruption web',
+		name => 'Disruption Web',
 		abbr => 'dw',
 		min => 200,
 		gas => 200,
 		build => 80,
 		desc => 'creates a field in which no ground unit/structure can attack',
 		range => 9,
-		cost => 62-50,
-		duration => undef, #XXX
+		cost => 125,
+		duration => 24,
 	},
 ],
 counter => ['devourer', 'valkyrie'],
@@ -502,6 +527,7 @@ min => 350,
 gas => 250,
 build => 140,
 suit => 3,
+size => 64 / $PPT,
 pop => 6,
 race => 'protoss',
 attr => {
@@ -520,7 +546,7 @@ attack => [
 	},
 ],
 sight => 11,
-speed => 10,
+speed => 3.33 * $SM,
 special => [
 	{
 		name => 'Build Interceptor',
@@ -528,6 +554,7 @@ special => [
 		min => 25,
 		build => 20,
 		suit => 1,
+		size => 16 / $PPT,
 		pop => 0,
 		race => 'protoss',
 		attr => {
@@ -540,15 +567,16 @@ special => [
 		attack => [
 			{
 				anti => 3,
+				name => 'Pulse Cannon',
 				damage => 6,
 				upgrade => 1,
 				cooldown => 43 / $FPS, # approximately 37 according to liquipedia
 				build => 20,
-				range => 0,
+				range => 4,
 			},
 		],
-		sight => 0,
-		range => 0,
+		sight => 6,
+		speed => 13.33 * $SM,
 	},
 ],
 upgrade => [
@@ -575,6 +603,7 @@ min => 100,
 gas => 350,
 build => 160,
 suit => 3,
+size => 44 / $PPT,
 pop => 4,
 race => 'protoss',
 attr => {
@@ -588,6 +617,7 @@ armor => 1,
 attack => [
 	{
 		anti => 3,
+		name => 'Phase Disruptor Cannon',
 		damage => 10,
 		upgrade => 1,
 		cooldown => 45 / $FPS,
@@ -596,7 +626,7 @@ attack => [
 	},
 ],
 sight => 9,
-speed => 12,
+speed => 5 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -647,6 +677,7 @@ min => 200,
 gas => 100,
 build => 70,
 suit => 3,
+size => 32 / $PPT,
 pop => 4,
 cargo => 4,
 race => 'protoss',
@@ -660,7 +691,7 @@ attack => [
 	{
 		anti => 1,
 		damage => 100,
-		cooldown => 60 / $FPS,
+		cooldown => 60 / $FPS, # 30 after drop
 		splash => 1,
 		min => 15,
 		build => 7,
@@ -669,7 +700,7 @@ attack => [
 	},
 ],
 sight => 10,
-speed => 5,
+speed => 1.78 * $SM,
 upgrade => [
 	{
 		name => 'Scarab Damage',
@@ -713,6 +744,7 @@ min => 25,
 gas => 75,
 build => 40,
 suit => 1,
+size => 32 / $PPT,
 pop => 1,
 race => 'protoss',
 attr => {
@@ -725,7 +757,7 @@ shield => 20,
 armor => 0,
 sight => 9,
 detect => 1,
-speed => 9,
+speed => 3.33 * $SM,
 upgrade => [
 	{
 		name => "Sensor Array",
@@ -739,7 +771,7 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		speed => 13 - 9,
+		speed => (5 - 3.33) * $SM,
 	},
 ],
 special => [
@@ -762,6 +794,7 @@ min => 200,
 gas => 0,
 build => 60,
 suit => 3,
+size => 40 / $PPT, # x32
 pop => 2,
 cargo => -8,
 race => 'protoss',
@@ -772,7 +805,7 @@ hp => 80,
 shield => 60,
 armor => 1,
 sight => 8,
-speed => 13,
+speed => 4.43 * $SM,
 transport => 1,
 upgrade => [
 	{
@@ -780,7 +813,7 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 166,
-		speed => 19 - 13,
+		speed => (6.67 - 4.43) * $SM,
 	}
 ],
 },
@@ -795,6 +828,7 @@ min => 50,
 gas => 0,
 build => 20,
 suit => 1,
+size => 23 / $PPT,
 pop => 1,
 cargo => 1,
 race => 'terran',
@@ -807,13 +841,21 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
+		name => 'Fusion Cutter',
 		damage => 5,
 		cooldown => 15 / $FPS,
-		range => 0,
+		range => 10 / $PPT,
 	},
 ],
 sight => 7,
-speed => 15,
+speed => 4.92 * $SM,
+special => [
+	{
+		name => 'worker',
+		abbr => '⚒',
+		desc => "construct or repair buildings and gather minerals (68/minute) or gas (103/minute)",
+	},
+],
 },
 
 {
@@ -826,6 +868,7 @@ min => 75,
 gas => 0,
 build => 30,
 suit => 3,
+size => 2, # 33x49
 race => 'terran',
 attr => {
 	structure => 1,
@@ -835,6 +878,7 @@ armor => 0,
 attack => [
 	{
 		anti => 2,
+		name => 'Longbolt Missile',
 		damage => 20,
 		cooldown => 15 / $FPS,
 		type => 'explosive',
@@ -856,6 +900,7 @@ min => 50,
 gas => 0,
 build => 24,
 suit => 1,
+size => 17 / $PPT, # x20
 pop => 1,
 cargo => 1,
 race => 'terran',
@@ -867,6 +912,7 @@ armor => 0,
 attack => [
 	{
 		anti => 3,
+		name => 'Gauss Rifle',
 		damage => 6,
 		upgrade => 1,
 		cooldown => 15 / $FPS,
@@ -874,7 +920,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 11,
+speed => 4 * $SM,
 upgrade => [
 	{
 		name => 'U-238 Shells',
@@ -890,13 +936,13 @@ upgrade => [
 ],
 special => [
 	{
-		name => 'stim pack',
+		name => 'Stim Pack',
 		abbr => 'sp',
 		min => 100,
 		gas => 100,
 		build => 80,
 		desc => 'doubles attack speed and faster movement for a few seconds at the cost of 10 health',
-		speed => 17,
+		speed => (6 - 4) * $SM,
 		attack => [
 			{
 				anti => 3,
@@ -915,6 +961,7 @@ min => 50,
 gas => 25,
 build => 24,
 suit => 1,
+size => 23 / $PPT, # x22
 pop => 1,
 cargo => 1,
 race => 'terran',
@@ -926,16 +973,17 @@ armor => 1,
 attack => [
 	{
 		anti => 1,
+		name => 'Flame Thrower',
 		damage => 16,
 		upgrade => 2,
 		cooldown => 22 / $FPS,
 		splash => 1,
 		type => 'implosive',
-		range => 2,
+		range => 1,
 	},
 ],
 sight => 7,
-speed => 11,
+speed => 4 * $SM,
 upgrade => [
 ],
 special => [
@@ -946,7 +994,7 @@ special => [
 		gas => 100,
 		build => 80,
 		desc => 'doubles attack speed and faster movement for a few seconds at the cost of 10 health',
-		speed => 17,
+		speed => (6 - 4) * $SM,
 		attack => [
 			{
 				anti => 1,
@@ -968,6 +1016,7 @@ min => 25,
 gas => 75,
 build => 50,
 suit => 1,
+size => 15 / $PPT, # x22
 pop => 1,
 cargo => 1,
 race => 'terran',
@@ -979,6 +1028,7 @@ armor => 0,
 attack => [
 	{
 		anti => 3,
+		name => 'C-10 Canister Rifle',
 		damage => 10,
 		upgrade => 1,
 		cooldown => 22 / $FPS,
@@ -987,7 +1037,7 @@ attack => [
 	},
 ],
 sight => 9,
-speed => 11,
+speed => 4 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -1055,6 +1105,7 @@ min => 50,
 gas => 25,
 build => 30,
 suit => 1,
+size => 17 / $PPT, # x20
 pop => 1,
 cargo => 1,
 race => 'terran',
@@ -1064,7 +1115,7 @@ attr => {
 hp =>  60,
 armor => 1,
 sight => 9,
-speed => 11,
+speed => 4 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -1121,6 +1172,7 @@ min => 75,
 gas => 0,
 build => 30,
 suit => 2,
+size => 32 / $PPT,
 pop => 2,
 cargo => 2,
 race => 'terran',
@@ -1132,6 +1184,7 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
+		name => 'Fragmentation Grenade',
 		damage => 20,
 		upgrade => 2,
 		cooldown => 30 / $FPS,
@@ -1140,14 +1193,14 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 20,
+speed => 6.4 * $SM,
 upgrade => [
 	{
 		name => 'Ion Thrusters',
 		min => 100,
 		gas => 100,
 		build => 100,
-		speed => 28 - 20,
+		speed => (10 - 6.4) * $SM,
 	},
 ],
 special => [
@@ -1165,6 +1218,7 @@ special => [
 		},
 		hp => 20,
 		suit => 1,
+		size => 15 / $PPT,
 		armor => 0,
 		attack => [
 			{
@@ -1172,11 +1226,11 @@ special => [
 				damage => 125,
 				splash => 1,
 				type => 'explosive',
-				range => 3,
+				range => 3, # to walk, melee to explode
 			},
 		],
 		sight => 3,
-		speed => 25,
+		speed => 16 * $SM,
     },
 ],
 },
@@ -1191,6 +1245,7 @@ min => 150,
 gas => 100,
 build => 50,
 suit => 3,
+size => 32 / $PPT,
 pop => 2,
 cargo => 4,
 race => 'terran',
@@ -1202,15 +1257,16 @@ armor => 1,
 attack => [
 	{
 		anti => 1,
+		name => 'Arclite Cannon',
 		damage => 30,
 		upgrade => 3,
-		cooldown => 37 / $FPS,
+		cooldown => 37 / $FPS, # 15 after drop
 		type => 'explosive',
 		range => 7,
 	},
 ],
 sight => 10,
-speed => 12,
+speed => 4 * $SM,
 special => [
 	{
 		name => 'Siege Mode',
@@ -1222,12 +1278,13 @@ special => [
 		attack => [
 			{
 				anti => 1,
+				name => 'Arclite Shock Cannon',
 				damage => 70,
 				upgrade => 5,
 				cooldown => 75 / $FPS,
 				splash => 1,
 				type => 'explosive',
-				range => 12,
+				range => 12, # minimum 2
 			},
 		],
 		speed => 0,
@@ -1245,6 +1302,7 @@ min => 100,
 gas => 50,
 build => 40,
 suit => 3,
+size => 32 / $PPT,
 pop => 2,
 cargo => 2,
 race => 'terran',
@@ -1256,22 +1314,25 @@ armor => 1,
 attack => [
 	{
 		anti => 1,
+		name => 'Twin Autocannons',
 		damage => 12,
 		upgrade => 1,
-		cooldown => 22 / $FPS,
-		range => 5,
+		cooldown => 22 / $FPS, # 15 after drop
+		range => 6,
 	},
 	{
 		anti => 2,
-		damage => 20,
-		upgrade => 4,
+		name => 'Hellfire Missile Pack',
+		damage => 10,
+		count => 2,
+		upgrade => 2,
 		type => 'explosive',
 		cooldown => 22 / $FPS,
 		range => 5,
 	},
 ],
 sight => 8,
-speed => 13,
+speed => 4.57 * $SM,
 upgrade => [
 	{
 		name => 'Charon Boosters',
@@ -1295,6 +1356,7 @@ min => 150,
 gas => 100,
 build => 60,
 suit => 3,
+size => 38 / $PPT, # x30
 pop => 2,
 race => 'terran',
 attr => {
@@ -1307,6 +1369,7 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
+		name => 'Burst Lasers',
 		damage => 8,
 		upgrade => 1,
 		cooldown => 30 / $FPS,
@@ -1314,6 +1377,7 @@ attack => [
 	},
 	{
 		anti => 2,
+		name => 'Gemini Missiles',
 		damage => 20,
 		upgrade => 2,
 		cooldown => 22 / $FPS,
@@ -1322,7 +1386,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 17,
+speed => 6.67 * $SM,
 energy => 50,
 capacity => 200,
 special => [
@@ -1359,6 +1423,7 @@ min => 400,
 gas => 300,
 build => 133,
 suit => 3,
+size => 75 / $PPT, # x59
 pop => 6,
 race => 'terran',
 attr => {
@@ -1371,6 +1436,7 @@ armor => 3,
 attack => [
 	{
 		anti => 3,
+		name => 'ATS/A Laser Battery',
 		damage => 25,
 		upgrade => 3,
 		cooldown => 30 / $FPS,
@@ -1378,7 +1444,7 @@ attack => [
 	},
 ],
 sight => 11,
-speed => 7,
+speed => 2.5 * $SM,
 energy => 50,
 capacity => 200,
 special => [
@@ -1388,11 +1454,12 @@ special => [
 		min => 100,
 		gas => 100,
 		build => 120,
-		desc => 'blast doing 260 damage to a target',
+		desc => 'blast doing 260 explosive damage to a target',
 		attack => [
 			{
 				anti => 3,
 				damage => 260,
+				type => 'explosive',
 				range => 10,
 			},
 		],
@@ -1421,6 +1488,7 @@ min => 100,
 gas => 225,
 build => 80,
 suit => 3,
+size => 65 / $PPT, # x50
 pop => 2,
 race => 'terran',
 attr => {
@@ -1432,7 +1500,7 @@ hp => 200,
 armor => 1,
 sight => 10,
 detect => 1,
-speed => 15,
+speed => 5 * $SM,
 energy => 50,
 capacity => 200,
 special => [
@@ -1492,6 +1560,7 @@ min => 250,
 gas => 125,
 build => 50,
 suit => 3,
+size => 49 / $PPT, # x37
 pop => 3,
 race => 'terran',
 attr => {
@@ -1504,6 +1573,7 @@ armor => 2,
 attack => [
 	{
 		anti => 2,
+		name => 'Halo Rockets',
 		damage => 6,
 		upgrade => 1,
 		cooldown => 64 / $FPS,
@@ -1514,7 +1584,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 19,
+speed => 6.6 * $SM,
 },
 
 {
@@ -1524,6 +1594,7 @@ min => 100,
 gas => 100,
 build => 50,
 suit => 3,
+size => 49 / $PPT, # x37
 pop => 2,
 cargo => -8,
 race => 'terran',
@@ -1535,7 +1606,7 @@ air => 1,
 hp => 150,
 armor => 1,
 sight => 8,
-speed => 15,
+speed => 5.47 * $SM,
 transport => 1,
 },
 
@@ -1549,6 +1620,7 @@ min => 50,
 gas => 0,
 build => 20,
 suit => 1,
+size => 23 / $PPT,
 pop => 1,
 cargo => 1,
 race => 'zerg',
@@ -1560,13 +1632,21 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
+		name => 'Spines',
 		damage => 5,
 		cooldown => 22 / $FPS,
-		range => 0,
+		range => 1,
 	},
 ],
 sight => 7,
-speed => 14,
+speed => 4.92 * $SM,
+special => [
+	{
+		name => 'worker',
+		abbr => '⚒',
+		desc => "morph into buildings and gather minerals (67/minute) or gas (103/minute)",
+	},
+],
 },
 
 {
@@ -1576,6 +1656,7 @@ min => 100,
 gas => 0,
 build => 40,
 suit => 3,
+size => 50 / $PPT,
 pop => -9,
 cargo => 0,
 race => 'zerg',
@@ -1589,7 +1670,7 @@ armor => 0,
 cargo => 0,
 sight => 9,
 detect => 1,
-speed => 2,
+speed => .83 * $SM,
 transport => 1,
 upgrade => [
 	{
@@ -1611,7 +1692,7 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 133,
-		speed => 10 - 2,
+		speed => (3.33 - .83) * $SM,
 	},
 ],
 },
@@ -1624,6 +1705,7 @@ trans => {
 },
 build => 20,
 suit => 1,
+size => 16 / $PPT,
 pop => 0,
 race => 'zerg',
 attr => {
@@ -1658,6 +1740,7 @@ min => 175,
 gas => 0,
 build => 20,
 suit => 3,
+size => 2, # 48x48
 race => 'zerg',
 attr => {
 	structure => 1,
@@ -1667,6 +1750,7 @@ armor => 2,
 attack => [
 	{
 		anti => 1,
+		name => 'Subterranean Tentacle',
 		damage => 40,
 		cooldown => 32 / $FPS,
 		type => 'explosive',
@@ -1684,6 +1768,7 @@ min => 175,
 gas => 0,
 build => 20,
 suit => 3,
+size => 2, # 48x48
 race => 'zerg',
 attr => {
 	structure => 1,
@@ -1693,6 +1778,7 @@ armor => 0,
 attack => [
 	{
 		anti => 2,
+		name => 'Seeker Spores',
 		damage => 15,
 		cooldown => 15 / $FPS,
 		range => 7,
@@ -1710,6 +1796,7 @@ min => 25,
 gas => 0,
 build => 28, # for 2
 suit => 1,
+size => 16 / $PPT,
 pop => 0.5,
 cargo => 1,
 race => 'zerg',
@@ -1721,21 +1808,22 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
+		name => 'Claws',
 		damage => 5,
 		upgrade => 1,
 		cooldown => 8 / $FPS,
-		range => 0,
+		range => 15 / $PPT,
 	},
 ],
 sight => 5,
-speed => 14,
+speed => 5.49 * $SM,
 upgrade => [
 	{
 		name => 'Metabolic Boost',
 		min => 100,
 		gas => 100,
 		build => 80,
-		speed => 22 - 14,
+		speed => (8.36 - 5.49) * $SM,
 	},
 	{
 		name => 'Adrenal Glands',
@@ -1744,7 +1832,7 @@ upgrade => [
 		build => 80,
 		attack => [
 			{
-				cooldown => 6 / $FPS,
+				cooldown => (6 - 8) / $FPS,
 			},
 		],
 	},
@@ -1759,6 +1847,7 @@ min => 75,
 gas => 25,
 build => 28,
 suit => 2,
+size => 21 / $PPT, # x23
 pop => 1,
 cargo => 2,
 race => 'zerg',
@@ -1770,6 +1859,7 @@ armor => 0,
 attack => [
 	{
 		anti => 3,
+		name => 'Needle Spines',
 		damage => 10,
 		upgrade => 1,
 		cooldown => 15 / $FPS,
@@ -1778,7 +1868,7 @@ attack => [
 	},
 ],
 sight => 6,
-speed => 11,
+speed => 3.66 * $SM,
 upgrade => [
 	{
 		name => 'Grooved Spines',
@@ -1796,7 +1886,7 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 100,
-		speed => 16 - 11,
+		speed => (5.57 - 3.66) * $SM,
 	},
 	{
 		name => 'Lurker Aspect',
@@ -1812,9 +1902,10 @@ cat => 'lair',
 name => 'Lurker',
 min => 125,
 gas => 125,
-base => 'hydralisk',
+base => ['hydralisk'],
 build => 40,
 suit => 2,
+size => 32 / $PPT,
 pop => 2,
 cargo => 4,
 race => 'zerg',
@@ -1826,6 +1917,7 @@ armor => 1,
 attack => [
 	{
 		anti => 1,
+		name => 'Subterranean Spines',
 		damage => 20,
 		upgrade => 2,
 		cooldown => 37 / $FPS,
@@ -1834,7 +1926,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 17,
+speed => 5.82 * $SM,
 },
 
 {
@@ -1844,6 +1936,7 @@ min => 100,
 gas => 100,
 build => 50,
 suit => 2,
+size => 48 / $PPT,
 pop => 2,
 race => 'zerg',
 attr => {
@@ -1854,7 +1947,7 @@ air => 1,
 hp => 120,
 armor => 0,
 sight => 10,
-speed => 18,
+speed => 6.67 * $SM,
 energy => 50,
 capacity => 200,
 special => [
@@ -1895,6 +1988,7 @@ special => [
 		count => 2,
 		alt => 'Broodling',
 		suit => 1,
+		size => 19 / $PPT,
 		pop => 0,
 		attr => {
 			organic => 1,
@@ -1904,14 +1998,15 @@ special => [
 		attack => [
 			{
 				anti => 1,
+				name => 'Toxic Spores',
 				damage => 4,
 				upgrade => 1,
 				cooldown => 15 / $FPS,
-				range => 0,
+				range => 2 / $PPT,
 			},
 		],
 		sight => 5,
-		speed => 19,
+		speed => 6 * $SM,
 	},
 ],
 },
@@ -1923,6 +2018,7 @@ min => 100,
 gas => 50,
 build => 40,
 suit => 1,
+size => 17 / $PPT, # x20
 pop => 1,
 race => 'zerg',
 attr => {
@@ -1933,14 +2029,15 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
+		name => 'Suicide',
 		damage => 500,
 		splash => 1,
 		type => 'explosive',
-		range => 0,
+		range => 3 / $PPT,
 	},
 ],
 sight => 5,
-speed => 17,
+speed => 5.82 * $SM,
 },
 
 {
@@ -1950,6 +2047,7 @@ min => 12,
 gas => 38,
 build => 30, # for 2
 suit => 1,
+size => 24 / $PPT,
 pop => 0.5,
 race => 'zerg',
 attr => {
@@ -1962,12 +2060,13 @@ armor => 0,
 attack => [
 	{
 		anti => 2,
+		name => 'Suicide',
 		damage => 110,
-		range => 0,
+		range => 3 / $PPT,
 	},
 ],
 sight => 5,
-speed => 18,
+speed => 6.67 * $SM,
 counter => ['cannon', 'goliath', 'hydralisk'],
 },
 
@@ -1978,6 +2077,7 @@ min => 100,
 gas => 100,
 build => 40,
 suit => 1,
+size => 44 / $PPT,
 pop => 2,
 race => 'zerg',
 attr => {
@@ -1990,6 +2090,7 @@ armor => 0,
 attack => [
 	{
 		anti => 3,
+		name => 'Glave Wurm',
 		damage => 9,
 		upgrade => 1,
 		cooldown => 30 / $FPS,
@@ -1998,11 +2099,12 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 18,
+speed => 6.67 * $SM,
 special => [
 	{
 		alt => 'Cocoon',
 		suit => 3,
+		size => 32 / $PPT,
 		attr => {
 			organic => 1,
 			flying => 1,
@@ -2023,8 +2125,9 @@ name => 'Guardian',
 min => 150,
 gas => 200,
 build => 40,
-base => 'mutalisk',
+base => ['mutalisk'],
 suit => 3,
+size => 44 / $PPT,
 pop => 2,
 race => 'zerg',
 attr => {
@@ -2037,6 +2140,7 @@ armor => 2,
 attack => [
 	{
 		anti => 1,
+		name => 'Acid Spore',
 		damage => 20,
 		upgrade => 2,
 		cooldown => 30 / $FPS,
@@ -2044,7 +2148,7 @@ attack => [
 	},
 ],
 sight => 11,
-speed => 7,
+speed => 2.5 * $SM,
 },
 
 {
@@ -2053,8 +2157,9 @@ name => 'Devourer',
 min => 250,
 gas => 150,
 build => 40,
-base => 'mutalisk',
+base => ['mutalisk'],
 suit => 3,
+size => 44 / $PPT,
 pop => 2,
 race => 'zerg',
 attr => {
@@ -2067,6 +2172,7 @@ armor => 2,
 attack => [
 	{
 		anti => 2,
+		name => 'Corrosive Acid',
 		damage => 25,
 		upgrade => 2,
 		cooldown => 100 / $FPS,
@@ -2075,7 +2181,7 @@ attack => [
 	},
 ],
 sight => 10,
-speed => 15,
+speed => 5 * $SM,
 counter => ['goliath', 'dragoon', 'scourge'],
 },
 
@@ -2086,6 +2192,7 @@ min => 50,
 gas => 150,
 build => 50,
 suit => 2,
+size => 27 / $PPT, # x25
 pop => 2,
 cargo => 2,
 race => 'zerg',
@@ -2095,7 +2202,7 @@ attr => {
 hp => 80,
 armor => 1,
 sight => 10,
-speed => 12,
+speed => 4 * $SM,
 energy => 50,
 capacity => 200,
 special => [
@@ -2129,6 +2236,16 @@ special => [
 		duration => 12,
 	},
 ],
+upgrade => [
+	{
+		name => 'Metasynaptic Node',
+		min => 150,
+		gas => 50,
+		build => 166,
+		energy => 62.5-50,
+		capacity => 250-200,
+	},
+],
 counter => ['archon', 'firebat'],
 },
 
@@ -2139,6 +2256,7 @@ min => 200,
 gas => 200,
 build => 60,
 suit => 3,
+size => 38 / $PPT, # x32
 pop => 4,
 cargo => 4,
 race => 'zerg',
@@ -2150,14 +2268,15 @@ armor => 1,
 attack => [
 	{
 		anti => 1,
+		name => 'Kaiser Blades',
 		damage => 20,
 		upgrade => 3,
 		cooldown => 15 / $FPS,
-		range => 0,
+		range => 25 / $PPT,
 	},
 ],
 sight => 7,
-speed => 16,
+speed => 5.12 * $SM,
 upgrade => [
 	{
 		name => 'Chitinous Plating',
@@ -2171,7 +2290,7 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 133,
-		speed => 21 - 16,
+		speed => (8.1 - 5.12) * $SM,
 	},
 ],
 },