X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/72f611ca7113c0a6c6efb073f0b0555f45530760..ce2e637541f303d2967f7d424c3ea8240e579172:/sc.plp

diff --git a/sc.plp b/sc.plp
index 8b0e5e8..d1c6fc8 100644
--- a/sc.plp
+++ b/sc.plp
@@ -95,10 +95,11 @@ sub coltoggle {
 <thead><tr>
 	<th></th>
 	<th><:= coltoggle('name', '') :></th>
-	<th class="val min"><img src="/minerals.png" alt="min"></th>
-	<th class="val gas"><img src="/gas.png" alt="gas"></th>
+	<th class="val min" title=minerals>cost</th>
+	<th class="val gas">gas</th>
 	<th class="val time"><:= coltoggle(qw'build cost') :></th>
-	<th class="unit" colspan="4"><:= coltoggle(qw'size size') :></th>
+	<th class="unit" colspan="2"><:= coltoggle(qw'size size') :></th>
+	<th class="unit" colspan="2">attr</th>
 	<th class="val unit-hp">HP</th>
 	<th class="val unit-shield">shield</th>
 	<th class="val unit-armor" title="armor">⛨</th>
@@ -114,10 +115,19 @@ sub showrange {
 	my ($min, $max) = @_;
 	return '' if not defined $min;
 	$_ &&= int($_ + .5) for $min, $max;  # round halves up
-	return $min if not defined $max or $min == $max;
+	return $min || '-' if not defined $max or $min == $max;
 	return "$min-$max";
 }
 
+	sub showcost {
+		my ($row, $unit) = @_;
+		return join(' ',
+			sprintf('cost %.0f%%', 100 * $row->{cost} / $unit->{energy}),
+			!defined $row->{maint} ? () :
+				sprintf('+%.1f%%/s', 100 * $row->{maint} / $unit->{energy}),
+		);
+	}
+
 	sub showattack {
 		my ($row, $area) = @_;
 		my $attack = $row->{attack}->[$area]
@@ -129,6 +139,8 @@ sub showrange {
 		$maxdamage += ($upattack->{upgrade} // $attack->{upgrade}) * 3;
 
 		my $out = '<td class="val hurt">';
+		$out .= sprintf '<span title="%s">¤</span> ', showcost($attack, $row)
+			if $attack->{cost};
 		$out .= sprintf('<small>%s× </small>',
 			showrange($attack->{count}, $upattack->{count}),
 		) if $attack->{count} > 1;
@@ -216,12 +228,7 @@ sub showrange {
 					(map { $_ && " ($_)" } join ', ',
 						#TODO: apply upgrades
 						$_->{range} ? "range $_->{range}" : (),
-						$_->{cost} ? sprintf('cost %.0f%%%s',
-							100 * $_->{cost} / $row->{energy},
-							defined $_->{maint} && sprintf('+%.1f%%/s',
-								100 * $_->{maint} / $row->{energy},
-							),
-						) :
+						$_->{cost} ? showcost($_, $row) :
 						$_->{cooldown} ? "cooldown $_->{cooldown}s" : (),
 					),
 				),