X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/dd526b56391929a69bb47a5f7d4b911b61f463f8..f1c776e1a305b40451b2e66410beeb904f53a3ef:/sc-units-bw.inc.pl

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index 552c7e4..196be63 100644
--- a/sc-units-bw.inc.pl
+++ b/sc-units-bw.inc.pl
@@ -1,10 +1,11 @@
 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 $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 / 32;  # pixels per frame to tiles per second multiplication
 
 [
 '<span title="no known changes as of v1.16.1">version≥1.08</span>',
@@ -34,11 +35,11 @@ attack => [
 		name => "Particle Beam",
 		damage => 5,
 		cooldown => 22 / $FPS,
-		range => 0,
+		range => 1,
 	},
 ],
 sight => 8,
-speed => 14,
+speed => 5 * $SM,
 counter => ['vulture', 'dark templar'],
 },
 
@@ -105,11 +106,11 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 11,
+speed => 4 * $SM,
 upgrade => [
 	{
 		name => 'Leg Enhancements',
-		speed => 16 - 11,
+		speed => (6 - 4) * $SM,
 		min => 150,
 		gas => 150,
 		build => 133,
@@ -150,7 +151,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 15,
+speed => 5.25 * $SM,
 upgrade => [
 	{
 		name => 'Singularity Charge',
@@ -188,7 +189,7 @@ hp => 40,
 shield => 40,
 armor => 0,
 sight => 7,
-speed => 9,
+speed => 3.33 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -258,7 +259,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 15,
+speed => 5 * $SM,
 special => [
 	{
 		name => 'Cloaked',
@@ -302,7 +303,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 14,
+speed => 5 * $SM,
 },
 
 {
@@ -327,7 +328,7 @@ hp => 25,
 shield => 200,
 armor => 1,
 sight => 10,
-speed => 14,
+speed => 5 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -412,7 +413,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 13,
+speed => 5 * $SM,
 upgrade => [
 	{
 		name => 'Apial Sensors',
@@ -426,7 +427,7 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 166,
-		speed => 18 - 13,
+		speed => (6.67 - 5) * $SM,
 	},
 ],
 },
@@ -463,7 +464,7 @@ attack => [
 	},
 ],
 sight => 9,
-speed => 17,
+speed => 6.67 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -520,7 +521,7 @@ attack => [
 	},
 ],
 sight => 11,
-speed => 10,
+speed => 3.33 * $SM,
 special => [
 	{
 		name => 'Build Interceptor',
@@ -596,7 +597,7 @@ attack => [
 	},
 ],
 sight => 9,
-speed => 12,
+speed => 5 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -660,7 +661,7 @@ attack => [
 	{
 		anti => 1,
 		damage => 100,
-		cooldown => 60 / $FPS,
+		cooldown => 60 / $FPS, # 30 after drop
 		splash => 1,
 		min => 15,
 		build => 7,
@@ -669,7 +670,7 @@ attack => [
 	},
 ],
 sight => 10,
-speed => 5,
+speed => 1.77 * $SM,
 upgrade => [
 	{
 		name => 'Scarab Damage',
@@ -725,7 +726,7 @@ shield => 20,
 armor => 0,
 sight => 9,
 detect => 1,
-speed => 9,
+speed => 3.33 * $SM,
 upgrade => [
 	{
 		name => "Sensor Array",
@@ -739,7 +740,7 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		speed => 13 - 9,
+		speed => (5 - 3.33) * $SM,
 	},
 ],
 special => [
@@ -772,7 +773,7 @@ hp => 80,
 shield => 60,
 armor => 1,
 sight => 8,
-speed => 13,
+speed => 4.44 * $SM,
 transport => 1,
 upgrade => [
 	{
@@ -780,7 +781,7 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 166,
-		speed => 19 - 13,
+		speed => (6.67 - 4.44) * $SM,
 	}
 ],
 },
@@ -813,7 +814,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 15,
+speed => 5 * $SM,
 },
 
 {
@@ -874,7 +875,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 11,
+speed => 4 * $SM,
 upgrade => [
 	{
 		name => 'U-238 Shells',
@@ -896,7 +897,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 => 3,
@@ -935,7 +936,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 11,
+speed => 4 * $SM,
 upgrade => [
 ],
 special => [
@@ -946,7 +947,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,
@@ -987,7 +988,7 @@ attack => [
 	},
 ],
 sight => 9,
-speed => 11,
+speed => 4 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -1064,7 +1065,7 @@ attr => {
 hp =>  60,
 armor => 1,
 sight => 9,
-speed => 11,
+speed => 4 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -1140,14 +1141,14 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 20,
+speed => 6.67 * $SM,
 upgrade => [
 	{
 		name => 'Ion Thrusters',
 		min => 100,
 		gas => 100,
 		build => 100,
-		speed => 28 - 20,
+		speed => (10 - 6.67) * $SM,
 	},
 ],
 special => [
@@ -1176,7 +1177,7 @@ special => [
 			},
 		],
 		sight => 3,
-		speed => 25,
+		speed => 9 * $SM, #XXX
     },
 ],
 },
@@ -1204,13 +1205,13 @@ attack => [
 		anti => 1,
 		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',
@@ -1258,7 +1259,7 @@ attack => [
 		anti => 1,
 		damage => 12,
 		upgrade => 1,
-		cooldown => 22 / $FPS,
+		cooldown => 22 / $FPS, # 15 after drop
 		range => 5,
 	},
 	{
@@ -1271,7 +1272,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 13,
+speed => 4.7 * $SM,
 upgrade => [
 	{
 		name => 'Charon Boosters',
@@ -1322,7 +1323,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 17,
+speed => 6.67 * $SM,
 energy => 50,
 capacity => 200,
 special => [
@@ -1378,7 +1379,7 @@ attack => [
 	},
 ],
 sight => 11,
-speed => 7,
+speed => 2.5 * $SM,
 energy => 50,
 capacity => 200,
 special => [
@@ -1432,7 +1433,7 @@ hp => 200,
 armor => 1,
 sight => 10,
 detect => 1,
-speed => 15,
+speed => 5 * $SM,
 energy => 50,
 capacity => 200,
 special => [
@@ -1514,7 +1515,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 19,
+speed => 6.6 * $SM,
 },
 
 {
@@ -1535,7 +1536,7 @@ air => 1,
 hp => 150,
 armor => 1,
 sight => 8,
-speed => 15,
+speed => 5.47 * $SM,
 transport => 1,
 },
 
@@ -1562,11 +1563,11 @@ attack => [
 		anti => 1,
 		damage => 5,
 		cooldown => 22 / $FPS,
-		range => 0,
+		range => 1,
 	},
 ],
 sight => 7,
-speed => 14,
+speed => 5 * $SM,
 },
 
 {
@@ -1589,7 +1590,7 @@ armor => 0,
 cargo => 0,
 sight => 9,
 detect => 1,
-speed => 2,
+speed => .83 * $SM,
 transport => 1,
 upgrade => [
 	{
@@ -1611,7 +1612,7 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 133,
-		speed => 10 - 2,
+		speed => (3.33 - .83) * $SM,
 	},
 ],
 },
@@ -1728,14 +1729,14 @@ attack => [
 	},
 ],
 sight => 5,
-speed => 14,
+speed => 5.57 * $SM,
 upgrade => [
 	{
 		name => 'Metabolic Boost',
 		min => 100,
 		gas => 100,
 		build => 80,
-		speed => 22 - 14,
+		speed => (8.36 - 5.57) * $SM,
 	},
 	{
 		name => 'Adrenal Glands',
@@ -1778,7 +1779,7 @@ attack => [
 	},
 ],
 sight => 6,
-speed => 11,
+speed => 3.71 * $SM,
 upgrade => [
 	{
 		name => 'Grooved Spines',
@@ -1796,7 +1797,7 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 100,
-		speed => 16 - 11,
+		speed => (5.57 - 3.71) * $SM,
 	},
 	{
 		name => 'Lurker Aspect',
@@ -1834,7 +1835,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 17,
+speed => 6 * $SM,
 },
 
 {
@@ -1854,7 +1855,7 @@ air => 1,
 hp => 120,
 armor => 0,
 sight => 10,
-speed => 18,
+speed => 6.67 * $SM,
 energy => 50,
 capacity => 200,
 special => [
@@ -1911,7 +1912,7 @@ special => [
 			},
 		],
 		sight => 5,
-		speed => 19,
+		speed => 6.04 * $SM,
 	},
 ],
 },
@@ -1940,7 +1941,7 @@ attack => [
 	},
 ],
 sight => 5,
-speed => 17,
+speed => 6 * $SM,
 },
 
 {
@@ -1967,7 +1968,7 @@ attack => [
 	},
 ],
 sight => 5,
-speed => 18,
+speed => 6.67 * $SM,
 counter => ['cannon', 'goliath', 'hydralisk'],
 },
 
@@ -1998,7 +1999,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 18,
+speed => 6.67 * $SM,
 special => [
 	{
 		alt => 'Cocoon',
@@ -2044,7 +2045,7 @@ attack => [
 	},
 ],
 sight => 11,
-speed => 7,
+speed => 2.5 * $SM,
 },
 
 {
@@ -2075,7 +2076,7 @@ attack => [
 	},
 ],
 sight => 10,
-speed => 15,
+speed => 5 * $SM,
 counter => ['goliath', 'dragoon', 'scourge'],
 },
 
@@ -2095,7 +2096,7 @@ attr => {
 hp => 80,
 armor => 1,
 sight => 10,
-speed => 12,
+speed => 4 * $SM,
 energy => 50,
 capacity => 200,
 special => [
@@ -2167,7 +2168,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 16,
+speed => 5.4 * $SM,
 upgrade => [
 	{
 		name => 'Chitinous Plating',
@@ -2181,7 +2182,7 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 133,
-		speed => 21 - 16,
+		speed => (8.1 - 5.4) * $SM,
 	},
 ],
 },