X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Commands%2FPA.pm;h=808f4092020ef9b67dc9addaa3ba0441009783b7;hb=cd394b6907c15c9a6a9161022a9e58f403f9618a;hp=811d102dab3a8ee8ab4386d8ca4cff22ed13d29f;hpb=d7fb98229df0785d44926ac061ab2b48cf11f4b3;p=NDIRC.git
diff --git a/Commands/PA.pm b/Commands/PA.pm
index 811d102..808f409 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) = @_;
@@ -123,11 +132,11 @@ WHERE id = (SELECT planet FROM users WHERE hostmask ILIKE ?)
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