X-Git-Url: https://ruin.nu/git/?p=NDIRC.git;a=blobdiff_plain;f=Commands%2FScans.pm;h=06ae96f960e93bfd352d1ee0cf142a9ef8353c03;hp=ffc8e184023a0b31d09ce894de92346ae103cff3;hb=b349d82228db72957556f5dc15fda5e103eaf578;hpb=6815b7a875e95937693864b76a028f92ee2cbf35

diff --git a/Commands/Scans.pm b/Commands/Scans.pm
index ffc8e18..06ae96f 100644
--- a/Commands/Scans.pm
+++ b/Commands/Scans.pm
@@ -52,8 +52,11 @@ sub gs
 	$typeid = $scanid{$typeid};
 	my $type = $scantypes[$typeid-1];
 
-	my $planet = $c->model->selectrow_array(q{SELECT planetid($1,$2,$3,tick())}
-		,undef,$x,$y,$z);
+	my ($planet,$dists,$tick) = $c->model->selectrow_array(q{
+SELECT pid,distorters,tick
+FROM current_planet_stats LEFT JOIN current_development_scans USING (pid)
+WHERE x = $1 AND y = $2 AND z = $3
+		},undef,$x,$y,$z);
 	unless ($planet){
 		$c->reply("There is no planet with coords $x:$y:$z, try again after the tick.");
 		return;
@@ -93,9 +96,15 @@ VALUES($1,$2,$3,$4) RETURNING (id)
 		}
 
 		if ($id){
+
+			if (defined $dists){
+				$dists = "$dists dists PT$tick"
+			}else{
+				$dists = "DISTS UNKNOWN, ADD DEVSCAN"
+			}
 			$c->message(privmsg => $c->disp->targets->{scan}
 				,"<b>$id</b> http://game.planetarion.com/waves.pl?id=$typeid&x=$x&y=$y&z=$z"
-				. " ($x:$y:$z $type) | <".$c->nick."> $msg"
+				. " ($x:$y:$z $type - $dists) | <".$c->nick."> $msg"
 			);
 			$c->reply("sent request ($x:$y:$z $type)");
 		}else{