Updating for new webbie

[NDIRC.git] / PA.pm

diff --git a/PA.pm b/PA.pm
index a5109a329cb86dbdb8615b3443574a1b2494a9c3..21183bcc16cfacf6043b022b041a18dfc99fcdab 100644 (file)
--- a/PA.pm
+++ b/PA.pm
@@ -72,11 +72,13 @@ sub checkGal {
        }else{
                $ND::server->command("notice $ND::nick syntax: .g X:Y");
        }
-       my $f = $ND::DBH->prepare("SELECT score,size,value FROM galaxies WHERE x = ? AND y = ? and tick = (SELECT max(tick) from galaxies)");
+       my $f = $ND::DBH->prepare(q{SELECT score,scorerank,size,sizerank,value,valuerank,planets
+               FROM galaxies WHERE x = ? AND y = ? AND tick = (SELECT max(tick) from galaxies)
+       });
        $f->execute($x,$y);
        while (my @row = $f->fetchrow()){
                @row = map (valuecolor(1),@row);
-               $ND::server->command("notice $ND::nick $x:$y  Score=$row[0], Size=$row[1], Value=$row[2]");
+               $ND::server->command("notice $ND::nick $x:$y  Score=$row[0] ($row[1]), Size=$row[2] ($row[3]), Value=$row[4] ($row[5]), Planets=$row[6]");
        }
 }
 
@@ -111,7 +113,7 @@ sub shipEff {
        if ($s){
                if (defined $value){
                        $amount = int(($value*100/$s->{cost}));
-                       $feud = '(FEUD: '.prettyValue(int($amount/0.85)).') ';
+                       $feud = '(FEUD: '.prettyValue(int($amount/0.86)).') ';
                }
                $value = prettyValue(($amount*$s->{cost}/100));
                my $name = shipColor($s->{name},$s->{type});