X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=PA.pm;fp=PA.pm;h=1eb767520d5a478d1c475575865d7b5ea2287893;hb=113d72c69d686a58b41b0a055ff5a582fab5d2c8;hp=dd3dbb9a04deed3d06f6523cefecded5268dab7e;hpb=035b1523b2136f620f1aa161b04c011a30fbc174;p=NDIRC.git diff --git a/PA.pm b/PA.pm index dd3dbb9..1eb7675 100644 --- 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) = @_;