From 21cb796be35d56fc6620af557355ab57b6c00e88 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Fri, 8 May 2009 19:33:44 +0200 Subject: [PATCH] Converted .eff, .stop, .veff and .vstop --- Commands/PA.pm | 114 +++++++++++++++++++++++++++++++++++++ PA.pm | 148 ------------------------------------------------- 2 files changed, 114 insertions(+), 148 deletions(-) delete mode 100644 PA.pm diff --git a/Commands/PA.pm b/Commands/PA.pm index b629592..0d83484 100644 --- a/Commands/PA.pm +++ b/Commands/PA.pm @@ -180,4 +180,118 @@ WHERE ps.tick = $1 AND (2000.0*$2*$3/ps.value)::int = $4 } } +sub eff + : Alias(qw/veff stop vstop/) + : Help( syntax: .eff 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) | veff, stop and vstop are variations of this command) +{ + my ($self, $c, $msg) = @_; + my ($amount,$ship,$target) = $msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)(?: (\w+))?/ + or die 'ARGS'; + + my $eff = ($self->name =~ /(eff)/); + $ship = "\%$ship\%"; + $target //= '%'; + my $value; + if ($self->name =~ /^v.+$/){ + $value = parseValue($amount); + $value *= -1.5 if $value < 0; + }else{ + $amount = parseValue($amount); + } + + my $feud = ''; + + my $s= $c->model->selectrow_hashref(q{ + SELECT name,t1,t2,t3,"type",damage + ,metal+crystal+eonium AS cost + ,init,"class",guns,race,eres,armor + FROM ship_stats WHERE name ILIKE ? + }, undef, $ship); + if ($s){ + if (defined $value){ + $amount = int(($value*100/$s->{cost})); + $feud = '(FEUD: '.prettyValue(int($amount/0.86)).') '; + } + $value = prettyValue(($amount*$s->{cost}/100)); + my $name = shipColor($s->{name},$s->{type}); + my $text = prettyValue($amount)." $name ($s->{init}:$value) :"; + for my $tn ('t1','t2','t3'){ + next if ($eff && not defined $s->{$tn}); + $text .= " " . ($eff ? $s->{$tn} : $tn) . ": "; + my $st = q{ + SELECT name,"class","type",armor + ,metal+crystal+eonium AS cost + ,init,t1,t2,t3,eres,race + ,damage,guns + FROM ship_stats + }; + if ($eff){ + $st = $c->model->prepare($st . q{ + WHERE "class" = $1 + AND ("class" ILIKE $2 OR race ILIKE $2) + }); + $st->execute($s->{$tn},$target); + }else{ + $st = $c->model->prepare($st . qq{ + WHERE $tn = \$1 + AND ("class" ILIKE \$2 OR race ILIKE \$2) + }); + $st->execute($s->{class},$target); + } + 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 .= " $number $name ($t->{init}:$value),"; + } + chop $text; + } + $c->reply($text); + } +} + +sub calcEff { + my ($s,$t,$amount,$eff) = @_; + + my $number = 0; + if ($eff){ + $number = $s->{type} eq 'Emp' ? + ($amount*$s->{guns}*(100-$t->{eres})/100) + : ($amount*$s->{damage}/$t->{armor}); + }else{ + $number = $t->{type} eq 'Emp' ? + ($amount*100/(100 - $s->{eres})/$t->{guns}) + : ($amount*$s->{armor}/$t->{damage}); + } + + for my $tn ('t1','t2','t3'){ + my ($s1,$t1) = $eff ? ($s,$t) : ($t,$s); + next unless (defined $t1->{$tn}); + next unless ($t1->{$tn} eq $s1->{class}); + + if($t1->{init} <= $s1->{init}){ + $t->{init} = "$t->{init}"; + }else{ + $t->{init} = "$t->{init}"; + } + } + return $number; +} + +sub shipColor { + my ($string,$type) = @_; + my $c = 04; + $c = 12 if $type eq 'Emp'; + $c = 13 if $type eq 'Steal'; + return "$string"; +} + 1; diff --git a/PA.pm b/PA.pm deleted file mode 100644 index 094c567..0000000 --- a/PA.pm +++ /dev/null @@ -1,148 +0,0 @@ -#************************************************************************** -# Copyright (C) 2006 by Michael Andreen * -# * -# This program is free software; you can redistribute it and/or modify * -# it under the terms of the GNU General Public License as published by * -# the Free Software Foundation; either version 2 of the License, or * -# (at your option) any later version. * -# * -# This program is distributed in the hope that it will be useful, * -# but WITHOUT ANY WARRANTY; without even the implied warranty of * -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -# GNU General Public License for more details. * -# * -# You should have received a copy of the GNU General Public License * -# along with this program; if not, write to the * -# Free Software Foundation, Inc., * -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * -#**************************************************************************/ -package NDIRC::PA; -use strict; -use warnings; -use ND::DB; -use ND::Include; -use NDIRC::Access; -use NDIRC::Misc; -use POSIX; -require Exporter; - -our @ISA = qw/Exporter/; - -our @EXPORT = qw/shipEff shipStop parseValue prettyValue findCovOpper/; - -sub shipEff { - my ($msg,$command) = @_; - my ($amount,$ship,$value,$target); - my $eff = 1; - $eff = 0 if $command =~ /stop/; - if(defined $msg && $msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)(?: (\w+))?/){ - $ship = "\%$2\%"; - $target = ($3 || '%'); - my $am = $1; - if ($command =~ /^v.+$/){ - $value = parseValue($am); - $value *= -1.5 if $value < 0; - my $feud = ''; - }else{ - $amount = parseValue($am); - } - }else{ - $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 $s= $ND::DBH->selectrow_hashref(q{ - SELECT name,t1,t2,t3,"type",damage - ,metal+crystal+eonium AS cost - ,init,"class",guns,race,eres,armor - FROM ship_stats WHERE name ILIKE ? - }, undef, $ship); - if ($s){ - if (defined $value){ - $amount = int(($value*100/$s->{cost})); - $feud = '(FEUD: '.prettyValue(int($amount/0.86)).') '; - } - $value = prettyValue(($amount*$s->{cost}/100)); - my $name = shipColor($s->{name},$s->{type}); - my $text = prettyValue($amount)." $name ($s->{init}:$value) :"; - for my $tn ('t1','t2','t3'){ - next if ($eff && not defined $s->{$tn}); - $text .= " $ND::B${ND::C}03" . ($eff ? $s->{$tn} : $tn) . "$ND::O: "; - my $st = q{ - SELECT name,"class","type",armor - ,metal+crystal+eonium AS cost - ,init,t1,t2,t3,eres,race - ,damage,guns - FROM ship_stats - }; - if ($eff){ - $st = $ND::DBH->prepare($st . q{ - WHERE "class" = $1 - AND ("class" ILIKE $2 OR race ILIKE $2) - }); - $st->execute($s->{$tn},$target); - }else{ - $st = $ND::DBH->prepare($st . qq{ - WHERE $tn = \$1 - AND ("class" ILIKE \$2 OR race ILIKE \$2) - }); - $st->execute($s->{class},$target); - } - 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),"; - } - chop $text; - } - $ND::server->command("notice $ND::nick $text"); - } -} - -sub calcEff { - my ($s,$t,$amount,$eff) = @_; - - my $number = 0; - if ($eff){ - $number = $s->{type} eq 'Emp' ? - ($amount*$s->{guns}*(100-$t->{eres})/100) - : ($amount*$s->{damage}/$t->{armor}); - }else{ - $number = $t->{type} eq 'Emp' ? - ($amount*100/(100 - $s->{eres})/$t->{guns}) - : ($amount*$s->{armor}/$t->{damage}); - } - - for my $tn ('t1','t2','t3'){ - my ($s1,$t1) = $eff ? ($s,$t) : ($t,$s); - next unless (defined $t1->{$tn}); - next unless ($t1->{$tn} eq $s1->{class}); - - if($t1->{init} <= $s1->{init}){ - $t->{init} = "${ND::C}04$t->{init}$ND::O"; - }else{ - $t->{init} = "${ND::C}12$t->{init}$ND::O"; - } - } - return $number; -} - -sub shipColor { - my ($string,$type) = @_; - my $c = 04; - $c = 12 if $type eq 'Emp'; - $c = 13 if $type eq 'Steal'; - return "$ND::C$c$string$ND::O"; -} - -1; -- 2.39.2