X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/23b5f682cff553f97e80951ed12f4097bfed4c8f..0b686d7436dbdb50f0bf8547f845af6bc334a9e4:/sc.plp

diff --git a/sc.plp b/sc.plp
index 8251f75..d6ccaf6 100644
--- a/sc.plp
+++ b/sc.plp
@@ -52,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;
@@ -67,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;
@@ -127,10 +127,17 @@ Unit properties as seen or measured in Brood War
 		display: table-cell;
 	}
 	.legend {
-		min-width: 15em;
-		padding-left: 2em;
+		min-width: 20em;
 		text-align: left;
 	}
+	.units {
+		float: left;
+		padding-bottom: 1em;
+		margin-right: 2em;
+	}
+	.footer {
+		clear: left;
+	}
 </style>
 
 <:
@@ -185,16 +192,18 @@ sub showrange {
 		}
 	}
 
-	if ($elements[0] eq 'attack' and $elements[1] ne 'range' and $elements[2] eq 'cmp') {{
-		my $type = $row->{$elements[0]}->{$elements[1]}->{type} or next;
+	if ($elements[0] eq 'attack' and $elements[1] ne 'range' and $elements[2] eq 'dps') {{
+		my $attack = $row->{ $elements[0] }->{ $elements[1] };
+		ref $attack or $attack = $row->{ $elements[0] }->{$attack}; # follow
+		my $type = $attack->{type} or next;
 		if ($type eq 'explosive') {
 			$min /= 2;
 		}
 		elsif ($type eq 'implosive') {
 			$min /= 4;
 		}
-		$min = int($min + .5);  # round halves up
 	}}
+	$_ = int($_ + .5) for $min, $max;  # round halves up
 
 	return $min == $max ? $min : "$min-$max";
 }
@@ -202,6 +211,11 @@ sub showrange {
 	sub showattack {
 		my ($row, $area) = @_;
 		local $_ = $row->{attack}->{$area};
+		if (not ref $_) {
+			# reference to another area
+			$area = $_;
+			$_ = $row->{attack}->{$area};
+		}
 
 		return '<td colspan="2" class="hurt">' unless $_;
 
@@ -218,7 +232,7 @@ sub showrange {
 
 		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, 'cmp');
+		$out .= '<td class="val hurt hurtrel">' . showrange($row, 'attack', $area, 'dps');
 		return $tagbase . $out;
 	}
 
@@ -240,12 +254,12 @@ 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} ||= '';
 		if ($get{order} eq 'size') {
-			$_->{order} = $_->{unit}*8 + $_->{size} + $_->{hp}/512 + $_->{min}/8192 for @$units;
+			$_->{order} = $_->{unit}*8 + $_->{suit} + $_->{hp}/512 + $_->{min}/8192 for @$units;
 		}
 		elsif ($get{order} eq 'cost') {
 			$_->{order} = $_->{gas}*1.5 + $_->{min} + $_->{unit}/8 + $_->{build}/256/8 for @$units;
@@ -262,15 +276,19 @@ sub showrange {
 		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}];
+		$_->{hp} += $_->{shield};
+		my $suitchar = [qw/? s m l/]->[$_->{suit}];
 		print(
 			'<tr>',
 			sprintf('<t%s class="cat">%s', $cat ne $_->{cat} ? ('h', $cat = $_->{cat}) : ('d', '&nbsp;')),
 			'<td>' . $_->{name},
 			'<td class="val min">' . ($_->{min} || '0'),
 			'<td class="val gas">' . ($_->{gas} || ''),
-			'<td class="val time">' . sprintf('%.0f', $_->{build} || '0'),
-			sprintf('<td class="unit unit-%s">%s', $sizechar, ucfirst $sizechar),
+			sprintf('<td class="val time">%s%.0f',
+				!!$_->{base} && '<span class="unit-composed">+</span>',
+				$_->{build} || '0',
+			),
+			sprintf('<td class="unit unit-%s">%s', $suitchar, ucfirst $suitchar),
 			'<td class="val unit">' . join('',
 				$_->{unit} ? $_->{unit} == .5 ? '½' : $_->{unit} : '&nbsp;',
 				defined $_->{organic} && sprintf(
@@ -281,7 +299,9 @@ sub showrange {
 				),
 			),
 			'<td class="val unit-hp">' . $_->{hp},
-			'<td class="val unit-shield">' . ($_->{shield} ? $_->{shield}.'%' : '&nbsp;'),
+			'<td class="val unit-shield">' . (
+				$_->{shield} ? sprintf('%.0f%%', 100 * $_->{shield} / $_->{hp}) : '&nbsp;'
+			),
 			'<td class="val unit-armor">' . showrange($_, 'armor'),
 			showattack($_, 'ground'),
 			showattack($_, 'air'),
@@ -320,14 +340,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
@@ -338,7 +361,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