X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Intel.pm;h=18ea15f16fc2218cf8ca2225c3a9da28e58bf37c;hb=491db8f0abea3c779a1ecdc64f22ed233bc9546b;hp=c9fbac1444508cf182d5641f39c2ee6403a007b2;hpb=ec80f6c0dba1fd56a63d591e89f6368d468912f7;p=NDIRC.git

diff --git a/Intel.pm b/Intel.pm
index c9fbac1..18ea15f 100644
--- a/Intel.pm
+++ b/Intel.pm
@@ -27,28 +27,21 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/checkIntel setHostile findNick setNick setAlly setChannel/;
+our @EXPORT = qw/setHostile setNick setAlly setChannel/;
 
-sub checkIntel {
-	my ($x,$y,$z) = @_;
-	DB();
-	if (officer() || dc()){
-		my $f = $ND::DBH->prepare("SELECT nick,alliance,coords(x,y,z),ruler,planet,hit_us,race,score,size,value,planet_status,relationship,channel FROM current_planet_stats WHERE x = ? AND y = ? and z = ?");
-		$f->execute($x,$y,$z);
-		while (my @row = $f->fetchrow()){
-			@row = map (valuecolor(1),@row);
-			$ND::server->command("notice $ND::target $row[2] - $row[3] OF $row[4], Alliance=$row[1] ($row[11]), Nick=$row[0] ($row[10]), Channel=$row[12] Hostile Count=$row[5], Race=$row[6], Score=$row[7], Size=$row[8], Value=$row[9] ");
-		}
+sub setHostile {
+	my ($msg, $command) = @_;
+	my ($x,$y,$z);
+	if(defined $msg && $msg =~ /^(\d+)\D(\d+)\D(\d+)$/){
+		$x = $1;
+		$y = $2;
+		$z = $3;
 	}else{
-		$ND::server->command("msg $ND::target Only officers are allowed to check that");
+		$ND::server->command("notice $ND::nick Usage: .$command X:Y:Z");
+		return;
 	}
-}
-
-sub setHostile {
-	my ($x,$y,$z) = @_;
-	DB();
 	if(my $user = dc()){
-		my $findid = $ND::DBH->prepare_cached(q{SELECT planetid(?,?,?,0)});
+		my $findid = $ND::DBH->prepare_cached(q{SELECT planetid(?,?,?,tick())});
 		my ($id) = $ND::DBH->selectrow_array($findid,undef,$x,$y,$z);
 		my $rv = $ND::DBH->do(q{UPDATE planets SET planet_status = 'Hostile' WHERE id = $1},undef,$id);
 		if ($rv == 1){
@@ -58,49 +51,71 @@ sub setHostile {
 	}
 }
 
-sub findNick {
-	my ($nick) = @_;
-	DB();
-	if(officer()){
-		my $f = $ND::DBH->prepare("SELECT coords(x,y,z), ruler,planet,nick FROM current_planet_stats WHERE nick ILIKE ? ORDER BY x,y,z");
-		$f->execute($nick);
-		$ND::server->command("notice $ND::target No such nick") if $f->rows == 0;
-		while (my @row = $f->fetchrow()){
-			$ND::server->command("notice $ND::target $row[0] $row[1] OF $row[2] is $row[3]");
-		}
-	}
-}
 sub setNick {
-	my ($x,$y,$z,$nick) = @_;
-	DB();
-	if (my $user = officer){
-		my $findid = $ND::DBH->prepare_cached(q{SELECT planetid(?,?,?,0)});
-		my ($id) = $ND::DBH->selectrow_array($findid,undef,$x,$y,$z);
-		if ($ND::DBH->do('UPDATE planets SET nick = $1 WHERE id = $2'
+	my ($msg, $command) = @_;
+	my ($x,$y,$z,$nick);
+	if(defined $msg && $msg =~ /^(\d+)\D(\d+)\D(\d+) (\S+)$/){
+		$x = $1;
+		$y = $2;
+		$z = $3;
+		$nick = $4;
+	}else{
+		$ND::server->command("notice $ND::nick Usage: .$command X:Y:Z nick");
+		return;
+	}
+	if (my $user = intel){
+		my $findid = $ND::DBH->prepare_cached(q{SELECT nick, id FROM planets
+			WHERE id = planetid(?,?,?,tick())});
+		my ($oldnick,$id) = $ND::DBH->selectrow_array($findid,undef,$x,$y,$z);
+		if ($id && $ND::DBH->do('UPDATE planets SET nick = $1 WHERE id = $2'
 				,undef,$nick,$id)){
-			$ND::server->command("msg $ND::target $x:$y:$z has been updated");
+			unless (defined $oldnick){
+				$ND::server->command("msg $ND::target $x:$y:$z nick has been set to $ND::B$nick");
+			}else{
+				$ND::server->command("msg $ND::target $x:$y:$z nick has been changed from $ND::B$oldnick$ND::B to $ND::B$nick");
+			}
 			intel_log $user->{uid},$id,"Set nick to: $nick";
+		}else{
+			$ND::server->command("msg $ND::target Couldn't find any planet with coords $x:$y:$z");
 		}
 	}
 }
 
 sub setAlly {
-	my ($x,$y,$z,$ally) = @_;
-	DB();
-	if (my $user = officer){
+	my ($msg, $command) = @_;
+	my ($x,$y,$z,$ally);
+	if(defined $msg && $msg =~ /^(\d+)\D(\d+)\D(\d+) (\S+)$/){
+		$x = $1;
+		$y = $2;
+		$z = $3;
+		$ally = $4;
+	}else{
+		$ND::server->command("notice $ND::nick Usage: .$command X:Y:Z ally | | % can be used for wildcards \%-crew\% will match [F-Crew]");
+		return;
+	}
+	if (my $user = intel){
 		my $aid;
 		if ($ally ne 'unknown'){
 			($aid,$ally) = $ND::DBH->selectrow_array("SELECT id,name FROM alliances WHERE name ILIKE ?",undef,$ally);
 		}
 		if ($ally){
-			my $findid = $ND::DBH->prepare_cached(q{SELECT planetid(?,?,?,0)});
-			my ($id) = $ND::DBH->selectrow_array($findid,undef,$x,$y,$z);
-			if($id && $ND::DBH->do('UPDATE planets SET alliance_id = $1 WHERE id = $2'
+			my $findid = $ND::DBH->prepare(q{SELECT id,alliance FROM current_planet_stats 
+				WHERE x = ? AND y = ? and z = ?});
+			my ($id,$alliance) = $ND::DBH->selectrow_array($findid,undef,$x,$y,$z);
+			unless ($id){
+				$ND::server->command("msg $ND::target Couldn't find a planet at $x:$y:$z");
+				return;
+			}
+			if($ND::DBH->do('UPDATE planets SET alliance_id = $1 WHERE id = $2'
 				,undef,$aid,$id)){
-				$ND::server->command("msg $ND::target Setting $x:$y:$z as $ally");
+				if (defined $alliance){
+					$ND::server->command("msg $ND::target Changed $x:$y:$z from $ND::B$alliance$ND::B to $ND::B$ally");
+				}else{
+					$ND::server->command("msg $ND::target Setting $x:$y:$z as $ND::B$ally");
+				}
 				intel_log $user->{uid},$id,"Set alliance_id to: $aid ($ally)";
 			}else{
-				$ND::server->command("msg $ND::target Couldn't find a planet at $x:$y:$z");
+				$ND::server->command("msg $ND::target Couldn't set alliance_id to: $aid");
 			}
 		}else{
 			$ND::server->command("msg $ND::target Couldn't find such an alliance");
@@ -109,15 +124,32 @@ sub setAlly {
 }
 
 sub setChannel {
-	my ($x,$y,$z,$channel) = @_;
-	DB();
-	if (my $user = officer()){
-		my $findid = $ND::DBH->prepare_cached(q{SELECT planetid(?,?,?,0)});
-		my ($id) = $ND::DBH->selectrow_array($findid,undef,$x,$y,$z);
+	my ($msg, $command) = @_;
+	my ($x,$y,$z,$channel);
+	if(defined $msg && $msg =~ /^(\d+)\D(\d+)\D(\d+) (\S+)$/){
+		$x = $1;
+		$y = $2;
+		$z = $3;
+		$channel = $4;
+	}else{
+		$ND::server->command("notice $ND::nick Usage: .$command X:Y:Z channel");
+		return;
+	}
+	if (my $user = intel){
+		my $findid = $ND::DBH->prepare_cached(q{SELECT id,channel FROM current_planet_stats 
+				WHERE x = ? AND y = ? and z = ?});
+		my ($id,$c) = $ND::DBH->selectrow_array($findid,undef,$x,$y,$z);
 		if ($ND::DBH->do('UPDATE planets SET channel = $1 WHERE id = $2'
 				,undef,$channel,$id)){
-			$ND::server->command("msg $ND::target $x:$y:$z relay channel has been set to: $channel");
+
+			if (defined $c){
+				$ND::server->command("msg $ND::target Changed $x:$y:$z from $ND::B$c$ND::B to $ND::B$channel");
+			}else{
+				$ND::server->command("msg $ND::target Setting $x:$y:$z as $ND::B$channel");
+			}
 			intel_log $user->{uid},$id,"Set channel to: $channel";
+		}else{
+			$ND::server->command("msg $ND::target Couldn't find a planet at $x:$y:$z");
 		}
 	}
 }