X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=PA.pm;h=b1ae3619434f9a68039b6e07a99c5362e86aad35;hb=094c16b1d21e4b336d9e791d52ad91493078cd9f;hp=2f708ec5b738b5ba2641bf11f50b0aa307096484;hpb=b5ae63cf1f39a655a3e0d66d984920bb6055058c;p=NDIRC.git

diff --git a/PA.pm b/PA.pm
index 2f708ec..b1ae361 100644
--- a/PA.pm
+++ b/PA.pm
@@ -82,116 +82,117 @@ sub checkGal {
 
 sub shipEff {
 	my ($msg,$command) = @_;
-	my ($amount,$ship,$value);
-	if($msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)/){
-		if ($command eq 'veff'){
-			$value = parseValue($1);
+	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($1);
+			$amount = parseValue($am);
 		}
-		$ship = "\%$2\%";
 	}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
-FROM ship_stats WHERE name ILIKE ?
+	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 (@ship){
-		my $type = "kill";
-		$type = "stun" if $ship[2] eq 'Emp';
-		$type = "steal" if ($ship[2] eq 'Steal') or ($ship[2] eq 'Pod');
-
+	if ($s){
 		if (defined $value){
-			$amount = int(($value*100/$ship[4]));
+			$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 $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);
 			}
-			$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),";
+			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;
 		}
-		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' ?
+			($amount*$s->{guns}*(100-$t->{eres})/100)
+			: ($amount*$s->{damage}/$t->{armor});
 	}else{
-		$ND::server->command("notice $ND::nick syntax: .$command amount ship");
-		return;
+		$number = $t->{type} eq 'Emp' ?
+			($amount*100/(100 - $s->{eres})/$t->{guns})
+			: ($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 {
@@ -268,7 +269,7 @@ sub findCovOpper {
 	}
 	my $attackers = $ND::DBH->prepare(q{
 		SELECT coords(p.x,p.y,p.z), ruler, planet FROM current_planet_stats p JOIN planet_stats ps using (id) WHERE 
-		ps.tick = $1 AND (2000*$2*$3/ps.value)::int = $4 ;
+		ps.tick = $1 AND (2000.0*$2*$3/ps.value)::int = $4 ;
 		});
 	$attackers->execute($tick,$agents,$value,$stolen);
 	if ($attackers->rows == 0){