From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 21 Apr 2018 18:28:45 +0000 (+0200)
Subject: sc: prefer warpgate times, indicate build details
X-Git-Tag: v1.12~70
X-Git-Url: http://git.shiar.net/sheet.git/commitdiff_plain/277969d25c6759906ffdbd37ac6b44acd4def7e9

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 f4c1f7c..7d1fb64 100644
--- 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 d0b2691..791a422 100644
--- 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') :