From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 21 Apr 2018 18:24:36 +0000 (+0200)
Subject: sc: compare attack order by dps
X-Git-Tag: v1.12~75
X-Git-Url: http://git.shiar.net/sheet.git/commitdiff_plain/cd55ca709c1aefb562b3dd5a3436759177208070

sc: compare attack order by dps

Link by more descriptive "attack" column despite this.
---

diff --git a/sc.plp b/sc.plp
index 88ff4b1..a721035 100644
--- a/sc.plp
+++ b/sc.plp
@@ -101,8 +101,8 @@ 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">attack</th>
-	<th class="hurt hurtrel"><:= coltoggle(qw'dps attack 1') :></th>
+	<th class="val hurt"><:= coltoggle(attack => 'attack') :></th>
+	<th class="hurt hurtrel">dps</th>
 	<th class="val unit-range" colspan=3>range</th>
 	<th class="val unit-sight">sight</th>
 	<th class="val unit-speed">speed</th>
@@ -360,8 +360,10 @@ sub showrangeint {
 		elsif ($get{order} eq 'attack') {
 			$_->{order} = $_->{hp} / 1024 + $_->{shield} / 1008 + max(
 				map {
-					($_->{damage} + $_->{upgrade} * 3)
-					* ($_->{count} // 1) / ($_->{cooldown} // 1)
+					($_->{dps} ? $_->{dps}->[-1] :
+						($_->{damage} + $_->{upgrade} * 3)
+						* ($_->{count} // 1) / ($_->{cooldown} // 1)
+					)
 					* ($_->{splash} ? 1.01 : 1)
 					* ($_->{type} eq 'implosive' ? .96 : 1)
 					* ($_->{type} eq 'explosive' ? .98 : 1)