X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/f69c7a581912c31681e3188f91f2b22656020ea3..9f1aad6e442dbb3a88210a379d645db842d00def:/sc.plp

diff --git a/sc.plp b/sc.plp
index 53934f2..0a41018 100644
--- a/sc.plp
+++ b/sc.plp
@@ -103,12 +103,12 @@ sub coltoggle {
 :><table class="units">
 <thead><tr>
 	<th><:= coltoggle(exists $get{order} ? 'race' : 'source' => '') :></th>
-	<th><:= coltoggle(name => 'name') :></th>
+	<th class="unit-name"><:= coltoggle(name => 'name') :></th>
 	<th class="val min" title=minerals><:= coltoggle(cost => 'cost') :></th>
 	<th class="val gas">gas</th>
 	<th class="val time"><:= coltoggle(build => 'build') :></th>
 	<th class="unit" colspan="2"><:= coltoggle(qw'size size') :></th>
-	<th class="unit" colspan="2">attr</th>
+	<th class="unit unit-attr" colspan="2">attr</th>
 	<th class="val unit-hp"><:= coltoggle(HP => 'hp') :></th>
 	<th class="val unit-shield">shield</th>
 	<th class="val unit-armor" title="armor">⛨</th>
@@ -280,7 +280,8 @@ sub showrangeint {
 			sprintf('<td class="unit unit-%s" title="%4$s%3$s">%s',
 				$_->            {cargo} < 0 ? ('supply',           T => 'transport') :
 				$_->{upgraded}->{cargo} < 0 ? ('supply magic-opt', T => 'optional transport') :
-				$_->{attr}->{flying}    ? ('air', F => 'flying') :
+				$_->            {attr}->{flying} ? ('air',           F => 'flying') :
+				$_->{upgraded}->{attr}->{flying} ? ('air magic-opt', F => 'potentially flying') :
 				$_->{attr}->{structure} ? ('x',   B => 'building') :
 				(
 					[qw( x s m l l h h h h )]->[ $_->{cargo} ],
@@ -289,7 +290,7 @@ sub showrangeint {
 				),
 				defined $_->{size} && sprintf('⌀%.1f ', $_->{size}),
 			),
-			sprintf('<td class="val unit%s">%s',
+			sprintf('<td class="val unit unit-pop%s">%s',
 				defined $_->{pop} && $_->{pop} < 0 && ' unit-supply',
 				defined $_->{pop} && $_->{pop} == .5 ? '½' : $_->{pop},
 			),
@@ -319,7 +320,7 @@ sub showrangeint {
 					&& '<span class="unit-massive" title="massive">⚓</span>',
 			),
 			$_->{hp} < 0 ? '<td class="val unit-hp" title="invulnerable">∞' :
-			'<td class="val unit-hp">' . $_->{hp} // '',
+			'<td class="val unit-hp">' . showrangeint($_->{hp}, $_->{upgraded}->{hp}),
 			$_->{shield} ? sprintf('<td class="val unit-shield">%.0f%%<td',
 				100 * $_->{shield} / $_->{hp}
 			) : '<td colspan=2',
@@ -348,10 +349,10 @@ sub showrangeint {
 				&& qq'<span class="unit unit-jump" title="$_->{attr}->{jump}">↕</span>',
 			'<td class="unit-magic">' . showmagic($_),
 			!$_->{attack}->[1] ? () : (
-				'<tr><td colspan=12>', showattack($_, 1), '<td colspan=3>'
+				'<tr><th class="cat" colspan="2"><td colspan=10>', showattack($_, 1), '<td colspan=3>'
 			),
 			!$_->{attack}->[2] ? () : (
-				'<tr><td colspan=12>', showattack($_, 2), '<td colspan=3>'
+				'<tr><th class="cat" colspan="2"><td colspan=10>', showattack($_, 2), '<td colspan=3>'
 			),
 			"\n"
 		);