sc: multiply speed of bw units to match sc2 values

Guess at proper hex/s conversion instead of random measurement scale.

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index 552c7e45b5ecb979579cafcb64ef7a0c06125c1b..7d3feb17563e0ce308c4c899760ca343feab197c 100644 (file)
--- a/sc-units-bw.inc.pl
+++ b/sc-units-bw.inc.pl
@@ -5,6 +5,7 @@ use strict;
 my $FPS = 24;  # frames per second
 # toss shield += .65 per second
 # zerg regen  += .37 per second
+my $SM = .2;  # speed multiplication
 
 [
 '<span title="no known changes as of v1.16.1">version≥1.08</span>',
@@ -38,7 +39,7 @@ attack => [
        },
 ],
 sight => 8,
-speed => 14,
+speed => 14 * $SM,
 counter => ['vulture', 'dark templar'],
 },
 
@@ -105,11 +106,11 @@ attack => [
        },
 ],
 sight => 7,
-speed => 11,
+speed => 11 * $SM,
 upgrade => [
        {
                name => 'Leg Enhancements',
-               speed => 16 - 11,
+               speed => (16 - 11) * $SM,
                min => 150,
                gas => 150,
                build => 133,
@@ -150,7 +151,7 @@ attack => [
        },
 ],
 sight => 8,
-speed => 15,
+speed => 15 * $SM,
 upgrade => [
        {
                name => 'Singularity Charge',
@@ -188,7 +189,7 @@ hp => 40,
 shield => 40,
 armor => 0,
 sight => 7,
-speed => 9,
+speed => 9 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -258,7 +259,7 @@ attack => [
        },
 ],
 sight => 7,
-speed => 15,
+speed => 15 * $SM,
 special => [
        {
                name => 'Cloaked',
@@ -302,7 +303,7 @@ attack => [
        },
 ],
 sight => 8,
-speed => 14,
+speed => 14 * $SM,
 },
 
 {
@@ -327,7 +328,7 @@ hp => 25,
 shield => 200,
 armor => 1,
 sight => 10,
-speed => 14,
+speed => 14 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -412,7 +413,7 @@ attack => [
        },
 ],
 sight => 8,
-speed => 13,
+speed => 13 * $SM,
 upgrade => [
        {
                name => 'Apial Sensors',
@@ -426,7 +427,7 @@ upgrade => [
                min => 200,
                gas => 200,
                build => 166,
-               speed => 18 - 13,
+               speed => (18 - 13) * $SM,
        },
 ],
 },
@@ -463,7 +464,7 @@ attack => [
        },
 ],
 sight => 9,
-speed => 17,
+speed => 17 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -520,7 +521,7 @@ attack => [
        },
 ],
 sight => 11,
-speed => 10,
+speed => 10 * $SM,
 special => [
        {
                name => 'Build Interceptor',
@@ -596,7 +597,7 @@ attack => [
        },
 ],
 sight => 9,
-speed => 12,
+speed => 12 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -669,7 +670,7 @@ attack => [
        },
 ],
 sight => 10,
-speed => 5,
+speed => 5 * $SM,
 upgrade => [
        {
                name => 'Scarab Damage',
@@ -725,7 +726,7 @@ shield => 20,
 armor => 0,
 sight => 9,
 detect => 1,
-speed => 9,
+speed => 9 * $SM,
 upgrade => [
        {
                name => "Sensor Array",
@@ -739,7 +740,7 @@ upgrade => [
                min => 150,
                gas => 150,
                build => 166,
-               speed => 13 - 9,
+               speed => (13 - 9) * $SM,
        },
 ],
 special => [
@@ -772,7 +773,7 @@ hp => 80,
 shield => 60,
 armor => 1,
 sight => 8,
-speed => 13,
+speed => 13 * $SM,
 transport => 1,
 upgrade => [
        {
@@ -780,7 +781,7 @@ upgrade => [
                min => 200,
                gas => 200,
                build => 166,
-               speed => 19 - 13,
+               speed => (19 - 13) * $SM,
        }
 ],
 },
@@ -813,7 +814,7 @@ attack => [
        },
 ],
 sight => 7,
-speed => 15,
+speed => 15 * $SM,
 },
 
 {
@@ -874,7 +875,7 @@ attack => [
        },
 ],
 sight => 7,
-speed => 11,
+speed => 11 * $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 => 17 * $SM,
                attack => [
                        {
                                anti => 3,
@@ -935,7 +936,7 @@ attack => [
        },
 ],
 sight => 7,
-speed => 11,
+speed => 11 * $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 => 17 * $SM,
                attack => [
                        {
                                anti => 1,
@@ -987,7 +988,7 @@ attack => [
        },
 ],
 sight => 9,
-speed => 11,
+speed => 11 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -1064,7 +1065,7 @@ attr => {
 hp =>  60,
 armor => 1,
 sight => 9,
-speed => 11,
+speed => 11 * $SM,
 energy => 50,
 capacity => 200,
 upgrade => [
@@ -1140,14 +1141,14 @@ attack => [
        },
 ],
 sight => 8,
-speed => 20,
+speed => 20 * $SM,
 upgrade => [
        {
                name => 'Ion Thrusters',
                min => 100,
                gas => 100,
                build => 100,
-               speed => 28 - 20,
+               speed => (28 - 20) * $SM,
        },
 ],
 special => [
@@ -1176,7 +1177,7 @@ special => [
                        },
                ],
                sight => 3,
-               speed => 25,
+               speed => 25 * $SM,
     },
 ],
 },
@@ -1210,7 +1211,7 @@ attack => [
        },
 ],
 sight => 10,
-speed => 12,
+speed => 12 * $SM,
 special => [
        {
                name => 'Siege Mode',
@@ -1271,7 +1272,7 @@ attack => [
        },
 ],
 sight => 8,
-speed => 13,
+speed => 13 * $SM,
 upgrade => [
        {
                name => 'Charon Boosters',
@@ -1322,7 +1323,7 @@ attack => [
        },
 ],
 sight => 7,
-speed => 17,
+speed => 17 * $SM,
 energy => 50,
 capacity => 200,
 special => [
@@ -1378,7 +1379,7 @@ attack => [
        },
 ],
 sight => 11,
-speed => 7,
+speed => 7 * $SM,
 energy => 50,
 capacity => 200,
 special => [
@@ -1432,7 +1433,7 @@ hp => 200,
 armor => 1,
 sight => 10,
 detect => 1,
-speed => 15,
+speed => 15 * $SM,
 energy => 50,
 capacity => 200,
 special => [
@@ -1514,7 +1515,7 @@ attack => [
        },
 ],
 sight => 8,
-speed => 19,
+speed => 19 * $SM,
 },
 
 {
@@ -1535,7 +1536,7 @@ air => 1,
 hp => 150,
 armor => 1,
 sight => 8,
-speed => 15,
+speed => 15 * $SM,
 transport => 1,
 },
 
@@ -1566,7 +1567,7 @@ attack => [
        },
 ],
 sight => 7,
-speed => 14,
+speed => 14 * $SM,
 },
 
 {
@@ -1589,7 +1590,7 @@ armor => 0,
 cargo => 0,
 sight => 9,
 detect => 1,
-speed => 2,
+speed => 2 * $SM,
 transport => 1,
 upgrade => [
        {
@@ -1611,7 +1612,7 @@ upgrade => [
                min => 150,
                gas => 150,
                build => 133,
-               speed => 10 - 2,
+               speed => (10 - 2) * $SM,
        },
 ],
 },
@@ -1728,14 +1729,14 @@ attack => [
        },
 ],
 sight => 5,
-speed => 14,
+speed => 14 * $SM,
 upgrade => [
        {
                name => 'Metabolic Boost',
                min => 100,
                gas => 100,
                build => 80,
-               speed => 22 - 14,
+               speed => (22 - 14) * $SM,
        },
        {
                name => 'Adrenal Glands',
@@ -1778,7 +1779,7 @@ attack => [
        },
 ],
 sight => 6,
-speed => 11,
+speed => 11 * $SM,
 upgrade => [
        {
                name => 'Grooved Spines',
@@ -1796,7 +1797,7 @@ upgrade => [
                min => 150,
                gas => 150,
                build => 100,
-               speed => 16 - 11,
+               speed => (16 - 11) * $SM,
        },
        {
                name => 'Lurker Aspect',
@@ -1834,7 +1835,7 @@ attack => [
        },
 ],
 sight => 8,
-speed => 17,
+speed => 17 * $SM,
 },
 
 {
@@ -1854,7 +1855,7 @@ air => 1,
 hp => 120,
 armor => 0,
 sight => 10,
-speed => 18,
+speed => 18 * $SM,
 energy => 50,
 capacity => 200,
 special => [
@@ -1911,7 +1912,7 @@ special => [
                        },
                ],
                sight => 5,
-               speed => 19,
+               speed => 19 * $SM,
        },
 ],
 },
@@ -1940,7 +1941,7 @@ attack => [
        },
 ],
 sight => 5,
-speed => 17,
+speed => 17 * $SM,
 },
 
 {
@@ -1967,7 +1968,7 @@ attack => [
        },
 ],
 sight => 5,
-speed => 18,
+speed => 18 * $SM,
 counter => ['cannon', 'goliath', 'hydralisk'],
 },
 
@@ -1998,7 +1999,7 @@ attack => [
        },
 ],
 sight => 7,
-speed => 18,
+speed => 18 * $SM,
 special => [
        {
                alt => 'Cocoon',
@@ -2044,7 +2045,7 @@ attack => [
        },
 ],
 sight => 11,
-speed => 7,
+speed => 7 * $SM,
 },
 
 {
@@ -2075,7 +2076,7 @@ attack => [
        },
 ],
 sight => 10,
-speed => 15,
+speed => 15 * $SM,
 counter => ['goliath', 'dragoon', 'scourge'],
 },
 
@@ -2095,7 +2096,7 @@ attr => {
 hp => 80,
 armor => 1,
 sight => 10,
-speed => 12,
+speed => 12 * $SM,
 energy => 50,
 capacity => 200,
 special => [
@@ -2167,7 +2168,7 @@ attack => [
        },
 ],
 sight => 7,
-speed => 16,
+speed => 16 * $SM,
 upgrade => [
        {
                name => 'Chitinous Plating',
@@ -2181,7 +2182,7 @@ upgrade => [
                min => 200,
                gas => 200,
                build => 133,
-               speed => 21 - 16,
+               speed => (21 - 16) * $SM,
        },
 ],
 },

diff --git a/sc.plp b/sc.plp
index 450d1cb57c6a92244dbffec769b6acc8533114e2..5f18477389b53f8cd183e3298e106468102c045b 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -473,7 +473,8 @@ if ($scver{major} > 1) {
        <dd>range in which the unit detects other units
        <dd><strong class="unit-detect">emphasis</strong> indicates ability to detect cloaked units
 <dt>speed
-       <dd>relative speed of movement (when in full motion, startup speed ignored)
+       <dd>top movement speed in hex per second
+       <dd>acceleration and deceleration ignored
 <dt>specials
        <dd>parentheses () indicate that it needs to be researched first
        <dd><span class="magic-perma">passive</span> abilities are always enabled