From fbf88ef7c837a073498b1fc4902d7301c04ecc4e Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Wed, 4 Nov 2009 22:23:55 +0100
Subject: [PATCH] Added planet intel to g command

---
 Commands/PA.pm     | 27 ++++++++++++++++++++++-----
 database/roles.sql |  6 ++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/Commands/PA.pm b/Commands/PA.pm
index 9f7ae8a..1db6ac1 100644
--- a/Commands/PA.pm
+++ b/Commands/PA.pm
@@ -91,16 +91,33 @@ sub g
 	my ($self, $c, $msg) = @_;
 
 	my ($x,$y) = ($msg =~ /(\d+)\D+(\d+)/) or die 'ARGS';
+	my $dbh = $c->model;
 
-	my $f = $c->model->prepare(q{
+	my $f = $dbh->prepare(q{
 SELECT score,scorerank,size,sizerank,value,valuerank,planets
 FROM galaxies WHERE x = ? AND y = ? AND tick = (SELECT max(tick) from galaxies)
-	});
+		});
 	$f->execute($x,$y);
-	while (my @row = $f->fetchrow()){
-		@row = map (valuecolor(1),@row);
-		$c->reply("$x:$y  Score=$row[0] ($row[1]), Size=$row[2] ($row[3]), Value=$row[4] ($row[5]), Planets=$row[6]");
+	my @row = $f->fetchrow;
+	unless (@row){
+		$c->reply("No planet at $x:$y");
+		return;
+	}
+	my @planets;
+	if ($c->check_user_roles(qw/irc_g_intel/)) {
+		my $query = $dbh->prepare(q{
+SELECT z,COALESCE(nick,'?') AS nick,COALESCE(alliance,'?') AS alliance
+FROM current_planet_stats
+WHERE x = $1 AND y = $2 ORDER BY z
+		});
+		$query->execute($x,$y);
+		while(my $p = $query->fetchrow_hashref){
+			push @planets, "$p->{z} [$p->{nick}/$p->{alliance}]";
+		}
 	}
+	@row = map (valuecolor(1),@row);
+	$c->reply("$x:$y  Score=$row[0] ($row[1]), Size=$row[2] ($row[3]), Value=$row[4] ($row[5]), Planets=$row[6] - "
+		. join " ", @planets);
 }
 
 sub time
diff --git a/database/roles.sql b/database/roles.sql
index a424e1c..6809e92 100644
--- a/database/roles.sql
+++ b/database/roles.sql
@@ -44,6 +44,7 @@ INSERT INTO roles VALUES('irc_say');
 INSERT INTO roles VALUES('irc_cmd');
 INSERT INTO roles VALUES('irc_allycoords');
 INSERT INTO roles VALUES('irc_allygals');
+INSERT INTO roles VALUES('irc_g_intel');
 
 INSERT INTO group_roles (gid,role) VALUES('T','irc_p_nick');
 INSERT INTO group_roles (gid,role) VALUES('T','irc_p_intel');
@@ -86,6 +87,7 @@ INSERT INTO group_roles (gid,role) VALUES('T','irc_say');
 INSERT INTO group_roles (gid,role) VALUES('T','irc_cmd');
 INSERT INTO group_roles (gid,role) VALUES('T','irc_allycoords');
 INSERT INTO group_roles (gid,role) VALUES('T','irc_allygals');
+INSERT INTO group_roles (gid,role) VALUES('T','irc_g_intel');
 
 INSERT INTO group_roles (gid,role) VALUES('M','irc_gs');
 INSERT INTO group_roles (gid,role) VALUES('M','irc_scan');
@@ -131,9 +133,11 @@ INSERT INTO group_roles (gid,role) VALUES('H','irc_smsstatus');
 INSERT INTO group_roles (gid,role) VALUES('H','irc_forum_others');
 INSERT INTO group_roles (gid,role) VALUES('H','irc_allycoords');
 INSERT INTO group_roles (gid,role) VALUES('H','irc_allygals');
+INSERT INTO group_roles (gid,role) VALUES('H','irc_g_intel');
 
 INSERT INTO group_roles (gid,role) VALUES('B','irc_points_others');
 INSERT INTO group_roles (gid,role) VALUES('B','irc_a');
+INSERT INTO group_roles (gid,role) VALUES('B','irc_g_intel');
 
 INSERT INTO group_roles (gid,role) VALUES('I','irc_p_nick');
 INSERT INTO group_roles (gid,role) VALUES('I','irc_p_intel');
@@ -143,6 +147,7 @@ INSERT INTO group_roles (gid,role) VALUES('I','irc_setally');
 INSERT INTO group_roles (gid,role) VALUES('I','irc_setchannel');
 INSERT INTO group_roles (gid,role) VALUES('I','irc_allycoords');
 INSERT INTO group_roles (gid,role) VALUES('I','irc_allygals');
+INSERT INTO group_roles (gid,role) VALUES('I','irc_g_intel');
 
 INSERT INTO group_roles (gid,role) VALUES('D','irc_p_intel');
 INSERT INTO group_roles (gid,role) VALUES('D','irc_points_others');
@@ -186,3 +191,4 @@ INSERT INTO group_roles (gid,role) VALUES('s','irc_settype');
 INSERT INTO group_roles (gid,role) VALUES('s','irc_calltake');
 INSERT INTO group_roles (gid,role) VALUES('s','irc_setcalc');
 INSERT INTO group_roles (gid,role) VALUES('s','irc_getcalc');
+INSERT INTO group_roles (gid,role) VALUES('s','irc_g_intel');
-- 
2.39.2