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

diff --git a/sc.plp b/sc.plp
index fc3156c..9c271be 100644
--- a/sc.plp
+++ b/sc.plp
@@ -66,9 +66,11 @@ sub coltoggle {
 	<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,7 +183,10 @@ 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) {
@@ -220,10 +228,10 @@ sub showval {
 					&& '<span class="unit unit-s" title="light">L</span>',
 			),
 			'<td class="val unit-hp">' . $_->{hp} // '',
-			'<td class="val unit-shield">' . (
-				$_->{shield} ? sprintf('%.0f%%', 100 * $_->{shield} / $_->{hp}) : '&nbsp;'
-			),
-			'<td class="val unit-armor">' . showval($_, 'armor'),
+			$_->{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'),
@@ -232,7 +240,8 @@ sub showval {
 				showval($_, 'sight')
 			),
 			'<td class="val unit-speed">' . showval($_, 'speed'),
-			$_->{attr}->{massive} && '<span class="unit-massive">☇</span>',
+			$_->{attr}->{massive}
+				&& '<span class="unit-massive" title="massive">⚓</span>',
 			'<td class="unit-magic">' . showmagic($_),
 			"\n"
 		);