Integrated the updated .stop and .vstop into shipEff

diff --git a/PA.pm b/PA.pm
index e6c00e87851aff029262118614760e4750d71b6a..0eb0412d4e36684466de99709c44ae6d981446f9 100644 (file)
--- a/PA.pm
+++ b/PA.pm
@@ -83,16 +83,19 @@ sub checkGal {
 sub shipEff {
        my ($msg,$command) = @_;
        my ($amount,$ship,$value,$target);
-       if($msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)(?: (\w+))?/){
-               if ($command eq 'veff'){
-                       $value = parseValue($1);
+       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($1);
+                       $amount = parseValue($am);
                }
-               $ship = "\%$2\%";
-               $target = ($3 || '%');
        }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;
@@ -100,112 +103,88 @@ sub shipEff {
        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
-FROM ship_stats WHERE name ILIKE ?
+               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){
-               my $type = "kill";
-               $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/$s->{cost}));
                        $feud = '(FEUD: '.prettyValue(int($amount/0.85)).') ';
                }
                $value = prettyValue(($amount*$s->{cost}/100));
-               my $text = prettyValue($amount)." $feud $s->{name} ($s->{init}:$value) will $type:";
+               my $name = shipColor($s->{name},$s->{type});
+               my $text = prettyValue($amount)." $name ($s->{init}:$value) :";
                for my $tn ('t1','t2','t3'){
-                       if (defined $s->{$tn}){
-                               $text .= " $ND::B${ND::C}03" . $s->{$tn} . "$ND::C$ND::B: ";
+                       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{
-                               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 = $ND::DBH->prepare($st . qq{
+                               WHERE $tn = \$1
+                                       AND ("class" ILIKE \$2 OR race ILIKE \$2)
                                });
-                       $st->execute($s->{$tn},$target);
+                               $st->execute($s->{class},$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),";
+                               my $number = calcEff($s,$t,$amount,$eff);
+                               $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");
        }
-       #print $text;
 }
 
-sub shipStop {
-       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 = '';
-               }else{
-                       $amount = parseValue($1);
-               }
-               $ship = "\%$2\%";
+sub calcEff {
+       my ($s,$t,$amount,$eff) = @_;
+
+       my $number = 0;
+       if ($eff){
+               $number = $s->{type} eq 'Emp' ?
+                       int($amount*$s->{guns}*(100-$t->{eres})/100)
+                       : int($amount*$s->{damage}/$t->{armor});
        }else{
-               $ND::server->command("notice $ND::nick syntax: .$command amount ship");
-               return;
+               $number = $t->{type} eq 'Emp' ?
+                       int($amount*100/(100 - $s->{eres})/$t->{guns})
+                       : int($amount*$s->{armor}/$t->{damage});
        }
-       my $feud = '';
 
-       my @ship = $ND::DBH->selectrow_array(q{
-SELECT name,target,"type",armor,metal+crystal+eonium,init,"class",eres,race
-FROM ship_stats WHERE name ILIKE ?
-               }, undef, $ship);
-       if (@ship){
-               $ship[0] = "${ND::C}04$ship[0]$ND::C" if $ship[2] eq 'Norm';
-               $ship[0] = "${ND::C}12$ship[0]$ND::C" if $ship[2] eq 'Emp';
-               $ship[0] = "${ND::C}13$ship[0]$ND::C" if $ship[2] eq 'Steal';
+       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 (defined $value){
-                       $amount = int(($value*100/$ship[4]));
-                       $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:";
-               my $st = $ND::DBH->prepare(q{
-                       SELECT name,"class","type",damage,metal+crystal+eonium,init,target,guns,race
-                       FROM ship_stats WHERE "target" = ?
-                       });
-               $st->execute($ship[6]);
-               while (my @stopper = $st->fetchrow()){
-                       my $needed = $stopper[2] eq 'Emp' ? ceil($amount*100/(100-$ship[7])/$stopper[7]) : ceil($amount*$ship[3]/$stopper[3]);
-                       $value = prettyValue($needed*$stopper[4]/100);
-                       if (($stopper[1] eq $ship[1]) and ($ship[5] <= $stopper[5])){
-                               $stopper[5] = "${ND::C}04$stopper[5]$ND::C";
-                       }elsif(($stopper[1] eq $ship[1]) and ($ship[5] > $stopper[5])){
-                               $stopper[5] = "${ND::C}12$stopper[5]$ND::C";
-                       }
-                       $stopper[0] = "${ND::C}04$stopper[0]$ND::C" if $stopper[2] eq 'Norm' || $stopper[2] eq 'Cloak';
-                       $stopper[0] = "${ND::C}12$stopper[0]$ND::C" if $stopper[2] eq 'Emp';
-                       $stopper[0] = "${ND::C}13$stopper[0]$ND::C" if $stopper[2] eq 'Steal';
-                       $text .= " $ND::B$needed$ND::B $stopper[0] ($stopper[5]:$value),";
+               if($t1->{init} <= $s1->{init}){
+                       $t->{init} = "${ND::C}04$t->{init}$ND::O";
+               }else{
+                       $t->{init} = "${ND::C}12$t->{init}$ND::O";
                }
-               chop $text;
-               $ND::server->command("notice $ND::nick $text");
        }
-       #print $text;
+       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";
 }
 
 sub calcXp {