From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 20 Jun 2015 04:06:04 +0000 (+0200)
Subject: sc: display weapons range with each attack row
X-Git-Tag: v1.8~118
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/53663289d87a1a07c0ff8789776029cd554fa293

sc: display weapons range with each attack row
---

diff --git a/sc.plp b/sc.plp
index 1c61130..7f40dd2 100644
--- a/sc.plp
+++ b/sc.plp
@@ -112,7 +112,7 @@ sub showrange {
 	sub showattack {
 		my ($row, $area) = @_;
 		my $attack = $row->{attack}->[$area]
-			or return '<td colspan=4 class="hurt">';
+			or return '<td colspan=5 class="hurt">';
 
 		my $upattack = $row->{upgraded}->{attack}->[$area];
 		my $damage = $attack->{damage};
@@ -178,6 +178,9 @@ sub showrange {
 		$out .= '<td class="unit hurt-g">' . '▽' x !!($attack->{anti} & 1);
 		$out .= '<td class="unit hurt-a">' . '△' x !!($attack->{anti} & 2);
 
+		$out .= '<td class="val unit-range">' .
+			showrange($attack->{range}, $upattack->{range});
+
 		return $out;
 	}
 
@@ -266,8 +269,6 @@ sub showrange {
 			' class="val unit-armor">' .
 				showrange($_->{armor}, $_->{upgraded}->{armor}),
 			showattack($_, 0),
-			'<td class="val unit-range">' .
-				showrange(map { $_->{attack}->[0]->{range} } $_, $_->{upgraded}),
 			'<td class="val unit-sight">' . sprintf(
 				$_->{detect} ? '<strong class="unit-detect">%s</strong>' : '%s',
 				showrange($_->{sight}, $_->{upgraded}->{sight})
@@ -280,7 +281,7 @@ sub showrange {
 				&& qq'<span class="unit unit-jump" title="flying">↑</span>',
 			'<td class="unit-magic">' . showmagic($_),
 			!$_->{attack}->[1] ? () : (
-				'<tr><td colspan=12>', showattack($_, 1), '<td colspan=4>'
+				'<tr><td colspan=12>', showattack($_, 1), '<td colspan=3>'
 			),
 			"\n"
 		);