Allow min claim and forum dates for laston

[NDIRC.git] / PA.pm

diff --git a/PA.pm b/PA.pm
index 0eb0412d4e36684466de99709c44ae6d981446f9..7a4a4b81e1c98c91971e6f746d23b22a895fa874 100644 (file)
--- a/PA.pm
+++ b/PA.pm
@@ -38,10 +38,10 @@ sub checkPlanet {
                $x = $1;
                $y = $2;
                $z = $3;
-       }elsif (officer() && defined $msg){
+       }elsif ((officer() || ia() || intel()) && defined $msg){
                $nick = $msg;
        }else{
-               $ND::server->command("notice $ND::nick usage .p X:Y:Z".(officer() ? ' or .p nick' : ''));
+               $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,
@@ -54,7 +54,7 @@ sub checkPlanet {
                        $planet->{$_} = valuecolor(1,$planet->{$_});
                }
                my $ally = "";
-               if (officer() || dc()){
+               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})");
@@ -72,11 +72,13 @@ sub checkGal {
        }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)");
+       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], Size=$row[1], Value=$row[2]");
+               $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]");
        }
 }
 
@@ -111,7 +113,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});
@@ -141,6 +143,14 @@ sub shipEff {
                        }
                        while (my $t = $st->fetchrow_hashref()){
                                my $number = calcEff($s,$t,$amount,$eff);
+                               if ($eff){
+                                       $number *= 0.60 if $tn eq 't2';
+                                       $number *= 0.30 if $tn eq 't3';
+                               }else{
+                                       $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),";
@@ -157,12 +167,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'){
@@ -261,7 +271,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){