X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/e75dbcba340459a1bef997680a7d1bf152039a32..3553bfad44ded8de93e288d7c73bd397c9d8a95a:/sc.plp

diff --git a/sc.plp b/sc.plp
index dc32a47..2a748dc 100644
--- a/sc.plp
+++ b/sc.plp
@@ -233,25 +233,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,13 +241,16 @@ 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="%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} || '-', ''),
 			),
-			'<td class="val unit">' . (
-				defined $_->{unit} && $_->{unit} == .5 ? '½' : $_->{unit}
+			sprintf('<td class="val unit%s">%s',
+				defined $_->{pop} && $_->{pop} < 0 && ' unit-supply',
+				defined $_->{pop} && $_->{pop} == .5 ? '½' : $_->{pop},
 			),
 			'<td class="unit unit-type">' . join('', grep { $_ }
 				(defined $_->{organic} ? !$_->{organic} : $_->{attr}->{mech})
@@ -281,6 +265,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',
@@ -297,8 +292,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>'
@@ -316,13 +309,13 @@ sub showrange {
 		$get{order} ||= '';
 		if ($get{order} eq 'size') {
 			$_->{order} = (
-				$_->{unit}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
+				$_->{pop}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
 				+ $_->{hp}/512 + $_->{min}/8192
 			) for @$units;
 		}
 		elsif ($get{order} eq 'cost') {
 			$_->{order} = (
-				$_->{gas}*1.5 + $_->{min} + $_->{unit}/8 + $_->{build}/256/8
+				$_->{gas}*1.5 + $_->{min} + $_->{pop}/8 + $_->{build}/256/8
 			) for @$units;
 		}
 		elsif ($get{order} eq 'attack') {
@@ -384,19 +377,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) {
@@ -406,9 +389,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)