Updated xp for new cap rules

diff --git a/Commands/PA.pm b/Commands/PA.pm
index b6cd08c3e071f9e59aafdc55b14447f503ba8dd1..808f4092020ef9b67dc9addaa3ba0441009783b7 100644 (file)
--- a/Commands/PA.pm
+++ b/Commands/PA.pm
@@ -25,6 +25,7 @@ use feature ':5.10';
 
 use Moose;
 use MooseX::MethodAttributes;
+use POSIX qw/pow/;
 
 use NDIRC::Misc;
 use ND::Include;
@@ -116,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) = @_;
 
@@ -131,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;
@@ -151,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 <b>$xp</b> XP, <b>$score</b> score, if you steal $roids roids (<b>$value</b> value), from <b>$x:$y:$z</b>, who will have <b>$tsize</b> roids left, total score gain will be: <b>$totscore</b> in total,");
+       $cap = sprintf "%.1f", $cap*100;
+       $c->reply("You will gain <b>$xp</b> XP, <b>$score</b> score, if you steal <b>$roids</b> roids (<b>$value</b> value, <b>$cap%</b> cap), from <b>$x:$y:$z</b>, who will have <b>$tsize</b> roids left, total score gain will be: <b>$totscore</b> in total,");
 }
 
 sub fco