X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=PA.pm;h=c55d2cf6b28b4a5ac5923d8f2518437cd5aa172d;hb=ffb56e4adfef8bd434b2baeb4e94d4635722c931;hp=29bdb7722f647226b3f230d289ea7e0878682653;hpb=2d63dadea0c5b15232ea5d7a1767a7fecdf6ac48;p=NDIRC.git

diff --git a/PA.pm b/PA.pm
index 29bdb77..c55d2cf 100644
--- a/PA.pm
+++ b/PA.pm
@@ -16,13 +16,13 @@
 #   Free Software Foundation, Inc.,                                       *
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 #**************************************************************************/
-package ND::IRC::PA;
+package NDIRC::PA;
 use strict;
 use warnings;
 use ND::DB;
 use ND::Include;
-use ND::IRC::Access;
-use ND::IRC::Misc;
+use NDIRC::Access;
+use NDIRC::Misc;
 use POSIX;
 require Exporter;
 
@@ -31,34 +31,73 @@ our @ISA = qw/Exporter/;
 our @EXPORT = qw/checkPlanet checkGal shipEff shipStop parseValue prettyValue calcXp/;
 
 sub checkPlanet {
-	my ($x,$y,$z,$intel) = @_;
-	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 ($msg) = @_;
+
+	my ($x,$y,$z,$nick);
+	if ($msg =~ /(\d+)\D+(\d+)\D+(\d+)/){
+		$x = $1;
+		$y = $2;
+		$z = $3;
+	}elsif (officer() && defined $msg){
+		$nick = $msg;
+	}else{
+		$ND::server->command("notice $ND::nick usage .p X:Y:Z".(officer() ? ' or .p nick' : ''));
+		return;
+	}
+	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::nick $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::nick Couldn't find planet: $msg");
 	}
 }
 sub checkGal {
-	my ($x,$y) = @_;
-	DB();
-	my $f = $ND::DBH->prepare("SELECT name,score,size,value FROM galaxies WHERE x = ? AND y = ? and tick = (SELECT max(tick) from galaxies)");
+	my ($msg) = @_;
+
+	my ($x,$y,);
+	if ($msg =~ /(\d+)\D+(\d+)/){
+		$x = $1;
+		$y = $2;
+	}else{
+		$ND::server->command("notice $ND::nick syntax: .g X:Y");
+	}
+	my $f = $ND::DBH->prepare("SELECT score,size,value FROM galaxies WHERE x = ? AND y = ? and tick = (SELECT max(tick) from galaxies)");
 	$f->execute($x,$y);
 	while (my @row = $f->fetchrow()){
 		@row = map (valuecolor(1),@row);
-		$ND::server->command("notice $ND::target $x:$y $row[0], Score=$row[1], Size=$row[2], Value=$row[3]");
+		$ND::server->command("notice $ND::nick $x:$y  Score=$row[0], Size=$row[1], Value=$row[2]");
 	}
 }
 
 sub shipEff {
-	my ($amount,$ship,$value) = @_;
-	$ship = "\%$ship\%";
-	$amount = parseValue($amount);
-	$value = parseValue($value);
-	$value *= -1.5 if defined $value and $value < 0;
+	my ($msg,$value) = @_;
+	my ($amount,$ship);
+	if($msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)$/){
+		if (defined $value){
+			$value = parseValue($1);
+			$value *= -1.5 if $value < 0;
+			my $feud = '';
+		}else{
+			$amount = parseValue($1);
+		}
+		$ship = "\%$2\%";
+	}else{
+		my $command = (defined $value ? "veff" : "eff");
+		$ND::server->command("notice $ND::nick syntax: .$command amount ship");
+		return;
+	}
+	my $feud = '';
 
 	my @ship = $ND::DBH->selectrow_array(q{
 SELECT name,target,"type",damage,metal+crystal+eonium,init,"class",guns,race
@@ -69,9 +108,12 @@ FROM ship_stats WHERE name ILIKE ?
 		$type = "stun" if $ship[2] eq 'Emp';
 		$type = "steal" if ($ship[2] eq 'Steal') or ($ship[2] eq 'Pod');
 
-		$amount = int(($value*100/$ship[4])) if $amount eq 'value';
+		if (defined $value){
+			$amount = int(($value*100/$ship[4]));
+			$feud = '(FEUD: '.prettyValue(int($amount/0.80)).') ';
+		}
 		$value = prettyValue(($amount*$ship[4]/100));
-		my $text = "$amount $ship[0] ($ship[5]:$value) will $type:";
+		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" = ?
@@ -91,17 +133,29 @@ FROM ship_stats WHERE name ILIKE ?
 			$text .= " $ND::B$dead$ND::B $target[0] ($target[5]:$value),";
 		}
 		chop $text;
-		$ND::server->command("notice $ND::target $text");
+		$ND::server->command("notice $ND::nick $text");
 	}
 	#print $text;
 }
 
 sub shipStop {
-	my ($amount,$ship,$value) = @_;
-	$ship = "\%$ship\%";
-	$amount = parseValue($amount);
-	$value = parseValue($value);
-	$value *= -1.5 if defined $value and $value < 0;
+	my ($msg,$value) = @_;
+	my ($amount,$ship);
+	if($msg =~ /^(-?\d+(?:\.\d+)?[hkMG]?) (\w+)$/){
+		if (defined $value){
+			$value = parseValue($1);
+			$value *= -1.5 if $value < 0;
+			my $feud = '';
+		}else{
+			$amount = parseValue($1);
+		}
+		$ship = "\%$2\%";
+	}else{
+		my $command = (defined $value ? "vstop" : "stop");
+		$ND::server->command("notice $ND::nick syntax: .$command amount ship");
+		return;
+	}
+	my $feud = '';
 
 	my @ship = $ND::DBH->selectrow_array(q{
 SELECT name,target,"type",armor,metal+crystal+eonium,init,"class",eres,race
@@ -112,9 +166,12 @@ FROM ship_stats WHERE name ILIKE ?
 		$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';
 
-		$amount = int(($value*100/$ship[4])) if $amount eq 'value';
+		if (defined $value){
+			$amount = int(($value*100/$ship[4]));
+			$feud = '(FEUD: '.prettyValue(int($amount/0.80)).') ';
+		}
 		$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" = ?
@@ -134,7 +191,7 @@ FROM ship_stats WHERE name ILIKE ?
 			$text .= " $ND::B$needed$ND::B $stopper[0] ($stopper[5]:$value),";
 		}
 		chop $text;
-		$ND::server->command("notice $ND::target $text");
+		$ND::server->command("notice $ND::nick $text");
 	}
 	#print $text;
 }
@@ -154,7 +211,7 @@ sub calcXp {
 	unless($roids){
 		$roids = int($tsize*$cap);
 	}elsif ($roids < 10){
-		$tsize *= int(.75**($roids-1));
+		$tsize = ceil($tsize*.75**($roids-1));
 		$roids = int($cap*$tsize);
 	}
 	$tsize -= $roids;
@@ -166,11 +223,37 @@ sub calcXp {
 		$ND::server->command("notice $ND::target Doesn't seem to be a planet at $x:$y:$z");
 		return;
 	}
-	my $xp = int(max($roids * 10 * (min(2,$tscore/$ascore) + min(2,$tvalue/$avalue) - 1),0));
+	my $xp = pa_xp($roids,$ascore,$avalue,$tscore,$tvalue);
 	my $score = 60 * $xp;
 	my $value = $roids*200;
 	my $totscore = prettyValue($score + $value);
 	$ND::server->command("notice $ND::target You will gain $ND::B$xp$ND::B XP, $ND::B$score$ND::B score, if you steal $roids roids ($ND::B$value$ND::B value), from $ND::B$x:$y:$z$ND::B, who will have $ND::B$tsize$ND::B roids left, total score gain will be: $ND::B$totscore$ND::B in total,");
 }
 
+sub findCovOpper {
+	my ($stolen) = @_;
+
+	my $tick = $ND::tick;
+	my $agents;
+
+	if ($stolen =~ /(\d+) (\d+) (\d+)/){
+		$tick = $1;
+		$agents = $2;
+		$stolen = $3;
+	}elsif ($stolen =~ /(\d+) (\d+)/){
+		$tick = $1;
+		$stolen = $3;
+	}
+
+	my ($value,$score) = $ND::DBH->selectrow_array(q{
+		SELECT value,score FROM planet_stats WHERE 
+			id = (SELECT planet FROM users WHERE hostmask ILIKE ?) AND tick = ?;
+		}, undef, $ND::address,$tick);
+	my ($coords) = $ND::DBH->selectrow_array(q{
+		SELECT coords(p.x,p.y,p.z) FROM current_planet_stats p JOIN planet_stats ps using (id) WHERE 
+		ps.tick = ? AND (2000*?*?/ps.value)::int = $stolen ;
+		}, undef, $tick,$agents,$value,$stolen);
+	$ND::server->command("notice $ND::target The planet that cov opped you is: $coords");
+}
+
 1;