X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Scans.pm;h=2bd67957a37c64f420db94c0fc7051945d5cb3d8;hb=df43148278c85c28726accbec2421688260661b7;hp=2b33361c65413da1665e70fe11e78f6a8e6fe3a4;hpb=227e9bfcf736a4a413d68b9f83a25636c13d8e0b;p=NDIRC.git diff --git a/Scans.pm b/Scans.pm index 2b33361..2bd6795 100644 --- a/Scans.pm +++ b/Scans.pm @@ -25,7 +25,7 @@ require Exporter; our @ISA = qw/Exporter/; -our @EXPORT = qw/addScan addScanGroup sendScan reqScan scanReqs getScan/; +our @EXPORT = qw/addScan addScanGroup/; sub addScan { my ($id,$verbose) = @_; @@ -68,67 +68,7 @@ sub addScanGroup { } } -sub sendScan { - my ($msg, $command) = @_; - my ($target,$mess); - if (defined $msg && $msg =~ /^(\S+) (.*)$/){ - $target = $1; - $mess = $2; - }else{ - $ND::server->command("notice $ND::nick syntax: $command nick message"); - return; - } - if (scanner()){ - $ND::server->command("msg $target ".chr(2).$mess.chr(3)."4 (reply with /msg $ND::scanchan)"); - $ND::server->command("msg $ND::target ${ND::C}3$target << $mess"); - } -} - -sub getScan { - my ($msg, $command) = @_; - - my ($t, $x, $y, $z, $type, $tick); - if (defined $msg && $msg =~ /^([pdunja]) (\d+)\D+(\d+)\D+(\d+)(?: (\d+))?/){ - $t = $1; - $type =$scantypes[$scanid{$1}-1]; - ($x,$y,$z) = ($2,$3,$4); - $tick = $5; - }else{ - $ND::server->command("notice $ND::nick syntax: $command type X:Y:Z [tick]" - . " | type is the first character in the scan name, like p for planet scan." - . " Specify a tick if you want scans older than the specified tick." - ); - return; - } - if (my $user = member){ - my $scan = $ND::DBH->selectrow_hashref(q{ -SELECT id, scan_id, tick FROM scans -WHERE type = $1 AND planet = planetid($2,$3,$4,0) AND COALESCE(tick < $5,TRUE) -ORDER BY tick DESC LIMIT 1 - },undef,$type,$x,$y,$z,$tick); - unless ($scan->{id}){ - $ND::server->command("notice $ND::nick No such scan"); - } - my $text = '|'; - if ($t =~ /[uja]/){ - my $fid = $ND::DBH->selectrow_array(q{ -SELECT fid FROM fleet_scans WHERE id = $1 - },undef,$scan->{id}); - my $ships = $ND::DBH->prepare(q{ -SELECT ship,amount FROM fleet_ships WHERE fid = $1 ORDER BY num - }); - $ships->execute($fid); - while (my $ship = $ships->fetchrow_hashref){ - $text .= " $ship->{ship} $ship->{amount} |" - } - }else{ - $text = "http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}"; - } - $ND::server->command("notice $ND::nick $ND::B$type$ND::O scan of $x:$y:$z " - . "($scan->{scan_id} pt: $ND::B$scan->{tick}$ND::O) $text"); - } -} 1;