X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=PA.pm;h=f085535c0edfed470c3ae32669b9b474ed4f2be2;hb=f8ae81b53b3edb30da430d26b1f161683f31c6f2;hp=2eb88b1f3abbcc33cda310d83e650ac589a51aec;hpb=480a92ac89c055627316da5d72865be84a0d109d;p=NDIRC.git

diff --git a/PA.pm b/PA.pm
index 2eb88b1..f085535 100644
--- a/PA.pm
+++ b/PA.pm
@@ -31,15 +31,35 @@ our @ISA = qw/Exporter/;
 our @EXPORT = qw/checkPlanet checkGal shipEff shipStop parseValue prettyValue calcXp/;
 
 sub checkPlanet {
-	my ($x,$y,$z,$intel) = @_;
+	my ($msg) = @_;
+
 	DB();
-	my $f = $ND::DBH->prepare("SELECT ruler,planet,race,score,size,value,scorerank,sizerank,valuerank, xp, xprank, alliance FROM current_planet_stats WHERE x = ? AND y = ? and z = ?");
-	$f->execute($x,$y,$z);
-	while (my @row = $f->fetchrow()){
-		@row = map (valuecolor(1),@row);
+	my ($x,$y,$z,$nick);
+	if ($msg =~ /(\d+)\D+(\d+)\D+(\d+)/){
+		$x = $1;
+		$y = $2;
+		$z = $3;
+	}elsif (officer()){
+		$nick = $msg;
+	}else{
+		$ND::server->command("notice $ND::target usage .p X:Y:Z".(officer() ? ' or .p nick' : ''));
+	}
+	my $f = $ND::DBH->prepare(q{SELECT coords(x,y,z),ruler,planet,race,score,size,value,scorerank,sizerank,
+		valuerank, xp, xprank, alliance, relationship, nick, planet_status, hit_us, channel
+		FROM current_planet_stats WHERE (x = $1 AND y = $2 and z = $3) OR nick ILIKE $4 LIMIT 1
+	});
+	$f->execute($x,$y,$z,$nick);
+	if (my $planet = $f->fetchrow_hashref()){
+		for (keys %{$planet}){
+			$planet->{$_} = valuecolor(1,$planet->{$_});
+		}
 		my $ally = "";
-		$ally = " Alliance=$row[11]," if $intel;
-		$ND::server->command("notice $ND::target $x:$y:$z $row[0] OF $row[1],$ally Race=$row[2], Score=$row[3] ($row[6]), Size=$row[4] ($row[7]), Value=$row[5] ($row[8]), XP=$row[9] ($row[10])");
+		if (officer() || dc()){
+			$ally = "Alliance=$planet->{alliance} ($planet->{relationship}), Nick=$planet->{nick} ($planet->{planet_status}), Channel: $planet->{channel}, Hostile Count: $planet->{hit_us},";
+		}
+		$ND::server->command("notice $ND::target $planet->{coords} $planet->{ruler} OF $planet->{planet},$ally Race=$planet->{race}, Score=$planet->{score} ($planet->{scorerank}), Size=$planet->{size} ($planet->{sizerank}), Value=$planet->{value} ($planet->{valuerank}), XP=$planet->{xp} ($planet->{xprank})");
+	}else{
+		$ND::server->command("notice $ND::target Couldn't find planet: $msg");
 	}
 }
 sub checkGal {
@@ -59,6 +79,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 +91,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 +124,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 +136,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" = ?