From 92599fd64e5807f0af90406e02385d3be7001379 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Fri, 19 Jun 2015 12:38:29 +0200
Subject: [PATCH] sc: move attack target columns next to range

---
 sc.plp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/sc.plp b/sc.plp
index 2b8112d..c86ef0b 100644
--- a/sc.plp
+++ b/sc.plp
@@ -93,9 +93,9 @@ sub coltoggle {
 	<th class="val unit-hp">HP</th>
 	<th class="val unit-shield">shield</th>
 	<th class="val unit-armor" title="armor">⛨</th>
-	<th class="val hurt" colspan=3>attack</th>
+	<th class="val hurt">attack</th>
 	<th class="hurt hurtrel"><:= coltoggle(qw'dps attack 1') :></th>
-	<th class="val unit-range">range</th>
+	<th class="val unit-range" colspan=3>range</th>
 	<th class="val unit-sight">sight</th>
 	<th class="val unit-speed">speed</th>
 	<th class="unit-magic">specials</th>
@@ -114,17 +114,13 @@ sub showrange {
 		my $attack = $row->{attack}->[$area]
 			or return '<td colspan=4 class="hurt">';
 
-		my $out = '';
-		$out .= '<td class="unit hurt-g">' . '▽' x !!($attack->{anti} & 1);
-		$out .= '<td class="unit hurt-a">' . '△' x !!($attack->{anti} & 2);
-		$out .= '<td class="val hurt">';
-
 		my $upattack = $row->{upgraded}->{attack}->[$area];
 		my $damage = $attack->{damage};
 		my $maxdamage = $upattack->{damage} // $damage;
 		$damage = $damage->[0] if ref $damage;
 		$maxdamage = $maxdamage->[-1] if ref $maxdamage;
 
+		my $out = '<td class="val hurt">';
 		$out .= "<small>$attack->{count}× </small>" if $attack->{count} > 1;
 		$out .= '<span class="unit-l" title="explosive">*</span>'
 			if $attack->{type} eq 'explosive';
@@ -148,6 +144,7 @@ sub showrange {
 				),
 			)} keys %{ $attack->{bonus} }),
 		) if $attack->{bonus};
+
 		$out .= showrange($damage, $maxdamage);
 		$out .= sprintf('<span class="unit-splash" title="%s">%s</span>',
 			$attack->{splash} eq 'line' ? ('linear', '×') : ('splash', '+')
@@ -174,6 +171,9 @@ sub showrange {
 			$out .= showrange($damage, $maxdamage);
 		}
 
+		$out .= '<td class="unit hurt-g">' . '▽' x !!($attack->{anti} & 1);
+		$out .= '<td class="unit hurt-a">' . '△' x !!($attack->{anti} & 2);
+
 		return $out;
 	}
 
@@ -393,8 +393,6 @@ if ($scver{major} > 1) {
 	<dd>reduction applies to initial damage, before size penalties
 		<small>(so a plasma hit of 12 to 4 armor large deals 2 damage, not ½)</small>
 <dt>attack
-	<dd>targets <span class="hurt-g">▽</span>&nbsp;ground
-		and/or  <span class="hurt-a">△</span>&nbsp;air
 	<dd>damage given per single hit
 	<dd><span class="hurtrel">dps</span> indicates relative amount of damage
 		done in 1 second of in-game time
@@ -410,11 +408,13 @@ if ($scver{major} > 1) {
 	<dd><span class="unit-s">~</span>concussive/plasma damage does
 		25% to large, 50% medium, 100% to small units<:
 } :>
+	<dd>targets <span class="hurt-g">▽</span>&nbsp;ground
+		and/or  <span class="hurt-a">△</span>&nbsp;air
+<dt>range
+	<dd>maximum range of weapon (note siege tank also has a minimum range)
 <dt>sight
 	<dd>range in which the unit detects other units
 	<dd><strong class="unit-detect">emphasis</strong> indicates ability to detect cloaked units
-<dt>range
-	<dd>maximum range of weapon (note siege tank also has a minimum range)
 <dt>speed
 	<dd>relative speed of movement (when in full motion, startup speed ignored)
 <dt>specials
-- 
2.30.0