checkPlanet and checkGal fixed for new command style

diff --git a/PA.pm b/PA.pm
index 6d3ed91f22bbeec9cd2a8952bc649e5027cf7ec5..c55d2cf6b28b4a5ac5923d8f2518437cd5aa172d 100644 (file)
--- a/PA.pm
+++ b/PA.pm
@@ -33,16 +33,16 @@ our @EXPORT = qw/checkPlanet checkGal shipEff shipStop parseValue prettyValue ca
 sub checkPlanet {
        my ($msg) = @_;
 
-       DB();
        my ($x,$y,$z,$nick);
        if ($msg =~ /(\d+)\D+(\d+)\D+(\d+)/){
                $x = $1;
                $y = $2;
                $z = $3;
-       }elsif (officer()){
+       }elsif (officer() && defined $msg){
                $nick = $msg;
        }else{
-               $ND::server->command("notice $ND::target usage .p X:Y:Z".(officer() ? ' or .p nick' : ''));
+               $ND::server->command("notice $ND::nick usage .p X:Y:Z".(officer() ? ' or .p nick' : ''));
+               return;
        }
        my $f = $ND::DBH->prepare(q{SELECT coords(x,y,z),ruler,planet,race,score,size,value,scorerank,sizerank,
                valuerank, xp, xprank, alliance, relationship, nick, planet_status, hit_us, channel
@@ -57,19 +57,26 @@ sub checkPlanet {
                if (officer() || dc()){
                        $ally = "Alliance=$planet->{alliance} ($planet->{relationship}), Nick=$planet->{nick} ($planet->{planet_status}), Channel: $planet->{channel}, Hostile Count: $planet->{hit_us},";
                }
-               $ND::server->command("notice $ND::target $planet->{coords} $planet->{ruler} OF $planet->{planet},$ally Race=$planet->{race}, Score=$planet->{score} ($planet->{scorerank}), Size=$planet->{size} ($planet->{sizerank}), Value=$planet->{value} ($planet->{valuerank}), XP=$planet->{xp} ($planet->{xprank})");
+               $ND::server->command("notice $ND::nick $planet->{coords} $planet->{ruler} OF $planet->{planet},$ally Race=$planet->{race}, Score=$planet->{score} ($planet->{scorerank}), Size=$planet->{size} ($planet->{sizerank}), Value=$planet->{value} ($planet->{valuerank}), XP=$planet->{xp} ($planet->{xprank})");
        }else{
-               $ND::server->command("notice $ND::target Couldn't find planet: $msg");
+               $ND::server->command("notice $ND::nick Couldn't find planet: $msg");
        }
 }
 sub checkGal {
-       my ($x,$y) = @_;
-       DB();
-       my $f = $ND::DBH->prepare("SELECT name,score,size,value FROM galaxies WHERE x = ? AND y = ? and tick = (SELECT max(tick) from galaxies)");
+       my ($msg) = @_;
+
+       my ($x,$y,);
+       if ($msg =~ /(\d+)\D+(\d+)/){
+               $x = $1;
+               $y = $2;
+       }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)");
        $f->execute($x,$y);
        while (my @row = $f->fetchrow()){
                @row = map (valuecolor(1),@row);
-               $ND::server->command("notice $ND::target $x:$y $row[0], Score=$row[1], Size=$row[2], Value=$row[3]");
+               $ND::server->command("notice $ND::nick $x:$y  Score=$row[0], Size=$row[1], Value=$row[2]");
        }
 }