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

diff --git a/sc.plp b/sc.plp
index 4706bbf..fc3156c 100644
--- a/sc.plp
+++ b/sc.plp
@@ -1,36 +1,53 @@
 <(common.inc.plp)><:
 
-my $datafile = 'sc-units.inc.pl';
+my %scver = (
+	id => 'bw',
+	name => 'Brood War',
+	title => 'starcraft',
+	game => 'StarCraft',
+	major => 1,
+);
+
 if ($ENV{PATH_INFO} and $ENV{PATH_INFO} eq '/2') {
-	$datafile = 'sc2-units.inc.pl';
+	%scver = (
+		id => 'hots',
+		name => 'Heart of the Swarm',
+		title => 'starcraft2',
+		game => 'StarCraft II',
+		major => 2,
+	);
 }
+my $datafile = "sc-units-$scver{id}.inc.pl";
 
 Html({
-	title => 'starcraft unit cheat sheet',
-	version => 'v1.0',
+	title => "$scver{title} unit cheat sheet",
+	version => 'v1.1',
 	description => [
-		'Reference of StarCraft unit properties,'
-		. ' comparing various statistics of all the units in Brood War'
+		"Reference of $scver{game} unit properties,"
+		. " comparing various statistics of all the units in $scver{name}"
 		. ' including costs, damage, defense, speed, ranges, and abilities.',
 	],
-	keywords => [qw'
+	keywords => [
+		qw'
 		starcraft game unit statistics stats comparison table sheet cheat
 		reference software attributes properties
-	'],
+		',
+		$scver{major} < 2 ? qw' bw broodwar brood war ' : qw' starcraft2 hots ',
+	],
 	stylesheet => [qw'light'],
 	raw => '<link rel="stylesheet" type="text/css" media="all" href="/sc.css?1.1" title="light">',
 	data => [$datafile],
 });
 
-:>
-<h1>StarCraft units</h1>
+print "<h1>$scver{game} units</h1>\n\n";
 
-<p>
-Unit properties as seen or measured in Brood War
-<span title="no known changes as of v1.16.1">version≥1.08</span>.
-</p>
+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</p>\n\n";
 
-<:
 sub coltoggle {
 	my ($name, $id) = @_;
 	return sprintf(
@@ -46,7 +63,7 @@ sub coltoggle {
 	<th class="val min"><img src="/minerals.png" alt="min"></th>
 	<th class="val gas"><img src="/gas.png" alt="gas"></th>
 	<th class="val time"><:= coltoggle(qw'build cost') :></th>
-	<th class="unit" colspan="2"><:= coltoggle(qw'size size') :></th>
+	<th class="unit" colspan="4"><:= coltoggle(qw'size size') :></th>
 	<th class="val unit-hp">HP</th>
 	<th class="val unit-shield">shield</th>
 	<th class="val unit-armor">armor</th>
@@ -164,6 +181,18 @@ sub showval {
 		if ($_->{suit}) {
 			$suitchar = [qw/? s m l/]->[$_->{suit}];
 		}
+		elsif ($_->{cargo} > 0) {
+			$suitchar = [qw/? s m l l h h h h/]->[abs $_->{cargo}];
+		}
+		elsif ($_->{size}) {
+			$suitchar = [qw/s m l h h h/]->[$_->{size}];
+		}
+		elsif ($_->{attr} and $_->{attr}->{light}) {
+			$suitchar = 's';
+		}
+		elsif ($_->{attr} and $_->{attr}->{armored}) {
+			$suitchar = 'l';
+		}
 
 		return (
 			'<td class="val min">' . ($_->{min} // ''),
@@ -173,14 +202,22 @@ sub showval {
 				$_->{build} || '0',
 			),
 			!$suitchar ? '<td>' : sprintf('<td class="unit unit-%s">%s', $suitchar, ucfirst $suitchar),
-			'<td class="val unit">' . join('',
-				defined $_->{unit} && $_->{unit} == .5 ? '½' : $_->{unit},
-				defined $_->{organic} && sprintf(
-					'<span class="unit-%s" title="%s">%s</span>',
-					$_->{organic} ? 'o' : 'u',
-					$_->{organic} ? 'organic' : 'mechanic',
-					$_->{organic} ? 'o' : 'm',
-				),
+			'<td class="val unit">' . (
+				defined $_->{unit} && $_->{unit} == .5 ? '½' : $_->{unit}
+			),
+			'<td class="unit unit-type">' . join('', grep { $_ }
+				(defined $_->{organic} ? !$_->{organic} : $_->{attr}->{mech})
+					&& '<span class="unit-u" title="mechanic">m</span>',
+				($_->{organic} || $_->{attr}->{organic})
+					&& '<span class="unit-o" title="organic">o</span>',
+				$_->{attr}->{psionic}
+					&& '<span class="unit-p" title="psionic">ψ</span>',
+			),
+			'<td class="unit unit-attr">' . join('', grep { $_ }
+				$_->{attr}->{armored}
+					&& '<span class="unit unit-l" title="armored">A</span>',
+				$_->{attr}->{light}
+					&& '<span class="unit unit-s" title="light">L</span>',
 			),
 			'<td class="val unit-hp">' . $_->{hp} // '',
 			'<td class="val unit-shield">' . (
@@ -195,13 +232,12 @@ sub showval {
 				showval($_, 'sight')
 			),
 			'<td class="val unit-speed">' . showval($_, 'speed'),
+			$_->{attr}->{massive} && '<span class="unit-massive">☇</span>',
 			'<td class="unit-magic">' . showmagic($_),
 			"\n"
 		);
 	}
 
-	my $units = do $datafile;
-	die "Cannot open unit data: $_\n" for $@ || $! || ();
 	my $grouped = 1;  # race headers
 	if (exists $get{order}) {
 		$grouped = 0;
@@ -222,7 +258,7 @@ sub showval {
 	my ($race, $cat) = ('', '');
 	for (@rows) {
 		if ($grouped) {
-			printf '<tbody id="%s"><tr class="race"><th colspan="18"><h2>%s</h2>'."\n",
+			printf '<tbody id="%s"><tr class="race"><th colspan="20"><h2>%s</h2>'."\n",
 				$race = $_->{race}, ucfirst $race
 					unless $race eq $_->{race};
 		}
@@ -232,17 +268,15 @@ sub showval {
 
 		print(
 			'<tr>',
-			sprintf('<t%s class="cat">%s',
-				$cat ne $_->{cat} ? ('h', $cat = $_->{cat}) : ('d', '&nbsp;')
-			),
-			'<td>' . $_->{name},
+			'<th class="cat">', $cat ne $_->{cat} && ($cat = $_->{cat}),
+			'<td>', $_->{name},
 			showunitcols($_),
 		);
 
 		for my $subrow (@{ $_->{special} }) {
 			$subrow->{alt} or next;
 			print(
-				'<tr class="alt"><td class="cat"><td>' . $subrow->{alt},
+				'<tr class="alt"><td class="cat"><td>', $subrow->{alt},
 				showunitcols($subrow),
 			);
 		}
@@ -262,11 +296,30 @@ sub showval {
 	<dd>excludes construction of dependencies such as buildings
 		and <span class="unit-composed">+</span>parent units
 <dt>size
-	<dd>affected by <span class="unit unit-s">S</span>mall,
-		<span class="unit unit-m">M</span>edium,
-		or <span class="unit unit-l">L</span>arge unit damage
+	<dd><:
+if ($scver{major} > 1) {
+		:>transports can fit 8 <span class="unit unit-s">S</span>mall,
+		4 <span class="unit unit-m">M</span>edium,
+		2 <span class="unit unit-l">L</span>arge,
+		or a single <span class="unit unit-h">H</span>uge unit<:
+} else {
+		:>affected by <span class="unit unit-s">S</span>mall,
+		<span class="unit unit-m">M</span>edium, or
+		<span class="unit unit-l">L</span>arge unit damage<:
+} :>
 	<dd>number of command points taken per unit
-	<dd><span class="unit unit-o">o</span>rganic/<span class="unit unit-u">m</span>echanic unit
+	<dd><:
+if ($scver{major} > 1) {
+		:>received damage depends on
+		<span class="unit unit-o">o</span>rganic,
+		<span class="unit unit-u">m</span>echanic,
+		<span class="unit unit-p">ψ</span>(ps)ionic,
+		<span class="unit unit-s">L</span>ight, and
+		<span class="unit unit-l">A</span>rmored
+		attributes<:
+} else {
+		:><span class="unit unit-o">o</span>rganic/<span class="unit unit-u">m</span>echanic unit<:
+} :>
 <dt>HP<dd>
 	total number of hitpoints (including shields)
 <dt>shield