From a1d98bc55c2ea2df2f2be3ff78386542b096c4dc Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Thu, 3 Jul 2008 12:53:29 +0200 Subject: [PATCH] Switched intel commands to intel group --- Intel.pm | 6 +++--- PA.pm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Intel.pm b/Intel.pm index bc9a925..18ea15f 100644 --- a/Intel.pm +++ b/Intel.pm @@ -63,7 +63,7 @@ sub setNick { $ND::server->command("notice $ND::nick Usage: .$command X:Y:Z nick"); return; } - if (my $user = officer){ + 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); @@ -93,7 +93,7 @@ sub setAlly { $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 = officer){ + 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); @@ -135,7 +135,7 @@ sub setChannel { $ND::server->command("notice $ND::nick Usage: .$command X:Y:Z channel"); return; } - if (my $user = officer()){ + 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); diff --git a/PA.pm b/PA.pm index 21183bc..afc5b05 100644 --- a/PA.pm +++ b/PA.pm @@ -38,7 +38,7 @@ sub checkPlanet { $x = $1; $y = $2; $z = $3; - }elsif ((officer() || ia()) && defined $msg){ + }elsif ((officer() || ia() || intel()) && defined $msg){ $nick = $msg; }else{ $ND::server->command("notice $ND::nick usage .p X:Y:Z".(officer() || ia() ? ' or .p nick' : '')); @@ -54,7 +54,7 @@ sub checkPlanet { $planet->{$_} = valuecolor(1,$planet->{$_}); } my $ally = ""; - if (officer() || ia() || dc()){ + if (officer() || ia() || dc() | intel()){ $ally = "Alliance=$planet->{alliance} ($planet->{relationship}), Nick=$planet->{nick} ($planet->{planet_status}), Channel: $planet->{channel}, Hostile Count: $planet->{hit_us},"; } $ND::server->command("notice $ND::nick $planet->{coords} $planet->{ruler} OF $planet->{planet},$ally Race=$planet->{race}, Score=$planet->{score} ($planet->{scorerank}), Size=$planet->{size} ($planet->{sizerank}), Value=$planet->{value} ($planet->{valuerank}), XP=$planet->{xp} ($planet->{xprank})"); -- 2.39.2