X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/d6d025d26de5282bb1fdde360d10bc0a82b5c1b4..7daf512d5b78e196e4b3ada31ae8c5c9705456d7:/sc.plp
diff --git a/sc.plp b/sc.plp
index 48cb282..2b8112d 100644
--- a/sc.plp
+++ b/sc.plp
@@ -1,5 +1,5 @@
<(common.inc.plp)><:
-use List::Util qw(max);
+use List::Util qw(max sum);
my %scver = (
id => 'bw',
@@ -75,10 +75,10 @@ for my $unit (@{$units}) {
}
sub coltoggle {
- my ($name, $id) = @_;
+ my ($name, $id, $nolink) = @_;
return sprintf(
(defined $get{order} ? $get{order} eq $id : !$id) ? '%2$s â¼'
- : '%s',
+ : $nolink ? '%2$s' : '%s',
$id && "order=$id", $name
);
}
@@ -94,7 +94,7 @@ sub coltoggle {
shield |
⨠|
attack |
- dps |
+ <:= coltoggle(qw'dps attack 1') :> |
range |
sight |
speed |
@@ -285,10 +285,26 @@ sub showrange {
$grouped = 0;
$get{order} ||= '';
if ($get{order} eq 'size') {
- $_->{order} = $_->{unit}*8 + $_->{suit} + $_->{hp}/512 + $_->{min}/8192 for @$units;
+ $_->{order} = (
+ $_->{unit}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
+ + $_->{hp}/512 + $_->{min}/8192
+ ) for @$units;
}
elsif ($get{order} eq 'cost') {
- $_->{order} = $_->{gas}*1.5 + $_->{min} + $_->{unit}/8 + $_->{build}/256/8 for @$units;
+ $_->{order} = (
+ $_->{gas}*1.5 + $_->{min} + $_->{unit}/8 + $_->{build}/256/8
+ ) for @$units;
+ }
+ elsif ($get{order} eq 'attack') {
+ $_->{order} = $_->{hp} / 1024 + $_->{shield} / 1008 + max(
+ map {
+ ((map { ref $_ ? $_->[-1] : $_ } $_->{damage})[0])
+ * ($_->{count} // 1) / ($_->{cooldown} // 1)
+ * ($_->{splash} ? 1.01 : 1)
+ * ($_->{type} eq 'implosive' ? .96 : 1)
+ * ($_->{type} eq 'explosive' ? .98 : 1)
+ } @{ $_->{attack} }
+ ) for @$units;
}
else {
$units->[$_]->{order} = $_ for 0 .. $#$units;