X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/8ad63ee2484b0c1f344e6f8ff5fbd4ccbd963e1b..c8b78d7e45756addbc07cc8591ff68ba95f538c3:/sc.plp

diff --git a/sc.plp b/sc.plp
index 76974c9..4105bec 100644
--- a/sc.plp
+++ b/sc.plp
@@ -108,6 +108,9 @@ Unit properties as seen or measured in Brood War
 	.unit-magic {
 		padding-left: 0.5em;
 	}
+	.magic-perma {
+		text-decoration: underline;
+	}
 
 	.units .val {
 		text-align: right;
@@ -216,28 +219,33 @@ sub showrange {
 
 	sub showattack {
 		my ($row, $area) = @_;
-		local $_ = $row->{attack}->{$area};
-		if (not ref $_) {
+		my $attack = $row->{attack}->{$area};
+		if (not ref $attack) {
 			# reference to another area
-			$area = $_;
-			$_ = $row->{attack}->{$area};
+			$area = $attack;
+			$attack = $row->{attack}->{$area};
 		}
 
-		return '<td colspan="2" class="hurt">' unless $_;
+		return '<td colspan="2" class="hurt">' unless $attack;
 
 		my $tagbase = '<td class="val hurt';
-		if (ref $_ and $_->{type}) {
-			if ($_->{type} eq 'explosive') {
+		if (ref $attack and $attack->{type}) {
+			if ($attack->{type} eq 'explosive') {
 				$tagbase .= ' unit-l';
 			}
-			elsif ($_->{type} eq 'implosive') {
+			elsif ($attack->{type} eq 'implosive') {
 				$tagbase .= ' unit-s';
 			}
 		}
 		$tagbase .= '">';
 
 		my $out = showrange($row, 'attack', $area, 'damage');
-		$out .= '<span class="unit-splash">+</span>' if $_->{splash};
+		$out .= '<span class="unit-splash">+</span>' if $attack->{splash};
+		$attack->{dps} = $attack->{cooldown} && [
+			map { 24 * $_ / $attack->{cooldown} * ($attack->{count} // 1) }
+			map { ref $_ ? @{$_} : $_ }
+			$attack->{damage}
+		];
 		$out .= '<td class="val hurt hurtrel">' . showrange($row, 'attack', $area, 'dps');
 		return $tagbase . $out;
 	}
@@ -246,22 +254,26 @@ sub showrange {
 		my ($row) = @_;
 		my $specials = $row->{special} or return '';
 		return join ' ', map {
-			sprintf '<span title="%s">%s</span>',
+			sprintf '<span%s title="%s">%s</span>',
+				$_->{duration} < 0 && ' class="magic-perma"',
 				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};
 	}
 
 	sub showunitcols {
 		my ($row) = @_;
 		local $_ = $row;
+		$_->{hp} += $_->{shield} if $_->{shield};
 		my $suitchar = '';
 		if ($_->{suit}) {
 			$suitchar = [qw/? s m l/]->[$_->{suit}];
@@ -325,7 +337,6 @@ 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;
-		$_->{hp} += $_->{shield};
 		print(
 			'<tr>',
 			sprintf('<t%s class="cat">%s', $cat ne $_->{cat} ? ('h', $cat = $_->{cat}) : ('d', '&nbsp;')),
@@ -374,8 +385,7 @@ sub showrange {
 <dt>ground/air
 	<dd>damage done per single attack against ground/air units
 	<dd>2nd column indicates relative amount of damage done in
-		<span title="the time in which a dragoon fires a shot">a certain
-		amount</span> of time
+		1 second of fastest game time
 	<dd>splash damage<span class="unit-splash">+</span> hits nearby objects as well
 	<dd><span class="hurt unit-l">explosive</span> damage does only
 		50% damage to small units, 75% to medium, 100% to large
@@ -389,7 +399,7 @@ sub showrange {
 <dt>speed
 	<dd>relative speed of movement (when in full motion, startup speed ignored)
 <dt>specials
-	<dd>special abilities
+	<dd>special abilities are usually casted manually, but some are <span class="magic-perma">always active</span>
 	<dd>parentheses () indicate that it needs to be researched first
 	<dd>hover for description
 	<dd>range is maximum range required to activate