X-Git-Url: https://ruin.nu/git/%3CTMPL_VAR%20NAME=PAGE%3E?a=blobdiff_plain;f=Delling.pm;h=62a9d363b3262483650e61750b554a81819220ef;hb=899a2860f3816042c168b995616fc7425732e878;hp=df44711f1188df078221b8a546afd6c4fc47fda6;hpb=15d058ce6833c840aa9696c9cc06a25319a4dc5c;p=NDIRC.git

diff --git a/Delling.pm b/Delling.pm
index df44711..62a9d36 100644
--- a/Delling.pm
+++ b/Delling.pm
@@ -28,14 +28,6 @@ extends 'NDIRC::Bot';
 use POE::Session;
 use ND::DB;
 
-use AI::MegaHAL;
-
-has hal => (
-	is => 'ro',
-	isa => 'Object',
-	lazy_build => 1,
-);
-
 my ($tick,$stattick) = (0,0);
 my $last_announcement = 0;
 
@@ -52,20 +44,15 @@ after irc_public => sub {
 	$seen->execute($address);
 
 	my $nickname = $irc->nick_name;
-	if ($msg =~ /^$nickname: (.*)/i){
-		my $text = $self->hal->do_reply($1);
-		$irc->yield(privmsg => $channel, "$nick: $text");
-	}elsif ($msg =~ /^(\S+): (.+)$/ && $self->disp->has_command('anon',$channel)){
+	if ($msg =~ /^(\S+): (.+)$/ && $self->disp->has_command('anon',$channel)){
 		my $_ = $1;
 		my $text = $2;
 		unless ($irc->is_channel_member($channel,$1) || /(Constructing|Researching)/){
 			$msg = ".anon $_ $text";
+			$self->parseCommand($msg,$irc,$nick,$address,$channel,$dbh);
 		}
 	}elsif ($self->parseCommand($msg,$irc,$nick,$address,$channel,$dbh)){
 		#Command parsed and run successfully
-	}elsif($self->disp->has_command('teachbot',$channel)){
-		$msg =~ s/^\S+:\s*//;
-		$self->hal->learn($msg);
 	}
 };
 
@@ -125,7 +112,7 @@ SELECT uid,pid,hostmask,password
 FROM users u WHERE hostmask = ?
 		}, undef, $address);
 		if ($user){
-			if ($user->{password} eq ''){
+			unless ($user->{password}) {
 				$irc->yield(privmsg => $disp->targets->{members}, "$nick: Get a new random password with /msg delling !getpass . If you don't know your username, then you can get it with .points");
 			}
 			if ($tick > 12 && not defined $user->{pid}){
@@ -221,15 +208,8 @@ GROUP BY username,call,tick,dm.fleet,p.value
 
 }
 
-sub _build_hal {
-	my $hal = AI::MegaHAL->new('Path' => '.', 'Banner' => 0, 'Prompt' => 0, 'Wrap' => 0, 'AutoSave' => 1);
-	return $hal;
-}
-
 after sig_usr2 => sub {
 	my $self = shift;
-	say 'Saving brain!';
-	$self->hal->_cleanup;
 };
 
 after _start => sub {