X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FIRC%2FPA.pm;h=e5f20bf7b42fa743282232816e77c686efa48329;hb=88bab2dd26fcdb7a49a81e9fe6a74022ce079f52;hp=ca73ea59030b818d885de1ea0a2ce300cb4faef7;hpb=1f1d37b478dace4b2c2c8054fe6f7350bfb24ae9;p=ndwebbie.git diff --git a/ND/IRC/PA.pm b/ND/IRC/PA.pm index ca73ea5..e5f20bf 100644 --- a/ND/IRC/PA.pm +++ b/ND/IRC/PA.pm @@ -59,6 +59,7 @@ sub shipEff { $amount = parseValue($amount); $value = parseValue($value); $value *= -1.5 if defined $value and $value < 0; + my $feud = ''; my @ship = $ND::DBH->selectrow_array(q{ SELECT name,target,"type",damage,metal+crystal+eonium,init,"class",guns,race @@ -70,8 +71,9 @@ FROM ship_stats WHERE name ILIKE ? $type = "steal" if ($ship[2] eq 'Steal') or ($ship[2] eq 'Pod'); $amount = int(($value*100/$ship[4])) if $amount eq 'value'; + $feud = '(FEUD: '.int($amount/0.75).') ' if defined $value; $value = prettyValue(($amount*$ship[4]/100)); - my $text = "$amount $ship[0] ($ship[5]:$value) will $type:"; + my $text = "$amount $feud $ship[0] ($ship[5]:$value) will $type:"; my $st = $ND::DBH->prepare(q{ SELECT name,"class","type",armor,metal+crystal+eonium,init,target,eres,race FROM ship_stats WHERE "class" = ? @@ -102,6 +104,7 @@ sub shipStop { $amount = parseValue($amount); $value = parseValue($value); $value *= -1.5 if defined $value and $value < 0; + my $feud = ''; my @ship = $ND::DBH->selectrow_array(q{ SELECT name,target,"type",armor,metal+crystal+eonium,init,"class",eres,race @@ -113,8 +116,9 @@ FROM ship_stats WHERE name ILIKE ? $ship[0] = "${ND::C}13$ship[0]$ND::C" if $ship[2] eq 'Steal'; $amount = int(($value*100/$ship[4])) if $amount eq 'value'; + $feud = '(FEUD: '.int($amount/0.75).') ' if defined $value; $value = prettyValue(($amount*$ship[4]/100)); - my $text = "To stop $amount $ship[0] ($ship[5]:$value) you need:"; + 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" = ? @@ -154,7 +158,7 @@ sub calcXp { unless($roids){ $roids = int($tsize*$cap); }elsif ($roids < 10){ - $tsize *= int(.75**($roids-1)); + $tsize = ceil($tsize*.75**($roids-1)); $roids = int($cap*$tsize); } $tsize -= $roids;