Convert calcXp to new format

diff --git a/PA.pm b/PA.pm
index 1b8f239c5aacc5dfd9eb873a0bf730ef5778c857..e5eaa6b5f5eff1617fc8ea5e87296fbbb504abe7 100644 (file)
--- a/PA.pm
+++ b/PA.pm
@@ -195,7 +195,19 @@ FROM ship_stats WHERE name ILIKE ?
 }
 
 sub calcXp {
-       my ($x,$y,$z,$roids,$cap) = @_;
+       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