fix for bug numbers + skeleton for the find cov opper function, which hasn't been...

[NDIRC.git] / PA.pm

diff --git a/PA.pm b/PA.pm
index 5781ee73f2cb94e9d3b42852f5aad3ab2dd13bea..0d6e160c391d68c054b46bfef73b8a527669b609 100644 (file)
--- a/PA.pm
+++ b/PA.pm
@@ -33,6 +33,7 @@ our @EXPORT = qw/checkPlanet checkGal shipEff shipStop parseValue prettyValue ca
 sub checkPlanet {
        my ($msg) = @_;
 
+       DB();
        my ($x,$y,$z,$nick);
        if ($msg =~ /(\d+)\D+(\d+)\D+(\d+)/){
                $x = $1;
@@ -43,7 +44,6 @@ sub checkPlanet {
        }else{
                $ND::server->command("notice $ND::target usage .p X:Y:Z".(officer() ? ' or .p nick' : ''));
        }
-       DB();
        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
@@ -91,9 +91,9 @@ FROM ship_stats WHERE name ILIKE ?
                $type = "steal" if ($ship[2] eq 'Steal') or ($ship[2] eq 'Pod');
 
                $amount = int(($value*100/$ship[4])) if $amount eq 'value';
-               $feud = '(FEUD: '.int($amount/0.75).') ' if defined $value;
+               $feud = '(FEUD: '.prettyValue(int($amount/0.80)).') ' if defined $value;
                $value = prettyValue(($amount*$ship[4]/100));
-               my $text = "$amount $feud $ship[0] ($ship[5]:$value) will $type:";
+               my $text = prettyValue($amount)." $feud $ship[0] ($ship[5]:$value) will $type:";
                my $st = $ND::DBH->prepare(q{
                        SELECT name,"class","type",armor,metal+crystal+eonium,init,target,eres,race
                        FROM ship_stats WHERE "class" = ?
@@ -136,7 +136,7 @@ FROM ship_stats WHERE name ILIKE ?
                $ship[0] = "${ND::C}13$ship[0]$ND::C" if $ship[2] eq 'Steal';
 
                $amount = int(($value*100/$ship[4])) if $amount eq 'value';
-               $feud = '(FEUD: '.int($amount/0.75).') ' if defined $value;
+               $feud = '(FEUD: '.int($amount/0.80).') ' if defined $value;
                $value = prettyValue(($amount*$ship[4]/100));
                my $text = "To stop $amount $feud $ship[0] ($ship[5]:$value) you need:";
                my $st = $ND::DBH->prepare(q{
@@ -197,4 +197,30 @@ sub calcXp {
        $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,");
 }
 
+sub findCovOpper {
+       my ($stolen) = @_;
+
+       my $tick = $ND::tick;
+       my $agents;
+
+       if ($stolen =~ /(\d+) (\d+) (\d+)/){
+               $tick = $1;
+               $agents = $2;
+               $stolen = $3;
+       }elsif ($stolen =~ /(\d+) (\d+)/){
+               $tick = $1;
+               $stolen = $3;
+       }
+
+       my ($value,$score) = $ND::DBH->selectrow_array(q{
+               SELECT value,score FROM planet_stats WHERE 
+                       id = (SELECT planet FROM users WHERE hostmask ILIKE ?) AND tick = ?;
+               }, undef, $ND::address,$tick);
+       my ($coords) = $ND::DBH->selectrow_array(q{
+               SELECT coords(p.x,p.y,p.z) FROM current_planet_stats p JOIN planet_stats ps using (id) WHERE 
+               ps.tick = ? AND (2000*?*?/ps.value)::int = $stolen ;
+               }, undef, $tick,$agents,$value,$stolen);
+       $ND::server->command("notice $ND::target The planet that cov opped you is: $coords");
+}
+
 1;