From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 22 Jun 2015 07:37:57 +0000 (+0200)
Subject: sc: transport slots instead or in addition to unit size
X-Git-Tag: v1.8~105
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/a691b071501b1ef5239752a1e594a449e8c2d16d

sc: transport slots instead or in addition to unit size
---

diff --git a/sc-units-hots.inc.pl b/sc-units-hots.inc.pl
index df37944..2efb4b4 100644
--- a/sc-units-hots.inc.pl
+++ b/sc-units-hots.inc.pl
@@ -1013,6 +1013,7 @@ use strict;
 	cat => 'base',
 	name => 'Mule',
 	pop => 0,
+	cargo => 0,
 	min => 0,
 	build => 0,
 	size => 0.75,
diff --git a/sc.css b/sc.css
index 17aec81..7ad23e1 100644
--- a/sc.css
+++ b/sc.css
@@ -47,7 +47,11 @@ table h2 {
 	color: #C88;
 	font-size: 70%;
 }
-.unit-s {color: #770}
+.unit-air {
+	color: #08C;
+}
+.unit-x {color: #888}
+.unit-s {color: #890}
 .unit-m {color: #C70}
 .unit-l {color: #D22}
 .unit-h {color: #804}
diff --git a/sc.plp b/sc.plp
index 09ae989..5b7e4a7 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,10 +241,11 @@ 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') :
+				$_->{attr}->{flying}    ? ('air', F => 'flying') :
+				$_->{attr}->{structure} ? ('x',   B => 'building') :
+				([qw( x s m l l h h h h )]->[ $_->{cargo} ], $_->{cargo} || '-', ''),
 			),
 			sprintf('<td class="val unit%s">%s',
 				defined $_->{pop} && $_->{pop} < 0 && ' unit-supply',
@@ -282,6 +264,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',
@@ -385,19 +378,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 +390,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)