sc: option to order alphabetically by name
authorMischa POSLAWSKY <perl@shiar.org>
Sat, 21 Apr 2018 18:22:41 +0000 (20:22 +0200)
committerMischa POSLAWSKY <perl@shiar.org>
Thu, 10 May 2018 14:49:06 +0000 (16:49 +0200)
Describe first column as appropriate for default grouped ordering.

sc.plp

diff --git a/sc.plp b/sc.plp
index 3a7f36bd365da00c266a556d7a3c0035cb9551de..88ff4b1fa4a66a1b6f808231b7ad280c2797b1c6 100644 (file)
--- a/sc.plp
+++ b/sc.plp
@@ -91,8 +91,8 @@ 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>
@@ -343,17 +343,20 @@ sub showrangeint {
        if (exists $get{order}) {
                $grouped = 0;
                $get{order} ||= '';
-               if ($get{order} eq 'size') {
-                       $_->{order} = (
-                               $_->{pop}*16 + ($_->{size} // $_->{suit}) + $_->{cargo}/8
-                               + $_->{hp}/512 + $_->{min}/8192
-                       ) for @rows;
+               if ($get{order} eq 'name') {
+                       @rows = sort {$a->{name} cmp $b->{name}} @rows;
                }
                elsif ($get{order} eq 'cost') {
                        $_->{order} = (
                                $_->{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 {