X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/864eed9b3a51a0a7c0f21f7cf1fdf78c4b937676..80a615f8414664e34d48d6ffc1263943ae6fbf73:/sc.plp

diff --git a/sc.plp b/sc.plp
index cd07f24..44940e5 100644
--- a/sc.plp
+++ b/sc.plp
@@ -28,6 +28,7 @@ Unit properties as seen or measured in Brood War
 		border-collapse: separate;
 		border-spacing: 0;
 		margin: 0 auto;
+		white-space: nowrap;
 	}
 	.units th, .units td {
 		border: 0;
@@ -51,10 +52,6 @@ Unit properties as seen or measured in Brood War
 		margin: 0;
 		text-align: center;
 	}
-	.units th.cat {
-		font-size: 70%;
-		text-transform: uppercase;
-	}
 	.units thead th, .units tfoot th {
 		font-size: 70%;
 		font-weight: normal;
@@ -66,6 +63,10 @@ Unit properties as seen or measured in Brood War
 		margin-left: 0.2em;
 		vertical-align: middle;
 	}
+	.unit-composed {
+		color: #C88;
+		font-size: 70%;
+	}
 	.unit {
 		text-align: center;
 		white-space: nowrap;
@@ -106,12 +107,9 @@ Unit properties as seen or measured in Brood War
 		text-align: right;
 	}
 
-	.legend dl {
-		text-align: left;
-		-moz-column-width: 20em;
-		-webkit-column-width: 20em;
-	}
 	.legend dt {
+		float: none;
+		text-align: left;
 		margin-top: 1ex;
 		font-weight: bold;
 	}
@@ -120,11 +118,26 @@ Unit properties as seen or measured in Brood War
 	}
 	.legend dd {
 		text-indent: -1em;
-		margin-left: 2em;
+		margin-left: 1em;
 		break-before: avoid;
-		break-inside: 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>
 
 <:
@@ -140,8 +153,8 @@ sub coltoggle {
 <thead><tr>
 	<th></th>
 	<th><:= coltoggle('name', '') :></th>
-	<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 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="val unit-hp">HP</th>
@@ -154,7 +167,6 @@ sub coltoggle {
 	<th class="val unit-speed">speed</th>
 	<th class="unit-magic">specials</th>
 </tr></thead>
-<tbody>
 <:
 sub showrange {
 	my ($row, @elements) = @_;
@@ -235,7 +247,7 @@ sub showrange {
 	}
 
 	my $units = do 'sc-units.inc.pl';
-	die "Cannot open unit data: $_\n" for $! || $@ || ();
+	die "Cannot open unit data: $_\n" for $@ || $! || ();
 	my $grouped = !exists $get{order};
 	if (exists $get{order}) {
 		$get{order} ||= '';
@@ -254,7 +266,7 @@ sub showrange {
 	my ($race, $cat) = ('', '');
 	for (@rows) {
 		$race = $_->{race},
-		printf '</tbody><tbody id="%s"><tr class="race"><th colspan="18"><h2>%s</h2>'."\n", $race, ucfirst $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;
 		my $sizechar = [qw/? s m l/]->[$_->{size}];
@@ -264,15 +276,18 @@ sub showrange {
 			'<td>' . $_->{name},
 			'<td class="val min">' . ($_->{min} || '0'),
 			'<td class="val gas">' . ($_->{gas} || ''),
-			'<td class="val time">' . sprintf('%.0f', $_->{build} || '0'),
+			sprintf('<td class="val time">%s%.0f',
+				!!$_->{base} && '<span class="unit-composed">+</span>',
+				$_->{build} || '0',
+			),
 			sprintf('<td class="unit unit-%s">%s', $sizechar, ucfirst $sizechar),
 			'<td class="val unit">' . join('',
 				$_->{unit} ? $_->{unit} == .5 ? '½' : $_->{unit} : '&nbsp;',
 				defined $_->{organic} && sprintf(
-					'<img class="unit-%s" src="s%s.png" alt="%s">',
+					'<span class="unit-%s" title="%s">%s</span>',
 					$_->{organic} ? 'o' : 'u',
-					$_->{race} . ($_->{organic} ? 'o' : ''),
-					$_->{organic} ? 'o' : 'm'
+					$_->{organic} ? 'organic' : 'mechanic',
+					$_->{organic} ? 'o' : 'm',
 				),
 			),
 			'<td class="val unit-hp">' . $_->{hp},
@@ -307,7 +322,6 @@ sub showrange {
 		}
 	}
 :>
-</tbody>
 </table>
 
 <div class="legend">
@@ -316,14 +330,17 @@ sub showrange {
 <dl>
 <dt>cost
 	<dd>minerals+gas 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
+	<dd>excludes construction of dependencies such as buildings
+		and <span class="unit-composed">+</span>parent units
 <dt>size
-	<dd><span class="unit unit-s">S</span>mall,
+	<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>number of command points taken per unit
-	<dd><span class="unit unit-o">organic</span>/<span class="unit unit-u">mechanic</span> unit
+	<dd><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
@@ -334,7 +351,7 @@ sub showrange {
 	<dd>base unit armor
 	<dd>can be increased by upto 3 at various facilities
 	<dd>each point decreases damage per hit by one, upto a minimum of ½
-	<dd>reduction applies to initial damage, before size penalties <small>(so a large plasma hit of 12 to 4 armor deals 2 damage, not ½)</small>
+	<dd>reduction applies to initial damage, before size penalties <small>(so a plasma hit of 12 to 4 armor large deals 2 damage, not ½)</small>
 <dt>ground/air
 	<dd>damage done per single attack against ground/air units
 	<dd>2nd column indicates relative amount of damage done in