From 5b4cd04d7fbe5581212a0f708cc674af7f9c6fd1 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Wed, 4 Nov 2009 21:10:14 +0100 Subject: [PATCH] Implemented allycoords command --- Commands/Intel.pm | 29 +++++++++++++++++++++++++++++ database/roles.sql | 4 ++++ 2 files changed, 33 insertions(+) diff --git a/Commands/Intel.pm b/Commands/Intel.pm index b52d694..54e7e3b 100644 --- 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 $rows 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 7cfa563..5ef73e6 100644 --- 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'); -- 2.39.2