X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/2735a0c0aa4788e25cd2017fa1541d7ca0b8e5ba..b274dda92ace617497bf5866832b46629ba79209:/sc.plp

diff --git a/sc.plp b/sc.plp
index 8ce0ba7..26c8a97 100644
--- a/sc.plp
+++ b/sc.plp
@@ -1,5 +1,10 @@
 <(common.inc.plp)><:
 
+my $datafile = 'sc-units.inc.pl';
+if ($ENV{PATH_INFO} and $ENV{PATH_INFO} eq '/2') {
+	$datafile = 'sc2-units.inc.pl';
+}
+
 Html({
 	title => 'starcraft unit cheat sheet',
 	version => 'v1.0',
@@ -13,6 +18,7 @@ Html({
 		reference software attributes properties
 	'],
 	stylesheet => [qw'light'],
+	data => [$datafile],
 });
 
 :>
@@ -192,8 +198,10 @@ 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;
 		}
@@ -209,6 +217,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 $_;
 
@@ -225,7 +238,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;
 	}
 
@@ -246,13 +259,13 @@ sub showrange {
 		} @$specials;
 	}
 
-	my $units = do 'sc-units.inc.pl';
+	my $units = do $datafile;
 	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;
@@ -269,7 +282,8 @@ 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;')),
@@ -280,7 +294,7 @@ sub showrange {
 				!!$_->{base} && '<span class="unit-composed">+</span>',
 				$_->{build} || '0',
 			),
-			sprintf('<td class="unit unit-%s">%s', $sizechar, ucfirst $sizechar),
+			sprintf('<td class="unit unit-%s">%s', $suitchar, ucfirst $suitchar),
 			'<td class="val unit">' . join('',
 				$_->{unit} ? $_->{unit} == .5 ? '½' : $_->{unit} : '&nbsp;',
 				defined $_->{organic} && sprintf(
@@ -291,7 +305,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'),