X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/3cfb4ca730767267ef6ecabe57b7b5ad7ab65265..b1a88e8b8c215a64c86e605de92ae65de4ce014c:/sc.plp

diff --git a/sc.plp b/sc.plp
index 21c3311..3437f8f 100644
--- a/sc.plp
+++ b/sc.plp
@@ -9,7 +9,7 @@ my %scver = (
 	major => 1,
 );
 
-if ($ENV{PATH_INFO} and $ENV{PATH_INFO} eq '/2') {
+if ($Request and $Request eq '2') {
 	%scver = (
 		id => 'hots',
 		name => 'Heart of the Swarm',
@@ -22,7 +22,7 @@ my $datafile = "sc-units-$scver{id}.inc.pl";
 
 Html({
 	title => "$scver{title} unit cheat sheet",
-	version => 'v1.1',
+	version => '1.1',
 	description => [
 		"Reference of $scver{game} unit properties,"
 		. " comparing various statistics of all the units in $scver{name}"
@@ -40,19 +40,19 @@ Html({
 	data => [$datafile],
 });
 
-print "<h1>$scver{game} units</h1>\n\n";
+say "<h1>$scver{game} units</h1>\n";
 
 my $units = do $datafile;
 die "Cannot open unit data: $_\n" for $@ || $! || ();
 my $patch = shift @{$units}
 	or die "Cannot open unit data: metadata not found\n";
 
-print "<p>Unit properties as seen or measured in $scver{name}\n$patch.\n";
-print "Also see the $_ table.\n" for join(', ',
-	('<a href="/sc/2">StarCraft 2: HotS</a>')    x ($scver{major} < 2),
-	('<a href="/sc">original SC: Brood War</a>') x ($scver{major} > 1),
+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),
 );
-print "</p>\n\n";
+say "</p>\n";
 
 sub addupgrade {
 	my ($ref, $increase, $org) = @_;
@@ -85,11 +85,9 @@ for my $unit (@{$units}) {
 
 sub coltoggle {
 	my ($name, $id, $nolink) = @_;
-	return sprintf(
-		(defined $get{order} ? $get{order} eq $id : !$id) ? '%2$s ▼'
-			: $nolink ? '%2$s' : '<a href="?%s">%s</a>',
-		$id && "order=$id", $name
-	);
+	return "$name ▼" if defined $get{order} ? $get{order} eq $id : !$id;
+	return $name if $nolink;
+	return showlink($name, '?'.($id && "order=$id"));
 }
 :><table class="units">
 <thead><tr>
@@ -376,7 +374,7 @@ sub showrangeint {
 	my ($race, $cat) = ('', '');
 	for (@rows) {
 		if ($grouped) {
-			printf '<tbody id="%s"><tr class="race"><th colspan="20"><h2>%s</h2>'."\n",
+			say sprintf '<tbody id="%s"><tr class="race"><th colspan="20"><h2>%s</h2>',
 				$race = $_->{race}, ucfirst $race
 					unless $race eq $_->{race};
 		}
@@ -435,8 +433,10 @@ if ($scver{major} > 1) {
 		<span class="unit unit-m">M</span>edium, or
 		<span class="unit unit-l">L</span>arge damage<:
 } :>
-<dt>HP<dd>
-	total number of hitpoints (including shields)
+<dt>HP
+	<dd>total number of hitpoints (including shields)
+	<dd>everything zerg (except for eggs) regenerates one point every
+		<:= $scver{major} == 1 ? '4½' : '3.7' :> seconds
 <dt>shield
 	<dd>percentage of HP in shields
 	<dd><:
@@ -446,6 +446,12 @@ if ($scver{major} > 1) {
 }
 		:>does not take armor bonuses,
 		but upgrades can decrease damage to any shield hit by upto 3
+	<dd><:
+if ($scver{major} > 1) {
+		:>after 10 seconds out of combat, 2 points are recharged per game second<:
+} else {
+		:>recharges one point every 2½ seconds<:
+} :>
 <dt>armor
 	<dd>base unit armor
 	<dd>can be increased by upto 3 at various facilities