X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/a691b071501b1ef5239752a1e594a449e8c2d16d..4a625d5eed49b9c5b46fa9c7d4b6e04fa355fc64:/sc.plp

diff --git a/sc.plp b/sc.plp
index 5b7e4a7..5d82a8d 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,7 +115,7 @@ 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";
 }
 
@@ -241,11 +242,17 @@ sub showrange {
 				!!$_->{base} && '<span class="unit-composed">+</span>',
 				$_->{build} || '0',
 			),
-			sprintf('<td class="unit unit-%s" title="%3$s">%s',
-				$_->{cargo} < 0      ? ('supply', T => 'transport') :
+			sprintf('<td class="unit unit-%s" title="%4$s%3$s">%s',
+				$_->            {cargo} < 0 ? ('supply',           T => 'transport') :
+				$_->{upgraded}->{cargo} < 0 ? ('supply magic-opt', T => 'optional transport') :
 				$_->{attr}->{flying}    ? ('air', F => 'flying') :
 				$_->{attr}->{structure} ? ('x',   B => 'building') :
-				([qw( x s m l l h h h h )]->[ $_->{cargo} ], $_->{cargo} || '-', ''),
+				(
+					[qw( x s m l l h h h h )]->[ $_->{cargo} ],
+					$_->{cargo} || '-',
+					$_->{cargo} ? 'transportable' : 'untransportable',
+				),
+				defined $_->{size} && sprintf('⌀%.1f ', $_->{size}),
 			),
 			sprintf('<td class="val unit%s">%s',
 				defined $_->{pop} && $_->{pop} < 0 && ' unit-supply',
@@ -291,8 +298,6 @@ sub showrange {
 				showrange($_->{speed}, $_->{upgraded}->{speed}),
 			$_->{attr}->{jump}
 				&& qq'<span class="unit unit-jump" title="$_->{attr}->{jump}">↕</span>',
-			$_->{attr}->{flying}
-				&& qq'<span class="unit unit-jump" title="flying">↑</span>',
 			'<td class="unit-magic">' . showmagic($_),
 			!$_->{attack}->[1] ? () : (
 				'<tr><td colspan=12>', showattack($_, 1), '<td colspan=3>'