X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/51f4351333a46b51e93e27c294015e084c8ea243..803fc2946b1c6a3b876cabea90ebac62ca6e55a9:/sc-units-bw.inc.pl

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index dc90ec8..f4c1f7c 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',
@@ -38,7 +41,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 14,
+speed => 4.92 * $SM,
 counter => ['vulture', 'dark templar'],
 },
 
@@ -53,6 +56,7 @@ min => 150,
 gas => 0,
 build => 50,
 suit => 3,
+size => 2, # 41x33
 race => 'protoss',
 attr => {
 	structure => 1,
@@ -63,6 +67,7 @@ armor => 0,
 attack => [
 	{
 		anti => 3,
+		name => 'STS/A Photon Cannon',
 		damage => 20,
 		cooldown => 22 / $FPS,
 		range => 7,
@@ -85,6 +90,7 @@ min => 100,
 gas => 0,
 build => 40,
 suit => 1,
+size => 23 / $PPT, # x19
 pop => 2,
 cargo => 2,
 race => 'protoss',
@@ -98,18 +104,19 @@ attack => [
 	{
 		anti => 1,
 		name => "Psi Blades",
-		damage => 16,
-		upgrade => 2,
+		damage => 8,
+		count => 2,
+		upgrade => 1,
 		cooldown => 22 / $FPS,
-		range => 1,
+		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 +136,7 @@ min => 125,
 gas => 50,
 build => 50,
 suit => 3,
+size => 32 / $PPT,
 pop => 2,
 cargo => 4,
 race => 'protoss',
@@ -150,7 +158,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 15,
+speed => 5 * $SM,
 upgrade => [
 	{
 		name => 'Singularity Charge',
@@ -178,6 +186,7 @@ min => 50,
 gas => 150,
 build => 50,
 suit => 1,
+size => 24 / $PPT,
 pop => 2,
 cargo => 2,
 race => 'protoss',
@@ -188,14 +197,16 @@ hp => 40,
 shield => 40,
 armor => 0,
 sight => 7,
-speed => 9,
-energy => 200,
+speed => 3.2 * $SM,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => "Khaydarin Amulet",
 		min => 150,
 		gas => 150,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 special => [
@@ -236,6 +247,7 @@ min => 125,
 gas => 100,
 build => 50,
 suit => 1,
+size => 25 / $PPT, # 24x26
 pop => 2,
 cargo => 2,
 race => 'protoss',
@@ -252,11 +264,11 @@ attack => [
 		damage => 40,
 		upgrade => 3,
 		cooldown => 30 / $FPS,
-		range => 1,
+		range => 15 / $PPT,
 	},
 ],
 sight => 7,
-speed => 15,
+speed => 4.92 * $SM,
 special => [
 	{
 		name => 'Cloaked',
@@ -279,6 +291,7 @@ gas => 300,
 build => 20,
 base => ['templar', 'templar'],
 suit => 3,
+size => 32 / $PPT,
 pop => 4,
 cargo => 4,
 race => 'protoss',
@@ -300,7 +313,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 14,
+speed => 4.92 * $SM,
 },
 
 {
@@ -315,6 +328,7 @@ gas => 200,
 build => 20,
 base => ['dark templar', 'dark templar'],
 suit => 3,
+size => 32 / $PPT,
 pop => 4,
 cargo => 4,
 race => 'protoss',
@@ -325,15 +339,16 @@ hp => 25,
 shield => 200,
 armor => 1,
 sight => 10,
-speed => 14,
-energy => 200,
+speed => 4.92 * $SM,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => "Argus Talisman",
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		capacity => 250-200,
 	},
 ],
 special => [
@@ -381,10 +396,12 @@ min => 275,
 gas => 125,
 build => 80,
 suit => 3,
+size => 36 / $PPT, # x32
 pop => 3,
 race => 'protoss',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 150,
@@ -393,6 +410,7 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
+		name => 'Dual Photon Blasters',
 		damage => 8,
 		upgrade => 1,
 		cooldown => 30 / $FPS,
@@ -400,15 +418,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',
@@ -422,7 +442,7 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 166,
-		speed => 18 - 13,
+		speed => (6.67 - 5) * $SM,
 	},
 ],
 },
@@ -437,10 +457,12 @@ min => 150,
 gas => 100,
 build => 40,
 suit => 2,
+size => 36 / $PPT, # x32
 pop => 2,
 race => 'protoss',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 100,
@@ -449,6 +471,7 @@ armor => 1,
 attack => [
 	{
 		anti => 2,
+		name => 'Neutron Flare',
 		damage => 5,
 		upgrade => 1,
 		cooldown => 8 / $FPS,
@@ -458,28 +481,30 @@ attack => [
 	},
 ],
 sight => 9,
-speed => 17,
-energy => 200,
+speed => 6.67 * $SM,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => 'Argus Jewel',
 		min => 100,
 		gas => 100,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 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'],
@@ -495,10 +520,12 @@ min => 350,
 gas => 250,
 build => 140,
 suit => 3,
+size => 64 / $PPT,
 pop => 6,
 race => 'protoss',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 hp => 300,
 shield => 150,
@@ -512,7 +539,7 @@ attack => [
 	},
 ],
 sight => 11,
-speed => 10,
+speed => 3.33 * $SM,
 special => [
 	{
 		name => 'Build Interceptor',
@@ -520,10 +547,12 @@ special => [
 		min => 25,
 		build => 20,
 		suit => 1,
+		size => 16 / $PPT,
 		pop => 0,
 		race => 'protoss',
 		attr => {
 			mech => 1,
+			flying => 1,
 		},
 		hp => 40,
 		shield => 40,
@@ -531,15 +560,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 => [
@@ -566,10 +596,12 @@ min => 100,
 gas => 350,
 build => 160,
 suit => 3,
+size => 44 / $PPT,
 pop => 4,
 race => 'protoss',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 200,
@@ -578,6 +610,7 @@ armor => 1,
 attack => [
 	{
 		anti => 3,
+		name => 'Phase Disruptor Cannon',
 		damage => 10,
 		upgrade => 1,
 		cooldown => 45 / $FPS,
@@ -586,15 +619,17 @@ attack => [
 	},
 ],
 sight => 9,
-speed => 12,
-energy => 200,
+speed => 5 * $SM,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => 'Khaydarin Core',
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 special => [
@@ -635,6 +670,7 @@ min => 200,
 gas => 100,
 build => 70,
 suit => 3,
+size => 32 / $PPT,
 pop => 4,
 cargo => 4,
 race => 'protoss',
@@ -648,16 +684,16 @@ attack => [
 	{
 		anti => 1,
 		damage => 100,
-		cooldown => 60 / $FPS,
+		cooldown => 60 / $FPS, # 30 after drop
 		splash => 1,
-		cost => 15,
+		min => 15,
 		build => 7,
 		max => 5,
 		range => 8,
 	},
 ],
 sight => 10,
-speed => 5,
+speed => 1.78 * $SM,
 upgrade => [
 	{
 		name => 'Scarab Damage',
@@ -701,10 +737,12 @@ min => 25,
 gas => 75,
 build => 40,
 suit => 1,
+size => 32 / $PPT,
 pop => 1,
 race => 'protoss',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 40,
@@ -712,7 +750,7 @@ shield => 20,
 armor => 0,
 sight => 9,
 detect => 1,
-speed => 9,
+speed => 3.33 * $SM,
 upgrade => [
 	{
 		name => "Sensor Array",
@@ -726,7 +764,7 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		speed => 13 - 9,
+		speed => (5 - 3.33) * $SM,
 	},
 ],
 special => [
@@ -749,6 +787,7 @@ min => 200,
 gas => 0,
 build => 60,
 suit => 3,
+size => 40 / $PPT, # x32
 pop => 2,
 cargo => -8,
 race => 'protoss',
@@ -759,7 +798,7 @@ hp => 80,
 shield => 60,
 armor => 1,
 sight => 8,
-speed => 13,
+speed => 4.43 * $SM,
 transport => 1,
 upgrade => [
 	{
@@ -767,7 +806,7 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 166,
-		speed => 19 - 13,
+		speed => (6.67 - 4.43) * $SM,
 	}
 ],
 },
@@ -782,24 +821,27 @@ min => 50,
 gas => 0,
 build => 20,
 suit => 1,
+size => 23 / $PPT,
 pop => 1,
 cargo => 1,
 race => 'terran',
 attr => {
 	mech => 1,
+	organic => 1,
 },
 hp =>  60,
 armor => 0,
 attack => [
 	{
 		anti => 1,
+		name => 'Fusion Cutter',
 		damage => 5,
 		cooldown => 15 / $FPS,
-		range => 1,
+		range => 10 / $PPT,
 	},
 ],
 sight => 7,
-speed => 15,
+speed => 4.92 * $SM,
 },
 
 {
@@ -812,6 +854,7 @@ min => 75,
 gas => 0,
 build => 30,
 suit => 3,
+size => 2, # 33x49
 race => 'terran',
 attr => {
 	structure => 1,
@@ -821,6 +864,7 @@ armor => 0,
 attack => [
 	{
 		anti => 2,
+		name => 'Longbolt Missile',
 		damage => 20,
 		cooldown => 15 / $FPS,
 		type => 'explosive',
@@ -842,6 +886,7 @@ min => 50,
 gas => 0,
 build => 24,
 suit => 1,
+size => 17 / $PPT, # x20
 pop => 1,
 cargo => 1,
 race => 'terran',
@@ -853,6 +898,7 @@ armor => 0,
 attack => [
 	{
 		anti => 3,
+		name => 'Gauss Rifle',
 		damage => 6,
 		upgrade => 1,
 		cooldown => 15 / $FPS,
@@ -860,7 +906,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 11,
+speed => 4 * $SM,
 upgrade => [
 	{
 		name => 'U-238 Shells',
@@ -876,13 +922,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,
@@ -901,6 +947,7 @@ min => 50,
 gas => 25,
 build => 24,
 suit => 1,
+size => 23 / $PPT, # x22
 pop => 1,
 cargo => 1,
 race => 'terran',
@@ -912,16 +959,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 => [
@@ -932,7 +980,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,
@@ -954,6 +1002,7 @@ min => 25,
 gas => 75,
 build => 50,
 suit => 1,
+size => 15 / $PPT, # x22
 pop => 1,
 cargo => 1,
 race => 'terran',
@@ -965,6 +1014,7 @@ armor => 0,
 attack => [
 	{
 		anti => 3,
+		name => 'C-10 Canister Rifle',
 		damage => 10,
 		upgrade => 1,
 		cooldown => 22 / $FPS,
@@ -973,7 +1023,9 @@ attack => [
 	},
 ],
 sight => 9,
-speed => 11,
+speed => 4 * $SM,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => 'Ocular Implants',
@@ -993,10 +1045,10 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
-energy => 200,
 special => [
 	{
 		name => 'Personal Cloaking',
@@ -1039,6 +1091,7 @@ min => 50,
 gas => 25,
 build => 30,
 suit => 1,
+size => 17 / $PPT, # x20
 pop => 1,
 cargo => 1,
 race => 'terran',
@@ -1048,15 +1101,17 @@ attr => {
 hp =>  60,
 armor => 1,
 sight => 9,
-speed => 11,
-energy => 200,
+speed => 4 * $SM,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => 'Caduceus Reactor',
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 special => [
@@ -1103,6 +1158,7 @@ min => 75,
 gas => 0,
 build => 30,
 suit => 2,
+size => 32 / $PPT,
 pop => 2,
 cargo => 2,
 race => 'terran',
@@ -1114,6 +1170,7 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
+		name => 'Fragmentation Grenade',
 		damage => 20,
 		upgrade => 2,
 		cooldown => 30 / $FPS,
@@ -1122,14 +1179,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 => [
@@ -1147,6 +1204,7 @@ special => [
 		},
 		hp => 20,
 		suit => 1,
+		size => 15 / $PPT,
 		armor => 0,
 		attack => [
 			{
@@ -1154,11 +1212,11 @@ special => [
 				damage => 125,
 				splash => 1,
 				type => 'explosive',
-				range => 3,
+				range => 3, # to walk, melee to explode
 			},
 		],
 		sight => 3,
-		speed => 25,
+		speed => 16 * $SM,
     },
 ],
 },
@@ -1173,6 +1231,7 @@ min => 150,
 gas => 100,
 build => 50,
 suit => 3,
+size => 32 / $PPT,
 pop => 2,
 cargo => 4,
 race => 'terran',
@@ -1184,15 +1243,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',
@@ -1204,12 +1264,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,
@@ -1227,6 +1288,7 @@ min => 100,
 gas => 50,
 build => 40,
 suit => 3,
+size => 32 / $PPT,
 pop => 2,
 cargo => 2,
 race => 'terran',
@@ -1238,22 +1300,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',
@@ -1277,10 +1342,12 @@ min => 150,
 gas => 100,
 build => 60,
 suit => 3,
+size => 38 / $PPT, # x30
 pop => 2,
 race => 'terran',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 120,
@@ -1288,6 +1355,7 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
+		name => 'Burst Lasers',
 		damage => 8,
 		upgrade => 1,
 		cooldown => 30 / $FPS,
@@ -1295,6 +1363,7 @@ attack => [
 	},
 	{
 		anti => 2,
+		name => 'Gemini Missiles',
 		damage => 20,
 		upgrade => 2,
 		cooldown => 22 / $FPS,
@@ -1303,8 +1372,9 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 17,
-energy => 200,
+speed => 6.67 * $SM,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Cloak',
@@ -1323,7 +1393,8 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 },
@@ -1338,10 +1409,12 @@ min => 400,
 gas => 300,
 build => 133,
 suit => 3,
+size => 75 / $PPT, # x59
 pop => 6,
 race => 'terran',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 500,
@@ -1349,6 +1422,7 @@ armor => 3,
 attack => [
 	{
 		anti => 3,
+		name => 'ATS/A Laser Battery',
 		damage => 25,
 		upgrade => 3,
 		cooldown => 30 / $FPS,
@@ -1356,8 +1430,9 @@ attack => [
 	},
 ],
 sight => 11,
-speed => 7,
-energy => 200,
+speed => 2.5 * $SM,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Yamato Gun',
@@ -1365,11 +1440,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,
 			},
 		],
@@ -1382,7 +1458,8 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 },
@@ -1397,18 +1474,21 @@ min => 100,
 gas => 225,
 build => 80,
 suit => 3,
+size => 65 / $PPT, # x50
 pop => 2,
 race => 'terran',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 200,
 armor => 1,
 sight => 10,
 detect => 1,
-speed => 15,
-energy => 200,
+speed => 5 * $SM,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Defensive Matrix',
@@ -1450,7 +1530,8 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 },
@@ -1465,10 +1546,12 @@ min => 250,
 gas => 125,
 build => 50,
 suit => 3,
+size => 49 / $PPT, # x37
 pop => 3,
 race => 'terran',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 200,
@@ -1476,6 +1559,7 @@ armor => 2,
 attack => [
 	{
 		anti => 2,
+		name => 'Halo Rockets',
 		damage => 6,
 		upgrade => 1,
 		cooldown => 64 / $FPS,
@@ -1486,7 +1570,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 19,
+speed => 6.6 * $SM,
 },
 
 {
@@ -1496,17 +1580,19 @@ min => 100,
 gas => 100,
 build => 50,
 suit => 3,
+size => 49 / $PPT, # x37
 pop => 2,
 cargo => -8,
 race => 'terran',
 attr => {
 	mech => 1,
+	flying => 1,
 },
 air => 1,
 hp => 150,
 armor => 1,
 sight => 8,
-speed => 15,
+speed => 5.47 * $SM,
 transport => 1,
 },
 
@@ -1520,6 +1606,7 @@ min => 50,
 gas => 0,
 build => 20,
 suit => 1,
+size => 23 / $PPT,
 pop => 1,
 cargo => 1,
 race => 'zerg',
@@ -1531,13 +1618,14 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
+		name => 'Spines',
 		damage => 5,
 		cooldown => 22 / $FPS,
 		range => 1,
 	},
 ],
 sight => 7,
-speed => 14,
+speed => 4.92 * $SM,
 },
 
 {
@@ -1547,11 +1635,13 @@ min => 100,
 gas => 0,
 build => 40,
 suit => 3,
+size => 50 / $PPT,
 pop => -9,
 cargo => 0,
 race => 'zerg',
 attr => {
 	organic => 1,
+	flying => 1,
 },
 air => 1,
 hp => 200,
@@ -1559,7 +1649,7 @@ armor => 0,
 cargo => 0,
 sight => 9,
 detect => 1,
-speed => 2,
+speed => .83 * $SM,
 transport => 1,
 upgrade => [
 	{
@@ -1581,7 +1671,7 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 133,
-		speed => 10 - 2,
+		speed => (3.33 - .83) * $SM,
 	},
 ],
 },
@@ -1594,6 +1684,7 @@ trans => {
 },
 build => 20,
 suit => 1,
+size => 16 / $PPT,
 pop => 0,
 race => 'zerg',
 attr => {
@@ -1628,6 +1719,7 @@ min => 175,
 gas => 0,
 build => 20,
 suit => 3,
+size => 2, # 48x48
 race => 'zerg',
 attr => {
 	structure => 1,
@@ -1637,6 +1729,7 @@ armor => 2,
 attack => [
 	{
 		anti => 1,
+		name => 'Subterranean Tentacle',
 		damage => 40,
 		cooldown => 32 / $FPS,
 		type => 'explosive',
@@ -1654,6 +1747,7 @@ min => 175,
 gas => 0,
 build => 20,
 suit => 3,
+size => 2, # 48x48
 race => 'zerg',
 attr => {
 	structure => 1,
@@ -1663,6 +1757,7 @@ armor => 0,
 attack => [
 	{
 		anti => 2,
+		name => 'Seeker Spores',
 		damage => 15,
 		cooldown => 15 / $FPS,
 		range => 7,
@@ -1680,6 +1775,7 @@ min => 25,
 gas => 0,
 build => 28, # for 2
 suit => 1,
+size => 16 / $PPT,
 pop => 0.5,
 cargo => 1,
 race => 'zerg',
@@ -1691,21 +1787,22 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
+		name => 'Claws',
 		damage => 5,
 		upgrade => 1,
 		cooldown => 8 / $FPS,
-		range => 1,
+		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',
@@ -1714,7 +1811,7 @@ upgrade => [
 		build => 80,
 		attack => [
 			{
-				cooldown => 6 / $FPS,
+				cooldown => (6 - 8) / $FPS,
 			},
 		],
 	},
@@ -1729,6 +1826,7 @@ min => 75,
 gas => 25,
 build => 28,
 suit => 2,
+size => 21 / $PPT, # x23
 pop => 1,
 cargo => 2,
 race => 'zerg',
@@ -1740,6 +1838,7 @@ armor => 0,
 attack => [
 	{
 		anti => 3,
+		name => 'Needle Spines',
 		damage => 10,
 		upgrade => 1,
 		cooldown => 15 / $FPS,
@@ -1748,7 +1847,7 @@ attack => [
 	},
 ],
 sight => 6,
-speed => 11,
+speed => 3.66 * $SM,
 upgrade => [
 	{
 		name => 'Grooved Spines',
@@ -1766,7 +1865,7 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 100,
-		speed => 16 - 11,
+		speed => (5.57 - 3.66) * $SM,
 	},
 	{
 		name => 'Lurker Aspect',
@@ -1785,6 +1884,7 @@ gas => 125,
 base => 'hydralisk',
 build => 40,
 suit => 2,
+size => 32 / $PPT,
 pop => 2,
 cargo => 4,
 race => 'zerg',
@@ -1796,6 +1896,7 @@ armor => 1,
 attack => [
 	{
 		anti => 1,
+		name => 'Subterranean Spines',
 		damage => 20,
 		upgrade => 2,
 		cooldown => 37 / $FPS,
@@ -1804,7 +1905,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 17,
+speed => 5.82 * $SM,
 },
 
 {
@@ -1814,17 +1915,20 @@ min => 100,
 gas => 100,
 build => 50,
 suit => 2,
+size => 48 / $PPT,
 pop => 2,
 race => 'zerg',
 attr => {
 	organic => 1,
+	flying => 1,
 },
 air => 1,
 hp => 120,
 armor => 0,
 sight => 10,
-speed => 18,
-energy => 200,
+speed => 6.67 * $SM,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Infest CC',
@@ -1863,6 +1967,7 @@ special => [
 		count => 2,
 		alt => 'Broodling',
 		suit => 1,
+		size => 19 / $PPT,
 		pop => 0,
 		attr => {
 			organic => 1,
@@ -1872,14 +1977,15 @@ special => [
 		attack => [
 			{
 				anti => 1,
+				name => 'Toxic Spores',
 				damage => 4,
 				upgrade => 1,
 				cooldown => 15 / $FPS,
-				range => 1,
+				range => 2 / $PPT,
 			},
 		],
 		sight => 5,
-		speed => 19,
+		speed => 6 * $SM,
 	},
 ],
 },
@@ -1891,6 +1997,7 @@ min => 100,
 gas => 50,
 build => 40,
 suit => 1,
+size => 17 / $PPT, # x20
 pop => 1,
 race => 'zerg',
 attr => {
@@ -1901,14 +2008,15 @@ armor => 0,
 attack => [
 	{
 		anti => 1,
+		name => 'Suicide',
 		damage => 500,
 		splash => 1,
 		type => 'explosive',
-		range => 1,
+		range => 3 / $PPT,
 	},
 ],
 sight => 5,
-speed => 17,
+speed => 5.82 * $SM,
 },
 
 {
@@ -1918,10 +2026,12 @@ min => 12,
 gas => 38,
 build => 30, # for 2
 suit => 1,
+size => 24 / $PPT,
 pop => 0.5,
 race => 'zerg',
 attr => {
 	organic => 1,
+	flying => 1,
 },
 air => 1,
 hp => 25,
@@ -1929,12 +2039,13 @@ armor => 0,
 attack => [
 	{
 		anti => 2,
+		name => 'Suicide',
 		damage => 110,
-		range => 1,
+		range => 3 / $PPT,
 	},
 ],
 sight => 5,
-speed => 18,
+speed => 6.67 * $SM,
 counter => ['cannon', 'goliath', 'hydralisk'],
 },
 
@@ -1945,10 +2056,12 @@ min => 100,
 gas => 100,
 build => 40,
 suit => 1,
+size => 44 / $PPT,
 pop => 2,
 race => 'zerg',
 attr => {
 	organic => 1,
+	flying => 1,
 },
 air => 1,
 hp => 120,
@@ -1956,6 +2069,7 @@ armor => 0,
 attack => [
 	{
 		anti => 3,
+		name => 'Glave Wurm',
 		damage => 9,
 		upgrade => 1,
 		cooldown => 30 / $FPS,
@@ -1964,13 +2078,15 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 18,
+speed => 6.67 * $SM,
 special => [
 	{
 		alt => 'Cocoon',
 		suit => 3,
+		size => 32 / $PPT,
 		attr => {
 			organic => 1,
+			flying => 1,
 		},
 		hp => 200,
 		armor => 0,
@@ -1990,10 +2106,12 @@ gas => 200,
 build => 40,
 base => 'mutalisk',
 suit => 3,
+size => 44 / $PPT,
 pop => 2,
 race => 'zerg',
 attr => {
 	organic => 1,
+	flying => 1,
 },
 air => 1,
 hp => 150,
@@ -2001,6 +2119,7 @@ armor => 2,
 attack => [
 	{
 		anti => 1,
+		name => 'Acid Spore',
 		damage => 20,
 		upgrade => 2,
 		cooldown => 30 / $FPS,
@@ -2008,7 +2127,7 @@ attack => [
 	},
 ],
 sight => 11,
-speed => 7,
+speed => 2.5 * $SM,
 },
 
 {
@@ -2019,10 +2138,12 @@ gas => 150,
 build => 40,
 base => 'mutalisk',
 suit => 3,
+size => 44 / $PPT,
 pop => 2,
 race => 'zerg',
 attr => {
 	organic => 1,
+	flying => 1,
 },
 air => 1,
 hp => 250,
@@ -2030,6 +2151,7 @@ armor => 2,
 attack => [
 	{
 		anti => 2,
+		name => 'Corrosive Acid',
 		damage => 25,
 		upgrade => 2,
 		cooldown => 100 / $FPS,
@@ -2038,7 +2160,7 @@ attack => [
 	},
 ],
 sight => 10,
-speed => 15,
+speed => 5 * $SM,
 counter => ['goliath', 'dragoon', 'scourge'],
 },
 
@@ -2049,6 +2171,7 @@ min => 50,
 gas => 150,
 build => 50,
 suit => 2,
+size => 27 / $PPT, # x25
 pop => 2,
 cargo => 2,
 race => 'zerg',
@@ -2058,8 +2181,9 @@ attr => {
 hp => 80,
 armor => 1,
 sight => 10,
-speed => 12,
-energy => 200,
+speed => 4 * $SM,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Consume',
@@ -2091,6 +2215,16 @@ special => [
 		duration => 12,
 	},
 ],
+upgrade => [
+	{
+		name => 'Metasynaptic Node',
+		min => 150,
+		gas => 50,
+		build => 166,
+		energy => 62.5-50,
+		capacity => 250-200,
+	},
+],
 counter => ['archon', 'firebat'],
 },
 
@@ -2101,6 +2235,7 @@ min => 200,
 gas => 200,
 build => 60,
 suit => 3,
+size => 38 / $PPT, # x32
 pop => 4,
 cargo => 4,
 race => 'zerg',
@@ -2112,14 +2247,15 @@ armor => 1,
 attack => [
 	{
 		anti => 1,
+		name => 'Kaiser Blades',
 		damage => 20,
 		upgrade => 3,
 		cooldown => 15 / $FPS,
-		range => 1,
+		range => 25 / $PPT,
 	},
 ],
 sight => 7,
-speed => 16,
+speed => 5.12 * $SM,
 upgrade => [
 	{
 		name => 'Chitinous Plating',
@@ -2133,7 +2269,7 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 133,
-		speed => 21 - 16,
+		speed => (8.1 - 5.12) * $SM,
 	},
 ],
 },