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

diff --git a/PA.pm b/PA.pm
index 72050d8..1eb7675 100644
--- a/PA.pm
+++ b/PA.pm
@@ -28,7 +28,7 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/shipEff shipStop parseValue prettyValue calcXp findCovOpper tick_time/;
+our @EXPORT = qw/shipEff shipStop parseValue prettyValue findCovOpper/;
 
 sub shipEff {
 	my ($msg,$command) = @_;
@@ -145,52 +145,6 @@ sub shipColor {
 	return "$ND::C$c$string$ND::O";
 }
 
-sub calcXp {
-	my ($msg) = @_;
-
-	my ($x,$y,$z,$roids,$cap);
-	if(defined $msg && $msg =~ /^(\d+)\D+(\d+)\D+(\d+)(?:[^\.\d]+(\d+))?(?:[^\.\d]+(\d*\.\d+))?$/){
-		$x = $1;
-		$y = $2;
-		$z = $3;
-		$roids = $4;
-		$cap = $5;
-	}else{
-		$ND::server->command("notice $ND::nick 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");
-		return;
-	}
-
-	my ($avalue,$ascore) = $ND::DBH->selectrow_array(q{
-		SELECT value,score FROM current_planet_stats WHERE 
-			id = (SELECT planet FROM users WHERE hostmask ILIKE ?);
-		}, undef, $ND::address);
-	my ($tvalue,$tscore,$tsize) = $ND::DBH->selectrow_array(q{
-		SELECT value,score,size FROM current_planet_stats WHERE 
-		x = ? AND y = ? and z = ?;
-		}, undef, $x,$y,$z);
-	$cap = 0.25 unless $cap;
-	unless($roids){
-		$roids = int($tsize*$cap);
-	}elsif ($roids < 10){
-		$tsize = ceil($tsize*.75**($roids-1));
-		$roids = int($cap*$tsize);
-	}
-	$tsize -= $roids;
-	unless (defined $avalue && defined $ascore){
-		$ND::server->command("notice $ND::nick You don't have a planet specified");
-		return;
-	}
-	unless (defined $tvalue && defined $tscore){
-		$ND::server->command("notice $ND::nick Doesn't seem to be a planet at $x:$y:$z");
-		return;
-	}
-	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::nick 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, $command) = @_;
 
@@ -233,24 +187,4 @@ 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;