sc: move cost order indicator to more appropriate column

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index 8f512164cc4c8a1ab0bcb34d38c3f7f84389b42e..b20e51df3597e6feda0506b2f8af7ea2233c6701 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -93,12 +93,12 @@ 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>
@@ -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