X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Commands%2FPA.pm;h=52fb3a007a1241c3cdc9e234f3c244cc3defde45;hb=a7e034b3599d41cdf5a158b14bd1715451f89a0c;hp=b6cd08c3e071f9e59aafdc55b14447f503ba8dd1;hpb=4d0d8ca826dba5f8baa8829fe02b3eab47eff586;p=NDIRC.git

diff --git a/Commands/PA.pm b/Commands/PA.pm
index b6cd08c..52fb3a0 100644
--- 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) = @_;
 
@@ -125,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 ?)
-		}, undef, $c->host);
+WHERE pid = (SELECT pid FROM users WHERE uid = ?)
+		}, undef, $c->uid);
 	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;
@@ -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
@@ -165,15 +167,15 @@ 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)
-		}, undef, $c->host,$tick);
+	pid = (SELECT pid FROM users WHERE uid = $1)
+		}, undef, $c->uid,$tick);
 	unless ($value){
 		$c->reply("You don't have a planet registered.");
 		return;
 	}
 	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)
+	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);