X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/9f1aad6e442dbb3a88210a379d645db842d00def..bf2e7804ab4bb344f4aa5090f1d06a266b028c9d:/sc.plp

diff --git a/sc.plp b/sc.plp
index 0a41018..1c9e7b6 100644
--- a/sc.plp
+++ b/sc.plp
@@ -24,14 +24,14 @@ my %scvers = (
 
 $Request ||= 'bw';
 $Request = 'lotv' if $Request eq '2';
-my %scver = %{ $scvers{$Request} }
-	or Abort("Requested version $Request not available", '404 unknown');
+my %scver = %{ $scvers{$Request} // {} }
+	or Html(), Abort("Requested version <q>$Request</q> not available", '404 request not found');
 
 my $datafile = "sc-units-$Request.inc.pl";
 
 Html({
 	title => "$scver{title} unit cheat sheet",
-	version => '1.1',
+	version => '1.2',
 	description => [
 		"Reference of $scver{game} unit properties,"
 		. " comparing various statistics of all the units in $scver{name}"
@@ -45,8 +45,8 @@ Html({
 		$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">',
+	stylesheet => [qw( light dark )],
+	raw => '<link rel="stylesheet" type="text/css" media="all" href="/sc.css?1.2">',
 	data => [$datafile],
 });
 
@@ -104,8 +104,8 @@ sub coltoggle {
 <thead><tr>
 	<th><:= coltoggle(exists $get{order} ? 'race' : 'source' => '') :></th>
 	<th class="unit-name"><:= coltoggle(name => 'name') :></th>
-	<th class="val min" title=minerals><:= coltoggle(cost => 'cost') :></th>
-	<th class="val gas">gas</th>
+	<th class="val unit-min" title=minerals><:= coltoggle(cost => 'cost') :></th>
+	<th class="val unit-gas">gas</th>
 	<th class="val time"><:= coltoggle(build => 'build') :></th>
 	<th class="unit" colspan="2"><:= coltoggle(qw'size size') :></th>
 	<th class="unit unit-attr" colspan="2">attr</th>
@@ -264,8 +264,8 @@ sub showrangeint {
 		$_->{hp} += $_->{shield} if $_->{shield};
 
 		return (
-			'<td class="val min">' . ($_->{min} // ''),
-			'<td class="val gas">' . ($_->{gas} || ''),
+			'<td class="val unit-min">' . ($_->{min} // ''),
+			'<td class="val unit-gas">' . ($_->{gas} || ''),
 			defined $_->{transform} ? sprintf('<td class="val time">%.0f',
 				$_->{transform},
 			) :
@@ -366,11 +366,6 @@ sub showrangeint {
 		if ($get{order} eq 'name') {
 			@rows = sort {$a->{name} cmp $b->{name}} @rows;
 		}
-		elsif ($get{order} eq 'hp') {
-			$_->{order} = (
-				$_->{hp}*1.01 + $_->{armor} + $_->{shield} + $_->{size}/1024,
-			) for @rows;
-		}
 		elsif ($get{order} eq 'cost') {
 			$_->{order} = (
 				$_->{gas}*1.5 + $_->{min} + $_->{pop}/8 + $_->{build}/256/8
@@ -391,6 +386,11 @@ sub showrangeint {
 				+ $_->{hp}/512 + $_->{min}/8192
 			) for @rows;
 		}
+		elsif ($get{order} eq 'hp') {
+			$_->{order} = (
+				$_->{hp}*1.01 + $_->{armor} + $_->{shield} + $_->{size}/1024,
+			) for @rows;
+		}
 		elsif ($get{order} eq 'attack') {
 			$_->{order} = $_->{hp} / 1024 + $_->{shield} / 1008 + max(
 				map {
@@ -447,7 +447,8 @@ sub showrangeint {
 
 <dl>
 <dt>cost
-	<dd>minerals and gas required to create one unit
+	<dd><span class="unit-min">minerals</span> and
+		<span class="unit-gas">gas</span> required to create one unit
 	<dd>includes total expenses if based on existing units
 <dt>build
 	<dd>relative time needed to create at least one unit