X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=PA.pm;h=72050d851a77a7fce5902d222e5de807e412e8de;hb=8492985c19c12b19d892a78664409590aeb57f47;hp=b1ae3619434f9a68039b6e07a99c5362e86aad35;hpb=ca6559660917a0c227d0362d2fc7e26e3f275a94;p=NDIRC.git

diff --git a/PA.pm b/PA.pm
index b1ae361..72050d8 100644
--- a/PA.pm
+++ b/PA.pm
@@ -28,57 +28,7 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/checkPlanet checkGal shipEff shipStop parseValue prettyValue calcXp findCovOpper/;
-
-sub checkPlanet {
-	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 = "";
-		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 ($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::nick $x:$y  Score=$row[0], Size=$row[1], Value=$row[2]");
-	}
-}
+our @EXPORT = qw/shipEff shipStop parseValue prettyValue calcXp findCovOpper tick_time/;
 
 sub shipEff {
 	my ($msg,$command) = @_;
@@ -111,7 +61,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 +233,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;