Converted the .xp command

diff --git a/Commands/PA.pm b/Commands/PA.pm
index 633d2fee5d9a41ea94a584843be521f56fe8df82..a71e897b3d6eb81239aaf4e861fa0d27c1d6ae80 100644 (file)
--- a/Commands/PA.pm
+++ b/Commands/PA.pm
@@ -27,6 +27,7 @@ use Moose;
 use MooseX::MethodAttributes;
 
 use NDIRC::Misc;
+use ND::Include;
 
 sub p
        : Help(usage: .p X:Y:Z | or .p nick with high enough access)
@@ -105,4 +106,44 @@ SELECT date_trunc('seconds',now() + (($1 - tick()) || ' hr')::interval) AT TIME
                die $@ if $@;
        }
 }
+
+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)
+{
+       my ($self, $c, $msg) = @_;
+
+       my ($x,$y,$z,$roids,$cap) = $msg =~ /^(\d+)\D+(\d+)\D+(\d+)(?:[^\.\d]+(\d+))?(?:[^\.\d]+(\d*\.\d+))?$/
+               or die 'ARGS';
+
+       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);
+       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;
+       unless($roids){
+               $roids = int($tsize*$cap);
+       }elsif ($roids < 10){
+               $tsize = ceil($tsize*.75**($roids-1));
+               $roids = int($cap*$tsize);
+       }
+       $tsize -= $roids;
+       unless (defined $avalue && defined $ascore){
+               $c->reply("You don't have a planet specified");
+               return;
+       }
+       unless (defined $tvalue && defined $tscore){
+               $c->reply("No planet found at $x:$y:$z");
+               return;
+       }
+       my $xp = pa_xp($roids,$ascore,$avalue,$tscore,$tvalue);
+       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,");
+}
+
 1;

diff --git a/PA.pm b/PA.pm
index dd3dbb9a04deed3d06f6523cefecded5268dab7e..1eb767520d5a478d1c475575865d7b5ea2287893 100644 (file)
--- a/PA.pm
+++ b/PA.pm
@@ -28,7 +28,7 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/shipEff shipStop parseValue prettyValue calcXp findCovOpper/;
+our @EXPORT = qw/shipEff shipStop parseValue prettyValue findCovOpper/;
 
 sub shipEff {
        my ($msg,$command) = @_;
@@ -145,52 +145,6 @@ sub shipColor {
        return "$ND::C$c$string$ND::O";
 }
 
-sub calcXp {
-       my ($msg) = @_;
-
-       my ($x,$y,$z,$roids,$cap);
-       if(defined $msg && $msg =~ /^(\d+)\D+(\d+)\D+(\d+)(?:[^\.\d]+(\d+))?(?:[^\.\d]+(\d*\.\d+))?$/){
-               $x = $1;
-               $y = $2;
-               $z = $3;
-               $roids = $4;
-               $cap = $5;
-       }else{
-               $ND::server->command("notice $ND::nick 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");
-               return;
-       }
-
-       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,$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 = ceil($tsize*.75**($roids-1));
-               $roids = int($cap*$tsize);
-       }
-       $tsize -= $roids;
-       unless (defined $avalue && defined $ascore){
-               $ND::server->command("notice $ND::nick You don't have a planet specified");
-               return;
-       }
-       unless (defined $tvalue && defined $tscore){
-               $ND::server->command("notice $ND::nick Doesn't seem to be a planet at $x:$y:$z");
-               return;
-       }
-       my $xp = pa_xp($roids,$ascore,$avalue,$tscore,$tvalue);
-       my $score = 60 * $xp;
-       my $value = $roids*200;
-       my $totscore = prettyValue($score + $value);
-       $ND::server->command("notice $ND::nick 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,");
-}
-
 sub findCovOpper {
        my ($stolen, $command) = @_;