Converted the .xp command

[NDIRC.git] / PA.pm

diff --git a/PA.pm b/PA.pm
index 7a4a4b81e1c98c91971e6f746d23b22a895fa874..1eb767520d5a478d1c475575865d7b5ea2287893 100644 (file)
--- a/PA.pm
+++ b/PA.pm
@@ -28,59 +28,7 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/checkPlanet checkGal shipEff shipStop parseValue prettyValue calcXp findCovOpper/;
-
-sub checkPlanet {
-       my ($msg) = @_;
-
-       my ($x,$y,$z,$nick);
-       if ($msg =~ /(\d+)\D+(\d+)\D+(\d+)/){
-               $x = $1;
-               $y = $2;
-               $z = $3;
-       }elsif ((officer() || ia() || intel()) && defined $msg){
-               $nick = $msg;
-       }else{
-               $ND::server->command("notice $ND::nick usage .p X:Y:Z".(officer() || ia() ? ' or .p nick' : ''));
-               return;
-       }
-       my $f = $ND::DBH->prepare(q{SELECT coords(x,y,z),ruler,planet,race,score,size,value,scorerank,sizerank,
-               valuerank, xp, xprank, alliance, relationship, nick, planet_status, hit_us, channel
-               FROM current_planet_stats WHERE (x = $1 AND y = $2 and z = $3) OR nick ILIKE $4 LIMIT 1
-       });
-       $f->execute($x,$y,$z,$nick);
-       if (my $planet = $f->fetchrow_hashref()){
-               for (keys %{$planet}){
-                       $planet->{$_} = valuecolor(1,$planet->{$_});
-               }
-               my $ally = "";
-               if (officer() || ia() || dc() || intel()){
-                       $ally = "Alliance=$planet->{alliance} ($planet->{relationship}), Nick=$planet->{nick} ($planet->{planet_status}), Channel: $planet->{channel}, Hostile Count: $planet->{hit_us},";
-               }
-               $ND::server->command("notice $ND::nick $planet->{coords} $planet->{ruler} OF $planet->{planet},$ally Race=$planet->{race}, Score=$planet->{score} ($planet->{scorerank}), Size=$planet->{size} ($planet->{sizerank}), Value=$planet->{value} ($planet->{valuerank}), XP=$planet->{xp} ($planet->{xprank})");
-       }else{
-               $ND::server->command("notice $ND::nick Couldn't find planet: $msg");
-       }
-}
-sub checkGal {
-       my ($msg) = @_;
-
-       my ($x,$y,);
-       if ($msg =~ /(\d+)\D+(\d+)/){
-               $x = $1;
-               $y = $2;
-       }else{
-               $ND::server->command("notice $ND::nick syntax: .g X:Y");
-       }
-       my $f = $ND::DBH->prepare(q{SELECT score,scorerank,size,sizerank,value,valuerank,planets
-               FROM galaxies WHERE x = ? AND y = ? AND tick = (SELECT max(tick) from galaxies)
-       });
-       $f->execute($x,$y);
-       while (my @row = $f->fetchrow()){
-               @row = map (valuecolor(1),@row);
-               $ND::server->command("notice $ND::nick $x:$y  Score=$row[0] ($row[1]), Size=$row[2] ($row[3]), Value=$row[4] ($row[5]), Planets=$row[6]");
-       }
-}
+our @EXPORT = qw/shipEff shipStop parseValue prettyValue findCovOpper/;
 
 sub shipEff {
        my ($msg,$command) = @_;
@@ -197,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) = @_;