X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Def.pm;h=512d637a52ee7fbd10d9cafa4a10f5a29386a920;hb=5e02deb33fbdb994d72da23e8de85e633ec6654c;hp=9e7f53c76c5bf526b35e9ef61486a0062201e403;hpb=d0625f3ae0d3c4d9b64a52f2632d9a1d568e98aa;p=NDIRC.git

diff --git a/Def.pm b/Def.pm
index 9e7f53c..512d637 100644
--- a/Def.pm
+++ b/Def.pm
@@ -28,7 +28,8 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/showCall setType takeCall covCall ignoreCall defcall anon setDefPrio/;
+our @EXPORT = qw/showCall takeCall covCall ignoreCall
+	setDefPrio setCalc getCalc/;
 
 sub showCall {
 	my ($msg,$command) = @_;
@@ -57,107 +58,27 @@ SQL
 	}
 }
 
-sub setType {
+sub setCalc {
 	my ($msg,$command) = @_;
-	my ($type,$id,$x,$y,$z) = @_;
-	if ($command eq 'settypeall'){
-		if (defined $msg && $msg =~ /^(\d+) (.*)$/){
-			$type = $2;
-			$id = $1
-		}else{
-			$ND::server->command("notice $ND::nick Usage: $command callId type");
-			return;
-		}
-	}else{
-		if (defined $msg && $msg =~ /^(\d+) (\d+):(\d+):(\d+) (.*)$/){
-			$type = $5;
-			$id = $1;
-			$x = $2;
-			$y = $3;
-			$z = $4;
-		}elsif (defined $msg && $msg =~ /^(\d+) (.*)$/){
-			$id = $1;
-			$type = $2;
-		}else{
-			$ND::server->command("notice $ND::nick Usage: $command incId type | or: $command callId X:Y:Z type");
-			return;
-		}
-	}
-	if (my $user = dc()){
-		my $fleet;
-		my $query = qq{
-			SELECT i.id,call,shiptype, coords(x,y,z),c.landing_tick - tick() FROM incomings i 
-				JOIN current_planet_stats p ON i.sender = p.id
-				JOIN calls c ON i.call = c.id
-			};
-		if ($command eq 'settypeall'){
-			$fleet = $ND::DBH->prepare(qq{
-					$query
-					WHERE i.call = ?
-				});
-			$fleet->execute($id);
-		}elsif (defined $x){
-			$fleet = $ND::DBH->prepare(qq{
-					$query
-					WHERE i.call = ? AND p.id = planetid(?,?,?,tick()) 
-				});
-			$fleet->execute($id,$x,$y,$z);
-		}else{
-			$fleet = $ND::DBH->prepare(qq{
-					$query
-					WHERE i.id = ?
-				});
-			$fleet->execute($id);
-		}	
-		$type = escapeHTML($type);
-		while (my ($id,$call,$oldtype,$coords,$tick) = $fleet->fetchrow()){
-			if($ND::DBH->do(q{UPDATE incomings SET shiptype = ? WHERE id = ?},undef,$type,$id) == 1){
-				def_log $user->{uid}, $call , "Set fleet: [B] $id [/B] to: [B] $type [/B]";
-				$ND::server->command("msg $ND::target Set fleet from $coords on call $call to $type (previously $oldtype)");
-				if ($tick < 0 && not (defined $x && $x eq 'call')){
-					$ND::server->command("msg $ND::target This call is old, did you use the call id, instead of inc id by accident? You can use .settypeall callid to set the type on all incs in a call.");
-				}
-			}
-		}
-	}
-}
-sub takeCall {
-	my ($msg,$command) = @_;
-	my ($id);
-	if (defined $msg && $msg =~ /^(\d+)$/){
-		$id = $1;
-	}else{
-		$ND::server->command("notice $ND::nick Usage: $command callid");
-		return;
-	}
-	if (my $user = dc()){
-		if ($ND::DBH->do(q{UPDATE calls SET dc = (SELECT uid FROM users WHERE hostmask ILIKE ?) WHERE id = ?}
-				,undef,$ND::address,$id) == 1){
-			$ND::server->command("msg $ND::target Updated the DC for call $id");
-			def_log $user->{uid}, $id , "Used: [B] $command [/B]";
-		}
-	}
-}
-
-sub covCall {
-	my ($msg,$command) = @_;
-	my ($id);
-	if (defined $msg && $msg =~ /^(\d+)$/){
+	my ($id, $calc);
+	if (defined $msg && $msg =~ /^(\d+) (.+)$/){
 		$id = $1;
+		$calc = escapeHTML($2);
 	}else{
-		$ND::server->command("notice $ND::nick Usage: $command callid");
+		$ND::server->command("notice $ND::nick Usage: $command callid calc");
 		return;
 	}
 	if (my $user = dc()){
-		if($ND::DBH->do(q{UPDATE calls SET dc = (SELECT uid FROM users WHERE hostmask ILIKE ?), covered = TRUE, open = FALSE WHERE id = ?}
-				,undef,$ND::address,$id) == 1){
-			$ND::server->command("msg $ND::target Marked call $id as covered");
-			def_log $user->{uid}, $id , "Used: [B] $command [/B]";
+		if ($ND::DBH->do(q{UPDATE calls SET calc = $2 WHERE id = $1}
+				,undef,$id, $calc) == 1){
+			$ND::server->command("notice $ND::nick Updated calc call $ND::B$id$ND::O");
+			def_log $user->{uid}, $id , 'Updated calc to: [URL]'
+				.$calc.'[/URL]';
 		}
 	}
 }
 
-sub ignoreCall {
+sub getCalc {
 	my ($msg,$command) = @_;
 	my ($id);
 	if (defined $msg && $msg =~ /^(\d+)$/){
@@ -167,64 +88,13 @@ sub ignoreCall {
 		return;
 	}
 	if (my $user = dc()){
-		if($ND::DBH->do(q{UPDATE calls SET dc = (SELECT uid FROM users WHERE hostmask ILIKE ?), covered = FALSE, open = FALSE WHERE id = ?}
-				,undef,$ND::address,$id) == 1){
-			$ND::server->command("msg $ND::target Marked call $id as ignored");
-			def_log $user->{uid}, $id , "Used: [B] $command [/B]";
-		}
-	}
-}
-
-sub defcall {
-	my ($msg,$command) = @_;
-	my ($mess,$nick,$callnr) = @_;
-	if (defined $msg && $msg =~ /^(\d+)?(.*)$/){
-		$callnr = $1;
-		$mess = $2;
-	}else{
-		$ND::server->command("notice $ND::nick Usage: $command [callid] message | if a call id is given, then shiptypes and eta will be fetched from the database and added to the message");
-		return;
-	}
-	if (dc()){
-		my $call = "";
-		if ($callnr){
-			my $st = $ND::DBH->prepare(q{
-	SELECT c.landing_tick - (SELECT value::integer FROM misc WHERE id = 'TICK'), concat(i.shiptype||'/') AS shiptype
-	FROM calls c 
-		JOIN incomings i ON i.call = c.id
-		LEFT OUTER JOIN users dc ON dc.uid = c.dc
-		JOIN users u ON u.uid = c.member
-	WHERE not covered AND c.id = ?
-	GROUP BY c.id,c.landing_tick
-	ORDER BY c.landing_tick;
-			});
-			if (my @row = $ND::DBH->selectrow_array($st,undef,$callnr)){
-				chop($row[1]);
-				$call = "(Anti $row[1] ETA: $row[0])"
-			}
-		}
-		$ND::server->command("notice $ND::memchan DEFENSE REQUIRED!! WAKE UP!!");
-		$ND::server->command("msg $ND::memchan DEFENSE REQUIRED $mess $call MSG $ND::nick TO RESPOND");
-	}
-}
-
-sub anon {
-	my ($msg,$command) = @_;
-	my ($target,$mess);
-	if (defined $msg && $msg =~ /^(\S+) (.+)$/){
-		$target = $1;
-		$mess = $2;
-	}else{
-		$ND::server->command("notice $ND::nick Usage: $command nick message");
-		return;
-	}
-	if (dc()){
-		$ND::server->command("msg $target ".chr(2).$mess);
-		$ND::server->command("msg $ND::target ".chr(3)."3$1 << $2");
+		my $calc = $ND::DBH->selectrow_array(q{SELECT calc
+			FROM calls WHERE id = $1}
+			,undef,$id);
+		$ND::server->command("notice $ND::nick calc for call $ND::B$id$ND::O: $calc");
 	}
 }
 
-
 sub setDefPrio {
 	my ($msg,$command) = @_;
 	my ($min,$max);