From 51374bc34007df2eddd99153063824d0ab7f19ad Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Sun, 9 Sep 2007 18:53:43 +0200 Subject: [PATCH] Updated the def commands --- Def.pm | 114 +++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 91 insertions(+), 23 deletions(-) diff --git a/Def.pm b/Def.pm index c081f9a..a21a17d 100644 --- a/Def.pm +++ b/Def.pm @@ -30,8 +30,14 @@ our @ISA = qw/Exporter/; our @EXPORT = qw/showCall setType takeCall covCall ignoreCall defcall anon setDefPrio/; sub showCall { - my ($id) = @_; - DB(); + my ($msg,$command) = @_; + my ($id); + if (defined $msg && $msg =~ /^(\d+)$/){ + $id = $1; + }else{ + $ND::server->command("notice $ND::nick Usage: $command callid"); + return; + } if (dc()){ my $f = $ND::DBH->prepare(<execute($id); while (my @row = $f->fetchrow()){ @row = map (valuecolor(0),@row); - $ND::server->command("msg $ND::target (CALL $id) $row[0]: $row[1], $row[3] ($row[2]), $row[4] ($row[10]), $row[5], ETA: $row[11](/$row[6]), Amount: $row[7], $row[8], Type: $row[9]"); + $ND::server->command("notice $ND::nick (CALL $id) $row[0]: $row[1], $row[3] ($row[2]), $row[4] ($row[10]), $row[5], ETA: $row[11](/$row[6]), Amount: $row[7], $row[8], Type: $row[9]"); } } } sub setType { + my ($msg,$command) = @_; my ($type,$id,$x,$y,$z) = @_; - DB(); + if ($command eq 'settypeall'){ + if (defined $msg && $msg =~ /^(\d+) (.*)$/){ + $type = $2; + $id = $1 + }else{ + $ND::server->command("notice $ND::nick Usage: $command callId type"); + return; + } + }else{ + if (defined $msg && $msg =~ /^(\d+) (\d+):(\d+):(\d+) (.*)$/){ + $type = $5; + $id = $1; + $x = $2; + $y = $3; + $z = $4; + }elsif (defined $msg && $msg =~ /^(\d+) (.*)$/){ + $id = $1; + $type = $2; + }else{ + $ND::server->command("notice $ND::nick Usage: $command incId type | or: $command callId X:Y:Z type"); + return; + } + } if (my $user = dc()){ my $fleet; my $query = qq{ @@ -60,7 +89,7 @@ sub setType { JOIN current_planet_stats p ON i.sender = p.id JOIN calls c ON i.call = c.id }; - if (defined $x && $x eq 'call'){ + if ($command eq 'settypeall'){ $fleet = $ND::DBH->prepare(qq{ $query WHERE i.call = ? @@ -91,8 +120,14 @@ sub setType { } } sub takeCall { - my ($id) = @_; - DB(); + my ($msg,$command) = @_; + my ($id); + if (defined $msg && $msg =~ /^(\d+)$/){ + $id = $1; + }else{ + $ND::server->command("notice $ND::nick Usage: $command callid"); + return; + } if (dc()){ if ($ND::DBH->do(q{UPDATE calls SET dc = (SELECT uid FROM users WHERE hostmask ILIKE ?) WHERE id = ?} ,undef,$ND::address,$id) == 1){ @@ -102,8 +137,14 @@ sub takeCall { } sub covCall { - my ($id) = @_; - DB(); + my ($msg,$command) = @_; + my ($id); + if (defined $msg && $msg =~ /^(\d+)$/){ + $id = $1; + }else{ + $ND::server->command("notice $ND::nick Usage: $command callid"); + return; + } if (dc()){ if($ND::DBH->do(q{UPDATE calls SET dc = (SELECT uid FROM users WHERE hostmask ILIKE ?), covered = TRUE, open = FALSE WHERE id = ?} ,undef,$ND::address,$id) == 1){ @@ -113,8 +154,14 @@ sub covCall { } sub ignoreCall { - my ($id) = @_; - DB(); + my ($msg,$command) = @_; + my ($id); + if (defined $msg && $msg =~ /^(\d+)$/){ + $id = $1; + }else{ + $ND::server->command("notice $ND::nick Usage: $command callid"); + return; + } if (dc()){ if($ND::DBH->do(q{UPDATE calls SET dc = (SELECT uid FROM users WHERE hostmask ILIKE ?), covered = FALSE, open = FALSE WHERE id = ?} ,undef,$ND::address,$id) == 1){ @@ -124,51 +171,72 @@ sub ignoreCall { } sub defcall { - my ($msg,$nick,$callnr) = @_; - DB(); + my ($msg,$command) = @_; + my ($mess,$nick,$callnr) = @_; + if (defined $msg && $msg =~ /^(\d+)?(.*)$/){ + $callnr = $1; + $mess = $2; + }else{ + $ND::server->command("notice $ND::nick Usage: $command [callid] message | if a call id is given, then shiptypes and eta will be fetched from the database and added to the message"); + return; + } if (dc()){ 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, p.x + SELECT c.landing_tick - (SELECT value::integer FROM misc WHERE id = 'TICK'), concat(i.shiptype||'/') AS shiptype 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,p.x + GROUP BY c.id,c.landing_tick 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] Cluster: $row[2])" + $call = "(Anti $row[1] ETA: $row[0])" } } $ND::server->command("notice $ND::memchan DEFENSE REQUIRED!! WAKE UP!!"); - $ND::server->command("msg $ND::memchan DEFENSE REQUIRED $msg $call MSG $nick TO RESPOND"); + $ND::server->command("msg $ND::memchan DEFENSE REQUIRED $mess $call MSG $ND::nick TO RESPOND"); } } sub anon { - my ($target,$msg) = @_; + my ($msg,$command) = @_; + my ($target,$mess); + if (defined $msg && $msg =~ /^(\S+) (.+)$/){ + $target = $1; + $mess = $2; + }else{ + $ND::server->command("notice $ND::nick Usage: $command nick message"); + return; + } if (dc()){ - $ND::server->command("msg $target ".chr(2).$msg); + $ND::server->command("msg $target ".chr(2).$mess); $ND::server->command("msg $ND::target ".chr(3)."3$1 << $2"); } } sub setDefPrio { - my ($min,$max) = @_; - DB(); + my ($msg,$command) = @_; + my ($min,$max); + if (defined $msg && $msg =~ /^(\d+)\D(\d+)$/){ + $min = $1; + $max = $2; + }else{ + $ND::server->command("notice $ND::nick Usage: $command Min Max"); + return; + } if (hc()){ $ND::DBH->begin_work; my $update = $ND::DBH->prepare('UPDATE misc SET value = ? :: int WHERE id = ?'); $update->execute($min,'DEFMIN'); $update->execute($max,'DEFMAX'); if ($ND::DBH->commit){ - $ND::server->command("msg $ND::target min def prio set to $min and max set to $max"); + $ND::server->command("msg $ND::target min def prio set to $ND::B$min$ND::B and max set to $ND::B$max"); }else{ $ND::server->command("msg $ND::target something went wrong"); } -- 2.39.2