X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f5e535f48dc60fdcaa93b9b6ee523801448b9f82..7ad7f804a2e521b2e4d5175aa5f057fa0cec43ad:/sc.plp

diff --git a/sc.plp b/sc.plp
index 09ae989..e463310 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";
 }
 
@@ -129,6 +130,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;
@@ -233,25 +236,6 @@ sub showrange {
 		my ($row) = @_;
 		local $_ = $row;
 		$_->{hp} += $_->{shield} if $_->{shield};
-		my $suitchar = '';
-		if ($_->{attr}->{structure}) {
-			$suitchar = 'b';
-		}
-		elsif ($_->{suit}) {
-			$suitchar = [qw/? s m l/]->[$_->{suit}];
-		}
-		elsif ($_->{cargo} > 0) {
-			$suitchar = [qw/? s m l l h h h h/]->[abs $_->{cargo}];
-		}
-		elsif ($_->{size}) {
-			$suitchar = [qw/s m l h h h/]->[$_->{size}];
-		}
-		elsif ($_->{attr} and $_->{attr}->{light}) {
-			$suitchar = 's';
-		}
-		elsif ($_->{attr} and $_->{attr}->{armored}) {
-			$suitchar = 'l';
-		}
 
 		return (
 			'<td class="val min">' . ($_->{min} // ''),
@@ -260,10 +244,17 @@ sub showrange {
 				!!$_->{base} && '<span class="unit-composed">+</span>',
 				$_->{build} || '0',
 			),
-			!$suitchar ? '<td>' : sprintf('<td class="unit unit-%s">%s%s',
-				$suitchar, ucfirst $suitchar,
-				$_->{attr}->{massive}
-					&& '<span class="unit-massive" title="massive">⚓</span>',
+			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} || '-',
+					$_->{cargo} ? 'transportable' : 'untransportable',
+				),
+				defined $_->{size} && sprintf('⌀%.1f ', $_->{size}),
 			),
 			sprintf('<td class="val unit%s">%s',
 				defined $_->{pop} && $_->{pop} < 0 && ' unit-supply',
@@ -282,6 +273,17 @@ sub showrange {
 					&& '<span class="unit unit-l" title="armored">A</span>',
 				$_->{attr}->{light}
 					&& '<span class="unit unit-s" title="light">L</span>',
+				$_->{suit} && sprintf(
+					'<span class="unit unit-%s" title="%3$s">%s</span>',
+					map { @{$_} } [
+						[qw( x ? unknown )],
+						[qw( s S small )],
+						[qw( m M medium )],
+						[qw( l L large )],
+					]->[ $_->{suit} ],
+				),
+				$_->{attr}->{massive}
+					&& '<span class="unit-massive" title="massive">⚓</span>',
 			),
 			'<td class="val unit-hp">' . $_->{hp} // '',
 			$_->{shield} ? sprintf('<td class="val unit-shield">%.0f%%<td',
@@ -298,8 +300,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>'
@@ -385,19 +385,9 @@ sub showrange {
 	<dd>excludes construction of dependencies such as buildings
 		and <span class="unit-composed">+</span>parent units
 <dt>size
-	<dd><:
-if ($scver{major} > 1) {
-		:>transports can fit 8 <span class="unit unit-s">S</span>mall,
-		4 <span class="unit unit-m">M</span>edium,
-		2 <span class="unit unit-l">L</span>arge,
-		or a single <span class="unit unit-h">H</span>uge unit
-	<dd>massive <span class="unit-massive">⚓</span> units
-		cannot be lifted or slowed and can break force fields<:
-} else {
-		:>affected by <span class="unit unit-s">S</span>mall,
-		<span class="unit unit-m">M</span>edium, or
-		<span class="unit unit-l">L</span>arge unit damage<:
-} :>
+	<dd><span class="unit unit-supply">T</span>ransports can fit upto
+		<span class="unit unit-s">8</span>
+		non-<span class="unit unit-air">F</span>lying units
 	<dd>number of command points taken per unit
 	<dd><:
 if ($scver{major} > 1) {
@@ -407,9 +397,14 @@ if ($scver{major} > 1) {
 		<span class="unit unit-p">ψ</span>(ps)ionic,
 		<span class="unit unit-s">L</span>ight, and
 		<span class="unit unit-l">A</span>rmored
-		attributes<:
+		attributes
+	<dd>massive <span class="unit-massive">⚓</span> units
+		cannot be lifted or slowed and can break force fields<:
 } else {
-		:><span class="unit unit-o">o</span>rganic/<span class="unit unit-u">m</span>echanic unit<:
+		:><span class="unit unit-o">o</span>rganic/<span class="unit unit-u">m</span>echanic unit
+	<dd>affected by <span class="unit unit-s">S</span>mall,
+		<span class="unit unit-m">M</span>edium, or
+		<span class="unit unit-l">L</span>arge unit damage<:
 } :>
 <dt>HP<dd>
 	total number of hitpoints (including shields)