X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Def.pm;h=b8dc386ba21f8d09fa48cd3c9e742a7f74026c30;hb=9d10a2de3709392a4e4be2d0b18ea962bd934c8d;hp=c081f9a17c7ddb8498fa88678ab0684aa0eebae9;hpb=ec80f6c0dba1fd56a63d591e89f6368d468912f7;p=NDIRC.git

diff --git a/Def.pm b/Def.pm
index c081f9a..b8dc386 100644
--- a/Def.pm
+++ b/Def.pm
@@ -23,15 +23,23 @@ use ND::DB;
 use ND::Include;
 use NDIRC::Access;
 use NDIRC::Misc;
+use CGI qw/:standard/;
 require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/showCall setType takeCall covCall ignoreCall defcall anon setDefPrio/;
+our @EXPORT = qw/showCall
+	setDefPrio/;
 
 sub showCall {
-	my ($id) = @_;
-	DB();
+	my ($msg,$command) = @_;
+	my ($id);
+	if (defined $msg && $msg =~ /^(\d+)$/){
+		$id = $1;
+	}else{
+		$ND::server->command("notice $ND::nick Usage: $command callid");
+		return;
+	}
 	if (dc()){
 		my $f = $ND::DBH->prepare(<<SQL
 		SELECT i.id,coords(p.x,p.y,p.z), p.planet_status,p.nick, p.alliance, p.race,i.eta,i.amount,i.fleet,i.shiptype,p.relationship,c.landing_tick - (SELECT value::integer FROM misc WHERE id = 'TICK')
@@ -45,130 +53,28 @@ SQL
 		$f->execute($id);
 		while (my @row = $f->fetchrow()){
 			@row = map (valuecolor(0),@row);
-			$ND::server->command("msg $ND::target (CALL $id) $row[0]: $row[1], $row[3] ($row[2]), $row[4] ($row[10]), $row[5], ETA: $row[11](/$row[6]), Amount: $row[7],  $row[8], Type: $row[9]");
-		}
-	}
-}
-
-sub setType {
-	my ($type,$id,$x,$y,$z) = @_;
-	DB();
-	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 (defined $x && $x eq 'call'){
-			$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(?,?,?,0) 
-				});
-			$fleet->execute($id,$x,$y,$z);
-		}else{
-			$fleet = $ND::DBH->prepare(qq{
-					$query
-					WHERE i.id = ?
-				});
-			$fleet->execute($id);
-		}	
-		while (my ($id,$call,$oldtype,$coords,$tick) = $fleet->fetchrow()){
-			if($ND::DBH->do(q{UPDATE incomings SET shiptype = ? WHERE id = ?},undef,$type,$id) == 1){
-				log_message $user->{uid}, "DC set fleet: $id to: $type";
-				$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 ($id) = @_;
-	DB();
-	if (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");
-		}
-	}
-}
-
-sub covCall {
-	my ($id) = @_;
-	DB();
-	if (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");
+			$ND::server->command("notice $ND::nick (CALL $id) $row[0]: $row[1], $row[3] ($row[2]), $row[4] ($row[10]), $row[5], ETA: $row[11](/$row[6]), Amount: $row[7],  $row[8], Type: $row[9]");
 		}
 	}
 }
 
-sub ignoreCall {
-	my ($id) = @_;
-	DB();
-	if (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");
-		}
-	}
-}
-
-sub defcall {
-	my ($msg,$nick,$callnr) = @_;
-	DB();
-	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, p.x
-	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
-		JOIN current_planet_stats p ON u.planet = p.id
-	WHERE not covered AND c.id = ?
-	GROUP BY c.id,c.landing_tick,p.x
-	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] Cluster: $row[2])"
-			}
-		}
-		$ND::server->command("notice $ND::memchan DEFENSE REQUIRED!! WAKE UP!!");
-		$ND::server->command("msg $ND::memchan DEFENSE REQUIRED $msg $call MSG $nick TO RESPOND");
-	}
-}
-
-sub anon {
-	my ($target,$msg) = @_;
-	if (dc()){
-		$ND::server->command("msg $target ".chr(2).$msg);
-		$ND::server->command("msg $ND::target ".chr(3)."3$1 << $2");
-	}
-}
-
-
 sub setDefPrio {
-	my ($min,$max) = @_;
-	DB();
+	my ($msg,$command) = @_;
+	my ($min,$max);
+	if (defined $msg && $msg =~ /^(\d+)\D(\d+)$/){
+		$min = $1;
+		$max = $2;
+	}else{
+		$ND::server->command("notice $ND::nick Usage: $command Min Max");
+		return;
+	}
 	if (hc()){
 		$ND::DBH->begin_work;
 		my $update = $ND::DBH->prepare('UPDATE misc SET value = ? :: int WHERE id = ?');
 		$update->execute($min,'DEFMIN');
 		$update->execute($max,'DEFMAX');
 		if ($ND::DBH->commit){
-			$ND::server->command("msg $ND::target min def prio set to $min and max set to $max");
+			$ND::server->command("msg $ND::target min def prio set to $ND::B$min$ND::B and max set to $ND::B$max");
 		}else{
 			$ND::server->command("msg $ND::target something went wrong");
 		}