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

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index a8ec4de..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,14 +189,16 @@ hp => 40,
 shield => 40,
 armor => 0,
 sight => 7,
-speed => 9,
-energy => 200,
+speed => 3.33 * $SM,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => "Khaydarin Amulet",
 		min => 150,
 		gas => 150,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 special => [
@@ -256,7 +259,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 15,
+speed => 5 * $SM,
 special => [
 	{
 		name => 'Cloaked',
@@ -300,7 +303,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 14,
+speed => 5 * $SM,
 },
 
 {
@@ -325,15 +328,16 @@ hp => 25,
 shield => 200,
 armor => 1,
 sight => 10,
-speed => 14,
-energy => 200,
+speed => 5 * $SM,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => "Argus Talisman",
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		capacity => 250-200,
 	},
 ],
 special => [
@@ -409,7 +413,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 13,
+speed => 5 * $SM,
 upgrade => [
 	{
 		name => 'Apial Sensors',
@@ -423,7 +427,7 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 166,
-		speed => 18 - 13,
+		speed => (6.67 - 5) * $SM,
 	},
 ],
 },
@@ -460,28 +464,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'],
@@ -515,7 +521,7 @@ attack => [
 	},
 ],
 sight => 11,
-speed => 10,
+speed => 3.33 * $SM,
 special => [
 	{
 		name => 'Build Interceptor',
@@ -591,15 +597,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 => [
@@ -653,7 +661,7 @@ attack => [
 	{
 		anti => 1,
 		damage => 100,
-		cooldown => 60 / $FPS,
+		cooldown => 60 / $FPS, # 30 after drop
 		splash => 1,
 		min => 15,
 		build => 7,
@@ -662,7 +670,7 @@ attack => [
 	},
 ],
 sight => 10,
-speed => 5,
+speed => 1.77 * $SM,
 upgrade => [
 	{
 		name => 'Scarab Damage',
@@ -718,7 +726,7 @@ shield => 20,
 armor => 0,
 sight => 9,
 detect => 1,
-speed => 9,
+speed => 3.33 * $SM,
 upgrade => [
 	{
 		name => "Sensor Array",
@@ -732,7 +740,7 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		speed => 13 - 9,
+		speed => (5 - 3.33) * $SM,
 	},
 ],
 special => [
@@ -765,7 +773,7 @@ hp => 80,
 shield => 60,
 armor => 1,
 sight => 8,
-speed => 13,
+speed => 4.44 * $SM,
 transport => 1,
 upgrade => [
 	{
@@ -773,7 +781,7 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 166,
-		speed => 19 - 13,
+		speed => (6.67 - 4.44) * $SM,
 	}
 ],
 },
@@ -806,7 +814,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 15,
+speed => 5 * $SM,
 },
 
 {
@@ -867,7 +875,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 11,
+speed => 4 * $SM,
 upgrade => [
 	{
 		name => 'U-238 Shells',
@@ -883,13 +891,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,
@@ -928,7 +936,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 11,
+speed => 4 * $SM,
 upgrade => [
 ],
 special => [
@@ -939,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,
@@ -980,7 +988,9 @@ attack => [
 	},
 ],
 sight => 9,
-speed => 11,
+speed => 4 * $SM,
+energy => 50,
+capacity => 200,
 upgrade => [
 	{
 		name => 'Ocular Implants',
@@ -1000,10 +1010,10 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
-energy => 200,
 special => [
 	{
 		name => 'Personal Cloaking',
@@ -1055,15 +1065,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 => [
@@ -1129,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 => [
@@ -1165,7 +1177,7 @@ special => [
 			},
 		],
 		sight => 3,
-		speed => 25,
+		speed => 9 * $SM, #XXX
     },
 ],
 },
@@ -1193,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',
@@ -1247,7 +1259,7 @@ attack => [
 		anti => 1,
 		damage => 12,
 		upgrade => 1,
-		cooldown => 22 / $FPS,
+		cooldown => 22 / $FPS, # 15 after drop
 		range => 5,
 	},
 	{
@@ -1260,7 +1272,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 13,
+speed => 4.7 * $SM,
 upgrade => [
 	{
 		name => 'Charon Boosters',
@@ -1311,8 +1323,9 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 17,
-energy => 200,
+speed => 6.67 * $SM,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Cloak',
@@ -1331,7 +1344,8 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 },
@@ -1365,8 +1379,9 @@ attack => [
 	},
 ],
 sight => 11,
-speed => 7,
-energy => 200,
+speed => 2.5 * $SM,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Yamato Gun',
@@ -1391,7 +1406,8 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 },
@@ -1417,8 +1433,9 @@ hp => 200,
 armor => 1,
 sight => 10,
 detect => 1,
-speed => 15,
-energy => 200,
+speed => 5 * $SM,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Defensive Matrix',
@@ -1460,7 +1477,8 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 166,
-		energy => 250-200,
+		energy => 62.5-50,
+		capacity => 250-200,
 	},
 ],
 },
@@ -1497,7 +1515,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 19,
+speed => 6.6 * $SM,
 },
 
 {
@@ -1518,7 +1536,7 @@ air => 1,
 hp => 150,
 armor => 1,
 sight => 8,
-speed => 15,
+speed => 5.47 * $SM,
 transport => 1,
 },
 
@@ -1545,11 +1563,11 @@ attack => [
 		anti => 1,
 		damage => 5,
 		cooldown => 22 / $FPS,
-		range => 0,
+		range => 1,
 	},
 ],
 sight => 7,
-speed => 14,
+speed => 5 * $SM,
 },
 
 {
@@ -1572,7 +1590,7 @@ armor => 0,
 cargo => 0,
 sight => 9,
 detect => 1,
-speed => 2,
+speed => .83 * $SM,
 transport => 1,
 upgrade => [
 	{
@@ -1594,7 +1612,7 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 133,
-		speed => 10 - 2,
+		speed => (3.33 - .83) * $SM,
 	},
 ],
 },
@@ -1711,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',
@@ -1727,7 +1745,7 @@ upgrade => [
 		build => 80,
 		attack => [
 			{
-				cooldown => 6 / $FPS,
+				cooldown => (6 - 8) / $FPS,
 			},
 		],
 	},
@@ -1761,7 +1779,7 @@ attack => [
 	},
 ],
 sight => 6,
-speed => 11,
+speed => 3.71 * $SM,
 upgrade => [
 	{
 		name => 'Grooved Spines',
@@ -1779,7 +1797,7 @@ upgrade => [
 		min => 150,
 		gas => 150,
 		build => 100,
-		speed => 16 - 11,
+		speed => (5.57 - 3.71) * $SM,
 	},
 	{
 		name => 'Lurker Aspect',
@@ -1817,7 +1835,7 @@ attack => [
 	},
 ],
 sight => 8,
-speed => 17,
+speed => 6 * $SM,
 },
 
 {
@@ -1837,8 +1855,9 @@ air => 1,
 hp => 120,
 armor => 0,
 sight => 10,
-speed => 18,
-energy => 200,
+speed => 6.67 * $SM,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Infest CC',
@@ -1893,7 +1912,7 @@ special => [
 			},
 		],
 		sight => 5,
-		speed => 19,
+		speed => 6.04 * $SM,
 	},
 ],
 },
@@ -1922,7 +1941,7 @@ attack => [
 	},
 ],
 sight => 5,
-speed => 17,
+speed => 6 * $SM,
 },
 
 {
@@ -1949,7 +1968,7 @@ attack => [
 	},
 ],
 sight => 5,
-speed => 18,
+speed => 6.67 * $SM,
 counter => ['cannon', 'goliath', 'hydralisk'],
 },
 
@@ -1980,7 +1999,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 18,
+speed => 6.67 * $SM,
 special => [
 	{
 		alt => 'Cocoon',
@@ -2026,7 +2045,7 @@ attack => [
 	},
 ],
 sight => 11,
-speed => 7,
+speed => 2.5 * $SM,
 },
 
 {
@@ -2057,7 +2076,7 @@ attack => [
 	},
 ],
 sight => 10,
-speed => 15,
+speed => 5 * $SM,
 counter => ['goliath', 'dragoon', 'scourge'],
 },
 
@@ -2077,8 +2096,9 @@ attr => {
 hp => 80,
 armor => 1,
 sight => 10,
-speed => 12,
-energy => 200,
+speed => 4 * $SM,
+energy => 50,
+capacity => 200,
 special => [
 	{
 		name => 'Consume',
@@ -2110,6 +2130,16 @@ special => [
 		duration => 12,
 	},
 ],
+upgrade => [
+	{
+		name => 'Metasynaptic Node',
+		min => 150,
+		gas => 50,
+		build => 166,
+		energy => 62.5-50,
+		capacity => 250-200,
+	},
+],
 counter => ['archon', 'firebat'],
 },
 
@@ -2138,7 +2168,7 @@ attack => [
 	},
 ],
 sight => 7,
-speed => 16,
+speed => 5.4 * $SM,
 upgrade => [
 	{
 		name => 'Chitinous Plating',
@@ -2152,7 +2182,7 @@ upgrade => [
 		min => 200,
 		gas => 200,
 		build => 133,
-		speed => 21 - 16,
+		speed => (8.1 - 5.4) * $SM,
 	},
 ],
 },