X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/7914537c1fda7796579fee5f8b9bb8791d93d546..be9d4788815fac719e6aab8cdcf7ac35183eea7c:/sc.plp

diff --git a/sc.plp b/sc.plp
index b20e51d..bbcd9c9 100644
--- a/sc.plp
+++ b/sc.plp
@@ -1,24 +1,33 @@
 <(common.inc.plp)><:
 use List::Util qw(max sum);
 
-my %scver = (
-	id => 'bw',
-	name => 'Brood War',
-	title => 'starcraft',
-	game => 'StarCraft',
-	major => 1,
-);
-
-if ($Request and $Request eq '2') {
-	%scver = (
-		id => 'hots',
+my %scvers = (
+	bw => {
+		name => 'Brood War',
+		title => 'starcraft',
+		game => 'StarCraft BW',
+		major => 1,
+	},
+	hots => {
 		name => 'Heart of the Swarm',
-		title => 'starcraft2',
-		game => 'StarCraft II',
+		title => 'starcraft2 hots',
+		game => 'StarCraft II HotS',
 		major => 2,
-	);
-}
-my $datafile = "sc-units-$scver{id}.inc.pl";
+	},
+	lotv => {
+		name => 'Legacy of the Void',
+		title => 'starcraft2 lotv',
+		game => 'StarCraft II LotV',
+		major => 2,
+	},
+);
+
+$Request ||= 'bw';
+$Request = 'lotv' if $Request eq '2';
+my %scver = %{ $scvers{$Request} }
+	or Abort("Requested version $Request not available", '404 unknown');
+
+my $datafile = "sc-units-$Request.inc.pl";
 
 Html({
 	title => "$scver{title} unit cheat sheet",
@@ -31,9 +40,10 @@ Html({
 	keywords => [
 		qw'
 		starcraft game unit statistics stats comparison table sheet cheat
-		reference software attributes properties
+		reference software attributes properties patch attribute multiplayer
 		',
-		$scver{major} < 2 ? qw' bw broodwar brood war ' : qw' starcraft2 hots ',
+		$scver{major} < 2 ? qw' bw broodwar brood war ' :
+		qw' starcraft2 lotv hots wol ',
 	],
 	stylesheet => [qw'light'],
 	raw => '<link rel="stylesheet" type="text/css" media="all" href="/sc.css?1.1" title="light">',
@@ -48,9 +58,10 @@ my $patch = shift @{$units}
 	or Abort("Cannot open unit data: metadata not found", 501);
 
 say "<p>Unit properties as seen or measured in $scver{name}\n$patch.";
-say "Also see the $_ table." for join(', ',
-	(showlink('StarCraft 2: HotS', '/sc/2'))    x ($scver{major} < 2),
-	(showlink('original SC: Brood War', '/sc')) x ($scver{major} > 1),
+say "Also see the $_ tables." for join(' and ',
+	(showlink('StarCraft 2: LotV', '/sc/lotv'))    x ($Request ne 'lotv'),
+	(showlink(             'HotS', '/sc/hots'))    x ($Request ne 'hots'),
+	(showlink('original SC: Brood War', '/sc/bw')) x ($Request ne 'bw'),
 );
 say "</p>\n";
 
@@ -95,7 +106,7 @@ sub coltoggle {
 	<th><:= coltoggle(name => 'name') :></th>
 	<th class="val min" title=minerals><:= coltoggle(cost => 'cost') :></th>
 	<th class="val gas">gas</th>
-	<th class="val time">build</th>
+	<th class="val time"><:= coltoggle(build => 'build') :></th>
 	<th class="unit" colspan="2"><:= coltoggle(qw'size size') :></th>
 	<th class="unit" colspan="2">attr</th>
 	<th class="val unit-hp"><:= coltoggle(HP => 'hp') :></th>
@@ -255,9 +266,16 @@ 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 $_->{transform} ? sprintf('<td class="val time">%.0f',
+				$_->{transform},
+			) :
+			!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') :
@@ -356,6 +374,15 @@ sub showrangeint {
 				$_->{gas}*1.5 + $_->{min} + $_->{pop}/8 + $_->{build}/256/8
 			) for @rows;
 		}
+		elsif ($get{order} eq 'build') {
+			my %unittime = map { ($_->{name} => $_->{warp} // $_->{build}) } @rows;
+			$unittime{Templar} = $unittime{'High Templar'};
+			$_->{order} = (
+				($_->{warp} // $_->{build})
+				+ ($_->{gas}*1.5 + $_->{min} + $_->{pop}/8)/1024
+				+ ($_->{base} ? ($unittime{$_->{base}->[0]} // 100) + 1 : 0)
+			) for @rows;
+		}
 		elsif ($get{order} eq 'size') {
 			$_->{order} = (
 				$_->{pop}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8