From 929c590c28463bc9f80f61250858eec6b4cab747 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 13 Jun 2015 06:55:48 +0200
Subject: [PATCH] sc: reduce armor column size if possible

Extend to shield column if unused.
---
 sc.plp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/sc.plp b/sc.plp
index fc3156c..59ef95c 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>
@@ -220,10 +222,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'),
-- 
2.30.0