]> ruin.nu Git - NDIRC.git/blobdiff - PA.pm
shipEff: updated for up to 3 target classes
[NDIRC.git] / PA.pm
diff --git a/PA.pm b/PA.pm
index 6d3ed91f22bbeec9cd2a8952bc649e5027cf7ec5..e6c00e87851aff029262118614760e4750d71b6a 100644 (file)
--- a/PA.pm
+++ b/PA.pm
@@ -28,21 +28,21 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/checkPlanet checkGal shipEff shipStop parseValue prettyValue calcXp/;
+our @EXPORT = qw/checkPlanet checkGal shipEff shipStop parseValue prettyValue calcXp findCovOpper/;
 
 sub checkPlanet {
        my ($msg) = @_;
 
-       DB();
        my ($x,$y,$z,$nick);
        if ($msg =~ /(\d+)\D+(\d+)\D+(\d+)/){
                $x = $1;
                $y = $2;
                $z = $3;
-       }elsif (officer()){
+       }elsif (officer() && defined $msg){
                $nick = $msg;
        }else{
-               $ND::server->command("notice $ND::target usage .p X:Y:Z".(officer() ? ' or .p nick' : ''));
+               $ND::server->command("notice $ND::nick usage .p X:Y:Z".(officer() ? ' 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
@@ -57,27 +57,34 @@ sub checkPlanet {
                if (officer() || dc()){
                        $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::target $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})");
+               $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::target Couldn't find planet: $msg");
+               $ND::server->command("notice $ND::nick Couldn't find planet: $msg");
        }
 }
 sub checkGal {
-       my ($x,$y) = @_;
-       DB();
-       my $f = $ND::DBH->prepare("SELECT name,score,size,value FROM galaxies WHERE x = ? AND y = ? and tick = (SELECT max(tick) from galaxies)");
+       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("SELECT score,size,value 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::target $x:$y $row[0], Score=$row[1], Size=$row[2], Value=$row[3]");
+               $ND::server->command("notice $ND::nick $x:$y  Score=$row[0], Size=$row[1], Value=$row[2]");
        }
 }
 
 sub shipEff {
-       my ($msg,$value) = @_;
-       my ($amount,$ship);
-       if($msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)$/){
-               if (defined $value){
+       my ($msg,$command) = @_;
+       my ($amount,$ship,$value,$target);
+       if($msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)(?: (\w+))?/){
+               if ($command eq 'veff'){
                        $value = parseValue($1);
                        $value *= -1.5 if $value < 0;
                        my $feud = '';
@@ -85,57 +92,70 @@ sub shipEff {
                        $amount = parseValue($1);
                }
                $ship = "\%$2\%";
+               $target = ($3 || '%');
        }else{
-               my $command = (defined $value ? "veff" : "eff");
-               $ND::server->command("notice $ND::nick syntax: .$command amount ship");
+               $ND::server->command("notice $ND::nick syntax: $command amount ship [race|class] | Amount can use SI prefixes like k and M. Race or class is an optional argument, using the short form (i.e. cath or Fi)");
                return;
        }
        my $feud = '';
 
-       my @ship = $ND::DBH->selectrow_array(q{
-SELECT name,target,"type",damage,metal+crystal+eonium,init,"class",guns,race
+       my $s= $ND::DBH->selectrow_hashref(q{
+SELECT name,t1,t2,t3,"type",damage,metal+crystal+eonium AS cost,init,"class",guns,race
 FROM ship_stats WHERE name ILIKE ?
                }, undef, $ship);
-       if (@ship){
+       if ($s){
                my $type = "kill";
-               $type = "stun" if $ship[2] eq 'Emp';
-               $type = "steal" if ($ship[2] eq 'Steal') or ($ship[2] eq 'Pod');
+               $type = "stun" if $s->{type} eq 'Emp';
+               $type = "steal" if ($s->{type} eq 'Steal') or ($s->{type} eq 'Pod');
 
                if (defined $value){
-                       $amount = int(($value*100/$ship[4]));
-                       $feud = '(FEUD: '.prettyValue(int($amount/0.80)).') ';
+                       $amount = int(($value*100/$s->{cost}));
+                       $feud = '(FEUD: '.prettyValue(int($amount/0.85)).') ';
                }
-               $value = prettyValue(($amount*$ship[4]/100));
-               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" = ?
-                       });
-               $st->execute($ship[1]);
-               while (my @target = $st->fetchrow()){
-                       my $dead = $ship[2] eq 'Emp' ? int($amount*$ship[7]*(100-$target[7])/100) : int($amount*$ship[3]/$target[3]);
-                       $value = prettyValue($dead*$target[4]/100);
-                       if (($target[6] eq $ship[6]) and ($target[5] <= $ship[5])){
-                               $target[5] = "${ND::C}04$target[5]$ND::C";
-                       }elsif(($target[6] eq $ship[6]) and ($target[5] > $ship[5])){
-                               $target[5] = "${ND::C}12$target[5]$ND::C";
+               $value = prettyValue(($amount*$s->{cost}/100));
+               my $text = prettyValue($amount)." $feud $s->{name} ($s->{init}:$value) will $type:";
+               for my $tn ('t1','t2','t3'){
+                       if (defined $s->{$tn}){
+                               $text .= " $ND::B${ND::C}03" . $s->{$tn} . "$ND::C$ND::B: ";
+                       }else{
+                               next;
+                       }
+                       my $st = $ND::DBH->prepare(q{
+                               SELECT name,"class","type",armor,metal+crystal+eonium AS cost,init,t1,t2,t3,eres,race
+                               FROM ship_stats WHERE "class" = $1 AND ("class" ILIKE $2 OR race ILIKE $2)
+                               });
+                       $st->execute($s->{$tn},$target);
+                       while (my $t = $st->fetchrow_hashref()){
+                               my $dead = $s->{type} eq 'Emp' ? int($amount*$s->{guns}*(100-$t->{eres})/100)
+                                       : int($amount*$s->{damage}/$t->{armor});
+                               $value = prettyValue($dead*$t->{cost}/100);
+                               for my $tn2 ('t1','t2','t3'){
+                                       next unless (defined $t->{$tn2});
+                                       next unless ($t->{$tn2} eq $s->{class});
+                                       
+                                       if($t->{init} <= $s->{init}){
+                                               $t->{init} = "${ND::C}04$t->{init}$ND::C";
+                                       }elsif($t->{init} > $s->{init}){
+                                               $t->{init} = "${ND::C}12$t->{init}$ND::C";
+                                       }
+                               }
+                               $t->{name} = "${ND::C}04$t->{name}$ND::C" if $t->{type} eq 'Norm' || $t->{type} eq 'Cloak';
+                               $t->{name} = "${ND::C}12$t->{name}$ND::C" if $t->{type} eq 'Emp';
+                               $t->{name} = "${ND::C}13$t->{name}$ND::C" if $t->{type} eq 'Steal';
+                               $text .= " $ND::B$dead$ND::B $t->{name} ($t->{init}:$value),";
                        }
-                       $target[0] = "${ND::C}04$target[0]$ND::C" if $target[2] eq 'Norm' || $target[2] eq 'Cloak';
-                       $target[0] = "${ND::C}12$target[0]$ND::C" if $target[2] eq 'Emp';
-                       $target[0] = "${ND::C}13$target[0]$ND::C" if $target[2] eq 'Steal';
-                       $text .= " $ND::B$dead$ND::B $target[0] ($target[5]:$value),";
+                       chop $text;
                }
-               chop $text;
                $ND::server->command("notice $ND::nick $text");
        }
        #print $text;
 }
 
 sub shipStop {
-       my ($msg,$value) = @_;
-       my ($amount,$ship);
-       if($msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)$/){
-               if (defined $value){
+       my ($msg,$command) = @_;
+       my ($amount,$ship,$value);
+       if($msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)/){
+               if ($command eq 'vstop'){
                        $value = parseValue($1);
                        $value *= -1.5 if $value < 0;
                        my $feud = '';
@@ -144,7 +164,6 @@ sub shipStop {
                }
                $ship = "\%$2\%";
        }else{
-               my $command = (defined $value ? "vstop" : "stop");
                $ND::server->command("notice $ND::nick syntax: .$command amount ship");
                return;
        }
@@ -161,7 +180,7 @@ FROM ship_stats WHERE name ILIKE ?
 
                if (defined $value){
                        $amount = int(($value*100/$ship[4]));
-                       $feud = '(FEUD: '.prettyValue(int($amount/0.80)).') ';
+                       $feud = '(FEUD: '.prettyValue(int($amount/0.85)).') ';
                }
                $value = prettyValue(($amount*$ship[4]/100));
                my $text = "To stop $amount $feud $ship[0] ($ship[5]:$value) you need:";
@@ -190,7 +209,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 
@@ -209,44 +240,60 @@ sub calcXp {
        }
        $tsize -= $roids;
        unless (defined $avalue && defined $ascore){
-               $ND::server->command("notice $ND::target You don't have a planet specified");
+               $ND::server->command("notice $ND::nick You don't have a planet specified");
                return;
        }
        unless (defined $tvalue && defined $tscore){
-               $ND::server->command("notice $ND::target Doesn't seem to be a planet at $x:$y:$z");
+               $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::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,");
+       $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) = @_;
+       my ($stolen, $command) = @_;
 
        my $tick = $ND::tick;
        my $agents;
 
-       if ($stolen =~ /(\d+) (\d+) (\d+)/){
+       if (defined $stolen && $stolen =~ /(\d+) (\d+) (\d+)/){
                $tick = $1;
                $agents = $2;
                $stolen = $3;
-       }elsif ($stolen =~ /(\d+) (\d+)/){
-               $tick = $1;
-               $stolen = $3;
+       }elsif (defined $stolen && $stolen =~ /(\d+) (\d+)/){
+               $agents = $1;
+               $stolen = $2;
+       }else{
+               $ND::server->command("notice $ND::nick syntax: .$command [tick] agents stolen | tick can be omitted if you're doing this the same tick you got cov opped, if you have different amount of your resources stolen, specify the highest amount. Only works if less than 10% of your resources and < 10,000*agents were stolen");
+               return;
        }
 
        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");
+       unless ($value){
+               $ND::server->command("notice $ND::nick No value found for tick $tick, can't find your cov opper.");
+               return;
+       }
+       my $attackers = $ND::DBH->prepare(q{
+               SELECT coords(p.x,p.y,p.z), ruler, planet FROM current_planet_stats p JOIN planet_stats ps using (id) WHERE 
+               ps.tick = $1 AND (2000*$2*$3/ps.value)::int = $4 ;
+               });
+       $attackers->execute($tick,$agents,$value,$stolen);
+       if ($attackers->rows == 0){
+               $ND::server->command("notice $ND::nick No cov opper found, did you specify the right tick, and was the stolen amount not capped?");
+               return;
+       }
+       my $coords = '';
+       while (my $attacker = $attackers->fetchrow_hashref){
+               $coords .= " ($attacker->{coords} : $attacker->{ruler} OF $attacker->{planet})";
+       }
+       $ND::server->command("notice $ND::nick The planet that cov opped you is one of: $coords");
 }
 
 1;