sc: option to order by hp

[sheet.git] / sc.plp

diff --git a/sc.plp b/sc.plp
index 3a7f36bd365da00c266a556d7a3c0035cb9551de..711e4203e82617da25e7f6283889242f07d07717 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -91,21 +91,21 @@ sub coltoggle {
 }
 :><table class="units">
 <thead><tr>
-       <th></th>
-       <th><:= coltoggle('name', '') :></th>
+       <th><:= coltoggle(exists $get{order} ? 'race' : 'source' => '') :></th>
+       <th><:= coltoggle(name => 'name') :></th>
        <th class="val min" title=minerals>cost</th>
        <th class="val gas">gas</th>
        <th class="val time"><:= coltoggle(qw'build cost') :></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">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>
+       <th class="val unit-speed"><:= coltoggle(speed => 'speed') :></th>
        <th class="unit-magic">specials</th>
 </tr></thead>
 <:
@@ -343,10 +343,12 @@ sub showrangeint {
        if (exists $get{order}) {
                $grouped = 0;
                $get{order} ||= '';
-               if ($get{order} eq 'size') {
+               if ($get{order} eq 'name') {
+                       @rows = sort {$a->{name} cmp $b->{name}} @rows;
+               }
+               elsif ($get{order} eq 'hp') {
                        $_->{order} = (
-                               $_->{pop}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
-                               + $_->{hp}/512 + $_->{min}/8192
+                               $_->{hp}*1.01 + $_->{armor} + $_->{shield} + $_->{size}/1024,
                        ) for @rows;
                }
                elsif ($get{order} eq 'cost') {
@@ -354,17 +356,31 @@ sub showrangeint {
                                $_->{gas}*1.5 + $_->{min} + $_->{pop}/8 + $_->{build}/256/8
                        ) for @rows;
                }
+               elsif ($get{order} eq 'size') {
+                       $_->{order} = (
+                               $_->{pop}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
+                               + $_->{hp}/512 + $_->{min}/8192
+                       ) for @rows;
+               }
                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)
                                } @{ $_->{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};
        }