X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/f5120824b11b754bdd9182d285ec81a3c001b350..8caeefa2ae6d13ce81061a22bff58b402f625161:/sc-units-bw.inc.pl

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index 06e59f1..7590883 100644
--- a/sc-units-bw.inc.pl
+++ b/sc-units-bw.inc.pl
@@ -1,11 +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 $SM = .555;  # pixels per frame to tiles per second multiplication
+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>',
@@ -20,6 +21,7 @@ min => 50,
 gas => 0,
 build => 20,
 suit => 1,
+size => 23 / $PPT,
 pop => 1,
 cargo => 1,
 race => 'protoss',
@@ -35,11 +37,11 @@ attack => [
 		name => "Particle Beam",
 		damage => 5,
 		cooldown => 22 / $FPS,
-		range => 0,
+		range => 1,
 	},
 ],
 sight => 8,
-speed => 5 * $SM,
+speed => 4.92 * $SM,
 counter => ['vulture', 'dark templar'],
 },
 
@@ -54,6 +56,7 @@ min => 150,
 gas => 0,
 build => 50,
 suit => 3,
+size => 2, # 41x33
 race => 'protoss',
 attr => {
 	structure => 1,
@@ -86,6 +89,7 @@ min => 100,
 gas => 0,
 build => 40,
 suit => 1,
+size => 23 / $PPT, # x19
 pop => 2,
 cargo => 2,
 race => 'protoss',
@@ -130,6 +134,7 @@ min => 125,
 gas => 50,
 build => 50,
 suit => 3,
+size => 32 / $PPT,
 pop => 2,
 cargo => 4,
 race => 'protoss',
@@ -151,7 +156,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 5.25 * $SM,
+speed => 5 * $SM,
 upgrade => [
 	{
 		name => 'Singularity Charge',
@@ -179,6 +184,7 @@ min => 50,
 gas => 150,
 build => 50,
 suit => 1,
+size => 24 / $PPT,
 pop => 2,
 cargo => 2,
 race => 'protoss',
@@ -189,7 +195,7 @@ hp => 40,
 shield => 40,
 armor => 0,
 sight => 7,
-speed => 3.33 * $SM,
+speed => 3.2 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -239,6 +245,7 @@ min => 125,
 gas => 100,
 build => 50,
 suit => 1,
+size => 25 / $PPT, # 24x26
 pop => 2,
 cargo => 2,
 race => 'protoss',
@@ -259,7 +266,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 5 * $SM,
+speed => 4.92 * $SM,
 special => [
 	{
 		name => 'Cloaked',
@@ -282,6 +289,7 @@ gas => 300,
 build => 20,
 base => ['templar', 'templar'],
 suit => 3,
+size => 32 / $PPT,
 pop => 4,
 cargo => 4,
 race => 'protoss',
@@ -303,7 +311,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 5 * $SM,
+speed => 4.92 * $SM,
 },
 
 {
@@ -318,6 +326,7 @@ gas => 200,
 build => 20,
 base => ['dark templar', 'dark templar'],
 suit => 3,
+size => 32 / $PPT,
 pop => 4,
 cargo => 4,
 race => 'protoss',
@@ -328,7 +337,7 @@ hp => 25,
 shield => 200,
 armor => 1,
 sight => 10,
-speed => 5 * $SM,
+speed => 4.92 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -385,6 +394,7 @@ min => 275,
 gas => 125,
 build => 80,
 suit => 3,
+size => 36 / $PPT, # x32
 pop => 3,
 race => 'protoss',
 attr => {
@@ -442,6 +452,7 @@ min => 150,
 gas => 100,
 build => 40,
 suit => 2,
+size => 36 / $PPT, # x32
 pop => 2,
 race => 'protoss',
 attr => {
@@ -503,6 +514,7 @@ min => 350,
 gas => 250,
 build => 140,
 suit => 3,
+size => 64 / $PPT,
 pop => 6,
 race => 'protoss',
 attr => {
@@ -529,6 +541,7 @@ special => [
 		min => 25,
 		build => 20,
 		suit => 1,
+		size => 16 / $PPT,
 		pop => 0,
 		race => 'protoss',
 		attr => {
@@ -548,8 +561,9 @@ special => [
 				range => 0,
 			},
 		],
-		sight => 0,
+		sight => 6,
 		range => 0,
+		speed => 13.33 * $SM,
 	},
 ],
 upgrade => [
@@ -576,6 +590,7 @@ min => 100,
 gas => 350,
 build => 160,
 suit => 3,
+size => 44 / $PPT,
 pop => 4,
 race => 'protoss',
 attr => {
@@ -648,6 +663,7 @@ min => 200,
 gas => 100,
 build => 70,
 suit => 3,
+size => 32 / $PPT,
 pop => 4,
 cargo => 4,
 race => 'protoss',
@@ -670,7 +686,7 @@ attack => [
 	},
 ],
 sight => 10,
-speed => 1.77 * $SM,
+speed => 1.78 * $SM,
 upgrade => [
 	{
 		name => 'Scarab Damage',
@@ -714,6 +730,7 @@ min => 25,
 gas => 75,
 build => 40,
 suit => 1,
+size => 32 / $PPT,
 pop => 1,
 race => 'protoss',
 attr => {
@@ -763,6 +780,7 @@ min => 200,
 gas => 0,
 build => 60,
 suit => 3,
+size => 40 / $PPT, # x32
 pop => 2,
 cargo => -8,
 race => 'protoss',
@@ -773,7 +791,7 @@ hp => 80,
 shield => 60,
 armor => 1,
 sight => 8,
-speed => 4.44 * $SM,
+speed => 4.43 * $SM,
 transport => 1,
 upgrade => [
 	{
@@ -781,7 +799,7 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 166,
-		speed => (6.67 - 4.44) * $SM,
+		speed => (6.67 - 4.43) * $SM,
 	}
 ],
 },
@@ -796,6 +814,7 @@ min => 50,
 gas => 0,
 build => 20,
 suit => 1,
+size => 23 / $PPT,
 pop => 1,
 cargo => 1,
 race => 'terran',
@@ -814,7 +833,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 5 * $SM,
+speed => 4.92 * $SM,
 },
 
 {
@@ -827,6 +846,7 @@ min => 75,
 gas => 0,
 build => 30,
 suit => 3,
+size => 2, # 33x49
 race => 'terran',
 attr => {
 	structure => 1,
@@ -857,6 +877,7 @@ min => 50,
 gas => 0,
 build => 24,
 suit => 1,
+size => 17 / $PPT, # x20
 pop => 1,
 cargo => 1,
 race => 'terran',
@@ -916,6 +937,7 @@ min => 50,
 gas => 25,
 build => 24,
 suit => 1,
+size => 23 / $PPT, # x22
 pop => 1,
 cargo => 1,
 race => 'terran',
@@ -969,6 +991,7 @@ min => 25,
 gas => 75,
 build => 50,
 suit => 1,
+size => 15 / $PPT, # x22
 pop => 1,
 cargo => 1,
 race => 'terran',
@@ -1056,6 +1079,7 @@ min => 50,
 gas => 25,
 build => 30,
 suit => 1,
+size => 17 / $PPT, # x20
 pop => 1,
 cargo => 1,
 race => 'terran',
@@ -1122,6 +1146,7 @@ min => 75,
 gas => 0,
 build => 30,
 suit => 2,
+size => 32 / $PPT,
 pop => 2,
 cargo => 2,
 race => 'terran',
@@ -1141,14 +1166,14 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 6.67 * $SM,
+speed => 6.4 * $SM,
 upgrade => [
 	{
 		name => 'Ion Thrusters',
 		min => 100,
 		gas => 100,
 		build => 100,
-		speed => (10 - 6.67) * $SM,
+		speed => (10 - 6.4) * $SM,
 	},
 ],
 special => [
@@ -1166,6 +1191,7 @@ special => [
 		},
 		hp => 20,
 		suit => 1,
+		size => 15 / $PPT,
 		armor => 0,
 		attack => [
 			{
@@ -1177,7 +1203,7 @@ special => [
 			},
 		],
 		sight => 3,
-		speed => 9 * $SM, #XXX
+		speed => 16 * $SM,
     },
 ],
 },
@@ -1192,6 +1218,7 @@ min => 150,
 gas => 100,
 build => 50,
 suit => 3,
+size => 32 / $PPT,
 pop => 2,
 cargo => 4,
 race => 'terran',
@@ -1246,6 +1273,7 @@ min => 100,
 gas => 50,
 build => 40,
 suit => 3,
+size => 32 / $PPT,
 pop => 2,
 cargo => 2,
 race => 'terran',
@@ -1272,7 +1300,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 4.7 * $SM,
+speed => 4.57 * $SM,
 upgrade => [
 	{
 		name => 'Charon Boosters',
@@ -1296,6 +1324,7 @@ min => 150,
 gas => 100,
 build => 60,
 suit => 3,
+size => 38 / $PPT, # x30
 pop => 2,
 race => 'terran',
 attr => {
@@ -1360,6 +1389,7 @@ min => 400,
 gas => 300,
 build => 133,
 suit => 3,
+size => 75 / $PPT, # x59
 pop => 6,
 race => 'terran',
 attr => {
@@ -1422,6 +1452,7 @@ min => 100,
 gas => 225,
 build => 80,
 suit => 3,
+size => 65 / $PPT, # x50
 pop => 2,
 race => 'terran',
 attr => {
@@ -1493,6 +1524,7 @@ min => 250,
 gas => 125,
 build => 50,
 suit => 3,
+size => 49 / $PPT, # x37
 pop => 3,
 race => 'terran',
 attr => {
@@ -1525,6 +1557,7 @@ min => 100,
 gas => 100,
 build => 50,
 suit => 3,
+size => 49 / $PPT, # x37
 pop => 2,
 cargo => -8,
 race => 'terran',
@@ -1550,6 +1583,7 @@ min => 50,
 gas => 0,
 build => 20,
 suit => 1,
+size => 23 / $PPT,
 pop => 1,
 cargo => 1,
 race => 'zerg',
@@ -1563,11 +1597,11 @@ attack => [
 		anti => 1,
 		damage => 5,
 		cooldown => 22 / $FPS,
-		range => 0,
+		range => 1,
 	},
 ],
 sight => 7,
-speed => 5 * $SM,
+speed => 4.92 * $SM,
 },
 
 {
@@ -1577,6 +1611,7 @@ min => 100,
 gas => 0,
 build => 40,
 suit => 3,
+size => 50 / $PPT,
 pop => -9,
 cargo => 0,
 race => 'zerg',
@@ -1625,6 +1660,7 @@ trans => {
 },
 build => 20,
 suit => 1,
+size => 16 / $PPT,
 pop => 0,
 race => 'zerg',
 attr => {
@@ -1659,6 +1695,7 @@ min => 175,
 gas => 0,
 build => 20,
 suit => 3,
+size => 2, # 48x48
 race => 'zerg',
 attr => {
 	structure => 1,
@@ -1685,6 +1722,7 @@ min => 175,
 gas => 0,
 build => 20,
 suit => 3,
+size => 2, # 48x48
 race => 'zerg',
 attr => {
 	structure => 1,
@@ -1711,6 +1749,7 @@ min => 25,
 gas => 0,
 build => 28, # for 2
 suit => 1,
+size => 16 / $PPT,
 pop => 0.5,
 cargo => 1,
 race => 'zerg',
@@ -1729,14 +1768,14 @@ attack => [
 	},
 ],
 sight => 5,
-speed => 5.57 * $SM,
+speed => 5.49 * $SM,
 upgrade => [
 	{
 		name => 'Metabolic Boost',
 		min => 100,
 		gas => 100,
 		build => 80,
-		speed => (8.36 - 5.57) * $SM,
+		speed => (8.36 - 5.49) * $SM,
 	},
 	{
 		name => 'Adrenal Glands',
@@ -1760,6 +1799,7 @@ min => 75,
 gas => 25,
 build => 28,
 suit => 2,
+size => 21 / $PPT, # x23
 pop => 1,
 cargo => 2,
 race => 'zerg',
@@ -1779,7 +1819,7 @@ attack => [
 	},
 ],
 sight => 6,
-speed => 3.71 * $SM,
+speed => 3.66 * $SM,
 upgrade => [
 	{
 		name => 'Grooved Spines',
@@ -1797,7 +1837,7 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 100,
-		speed => (5.57 - 3.71) * $SM,
+		speed => (5.57 - 3.66) * $SM,
 	},
 	{
 		name => 'Lurker Aspect',
@@ -1816,6 +1856,7 @@ gas => 125,
 base => 'hydralisk',
 build => 40,
 suit => 2,
+size => 32 / $PPT,
 pop => 2,
 cargo => 4,
 race => 'zerg',
@@ -1835,7 +1876,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 6 * $SM,
+speed => 5.82 * $SM,
 },
 
 {
@@ -1845,6 +1886,7 @@ min => 100,
 gas => 100,
 build => 50,
 suit => 2,
+size => 48 / $PPT,
 pop => 2,
 race => 'zerg',
 attr => {
@@ -1896,6 +1938,7 @@ special => [
 		count => 2,
 		alt => 'Broodling',
 		suit => 1,
+		size => 19 / $PPT,
 		pop => 0,
 		attr => {
 			organic => 1,
@@ -1912,7 +1955,7 @@ special => [
 			},
 		],
 		sight => 5,
-		speed => 6.04 * $SM,
+		speed => 6 * $SM,
 	},
 ],
 },
@@ -1924,6 +1967,7 @@ min => 100,
 gas => 50,
 build => 40,
 suit => 1,
+size => 17 / $PPT, # x20
 pop => 1,
 race => 'zerg',
 attr => {
@@ -1941,7 +1985,7 @@ attack => [
 	},
 ],
 sight => 5,
-speed => 6 * $SM,
+speed => 5.82 * $SM,
 },
 
 {
@@ -1951,6 +1995,7 @@ min => 12,
 gas => 38,
 build => 30, # for 2
 suit => 1,
+size => 24 / $PPT,
 pop => 0.5,
 race => 'zerg',
 attr => {
@@ -1979,6 +2024,7 @@ min => 100,
 gas => 100,
 build => 40,
 suit => 1,
+size => 44 / $PPT,
 pop => 2,
 race => 'zerg',
 attr => {
@@ -2004,6 +2050,7 @@ special => [
 	{
 		alt => 'Cocoon',
 		suit => 3,
+		size => 32 / $PPT,
 		attr => {
 			organic => 1,
 			flying => 1,
@@ -2026,6 +2073,7 @@ gas => 200,
 build => 40,
 base => 'mutalisk',
 suit => 3,
+size => 44 / $PPT,
 pop => 2,
 race => 'zerg',
 attr => {
@@ -2056,6 +2104,7 @@ gas => 150,
 build => 40,
 base => 'mutalisk',
 suit => 3,
+size => 44 / $PPT,
 pop => 2,
 race => 'zerg',
 attr => {
@@ -2087,6 +2136,7 @@ min => 50,
 gas => 150,
 build => 50,
 suit => 2,
+size => 27 / $PPT, # x25
 pop => 2,
 cargo => 2,
 race => 'zerg',
@@ -2150,6 +2200,7 @@ min => 200,
 gas => 200,
 build => 60,
 suit => 3,
+size => 38 / $PPT, # x32
 pop => 4,
 cargo => 4,
 race => 'zerg',
@@ -2168,7 +2219,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 5.4 * $SM,
+speed => 5.12 * $SM,
 upgrade => [
 	{
 		name => 'Chitinous Plating',
@@ -2182,7 +2233,7 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 133,
-		speed => (8.1 - 5.4) * $SM,
+		speed => (8.1 - 5.12) * $SM,
 	},
 ],
 },