sub shipEff {
my ($msg,$command) = @_;
- my ($amount,$ship,$value);
- if($msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)$/){
+ my ($amount,$ship,$value,$target);
+ if($msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)(?: (\w+))?/){
if ($command eq 'veff'){
$value = parseValue($1);
$value *= -1.5 if $value < 0;
$amount = parseValue($1);
}
$ship = "\%$2\%";
+ $target = ($3 || '%');
}else{
- $ND::server->command("notice $ND::nick syntax: .$command amount ship");
+ $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 @ship = $ND::DBH->selectrow_array(q{
-SELECT name,target,"type",damage,metal+crystal+eonium,init,"class",guns,race
+ 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 ?
}, undef, $ship);
- if (@ship){
+ if ($s){
my $type = "kill";
- $type = "stun" if $ship[2] eq 'Emp';
- $type = "steal" if ($ship[2] eq 'Steal') or ($ship[2] eq 'Pod');
+ $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/$ship[4]));
- $feud = '(FEUD: '.prettyValue(int($amount/0.80)).') ';
+ $amount = int(($value*100/$s->{cost}));
+ $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:";
- my $st = $ND::DBH->prepare(q{
- SELECT name,"class","type",armor,metal+crystal+eonium,init,target,eres,race
- FROM ship_stats WHERE "class" = ?
- });
- $st->execute($ship[1]);
- while (my @target = $st->fetchrow()){
- my $dead = $ship[2] eq 'Emp' ? int($amount*$ship[7]*(100-$target[7])/100) : int($amount*$ship[3]/$target[3]);
- $value = prettyValue($dead*$target[4]/100);
- if (($target[6] eq $ship[6]) and ($target[5] <= $ship[5])){
- $target[5] = "${ND::C}04$target[5]$ND::C";
- }elsif(($target[6] eq $ship[6]) and ($target[5] > $ship[5])){
- $target[5] = "${ND::C}12$target[5]$ND::C";
+ $value = prettyValue(($amount*$s->{cost}/100));
+ my $text = prettyValue($amount)." $feud $s->{name} ($s->{init}:$value) will $type:";
+ for my $tn ('t1','t2','t3'){
+ if (defined $s->{$tn}){
+ $text .= " $ND::B${ND::C}03" . $s->{$tn} . "$ND::C$ND::B: ";
+ }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->execute($s->{$tn},$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),";
}
- $target[0] = "${ND::C}04$target[0]$ND::C" if $target[2] eq 'Norm' || $target[2] eq 'Cloak';
- $target[0] = "${ND::C}12$target[0]$ND::C" if $target[2] eq 'Emp';
- $target[0] = "${ND::C}13$target[0]$ND::C" if $target[2] eq 'Steal';
- $text .= " $ND::B$dead$ND::B $target[0] ($target[5]:$value),";
+ chop $text;
}
- 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($msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)/){
if ($command eq 'vstop'){
$value = parseValue($1);
$value *= -1.5 if $value < 0;
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:";
}
sub calcXp {
- my ($x,$y,$z,$roids,$cap) = @_;
+ 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
projects / NDIRC.git / blobdiff