X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FIRC%2FPA.pm;h=2eb88b1f3abbcc33cda310d83e650ac589a51aec;hb=d39f98e3ec616f8ee204cbd12860c02d92df8153;hp=48751e490a64a1fdcc33cb5bcdf40845f60666f2;hpb=0590345742e647633ea9817a7bd28129d3f1f3f4;p=ndwebbie.git

diff --git a/ND/IRC/PA.pm b/ND/IRC/PA.pm
index 48751e4..2eb88b1 100644
--- a/ND/IRC/PA.pm
+++ b/ND/IRC/PA.pm
@@ -142,8 +142,6 @@ FROM ship_stats WHERE name ILIKE ?
 sub calcXp {
 	my ($x,$y,$z,$roids,$cap) = @_;
 
-	print "$roids:$cap:";
-
 	my ($avalue,$ascore) = $ND::DBH->selectrow_array(q{
 		SELECT value,score FROM current_planet_stats WHERE 
 			id = (SELECT planet FROM users WHERE hostmask ILIKE ?);
@@ -156,7 +154,7 @@ sub calcXp {
 	unless($roids){
 		$roids = int($tsize*$cap);
 	}elsif ($roids < 10){
-		$tsize *= .75**($roids-1);
+		$tsize = ceil($tsize*.75**($roids-1));
 		$roids = int($cap*$tsize);
 	}
 	$tsize -= $roids;
@@ -168,7 +166,7 @@ sub calcXp {
 		$ND::server->command("notice $ND::target Doesn't seem to be a planet at $x:$y:$z");
 		return;
 	}
-	my $xp = int(max($roids * 10 * (min(2,$tscore/$ascore) + min(2,$tvalue/$avalue) - 1),0));
+	my $xp = pa_xp($roids,$ascore,$avalue,$tscore,$tvalue);
 	my $score = 60 * $xp;
 	my $value = $roids*200;
 	my $totscore = prettyValue($score + $value);