X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/1cb822295129412ecabcac689b469a35d619724a..1de61e5745ecf3dd1a41e1e932bae2f7568353a4:/sc.plp

diff --git a/sc.plp b/sc.plp
index 0426b6e..55dbd09 100644
--- a/sc.plp
+++ b/sc.plp
@@ -1,9 +1,10 @@
 <(common.inc.plp)><:
 
-my $datafile = 'sc-units.inc.pl';
+my $scver = 'bw';
 if ($ENV{PATH_INFO} and $ENV{PATH_INFO} eq '/2') {
-	$datafile = 'sc2-units.inc.pl';
+	my $scver = 'hots';
 }
+my $datafile = "sc-units-$scver.inc.pl";
 
 Html({
 	title => 'starcraft unit cheat sheet',
@@ -18,6 +19,7 @@ Html({
 		reference software attributes properties
 	'],
 	stylesheet => [qw'light'],
+	raw => '<link rel="stylesheet" type="text/css" media="all" href="/sc.css?1.1" title="light">',
 	data => [$datafile],
 });
 
@@ -29,126 +31,6 @@ Unit properties as seen or measured in Brood War
 <span title="no known changes as of v1.16.1">version≥1.08</span>.
 </p>
 
-<style type="text/css">
-	.units {
-		border-collapse: separate;
-		border-spacing: 0;
-		margin: 0 auto;
-		white-space: nowrap;
-	}
-	.units th, .units td {
-		border: 0;
-		padding: 0 0.2em;
-		background: transparent;
-		text-align: left;
-	}
-	tr.alt td {
-		font-size: 70%;
-		border-top-style: dashed;
-	}
-	.units tr th:first-child {
-		padding-left: 0;
-	}
-	.units tr:hover:not(.race) {
-		background: #EEE;
-	}
-
-	table h2 {
-		padding: 1ex 0;
-		margin: 0;
-		text-align: center;
-	}
-	.units thead th, .units tfoot th {
-		font-size: 70%;
-		font-weight: normal;
-	}
-
-	.unit-o {color: #C08} /* organic */
-	.unit-u {color: #44C} /* mechanic */
-	img.unit-o, img.unit-u {
-		margin-left: 0.2em;
-		vertical-align: middle;
-	}
-	.unit-composed {
-		color: #C88;
-		font-size: 70%;
-	}
-	.unit {
-		text-align: center;
-		white-space: nowrap;
-	}
-	.unit.unit-s {color: #770}
-	.unit.unit-m {color: #C70}
-	.unit.unit-l {color: #D22}
-	.hurt.unit-s::before {
-		content: '~';
-		color: #773;
-	}
-	.hurt.unit-l::before {
-		content: '*';
-		color: #C66;
-	}
-	.hurt .unit-splash {
-		position: absolute;
-	}
-	.hurtrel, .units .hurtrel {
-		padding-left: 1em;
-		font-size: 70%;
-		color: #778;
-	}
-	.unit-splash {
-		color: #4A0;
-	}
-	.unit-detect::before {
-		content: '!';
-		color: #0A8;
-		font-size: 70%;
-		vertical-align: super;
-	}
-	.unit-magic {
-		padding-left: 0.5em;
-	}
-	.magic-perma {
-		text-decoration: underline;
-	}
-
-	.units .val {
-		text-align: right;
-	}
-
-	.legend dt {
-		float: none;
-		text-align: left;
-		margin-top: 1ex;
-		font-weight: bold;
-	}
-	.legend dd:before {
-		content: '• ';
-	}
-	.legend dd {
-		text-indent: -1em;
-		margin-left: 1em;
-		break-before: avoid;
-		-webkit-column-break-before: avoid;
-	}
-
-	.units, .legend {
-		display: table-cell;
-	}
-	.legend {
-		min-width: 20em;
-		text-align: left;
-	}
-	.units {
-		float: left;
-		padding-bottom: 1em;
-		margin-right: 2em;
-	}
-	.footer {
-		clear: left;
-	}
-</style>
-
 <:
 sub coltoggle {
 	my ($name, $id) = @_;
@@ -178,6 +60,12 @@ sub coltoggle {
 </tr></thead>
 <:
 sub showrange {
+	my ($min, $max) = @_;
+	$_ = int($_ + .5) for $min, $max;  # round halves up
+	return $min == $max ? $min : "$min-$max";
+}
+
+sub showval {
 	my ($row, @elements) = @_;
 	my ($min, $max);
 
@@ -212,36 +100,40 @@ sub showrange {
 			$min /= 4;
 		}
 	}}
-	$_ = int($_ + .5) for $min, $max;  # round halves up
-
-	return $min == $max ? $min : "$min-$max";
+	return showrange($min, $max);
 }
 
 	sub showattack {
 		my ($row, $area) = @_;
-		local $_ = $row->{attack}->{$area};
-		if (not ref $_) {
+		my $attack = $row->{attack}->{$area};
+		if (not ref $attack) {
 			# reference to another area
-			$area = $_;
-			$_ = $row->{attack}->{$area};
+			$area = $attack;
+			$attack = $row->{attack}->{$area};
 		}
 
-		return '<td colspan="2" class="hurt">' unless $_;
+		return '<td colspan="2" class="hurt">' unless $attack;
 
 		my $tagbase = '<td class="val hurt';
-		if (ref $_ and $_->{type}) {
-			if ($_->{type} eq 'explosive') {
+		if (ref $attack and $attack->{type}) {
+			if ($attack->{type} eq 'explosive') {
 				$tagbase .= ' unit-l';
 			}
-			elsif ($_->{type} eq 'implosive') {
+			elsif ($attack->{type} eq 'implosive') {
 				$tagbase .= ' unit-s';
 			}
 		}
 		$tagbase .= '">';
 
-		my $out = showrange($row, 'attack', $area, 'damage');
-		$out .= '<span class="unit-splash">+</span>' if $_->{splash};
-		$out .= '<td class="val hurt hurtrel">' . showrange($row, 'attack', $area, 'dps');
+		my $out = showval($row, 'attack', $area, 'damage');
+		$out .= '<span class="unit-splash">+</span>' if $attack->{splash};
+		$attack->{dps} = $attack->{cooldown} && [
+			map { 24 * $_ / $attack->{cooldown} * ($attack->{count} // 1) }
+			map { ref $_ ? @{$_} : $_ }
+			$attack->{damage}
+			#TODO: upgrade (zergling)
+		];
+		$out .= '<td class="val hurt hurtrel">' . showval($row, 'attack', $area, 'dps');
 		return $tagbase . $out;
 	}
 
@@ -295,15 +187,15 @@ sub showrange {
 			'<td class="val unit-shield">' . (
 				$_->{shield} ? sprintf('%.0f%%', 100 * $_->{shield} / $_->{hp}) : '&nbsp;'
 			),
-			'<td class="val unit-armor">' . showrange($_, 'armor'),
+			'<td class="val unit-armor">' . showval($_, 'armor'),
 			showattack($_, 'ground'),
 			showattack($_, 'air'),
-			'<td class="val unit-range">' . showrange($_, 'attack', 'range'),
+			'<td class="val unit-range">' . showval($_, 'attack', 'range'),
 			'<td class="val unit-sight">' . sprintf(
 				$_->{detect} ? '<strong class="unit-detect">%s</strong>' : '%s',
-				showrange($_, 'sight')
+				showval($_, 'sight')
 			),
-			'<td class="val unit-speed">' . showrange($_, 'speed'),
+			'<td class="val unit-speed">' . showval($_, 'speed'),
 			'<td class="unit-magic">' . showmagic($_),
 			"\n"
 		);
@@ -311,8 +203,9 @@ sub showrange {
 
 	my $units = do $datafile;
 	die "Cannot open unit data: $_\n" for $@ || $! || ();
-	my $grouped = !exists $get{order};
+	my $grouped = 1;  # race headers
 	if (exists $get{order}) {
+		$grouped = 0;
 		$get{order} ||= '';
 		if ($get{order} eq 'size') {
 			$_->{order} = $_->{unit}*8 + $_->{suit} + $_->{hp}/512 + $_->{min}/8192 for @$units;
@@ -324,25 +217,32 @@ sub showrange {
 			$units->[$_]->{order} = $_ for 0 .. $#$units;
 		}
 	}
-	my @rows = $grouped ? @$units : sort {$a->{order} <=> $b->{order}} @$units;
+	my @rows = @{$units};
+	@rows = sort {$a->{order} <=> $b->{order}} @rows unless $grouped;
 
 	my ($race, $cat) = ('', '');
 	for (@rows) {
-		$race = $_->{race},
-		printf '<tbody id="%s"><tr class="race"><th colspan="18"><h2>%s</h2>'."\n", $race, ucfirst $race
-			if $grouped and $race ne $_->{race};
-		$_->{cat} = $_->{race} if not $grouped;
+		if ($grouped) {
+			printf '<tbody id="%s"><tr class="race"><th colspan="18"><h2>%s</h2>'."\n",
+				$race = $_->{race}, ucfirst $race
+					unless $race eq $_->{race};
+		}
+		else {
+			$_->{cat} = $_->{race};
+		}
+
 		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 $alt (grep { $_->{alt} } @{ $_->{special} }) {
+		for my $subrow (@{ $_->{special} }) {
+			$subrow->{alt} or next;
 			print(
-				'<tr class="alt"><td class="cat"><td>' . $alt->{alt},
-				showunitcols($alt),
+				'<tr class="alt"><td class="cat"><td>', $subrow->{alt},
+				showunitcols($subrow),
 			);
 		}
 	}
@@ -380,8 +280,7 @@ sub showrange {
 <dt>ground/air
 	<dd>damage done per single attack against ground/air units
 	<dd>2nd column indicates relative amount of damage done in
-		<span title="the time in which a dragoon fires a shot">a certain
-		amount</span> of time
+		1 second of fastest game time
 	<dd>splash damage<span class="unit-splash">+</span> hits nearby objects as well
 	<dd><span class="hurt unit-l">explosive</span> damage does only
 		50% damage to small units, 75% to medium, 100% to large