X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/e7d0872468d9ff54c39ac8a7e64f283ba093c7aa..aac22478e6a264e504af77c87af6db144daabc68:/sc.plp

diff --git a/sc.plp b/sc.plp
index 13248fb..9c271be 100644
--- a/sc.plp
+++ b/sc.plp
@@ -63,12 +63,14 @@ sub coltoggle {
 	<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 time"><:= coltoggle(qw'build cost') :></th>
-	<th class="unit" colspan="2"><:= coltoggle(qw'size size') :></th>
+	<th class="unit" colspan="4"><:= coltoggle(qw'size size') :></th>
 	<th class="val unit-hp">HP</th>
 	<th class="val unit-shield">shield</th>
-	<th class="val unit-armor">armor</th>
-	<th class="val hurt" colspan="2">ground</th>
-	<th class="val hurt" colspan="2">air</th>
+	<th class="val unit-armor" title="armor">⛨</th>
+	<th class="val hurt">ground</th>
+	<th class="hurt hurtrel">dps</th>
+	<th class="val hurt">air</th>
+	<th class="hurt hurtrel">dps</th>
 	<th class="val unit-range">range</th>
 	<th class="val unit-sight">sight</th>
 	<th class="val unit-speed">speed</th>
@@ -164,8 +166,11 @@ sub showval {
 					$_->{desc} ? ": $_->{desc}" : '',
 					$_->{range} || $_->{cost} ? sprintf(' (%s)', join ', ',
 						$_->{range} ? "range $_->{range}" : (),
-						$_->{cost} ? sprintf('cost %.0f%%',
-							100 * $_->{cost} / $row->{energy}
+						$_->{cost} ? sprintf('cost %.0f%%%s',
+							100 * $_->{cost} / $row->{energy},
+							defined $_->{maint} && sprintf('+%.1f%%/s',
+								100 * $_->{maint} / $row->{energy},
+							),
 						) : (),
 					) : '',
 				),
@@ -178,9 +183,24 @@ sub showval {
 		local $_ = $row;
 		$_->{hp} += $_->{shield} if $_->{shield};
 		my $suitchar = '';
-		if ($_->{suit}) {
+		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} // ''),
@@ -190,20 +210,28 @@ sub showval {
 				$_->{build} || '0',
 			),
 			!$suitchar ? '<td>' : sprintf('<td class="unit unit-%s">%s', $suitchar, ucfirst $suitchar),
-			'<td class="val unit">' . join('',
-				defined $_->{unit} && $_->{unit} == .5 ? '½' : $_->{unit},
-				defined $_->{organic} && sprintf(
-					'<span class="unit-%s" title="%s">%s</span>',
-					$_->{organic} ? 'o' : 'u',
-					$_->{organic} ? 'organic' : 'mechanic',
-					$_->{organic} ? 'o' : 'm',
-				),
+			'<td class="val unit">' . (
+				defined $_->{unit} && $_->{unit} == .5 ? '½' : $_->{unit}
 			),
-			'<td class="val unit-hp">' . $_->{hp} // '',
-			'<td class="val unit-shield">' . (
-				$_->{shield} ? sprintf('%.0f%%', 100 * $_->{shield} / $_->{hp}) : '&nbsp;'
+			'<td class="unit unit-type">' . join('', grep { $_ }
+				(defined $_->{organic} ? !$_->{organic} : $_->{attr}->{mech})
+					&& '<span class="unit-u" title="mechanic">m</span>',
+				($_->{organic} || $_->{attr}->{organic})
+					&& '<span class="unit-o" title="organic">o</span>',
+				$_->{attr}->{psionic}
+					&& '<span class="unit-p" title="psionic">ψ</span>',
 			),
-			'<td class="val unit-armor">' . showval($_, 'armor'),
+			'<td class="unit unit-attr">' . join('', grep { $_ }
+				$_->{attr}->{armored}
+					&& '<span class="unit unit-l" title="armored">A</span>',
+				$_->{attr}->{light}
+					&& '<span class="unit unit-s" title="light">L</span>',
+			),
+			'<td class="val unit-hp">' . $_->{hp} // '',
+			$_->{shield} ? sprintf('<td class="val unit-shield">%.0f%%<td',
+				100 * $_->{shield} / $_->{hp}
+			) : '<td colspan=2',
+			' class="val unit-armor">' . showval($_, 'armor'),
 			showattack($_, 'ground'),
 			showattack($_, 'air'),
 			'<td class="val unit-range">' . showval($_, 'attack', 'range'),
@@ -212,6 +240,8 @@ sub showval {
 				showval($_, 'sight')
 			),
 			'<td class="val unit-speed">' . showval($_, 'speed'),
+			$_->{attr}->{massive}
+				&& '<span class="unit-massive" title="massive">⚓</span>',
 			'<td class="unit-magic">' . showmagic($_),
 			"\n"
 		);
@@ -237,7 +267,7 @@ sub showval {
 	my ($race, $cat) = ('', '');
 	for (@rows) {
 		if ($grouped) {
-			printf '<tbody id="%s"><tr class="race"><th colspan="18"><h2>%s</h2>'."\n",
+			printf '<tbody id="%s"><tr class="race"><th colspan="20"><h2>%s</h2>'."\n",
 				$race = $_->{race}, ucfirst $race
 					unless $race eq $_->{race};
 		}
@@ -275,11 +305,30 @@ sub showval {
 	<dd>excludes construction of dependencies such as buildings
 		and <span class="unit-composed">+</span>parent units
 <dt>size
-	<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
+	<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<:
+} 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>number of command points taken per unit
-	<dd><span class="unit unit-o">o</span>rganic/<span class="unit unit-u">m</span>echanic unit
+	<dd><:
+if ($scver{major} > 1) {
+		:>received damage depends on
+		<span class="unit unit-o">o</span>rganic,
+		<span class="unit unit-u">m</span>echanic,
+		<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<:
+} else {
+		:><span class="unit unit-o">o</span>rganic/<span class="unit unit-u">m</span>echanic unit<:
+} :>
 <dt>HP<dd>
 	total number of hitpoints (including shields)
 <dt>shield