mved package from ND::IRC to NDIRC

[NDIRC.git] / Def.pm

diff --git a/Def.pm b/Def.pm
index acf8f57c7cc697c05b0354da38663309615ab297..c081f9a17c7ddb8498fa88678ab0684aa0eebae9 100644 (file)
--- a/Def.pm
+++ b/Def.pm
@@ -16,13 +16,13 @@
 #   Free Software Foundation, Inc.,                                       *
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 #**************************************************************************/
-package ND::IRC::Def;
+package NDIRC::Def;
 use strict;
 use warnings;
 use ND::DB;
 use ND::Include;
-use ND::IRC::Access;
-use ND::IRC::Misc;
+use NDIRC::Access;
+use NDIRC::Misc;
 require Exporter;
 
 our @ISA = qw/Exporter/;
@@ -82,7 +82,7 @@ sub setType {
                while (my ($id,$call,$oldtype,$coords,$tick) = $fleet->fetchrow()){
                        if($ND::DBH->do(q{UPDATE incomings SET shiptype = ? WHERE id = ?},undef,$type,$id) == 1){
                                log_message $user->{uid}, "DC set fleet: $id to: $type";
-                               $ND::server->command("msg $ND::target Set fleet from $coords on call $call to $type (previosly $oldtype)");
+                               $ND::server->command("msg $ND::target Set fleet from $coords on call $call to $type (previously $oldtype)");
                                if ($tick < 0 && not (defined $x && $x eq 'call')){
                                        $ND::server->command("msg $ND::target This call is old, did you use the call id, instead of inc id by accident? You can use .settypeall callid to set the type on all incs in a call.");
                                }
@@ -130,17 +130,19 @@ sub defcall {
                my $call = "";
                if ($callnr){
                        my $st = $ND::DBH->prepare(q{
-       SELECT c.landing_tick - (SELECT value::integer FROM misc WHERE id = 'TICK'), concat(i.shiptype||'/') AS shiptype, dc.username
+       SELECT c.landing_tick - (SELECT value::integer FROM misc WHERE id = 'TICK'), concat(i.shiptype||'/') AS shiptype, p.x
        FROM calls c 
                JOIN incomings i ON i.call = c.id
                LEFT OUTER JOIN users dc ON dc.uid = c.dc
+               JOIN users u ON u.uid = c.member
+               JOIN current_planet_stats p ON u.planet = p.id
        WHERE not covered AND c.id = ?
-       GROUP BY c.id,c.landing_tick,dc.username
+       GROUP BY c.id,c.landing_tick,p.x
        ORDER BY c.landing_tick;
                        });
                        if (my @row = $ND::DBH->selectrow_array($st,undef,$callnr)){
                                chop($row[1]);
-                               $call = "(Anti $row[1] ETA: $row[0])"
+                               $call = "(Anti $row[1] ETA: $row[0] Cluster: $row[2])"
                        }
                }
                $ND::server->command("notice $ND::memchan DEFENSE REQUIRED!! WAKE UP!!");