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

diff --git a/sc.plp b/sc.plp
index 9a9a12a..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,7 +259,7 @@ 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}) {