Implemented allycoords command

diff --git a/Commands/Intel.pm b/Commands/Intel.pm
index b52d694eddaef305da830f7a1bd96c40435fbd29..54e7e3bdc0acbb072532444a8a82aa95c1a66b1f 100644 (file)
--- a/Commands/Intel.pm
+++ b/Commands/Intel.pm
@@ -228,4 +228,33 @@ DELETE FROM planet_tags WHERE uid = $1 AND pid = planetid($2,$3,$4,tick()) AND t
        $c->reply("Removed <b>$rows</b> matching $tag from $x:$y:$z");
 }
 
+sub allycoords
+       : Help(Usage: .allycoords ally | % can be used for wildcards \%-crew\% will match [F-Crew])
+       : ACL(irc_allycoords)
+{
+       my ($self,$c,$msg) = @_;
+       my ($ally) = $msg =~ /^(\S+)$/ or die 'ARGS';
+       my $dbh = $c->model;
+
+       my ($a, $members) = $dbh->selectrow_array(q{
+SELECT alliance, members
+FROM alliances JOIN alliance_stats USING (aid)
+WHERE tick = (SELECT max(tick) FROM alliance_stats)
+       AND alliance ILIKE $1
+               },undef,$ally);
+       unless ($a){
+               $c->reply("No alliance matching '$ally'");
+               return;
+       }
+       my $query = $dbh->prepare(q{
+SELECT coords(x,y,z) FROM current_planet_stats WHERE alliance = $1 ORDER BY x,y,z
+               });
+       $query->execute($a);
+       my @planets;
+       while (my $p = $query->fetchrow_hashref){
+               push @planets,$p->{coords};
+       }
+       my $kmem = scalar @planets;
+       $c->reply("$a ($kmem/$members) : ". join " ", @planets);
+}
 1;

diff --git a/database/roles.sql b/database/roles.sql
index 7cfa563293681682cec1d4e15010382567798b45..5ef73e64d0a9a529e7d4a2f799f5f14f6564a0a2 100644 (file)
--- a/database/roles.sql
+++ b/database/roles.sql
@@ -42,6 +42,7 @@ INSERT INTO roles VALUES('irc_addtag');
 INSERT INTO roles VALUES('irc_deltag');
 INSERT INTO roles VALUES('irc_say');
 INSERT INTO roles VALUES('irc_cmd');
+INSERT INTO roles VALUES('irc_allycoords');
 
 INSERT INTO group_roles (gid,role) VALUES('T','irc_p_nick');
 INSERT INTO group_roles (gid,role) VALUES('T','irc_p_intel');
@@ -82,6 +83,7 @@ INSERT INTO group_roles (gid,role) VALUES('T','irc_smsstatus');
 INSERT INTO group_roles (gid,role) VALUES('T','irc_forum_others');
 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('M','irc_gs');
 INSERT INTO group_roles (gid,role) VALUES('M','irc_scan');
@@ -125,6 +127,7 @@ INSERT INTO group_roles (gid,role) VALUES('H','irc_getcalc');
 INSERT INTO group_roles (gid,role) VALUES('H','irc_sendsms');
 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('B','irc_points_others');
 INSERT INTO group_roles (gid,role) VALUES('B','irc_a');
@@ -135,6 +138,7 @@ INSERT INTO group_roles (gid,role) VALUES('I','irc_sethostile');
 INSERT INTO group_roles (gid,role) VALUES('I','irc_setnick');
 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('D','irc_p_intel');
 INSERT INTO group_roles (gid,role) VALUES('D','irc_points_others');