X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Commands%2FPA.pm;h=2dcb00671d0c90ccc3355f138606ffd50ce7100d;hb=82c9be26b28b12fded144d363ef81a6047e20d11;hp=0d834846ae6e30b3edb9986f94fd657b5116441f;hpb=21cb796be35d56fc6620af557355ab57b6c00e88;p=NDIRC.git
diff --git a/Commands/PA.pm b/Commands/PA.pm
index 0d83484..2dcb006 100644
--- a/Commands/PA.pm
+++ b/Commands/PA.pm
@@ -25,10 +25,19 @@ use feature ':5.10';
use Moose;
use MooseX::MethodAttributes;
+use POSIX qw/pow/;
use NDIRC::Misc;
use ND::Include;
+
+sub bcalc
+ : Help(Lists bcalc and stats info)
+{
+ my ($self, $c, $msg) = @_;
+ $c->reply("http://game.planetarion.com/bcalc.pl http://game.planetarion.com/manual.php?page=stats");
+}
+
sub p
: Help(usage: .p X:Y:Z | or .p nick with high enough access)
{
@@ -108,7 +117,7 @@ SELECT date_trunc('seconds',now() + (($1 - tick()) || ' hr')::interval) AT TIME
}
sub xp
- : Help(syntax: .xp X:Y:Z [roids] [cap] | if roids < 10 then it's taken as the wave, cap is a floating point number, defaults to 0.25)
+ : Help(syntax: .xp X:Y:Z [roids] [cap] | if roids < 10 then it's taken as the wave, cap is a floating point number, defaults to cap according to your value)
{
my ($self, $c, $msg) = @_;
@@ -117,17 +126,17 @@ sub xp
my ($avalue,$ascore) = $c->model->selectrow_array(q{
SELECT value,score FROM current_planet_stats
-WHERE id = (SELECT planet FROM users WHERE hostmask ILIKE ?)
+WHERE pid = (SELECT pid FROM users WHERE hostmask ILIKE ?)
}, undef, $c->host);
my ($tvalue,$tscore,$tsize) = $c->model->selectrow_array(q{
SELECT value,score,size FROM current_planet_stats
WHERE x = ? AND y = ? and z = ?
}, undef, $x,$y,$z);
- $cap //= 0.25;
+ $cap //= min(0.25,0.25 * pow($tvalue/$avalue , 0.5));
unless($roids){
$roids = int($tsize*$cap);
}elsif ($roids < 10){
- $tsize = ceil($tsize*.75**($roids-1));
+ $tsize = int($tsize*.75**($roids-1));
$roids = int($cap*$tsize);
}
$tsize -= $roids;
@@ -143,7 +152,8 @@ WHERE x = ? AND y = ? and z = ?
my $score = 60 * $xp;
my $value = $roids*200;
my $totscore = prettyValue($score + $value);
- $c->reply("You will gain $xp XP, $score score, if you steal $roids roids ($value value), from $x:$y:$z, who will have $tsize roids left, total score gain will be: $totscore in total,");
+ $cap = sprintf "%.1f", $cap*100;
+ $c->reply("You will gain $xp XP, $score score, if you steal $roids roids ($value value, $cap% cap), from $x:$y:$z, who will have $tsize roids left, total score gain will be: $totscore in total,");
}
sub fco
@@ -157,7 +167,7 @@ sub fco
my ($value,$score) = $c->model->selectrow_array(q{
SELECT value,score FROM planet_stats WHERE tick = $2 AND
- id = (SELECT planet FROM users WHERE hostmask ILIKE $1)
+ pid = (SELECT pid FROM users WHERE hostmask ILIKE $1)
}, undef, $c->host,$tick);
unless ($value){
$c->reply("You don't have a planet registered.");
@@ -165,8 +175,8 @@ SELECT value,score FROM planet_stats WHERE tick = $2 AND
}
my $attackers = $c->model->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.0*$2*$3/ps.value)::int = $4
+ JOIN planet_stats ps using (pid)
+WHERE ps.tick = $1 AND trunc(2000.0*$2*$3/ps.value)::int = $4
});
$attackers->execute($tick,$agents,$value,$stolen);
if ($attackers->rows == 0){