$x = $1;
$y = $2;
$z = $3;
- }elsif (officer() && defined $msg){
+ }elsif ((officer() || ia() || intel()) && defined $msg){
$nick = $msg;
}else{
- $ND::server->command("notice $ND::nick usage .p X:Y:Z".(officer() ? ' or .p nick' : ''));
+ $ND::server->command("notice $ND::nick usage .p X:Y:Z".(officer() || ia() ? ' or .p nick' : ''));
return;
}
my $f = $ND::DBH->prepare(q{SELECT coords(x,y,z),ruler,planet,race,score,size,value,scorerank,sizerank,
$planet->{$_} = valuecolor(1,$planet->{$_});
}
my $ally = "";
- if (officer() || 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})");
}else{
$ND::server->command("notice $ND::nick syntax: .g X:Y");
}
- my $f = $ND::DBH->prepare("SELECT score,size,value FROM galaxies WHERE x = ? AND y = ? and tick = (SELECT max(tick) from galaxies)");
+ my $f = $ND::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);
- $ND::server->command("notice $ND::nick $x:$y Score=$row[0], Size=$row[1], Value=$row[2]");
+ $ND::server->command("notice $ND::nick $x:$y Score=$row[0] ($row[1]), Size=$row[2] ($row[3]), Value=$row[4] ($row[5]), Planets=$row[6]");
}
}
if ($s){
if (defined $value){
$amount = int(($value*100/$s->{cost}));
- $feud = '(FEUD: '.prettyValue(int($amount/0.85)).') ';
+ $feud = '(FEUD: '.prettyValue(int($amount/0.86)).') ';
}
$value = prettyValue(($amount*$s->{cost}/100));
my $name = shipColor($s->{name},$s->{type});
}
my $attackers = $ND::DBH->prepare(q{
SELECT coords(p.x,p.y,p.z), ruler, planet FROM current_planet_stats p JOIN planet_stats ps using (id) WHERE
- ps.tick = $1 AND (2000*$2*$3/ps.value)::int = $4 ;
+ ps.tick = $1 AND (2000.0*$2*$3/ps.value)::int = $4 ;
});
$attackers->execute($tick,$agents,$value,$stolen);
if ($attackers->rows == 0){