From 192e1cf53addda613ab7952efdc46a6c8a1ad06f Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Sat, 21 Apr 2018 20:21:26 +0200 Subject: [PATCH] sc: cleanup row ordering code --- sc.plp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sc.plp b/sc.plp index a282ef4..3a7f36b 100644 --- a/sc.plp +++ b/sc.plp @@ -338,6 +338,7 @@ sub showrangeint { ); } + my @rows = @{$units}; my $grouped = 1; # race headers if (exists $get{order}) { $grouped = 0; @@ -346,12 +347,12 @@ sub showrangeint { $_->{order} = ( $_->{pop}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8 + $_->{hp}/512 + $_->{min}/8192 - ) for @$units; + ) for @rows; } elsif ($get{order} eq 'cost') { $_->{order} = ( $_->{gas}*1.5 + $_->{min} + $_->{pop}/8 + $_->{build}/256/8 - ) for @$units; + ) for @rows; } elsif ($get{order} eq 'attack') { $_->{order} = $_->{hp} / 1024 + $_->{shield} / 1008 + max( @@ -362,14 +363,10 @@ sub showrangeint { * ($_->{type} eq 'implosive' ? .96 : 1) * ($_->{type} eq 'explosive' ? .98 : 1) } @{ $_->{attack} } - ) for @$units; - } - else { - $units->[$_]->{order} = $_ for 0 .. $#$units; + ) for @rows; } + @rows = sort {$a->{order} <=> $b->{order}} @rows if exists $rows[0]->{order}; } - my @rows = @{$units}; - @rows = sort {$a->{order} <=> $b->{order}} @rows unless $grouped; my ($race, $cat) = ('', ''); for (@rows) { -- 2.30.0