X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=PA.pm;h=6c39098a874249213da80824b51c70cfd49d5455;hb=f5ce817fa21bc211bb804595296bb1b2b0a3f60d;hp=a5109a329cb86dbdb8615b3443574a1b2494a9c3;hpb=d38e60b3d2501078fac47a6aacac638217cc4db1;p=NDIRC.git

diff --git a/PA.pm b/PA.pm
index a5109a3..6c39098 100644
--- a/PA.pm
+++ b/PA.pm
@@ -28,7 +28,7 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/checkPlanet checkGal shipEff shipStop parseValue prettyValue calcXp findCovOpper/;
+our @EXPORT = qw/checkPlanet checkGal shipEff shipStop parseValue prettyValue calcXp findCovOpper tick_time/;
 
 sub checkPlanet {
 	my ($msg) = @_;
@@ -38,7 +38,7 @@ sub checkPlanet {
 		$x = $1;
 		$y = $2;
 		$z = $3;
-	}elsif ((officer() || ia()) && defined $msg){
+	}elsif ((officer() || ia() || intel()) && defined $msg){
 		$nick = $msg;
 	}else{
 		$ND::server->command("notice $ND::nick usage .p X:Y:Z".(officer() || ia() ? ' or .p nick' : ''));
@@ -54,7 +54,7 @@ sub checkPlanet {
 			$planet->{$_} = valuecolor(1,$planet->{$_});
 		}
 		my $ally = "";
-		if (officer() || ia() || dc()){
+		if (officer() || ia() || dc() || intel()){
 			$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})");
@@ -72,11 +72,13 @@ sub checkGal {
 	}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)");
+	my $f = $ND::DBH->prepare(q{SELECT score,scorerank,size,sizerank,value,valuerank,planets
+		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::nick $x:$y  Score=$row[0], Size=$row[1], Value=$row[2]");
+		$ND::server->command("notice $ND::nick $x:$y  Score=$row[0] ($row[1]), Size=$row[2] ($row[3]), Value=$row[4] ($row[5]), Planets=$row[6]");
 	}
 }
 
@@ -111,7 +113,7 @@ sub shipEff {
 	if ($s){
 		if (defined $value){
 			$amount = int(($value*100/$s->{cost}));
-			$feud = '(FEUD: '.prettyValue(int($amount/0.85)).') ';
+			$feud = '(FEUD: '.prettyValue(int($amount/0.86)).') ';
 		}
 		$value = prettyValue(($amount*$s->{cost}/100));
 		my $name = shipColor($s->{name},$s->{type});
@@ -283,4 +285,24 @@ sub findCovOpper {
 	$ND::server->command("notice $ND::nick The planet that cov opped you is one of: $coords");
 }
 
+sub tick_time {
+	my ($msg,$command) = @_;
+	my $tick = $ND::tick;
+	my $timezone = 'GMT';
+	if ($msg =~ /^(\d+)(?: (\S+))?/){
+		$tick = $1 if defined $1;
+		$timezone = $2 if defined $2;
+	}elsif ($msg =~ /^(\S+)/){
+		$timezone = $1;
+	}elsif ($msg){
+		$ND::server->command("notice $ND::nick syntax: .time [tick] [timezone] | Gives the time at the specied tick. Assumes GMT if no timezone is given and current tick if no tick is given.");
+		return;
+	}
+	my $query = $ND::DBH->prepare(q{SELECT date_trunc('seconds',now() + (($1 - tick()) || ' hr')::interval) AT TIME ZONE $2});
+	$query->execute($tick,$timezone);
+	my $time = $query->fetchrow_array;
+	$ND::server->command("notice $ND::nick Time at tick $ND::B$tick$ND::O, timezone $ND::B$timezone$ND::O: $ND::B$time$ND::O");
+
+}
+
 1;