X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Commands%2FPA.pm;h=7fb453db9f78c513e759d679ad7db1916132a9db;hb=784ed86eacf5ebed4d3da2ff166b7542ac8f5cd0;hp=0d834846ae6e30b3edb9986f94fd657b5116441f;hpb=21cb796be35d56fc6620af557355ab57b6c00e88;p=NDIRC.git

diff --git a/Commands/PA.pm b/Commands/PA.pm
index 0d83484..7fb453d 100644
--- a/Commands/PA.pm
+++ b/Commands/PA.pm
@@ -25,10 +25,19 @@ use feature ':5.10';
 
 use Moose;
 use MooseX::MethodAttributes;
+use POSIX qw/pow/;
 
 use NDIRC::Misc;
 use ND::Include;
 
+
+sub bcalc
+	: Help(Lists bcalc and stats info)
+{
+	my ($self, $c, $msg) = @_;
+	$c->reply("http://game.planetarion.com/bcalc.pl http://game.planetarion.com/manual.php?page=stats");
+}
+
 sub p
 	: Help(usage: .p X:Y:Z | or .p nick with high enough access)
 {
@@ -46,11 +55,22 @@ sub p
 	}
 
 	my $f = $c->model->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
+WITH p AS (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
+), t AS (SELECT tag,bool_or(uid = $5) AS own,max(time) AS time
+	FROM planet_tags
+	WHERE pid = (SELECT pid FROM p)
+		AND ($6 OR uid = $5)
+	GROUP BY tag
+	ORDER BY time DESC
+), tags AS (SELECT array_to_string(array_agg(tag || CASE WHEN own THEN '*' ELSE '' END),' ') AS tags
+	FROM t
+)
+SELECT * FROM p, tags;
 	});
-	$f->execute($x,$y,$z,$nick);
+	$f->execute($x,$y,$z,$nick,$c->uid,$c->check_user_roles(qw/irc_p_intel/));
 	if (my $planet = $f->fetchrow_hashref()){
 		for (keys %{$planet}){
 			$planet->{$_} = valuecolor(1,$planet->{$_});
@@ -59,7 +79,7 @@ FROM current_planet_stats WHERE (x = $1 AND y = $2 and z = $3) OR nick ILIKE $4
 		if ($c->check_user_roles(qw/irc_p_intel/)){
 			$ally = "Alliance=$planet->{alliance} ($planet->{relationship}), Nick=$planet->{nick} ($planet->{planet_status}), Channel: $planet->{channel}, Hostile Count: $planet->{hit_us},";
 		}
-		$c->reply("$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})");
+		$c->reply("$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}) TAGS: $planet->{tags}");
 	}else{
 		$c->reply("Couldn't find planet: $msg");
 	}
@@ -108,7 +128,7 @@ SELECT date_trunc('seconds',now() + (($1 - tick()) || ' hr')::interval) AT TIME
 }
 
 sub xp
-	: Help(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)
+	: Help(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 cap according to your value)
 {
 	my ($self, $c, $msg) = @_;
 
@@ -117,17 +137,17 @@ sub xp
 
 	my ($avalue,$ascore) = $c->model->selectrow_array(q{
 SELECT value,score FROM current_planet_stats
-WHERE id = (SELECT planet FROM users WHERE hostmask ILIKE ?)
-		}, undef, $c->host);
+WHERE pid = (SELECT pid FROM users WHERE uid = ?)
+		}, undef, $c->uid);
 	my ($tvalue,$tscore,$tsize) = $c->model->selectrow_array(q{
 SELECT value,score,size FROM current_planet_stats
 WHERE x = ? AND y = ? and z = ?
 		}, undef, $x,$y,$z);
-	$cap //= 0.25;
+	$cap //= min(0.25,0.25 * pow($tvalue/$avalue , 0.5));
 	unless($roids){
 		$roids = int($tsize*$cap);
 	}elsif ($roids < 10){
-		$tsize = ceil($tsize*.75**($roids-1));
+		$tsize = int($tsize*.75**($roids-1));
 		$roids = int($cap*$tsize);
 	}
 	$tsize -= $roids;
@@ -143,7 +163,8 @@ WHERE x = ? AND y = ? and z = ?
 	my $score = 60 * $xp;
 	my $value = $roids*200;
 	my $totscore = prettyValue($score + $value);
-	$c->reply("You will gain <b>$xp</b> XP, <b>$score</b> score, if you steal $roids roids (<b>$value</b> value), from <b>$x:$y:$z</b>, who will have <b>$tsize</b> roids left, total score gain will be: <b>$totscore</b> in total,");
+	$cap = sprintf "%.1f", $cap*100;
+	$c->reply("You will gain <b>$xp</b> XP, <b>$score</b> score, if you steal <b>$roids</b> roids (<b>$value</b> value, <b>$cap%</b> cap), from <b>$x:$y:$z</b>, who will have <b>$tsize</b> roids left, total score gain will be: <b>$totscore</b> in total,");
 }
 
 sub fco
@@ -157,16 +178,16 @@ sub fco
 
 	my ($value,$score) = $c->model->selectrow_array(q{
 SELECT value,score FROM planet_stats WHERE tick = $2 AND
-	id = (SELECT planet FROM users WHERE hostmask ILIKE $1)
-		}, undef, $c->host,$tick);
+	pid = (SELECT pid FROM users WHERE uid = $1)
+		}, undef, $c->uid,$tick);
 	unless ($value){
 		$c->reply("You don't have a planet registered.");
 		return;
 	}
 	my $attackers = $c->model->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.0*$2*$3/ps.value)::int = $4
+	JOIN planet_stats ps using (pid)
+WHERE ps.tick = $1 AND trunc(2000.0*$2*$3/ps.value)::int = $4
 		});
 	$attackers->execute($tick,$agents,$value,$stolen);
 	if ($attackers->rows == 0){