sc: prefer warpgate times, indicate build details

Lower gateway time in hover text.
Also describe composition units (fixed in data).

diff --git a/sc-units-bw.inc.pl b/sc-units-bw.inc.pl
index f4c1f7c9c9e1b0a1e11a73c5988cbe4e5cc682a8..7d1fb6437795d7c7358c97467fa324ea932aa912 100644 (file)
--- a/sc-units-bw.inc.pl
+++ b/sc-units-bw.inc.pl
@@ -1881,7 +1881,7 @@ cat => 'lair',
 name => 'Lurker',
 min => 125,
 gas => 125,
-base => 'hydralisk',
+base => ['hydralisk'],
 build => 40,
 suit => 2,
 size => 32 / $PPT,
@@ -2104,7 +2104,7 @@ name => 'Guardian',
 min => 150,
 gas => 200,
 build => 40,
-base => 'mutalisk',
+base => ['mutalisk'],
 suit => 3,
 size => 44 / $PPT,
 pop => 2,
@@ -2136,7 +2136,7 @@ name => 'Devourer',
 min => 250,
 gas => 150,
 build => 40,
-base => 'mutalisk',
+base => ['mutalisk'],
 suit => 3,
 size => 44 / $PPT,
 pop => 2,

diff --git a/sc.plp b/sc.plp
index d0b269144c5df9db3712d882d69389465b1403d6..791a4229ad707da7cb687aeb9637069eea3c2909 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -255,9 +255,13 @@ sub showrangeint {
                return (
                        '<td class="val min">' . ($_->{min} // ''),
                        '<td class="val gas">' . ($_->{gas} || ''),
-                       !defined $_->{build} ? '<td>' : sprintf('<td class="val time">%s%.0f',
-                               !!$_->{base} && '<span class="unit-composed">+</span>',
-                               $_->{build} || '0',
+                       !defined $_->{build} ? '<td>' : sprintf('<td class="val time"%s>%s%.0f',
+                               defined $_->{warp} && qq(title="$_->{build} without warpgate"),
+                               !!$_->{base} && sprintf(
+                                       '<span class="unit-composed" title="%s">+</span>',
+                                       'from '.join('+', @{ $_->{base} }),
+                               ),
+                               $_->{warp} // $_->{build} || '0',
                        ),
                        sprintf('<td class="unit unit-%s" title="%4$s%3$s">%s',
                                $_->            {cargo} < 0 ? ('supply',           T => 'transport') :