X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FIRC%2FPA.pm;h=29bdb7722f647226b3f230d289ea7e0878682653;hb=4aa8043871fac60e6a5038489f6bc05ab2f3bd78;hp=f1444a247f5610cbcd10351f80f65e624b7e899f;hpb=33379bf7e2909a0f46ccf771a919121e48f9ab41;p=ndwebbie.git

diff --git a/ND/IRC/PA.pm b/ND/IRC/PA.pm
index f1444a2..29bdb77 100644
--- a/ND/IRC/PA.pm
+++ b/ND/IRC/PA.pm
@@ -28,7 +28,7 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/checkPlanet checkGal shipEff shipStop parseValue prettyValue/;
+our @EXPORT = qw/checkPlanet checkGal shipEff shipStop parseValue prettyValue calcXp/;
 
 sub checkPlanet {
 	my ($x,$y,$z,$intel) = @_;
@@ -140,16 +140,24 @@ FROM ship_stats WHERE name ILIKE ?
 }
 
 sub calcXp {
-	my ($x,$y,$z,$roids) = @_;
+	my ($x,$y,$z,$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 ?);
 		}, undef, $ND::address);
-	my ($tvalue,$tscore) = $ND::DBH->selectrow_array(q{
-		SELECT value,score FROM current_planet_stats WHERE 
-			x = ? AND y = ? and z = ?;
+	my ($tvalue,$tscore,$tsize) = $ND::DBH->selectrow_array(q{
+		SELECT value,score,size FROM current_planet_stats WHERE 
+		x = ? AND y = ? and z = ?;
 		}, undef, $x,$y,$z);
+	$cap = 0.25 unless $cap;
+	unless($roids){
+		$roids = int($tsize*$cap);
+	}elsif ($roids < 10){
+		$tsize *= int(.75**($roids-1));
+		$roids = int($cap*$tsize);
+	}
+	$tsize -= $roids;
 	unless (defined $avalue && defined $ascore){
 		$ND::server->command("notice $ND::target You don't have a planet specified");
 		return;
@@ -160,7 +168,9 @@ sub calcXp {
 	}
 	my $xp = int(max($roids * 10 * (min(2,$tscore/$ascore) + min(2,$tvalue/$avalue) - 1),0));
 	my $score = 60 * $xp;
-	$ND::server->command("notice $ND::target You will gain $ND::B$xp$ND::B XP, $ND::B$score$ND::B score, if you steal $roids roids from $x:$y:$z");
+	my $value = $roids*200;
+	my $totscore = prettyValue($score + $value);
+	$ND::server->command("notice $ND::target You will gain $ND::B$xp$ND::B XP, $ND::B$score$ND::B score, if you steal $roids roids ($ND::B$value$ND::B value), from $ND::B$x:$y:$z$ND::B, who will have $ND::B$tsize$ND::B roids left, total score gain will be: $ND::B$totscore$ND::B in total,");
 }
 
 1;