X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=PA.pm;h=2f708ec5b738b5ba2641bf11f50b0aa307096484;hb=b5ae63cf1f39a655a3e0d66d984920bb6055058c;hp=e5eaa6b5f5eff1617fc8ea5e87296fbbb504abe7;hpb=3071907dff9a326a9756d093b7cfeaed529a0605;p=NDIRC.git diff --git a/PA.pm b/PA.pm index e5eaa6b..2f708ec 100644 --- a/PA.pm +++ b/PA.pm @@ -83,7 +83,7 @@ sub checkGal { sub shipEff { my ($msg,$command) = @_; my ($amount,$ship,$value); - if($msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)$/){ + if($msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)/){ if ($command eq 'veff'){ $value = parseValue($1); $value *= -1.5 if $value < 0; @@ -109,7 +109,7 @@ FROM ship_stats WHERE name ILIKE ? if (defined $value){ $amount = int(($value*100/$ship[4])); - $feud = '(FEUD: '.prettyValue(int($amount/0.80)).') '; + $feud = '(FEUD: '.prettyValue(int($amount/0.85)).') '; } $value = prettyValue(($amount*$ship[4]/100)); my $text = prettyValue($amount)." $feud $ship[0] ($ship[5]:$value) will $type:"; @@ -140,7 +140,7 @@ FROM ship_stats WHERE name ILIKE ? sub shipStop { my ($msg,$command) = @_; my ($amount,$ship,$value); - if($msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)$/){ + if($msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)/){ if ($command eq 'vstop'){ $value = parseValue($1); $value *= -1.5 if $value < 0; @@ -166,7 +166,7 @@ FROM ship_stats WHERE name ILIKE ? if (defined $value){ $amount = int(($value*100/$ship[4])); - $feud = '(FEUD: '.prettyValue(int($amount/0.80)).') '; + $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:";