X-Git-Url: https://ruin.nu/git/?p=NDIRC.git;a=blobdiff_plain;f=Commands%2FPA.pm;h=2265d3f1da8ea343b6e8972214d6ba841cc98893;hp=ac414ca8542c629ebf6267565e1aaed126df854e;hb=effc5281e94e0fa16f1fd08bf848f607a306d0c0;hpb=cbe172da35e963a0e3205af1337e7b5efee24c13

diff --git a/Commands/PA.pm b/Commands/PA.pm
index ac414ca..2265d3f 100644
--- a/Commands/PA.pm
+++ b/Commands/PA.pm
@@ -239,26 +239,26 @@ my $eff = class extends NDIRC::Command {
 		my $feud = '';
 
 		my $s= $c->model->selectrow_hashref(q{
-SELECT name,t1,t2,t3,"type",damage
+SELECT ship,t1,t2,t3,"type",damage
 	,metal+crystal+eonium AS cost
 	,init,"class",guns,race,eres,armor
-FROM ship_stats WHERE name ILIKE ?
+FROM ship_stats WHERE ship ILIKE ?
 			}, undef, $ship);
 
 		return unless $s;
 
 		if (defined $value){
 			$amount = int(($value*100/$s->{cost}));
-			$feud = '(FEUD: '.prettyValue(int($amount/0.86)).') ';
+			$feud = '(Dem/Tot: '.prettyValue(int($amount/0.92)).') ';
 		}
 		$value = prettyValue(($amount*$s->{cost}/100));
-		my $name = shipColor($s->{name},$s->{type});
+		my $name = shipColor($s->{ship},$s->{type});
 		my $text = prettyValue($amount)." $feud $name ($s->{init}:$value) :";
 		for my $tn ('t1','t2','t3'){
 			next unless defined ($self->target($s,$tn));
 			$text .= " <b><c03>" . $self->target($s,$tn) . "</c></b>: ";
 			my $st = $self->query(q{
-SELECT name,"class","type",armor
+SELECT ship,"class","type",armor
 	,metal+crystal+eonium AS cost
 	,init,t1,t2,t3,eres,race
 	,damage,guns
@@ -267,7 +267,7 @@ FROM ship_stats
 			while (my $t = $st->fetchrow_hashref()){
 				my $number = $self->calcEff($s,$t,$tn,$amount);
 				$value = prettyValue($number*$t->{cost}/100);
-				my $name = shipColor($t->{name},$t->{type});
+				my $name = shipColor($t->{ship},$t->{type});
 				$text .= " <b>$number</b> $name ($t->{init}:$value),";
 			}
 			chop $text;