Converted the .time command

[NDIRC.git] / PA.pm

diff --git a/PA.pm b/PA.pm
index 62382dd8bf65da26587baf787473d0a309c3d140..dd3dbb9a04deed3d06f6523cefecded5268dab7e 100644 (file)
--- a/PA.pm
+++ b/PA.pm
@@ -28,57 +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() && defined $msg){
-               $nick = $msg;
-       }else{
-               $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
-               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() || 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::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("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::nick $x:$y  Score=$row[0], Size=$row[1], Value=$row[2]");
-       }
-}
+our @EXPORT = qw/shipEff shipStop parseValue prettyValue calcXp findCovOpper/;
 
 sub shipEff {
        my ($msg,$command) = @_;
@@ -111,7 +61,7 @@ sub shipEff {
        if ($s){
                if (defined $value){
                        $amount = int(($value*100/$s->{cost}));
-                       $feud = '(FEUD: '.prettyValue(int($amount/0.85)).') ';
+                       $feud = '(FEUD: '.prettyValue(int($amount/0.86)).') ';
                }
                $value = prettyValue(($amount*$s->{cost}/100));
                my $name = shipColor($s->{name},$s->{type});
@@ -148,6 +98,7 @@ sub shipEff {
                                        $number /= 0.60 if $tn eq 't2';
                                        $number /= 0.30 if $tn eq 't3';
                                }
+                               $number = int($number);
                                $value = prettyValue($number*$t->{cost}/100);
                                my $name = shipColor($t->{name},$t->{type});
                                $text .= " $ND::B$number$ND::O $name ($t->{init}:$value),";
@@ -164,12 +115,12 @@ sub calcEff {
        my $number = 0;
        if ($eff){
                $number = $s->{type} eq 'Emp' ?
-                       int($amount*$s->{guns}*(100-$t->{eres})/100)
-                       : int($amount*$s->{damage}/$t->{armor});
+                       ($amount*$s->{guns}*(100-$t->{eres})/100)
+                       : ($amount*$s->{damage}/$t->{armor});
        }else{
                $number = $t->{type} eq 'Emp' ?
-                       int($amount*100/(100 - $s->{eres})/$t->{guns})
-                       : int($amount*$s->{armor}/$t->{damage});
+                       ($amount*100/(100 - $s->{eres})/$t->{guns})
+                       : ($amount*$s->{armor}/$t->{damage});
        }
 
        for my $tn ('t1','t2','t3'){
@@ -268,7 +219,7 @@ sub findCovOpper {
        }
        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 ;
+               ps.tick = $1 AND (2000.0*$2*$3/ps.value)::int = $4 ;
                });
        $attackers->execute($tick,$agents,$value,$stolen);
        if ($attackers->rows == 0){