sc: move cost order indicator to more appropriate column

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index a721035d215ad2c3ec9a93744b3aa66548efb6dc..b20e51df3597e6feda0506b2f8af7ea2233c6701 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -93,19 +93,19 @@ sub coltoggle {
 <thead><tr>
        <th><:= coltoggle(exists $get{order} ? 'race' : 'source' => '') :></th>
        <th><:= coltoggle(name => 'name') :></th>
-       <th class="val min" title=minerals>cost</th>
+       <th class="val min" title=minerals><:= coltoggle(cost => 'cost') :></th>
        <th class="val gas">gas</th>
-       <th class="val time"><:= coltoggle(qw'build cost') :></th>
+       <th class="val time">build</th>
        <th class="unit" colspan="2"><:= coltoggle(qw'size size') :></th>
        <th class="unit" colspan="2">attr</th>
-       <th class="val unit-hp">HP</th>
+       <th class="val unit-hp"><:= coltoggle(HP => 'hp') :></th>
        <th class="val unit-shield">shield</th>
        <th class="val unit-armor" title="armor">⛨</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>
+       <th class="val unit-speed"><:= coltoggle(speed => 'speed') :></th>
        <th class="unit-magic">specials</th>
 </tr></thead>
 <:
@@ -346,6 +346,11 @@ sub showrangeint {
                if ($get{order} eq 'name') {
                        @rows = sort {$a->{name} cmp $b->{name}} @rows;
                }
+               elsif ($get{order} eq 'hp') {
+                       $_->{order} = (
+                               $_->{hp}*1.01 + $_->{armor} + $_->{shield} + $_->{size}/1024,
+                       ) for @rows;
+               }
                elsif ($get{order} eq 'cost') {
                        $_->{order} = (
                                $_->{gas}*1.5 + $_->{min} + $_->{pop}/8 + $_->{build}/256/8
@@ -370,6 +375,12 @@ sub showrangeint {
                                } @{ $_->{attack} }
                        ) for @rows;
                }
+               elsif ($get{order} eq 'speed') {
+                       $_->{order} = (
+                               ($_->{upgraded}->{speed} // $_->{speed}*1.01)
+                               + $_->{sight}/1024 + $_->{detect}/2048
+                       ) for @rows;
+               }
                @rows = sort {$a->{order} <=> $b->{order}} @rows if exists $rows[0]->{order};
        }