$x = $1;
$y = $2;
$z = $3;
- }elsif (officer() && defined $msg){
+ }elsif ((officer() || ia()) && 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()){
$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})");
$number /= 0.60 if $tn eq 't2';
$number /= 0.30 if $tn eq 't3';
}
+ $number = int($number);
$value = prettyValue($number*$t->{cost}/100);
my $name = shipColor($t->{name},$t->{type});
$text .= " $ND::B$number$ND::O $name ($t->{init}:$value),";
my $number = 0;
if ($eff){
$number = $s->{type} eq 'Emp' ?
- int($amount*$s->{guns}*(100-$t->{eres})/100)
- : int($amount*$s->{damage}/$t->{armor});
+ ($amount*$s->{guns}*(100-$t->{eres})/100)
+ : ($amount*$s->{damage}/$t->{armor});
}else{
$number = $t->{type} eq 'Emp' ?
- int($amount*100/(100 - $s->{eres})/$t->{guns})
- : int($amount*$s->{armor}/$t->{damage});
+ ($amount*100/(100 - $s->{eres})/$t->{guns})
+ : ($amount*$s->{armor}/$t->{damage});
}
for my $tn ('t1','t2','t3'){
}
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){