X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=PA.pm;h=1eb767520d5a478d1c475575865d7b5ea2287893;hb=113d72c69d686a58b41b0a055ff5a582fab5d2c8;hp=0eb0412d4e36684466de99709c44ae6d981446f9;hpb=3614f618f8ff7f59e885710dd387a61f2b16ff4a;p=NDIRC.git diff --git a/PA.pm b/PA.pm index 0eb0412..1eb7675 100644 --- 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 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}); @@ -141,6 +91,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 +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'){ @@ -187,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) = @_; @@ -261,7 +173,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){