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

diff --git a/sc.plp b/sc.plp
index e5f528f..b14e04f 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],
 });
 
 :>
@@ -127,10 +133,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 +198,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 +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 $_;
 
@@ -218,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;
 	}
 
@@ -230,52 +250,36 @@ sub showrange {
 				join('',
 					$_->{name},
 					$_->{desc} ? ": $_->{desc}" : '',
-					$_->{range} ? sprintf(' (%s)', join ', ',
-						"range $_->{range}",
-#						"cost $_->{cost}",
+					$_->{range} || $_->{cost} ? sprintf(' (%s)', join ', ',
+						$_->{range} ? "range $_->{range}" : (),
+						$_->{cost} ? sprintf('cost %.0f%%',
+							100 * $_->{cost} / $row->{energy}
+						) : (),
 					) : '',
 				),
-				$_->{abbr},
-		} @$specials;
+				sprintf($_->{build} ? '(%s)' : '%s', $_->{abbr}),
+		} grep { defined $_->{abbr} } @{$specials};
 	}
 
-	my $units = do 'sc-units.inc.pl';
-	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;
-		}
-		elsif ($get{order} eq 'cost') {
-			$_->{order} = $_->{gas}*1.5 + $_->{min} + $_->{unit}/8 + $_->{build}/256/8 for @$units;
-		}
-		else {
-			$units->[$_]->{order} = $_ for 0 .. $#$units;
+	sub showunitcols {
+		my ($row) = @_;
+		local $_ = $row;
+		$_->{hp} += $_->{shield} if $_->{shield};
+		my $suitchar = '';
+		if ($_->{suit}) {
+			$suitchar = [qw/? s m l/]->[$_->{suit}];
 		}
-	}
-	my @rows = $grouped ? @$units : sort {$a->{order} <=> $b->{order}} @$units;
 
-	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;
-		my $sizechar = [qw/? s m l/]->[$_->{size}];
-		print(
-			'<tr>',
-			sprintf('<t%s class="cat">%s', $cat ne $_->{cat} ? ('h', $cat = $_->{cat}) : ('d', '&nbsp;')),
-			'<td>' . $_->{name},
-			'<td class="val min">' . ($_->{min} || '0'),
+		return (
+			'<td class="val min">' . ($_->{min} // ''),
 			'<td class="val gas">' . ($_->{gas} || ''),
-			sprintf('<td class="val time">%s%.0f',
+			!defined $_->{build} ? '<td>' : 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),
+			!$suitchar ? '<td>' : sprintf('<td class="unit unit-%s">%s', $suitchar, ucfirst $suitchar),
 			'<td class="val unit">' . join('',
-				$_->{unit} ? $_->{unit} == .5 ? '½' : $_->{unit} : '&nbsp;',
+				defined $_->{unit} && $_->{unit} == .5 ? '½' : $_->{unit},
 				defined $_->{organic} && sprintf(
 					'<span class="unit-%s" title="%s">%s</span>',
 					$_->{organic} ? 'o' : 'u',
@@ -283,8 +287,10 @@ sub showrange {
 					$_->{organic} ? 'o' : 'm',
 				),
 			),
-			'<td class="val unit-hp">' . $_->{hp},
-			'<td class="val unit-shield">' . ($_->{shield} ? $_->{shield}.'%' : '&nbsp;'),
+			'<td class="val unit-hp">' . $_->{hp} // '',
+			'<td class="val unit-shield">' . (
+				$_->{shield} ? sprintf('%.0f%%', 100 * $_->{shield} / $_->{hp}) : '&nbsp;'
+			),
 			'<td class="val unit-armor">' . showrange($_, 'armor'),
 			showattack($_, 'ground'),
 			showattack($_, 'air'),
@@ -297,20 +303,42 @@ sub showrange {
 			'<td class="unit-magic">' . showmagic($_),
 			"\n"
 		);
+	}
+
+	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 + $_->{suit} + $_->{hp}/512 + $_->{min}/8192 for @$units;
+		}
+		elsif ($get{order} eq 'cost') {
+			$_->{order} = $_->{gas}*1.5 + $_->{min} + $_->{unit}/8 + $_->{build}/256/8 for @$units;
+		}
+		else {
+			$units->[$_]->{order} = $_ for 0 .. $#$units;
+		}
+	}
+	my @rows = $grouped ? @$units : sort {$a->{order} <=> $b->{order}} @$units;
+
+	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;
+		print(
+			'<tr>',
+			sprintf('<t%s class="cat">%s', $cat ne $_->{cat} ? ('h', $cat = $_->{cat}) : ('d', '&nbsp;')),
+			'<td>' . $_->{name},
+			showunitcols($_),
+		);
 
 		for my $alt (grep { $_->{alt} } @{ $_->{special} }) {
 			print(
-				'<tr class="alt"><td class="cat"><td colspan="9">' . $alt->{alt},
-				showattack($alt, 'ground'),
-				showattack($alt, 'air'),
-				'<td class="val unit-range">' . showrange($alt, 'attack', 'range'),
-				'<td class="val unit-sight">' . sprintf(
-					$alt->{detect} ? '<strong class="unit-detect">%s</strong>' : '%s',
-					showrange($alt, 'sight')
-				),
-				'<td class="val unit-speed">' . showrange($alt, 'speed'),
-				'<td>',
-				"\n",
+				'<tr class="alt"><td class="cat"><td>' . $alt->{alt},
+				showunitcols($alt),
 			);
 		}
 	}