--- deliantra/server/ext/chat.ext	2007/01/07 02:39:14	1.3
+++ deliantra/server/ext/chat.ext	2007/04/24 18:24:31	1.14
@@ -34,91 +34,797 @@
 );
 
 cf::register_command listen => sub {
-   my ($who, $msg) = @_;
-   my $player = cf::player::find_active $who->name;
+   my ($pl, $msg) = @_;
+   my $player = cf::player::find_active $pl->name;
 
    if ($msg ne "") {
+      $msg = 10 if $msg > 10;
+
       my $prev_listen = $player->listening;
       $player->listening ($msg);
       if ($prev_listen == $player->listening) {
-         $who->message ("Your verbose level stayed $prev_listen.", cf::NDI_UNIQUE);
+         $pl->message ("Your verbose level stayed $prev_listen.", cf::NDI_UNIQUE);
       } else {
-         $who->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_UNIQUE);
+         $pl->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_UNIQUE);
       }
    } else {
-      $who->message ("Your verbose level is " . $player->listening . ".", cf::NDI_UNIQUE);
+      $pl->message ("Your verbose level is " . $player->listening . ".", cf::NDI_UNIQUE);
+   }
+};
+
+cf::register_command cointoss => sub {
+   my ($pl, $msg) = @_;
+
+   my $name = $pl->name;
+
+   if (int rand 2) {
+      for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
+         next
+            if $other->ob == $pl;
+         $other->ob->message ("$name flips a coin.... Heads!", cf::NDI_GREY | cf::NDI_UNIQUE);
+      }
+      
+      $pl->message ("You flip a coin.... Heads!", cf::NDI_GREY | cf::NDI_UNIQUE);
+   } else {
+      for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
+         next
+            if $other->ob == $pl;
+         $other->ob->message ("$name flips a coin.... Tails!", cf::NDI_GREY | cf::NDI_UNIQUE);
+      }
+      
+      $pl->message ("You flip a coin.... Tails!", cf::NDI_GREY | cf::NDI_UNIQUE);
    }
 };
 
+cf::register_command orcknuckle => sub {
+   my ($pl, $msg) = @_;
+   my @orcknuckle =  ("none", "beholder", "ghost", "knight", "princess", "dragon", "orc");
+
+   my $name = $pl->name;
+
+   my ($i, $j, $k, $l) = ((int rand 5) + 1, (int rand 5) + 1, (int rand 5) + 1, (int rand 6) + 1);
+   my $result = "$orcknuckle[$i], $orcknuckle[$j], $orcknuckle[$k], $orcknuckle[$l]";
+
+   for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
+      next
+         if $other->ob == $pl;
+      $other->ob->message ("$name rolls $result!", cf::NDI_GREY | cf::NDI_UNIQUE);
+   }
+      
+   $pl->message ("You roll $result!", cf::NDI_GREY | cf::NDI_UNIQUE);
+};
+
+my $emotes = {
+   growl => {
+      noparams => {
+         other => "<self> growls.",
+         self => "Grrrrrrrrr....",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   giggle => {
+      noparams => {
+         other => "<self> giggles.",
+         self => "You giggle.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   shiver => {
+      noparams => {
+         other => "<self> shivers uncomfortably.",
+         self => "Brrrrrrrrr.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   chuckle => {
+      noparams => {
+         other => "<self> chuckles politely.",
+         self => "You chuckle politely",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   sigh => {
+      noparams => {
+         other => "<self> sighs loudly.",
+         self => "You sigh.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   scream => {
+      noparams => {
+         other => "<self> screams at the top of his lungs!",
+         self => "ARRRRRRRRRRGH!!!!!",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   puke => {
+      noparams => {
+         other => "<self> pukes.",
+         self => "Bleaaaaaghhhhhhh!",
+      },
+      params => {
+         target => "<self> pukes on your clothes!",
+         other => "<self> pukes on <other>.",
+         self => "You puke on <other>.",
+      },
+      self => {
+         other => "<self> pukes on his clothes.",
+         self => "You puke on yourself.",
+      },
+   },
+   strut => {
+      noparams => {
+         other => "<self> struts proudly.",
+         self => "Strut your stuff.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   cringe => {
+      noparams => {
+         other => "<self> cringes in terror!",
+         self => "You cringe in terror.",
+      },
+      params => {
+         target => "<self> cringes away from <other> in mortal terror.",
+         self => "You cringe away from <other>.",
+      },
+      self => {
+      },
+   },
+   hiccup => {
+      noparams => {
+         other => "<self> hiccups.",
+         self => "*HIC*",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   clap => {
+      noparams => {
+         other => "<self> gives a round of applause.",
+         self => "Clap, clap, clap.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   kiss => {
+      noparams => {
+         other => "<self> makes a weird facial contortion",
+         self => "All the lonely people..",
+      },
+      params => {
+         target => "<self> kisses you.",
+         other => "<self> kisses <other>.",
+         self => "You kiss <other>.",
+      },
+      self => {
+      },
+   },
+   wink => {
+      noparams => {
+         other => "<self> winks suggestively.",
+         self => "Have you got something in your eye?",
+      },
+      params => {
+         target => "<self> winks at you.",
+         other => "<self> winks at <other>.",
+         self => "You wink suggestively at <other>.",
+      },
+      self => {
+         other => "<self> winks at himself - something strange is going on...",
+         self => "You wink at yourself?? What are you up to?",
+      },
+   },
+   pout => {
+      noparams => {
+         other => "<self> pouts.",
+         self => "Aww, don't take it so hard.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   cackle => {
+      noparams => {
+         other => "<self> throws back his head and cackles with insane glee!",
+         self => "You cackle gleefully.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   sniff => {
+      noparams => {
+         other => "<self> sniffs sadly.",
+         self => "You sniff sadly. *SNIFF*",
+      },
+      params => {
+         target => "<self> sniffs you.",
+         other => "<self> sniffs <other>",
+         self => "You sniff <other>.",
+      },
+      self => {
+         other => "<self> sniffs himself.",
+         self => "You sniff yourself.",
+      },
+   },
+   nod => {
+      noparams => {
+         other => "<self> nods solemnly.",
+         self => "You nod solemnly.",
+      },
+      params => {
+         target => "<self> nods solemnly to you.",
+         other => "<self> nods solemnly to <other>.",
+         self => "You nod solemnly to <other>.",
+      },
+      self => {
+      },
+   },
+   frown => {
+      noparams => {
+         other => "<self> frowns.",
+         self => "What's bothering you?",
+      },
+      params => {
+         target => "<self> frowns darkly at you.",
+         other => "<self> frowns darkly at <other>.",
+         self => "You frown darkly at <other>.",
+      },
+      self => {
+         other => "<self> frowns at himself.",
+         self => "You frown at yourself.",
+      },
+   },
+   snicker => {
+      noparams => {
+         other => "<self> snickers softly.",
+         self => "You snicker softly.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   shrug => {
+      noparams => {
+         other => "<self> shrugs helplessly.",
+         self => "You shrug.",
+      },
+      params => {
+         target => "<self> shrugs at you.",
+         other => "<self> shrugs at <other>.",
+         self => "You shrug at <other>.",
+      },
+      self => {
+      },
+   },
+   bleed => {
+      noparams => {
+         other => "<self> is bleeding all over the carpet - got a spare tourniquet?",
+         self => "You bleed all over your nice new armour.",
+      },
+      params => {
+         target => "<self> slashes his wrist and bleeds all over you.",
+         other => "<self> slashes his wrist and bleeds all over <other>.",
+         self => "You slash your wrist and bleed all over <other>",
+      },
+      self => {
+         other => "<self> performs some satanic ritual while wiping his blood on himself.",
+         self => "Very impressive! You wipe your blood all over yourself.",
+      },
+   },
+   twiddle => {
+      noparams => {
+         other => "<self> patiently twiddles his thumbs.",
+         self => "You patiently twiddle your thumbs.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   spit => {
+      noparams => {
+         other => "<self> spits over his left shoulder.",
+         self => "You spit over your left shoulder.",
+      },
+      params => {
+         target => "<self> spits in your face!",
+         other => "<self> spits in <other>'s face.",
+         self => "You spit on <other>.",
+      },
+      self => {
+         other => "<self> drools all over himself.",
+         self => "You drool all over yourself.",
+      },
+   },
+   glare => {
+      noparams => {
+         other => "<self> glares around him.",
+         self => "You glare at nothing in particular.",
+      },
+      params => {
+         target => "<self> glares icily at you, you feel cold to your bones.",
+         other => "<self> glares at <other>.",
+         self => "You glare icily at <other>.",
+      },
+      self => {
+         other => "<self> glares at his feet, what is bothering him?",
+         self => "You glare icily at your feet, they are suddenly very cold.",
+      },
+   },
+   bow => {
+      noparams => {
+         other => "<self> bows deeply.",
+         self => "You bow deeply.",
+      },
+      params => {
+         target => "<self> bows before you.",
+         other => "<self> bows before <other>.",
+         self => "You bow before <other>.",
+      },
+      self => {
+         other => "<self> folds up like a jackknife and kisses his own toes.",
+         self => "You kiss your toes.",
+      },
+   },
+   dance => {
+      noparams => {
+         other => "<self> expresses himself through interpretive dance.",
+         self => "You dance with glee.",
+      },
+      params => {
+         target => "<self> grabs you, and begins dancing!",
+         other => "Yipe! <self> and <other> are doing the Macarena!",
+         self => "You grab <other> and begin doing the Cha-Cha!",
+      },
+      self => {
+         other => "<self> embraces himself and begins to dance!",
+         self => "You skip and dance around by yourself.",
+      },
+   },
+   snore => {
+      noparams => {
+         other => "<self> snores loudly.",
+         self => "Zzzzzzzzzzzzzzz.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   blush => {
+      noparams => {
+         other => "<self> blushes.",
+         self => "Your cheeks are burning.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   snap => {
+      noparams => {
+         other => "<self> snaps his fingers.",
+         self => "PRONTO! you snap your fingers.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   wave => {
+      noparams => {
+         other => "<self> waves happily.",
+         self => "You wave.",
+      },
+      params => {
+         target => "<self> waves goodbye to you. Have a good journey.",
+         other => "<self> waves goodbye to <other>.",
+         self => "You wave goodbye to <other>.",
+      },
+      self => {
+         other => "<self> waves goodbye to himself.",
+         self => "Are you going on adventures as well??",
+      },
+   },
+   smile => {
+      noparams => {
+         other => "<self> smiles happily.",
+         self => "You smile happily.",
+      },
+      params => {
+         target => "<self> smiles at you.",
+         other => "<self> beams a smile at <other>.",
+         self => "You smile at <other>.",
+      },
+      self => {
+      },
+   },
+   sneeze => {
+      noparams => {
+         other => "<self> sneezes.",
+         self => "Gesundheit!",
+      },
+      params => {
+         target => "<self> sneezes on you, you feel the snot cover you. EEEEEEW.",
+         other => "<self> sneezes on <other> and a film of snot covers him.",
+         self => "You sneeze at <other> and a film of snot shoots onto him.",
+      },
+      self => {
+         other => "<self> sneezes, and covers himself in a slimy substance.",
+         self => "You sneeze on yourself, what a mess!",
+      },
+   },
+   bounce => {
+      noparams => {
+         other => "<self> bounces around.",
+         self => "BOIINNNNNNGG!",
+      },
+      params => {
+         target => "<self> bounces around the room with you.",
+         other => "<self> bounces around the room with <other>.",
+         self => "You bounce around the room with <other>.",
+      },
+      self => {
+      },
+   },
+   shake => {
+      noparams => {
+         other => "<self> shakes his head.",
+         self => "You shake your head.",
+      },
+      params => {
+         target => "<self> shakes your hand.",
+         other => "<self> shakes <other>'s hand.",
+         self => "You shake <other>'s hand.",
+      },
+      self => {
+         other => "<self> shakes and quivers like a bowlful of jelly.",
+         self => "You are shaken by yourself.",
+      },
+   },
+   lick => {
+      noparams => {
+         other => "<self> licks his mouth and smiles.",
+         self => "You lick your mouth and smile.",
+      },
+      params => {
+         target => "<self> licks you.",
+         other => "<self> licks <other>.",
+         self => "You lick <other>.",
+      },
+      self => {
+         other => "<self> licks himself - YUCK.",
+         self => "You lick yourself.",
+      },
+   },
+   flip => {
+      noparams => {
+         other => "<self> flips head over heels.",
+         self => "You flip head over heels.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   think => {
+      noparams => {
+         other => "<self> closes his eyes and thinks really hard.",
+         self => "Anything in particular that you'd care to think about?",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   yawn => {
+      noparams => {
+         other => "<self> yawns sleepily.",
+         self => "You open up your yap and let out a big breeze of stale air.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   laugh => {
+      noparams => {
+         other => "<self> falls down laughing.",
+         self => "You fall down laughing.",
+      },
+      params => {
+         target => "<self> looks at you and falls down on the ground laughing.",
+         other => "<self> looks at <other> and falls down on the ground laughing.",
+         self => "You take one look at <other> and fall down laughing.",
+      },
+      self => {
+         other => "<self> is laughing at something.",
+         self => "Laugh at yourself all you want, the others won't understand.",
+      },
+   },
+   burp => {
+      noparams => {
+         other => "<self> burps loudly.",
+         self => "You burp loudly.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   gasp => {
+      noparams => {
+         other => "<self> gasps in astonishment.",
+         self => "You gasp in astonishment.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   smirk => {
+      noparams => {
+         other => "<self> smirks.",
+         self => "You smirk.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   cry => {
+      noparams => {
+         other => "<self> bursts into tears.",
+         self => "Waaaaaaahhh..",
+      },
+      params => {
+         target => "<self> cries on your shoulder.",
+         other => "<self> cries on <other>'s shoulder.",
+         self => "You cry on <other>'s shoulder.",
+      },
+      self => {
+         other => "<self> sobs quietly to himself.",
+         self => "You cry to yourself.",
+      },
+   },
+   sulk => {
+      noparams => {
+         other => "<self> sulks in the corner.",
+         self => "You sulk.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   whistle => {
+      noparams => {
+         other => "<self> whistles appreciatively.",
+         self => "You whistle appreciatively.",
+      },
+      params => {
+         target => "<self> whistles at <other>.",
+         self => "You whistle at <other>.",
+      },
+      self => {
+         other => "<self> whistles to himself in boredom.",
+         self => "You whistle while you work.",
+      },
+   },
+   groan => {
+      noparams => {
+         other => "<self> groans loudly.",
+         self => "You groan loudly.",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   cough => {
+      noparams => {
+         other => "<self> coughs loudly.",
+         self => "Yuck, try to cover your mouth next time!",
+      },
+      params => {
+      },
+      self => {
+      },
+   },
+   grin => {
+      noparams => {
+         other => "<self> grins evilly.",
+         self => "You grin evilly.",
+      },
+      params => {
+         target => "<self> grins evilly at you.",
+         other => "<self> grins evilly at <other>.",
+         self => "You grin at <other>.",
+      },
+      self => {
+      },
+   },
+};
+
+for my $emotion (keys %$emotes) {
+   cf::register_command $emotion => sub {
+      my ($pl, $tname) = @_;
+      
+      cf::async {
+         my $name = $pl->name;
+         
+         if ($tname eq $name) {
+            my $emote = $emotes->{$emotion}->{self};
+
+            $emote->{other} = "You look away from <self>."
+               if !$emote->{other};
+            $emote->{self} = "My god! Is that LEGAL?"
+               if !$emote->{self};
+
+            $emote->{other} =~ s/<self>/$name/;
+            
+            for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
+               next
+                  if $other->ob == $pl;
+               $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
+            }
+
+            $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE);
+         } elsif ($tname) {
+            my $target = cf::player::find $tname
+               or return $pl->reply (undef, "$tname is not around.");
+            
+            my $emote = $emotes->{$emotion}->{params};
+
+            $emote->{other} = "<self> is eyeing <other> quizzically."
+               if !$emote->{other};
+            $emote->{self} = "You are still nuts."
+               if !$emote->{self};
+            $emote->{target} = "You get the distinct feeling that <other> is nuts."
+               if !$emote->{target};
+
+            $emote->{self} =~ s/<other>/$tname/;
+            $emote->{target} =~ s/<self>/$name/;
+            $emote->{other} =~ s/<other>/$tname/;
+            $emote->{other} =~ s/<self>/$name/;
+            
+            for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
+               next
+                  if $other->ob == $pl or $other == $target;
+               $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
+            }
+
+            $target->ob->message ($emote->{target}, cf::NDI_GREY | cf::NDI_UNIQUE);
+            $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE);
+         } else {
+            my $emote = $emotes->{$emotion}->{noparams};
+            $emote->{other} =~ s/<self>/$name/;
+
+            $emote->{other} = "<self> dances with glee."
+               if !$emote->{other};
+            $emote->{self} = "You are a nut."
+               if !$emote->{self};
+            
+            for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
+               next
+                  if $other->ob == $pl;
+               $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
+            }
+
+            $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE);
+         }
+      };
+   };
+}
+
+cf::register_command me => sub {
+   my ($pl, $msg) = @_;
+   
+   my $name = $pl->name;
+   
+   $_->ob->message ("* $name $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
+      for grep $pl->on_same_map_as ($_->ob), cf::player::list;
+};
+
 cf::register_command say => sub {
-   my ($who, $msg) = @_;
+   my ($pl, $msg) = @_;
 
    utf8::decode $msg;
 
-   return if $who->contr->invoke (cf::EVENT_PLAYER_SAY, $msg);
+   return if $pl->contr->invoke (cf::EVENT_PLAYER_SAY, $msg);
 
    if ($msg) {
-      my $name = $who->name;
+      my $name = $pl->name;
 
       utf8::encode $msg; # ->message not yet utf8-ified
       $_->ob->message ("$name says: $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
-         for grep $who->on_same_map_as ($_->ob), cf::player::list;
+         for grep $pl->on_same_map_as ($_->ob), cf::player::list;
       utf8::decode $msg;
 
       # npcs, magic_ears etc.
       # first find all objects and theirt-level inventories
       # within a 5x5 square # that have something resembling
       # dialogue or support on_say.
-      my ($map, $x, $y) = ($who->map, $who->x - 2, $who->y - 2);
+      my ($map, $x, $y) = ($pl->map, $pl->x - 2, $pl->y - 2);
 
       for my $npc (
-         grep +($_->invoke (cf::EVENT_OBJECT_SAY, $who->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_,
+         grep +($_->invoke (cf::EVENT_OBJECT_SAY, $pl->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_,
             map +($_, $_->inv),
                grep $_,
                   map $map->at ($x + $_ % 5, $y + (int $_ / 5)),
                      0..24
       ) {
          # if some listener teleported us somewhere else, stop right here
-         last unless $map->path == $who->map->path;
+         last unless $map->path == $pl->map->path;
 
-         my $dialog = new NPC_Dialogue ob => $who, npc => $npc;
+         my $dialog = new NPC_Dialogue ob => $pl, npc => $npc;
          my ($reply, @kw) = $dialog->tell ($msg);
 
          if (defined $reply) {
             if ($npc->type == cf::MAGIC_EAR) {
                if (length $reply) {
                   $_->ob->message ($reply, cf::NDI_BROWN | cf::NDI_UNIQUE)
-                     for grep $who->on_same_map_as ($_->ob), cf::player::list;
+                     for grep $pl->on_same_map_as ($_->ob), cf::player::list;
                }
                $npc->use_trigger;
             } else {
                if (length $reply) {
                   $_->ob->message ($npc->name . " says: $reply", cf::NDI_BROWN | cf::NDI_UNIQUE)
-                     for grep $who->on_same_map_as ($_->ob), cf::player::list;
+                     for grep $pl->on_same_map_as ($_->ob), cf::player::list;
                }
             }
          }
 
          if (@kw) {
             $_->ob->message ("[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN | cf::NDI_UNIQUE)
-               for grep $who->on_same_map_as ($_->ob), cf::player::list;
+               for grep $pl->on_same_map_as ($_->ob), cf::player::list;
          }
       }
 
    } else {
-      $who->message ("What do you want to say?", cf::NDI_UNIQUE);
+      $pl->message ("What do you want to say?", cf::NDI_UNIQUE);
    }
 };
 
 cf::register_command chat => sub {
-   my ($who, $msg) = @_;
+   my ($pl, $msg) = @_;
 
    utf8::decode $msg;
 
-   return if $who->contr->invoke (cf::EVENT_PLAYER_CHAT, $msg);
+   return if $pl->contr->invoke (cf::EVENT_PLAYER_CHAT, $msg);
 
    if ($msg) {
-      my $name = $who->name;
+      my $name = $pl->name;
       my $NOW = time;
 
       utf8::encode $msg; # ->message not yet utf8-ified
@@ -129,20 +835,20 @@
          for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list;
 
    } else {
-      $who->message ("Chat what?", cf::NDI_UNIQUE);
+      $pl->message ("Chat what?", cf::NDI_UNIQUE);
    }
 };
 
 cf::register_command shout => sub {
-   my ($who, $msg) = @_;
+   my ($pl, $msg) = @_;
 
    utf8::decode $msg;
 
-   return if $who->contr->invoke (cf::EVENT_PLAYER_SHOUT, $msg);
+   return if $pl->contr->invoke (cf::EVENT_PLAYER_SHOUT, $msg);
 
    if ($msg) {
       my $NOW = time;
-      my $name = $who->name;
+      my $name = $pl->name;
 
       cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
       ext::schmorp_irc::do_notice (sprintf "\007\0034{%s} %s\n", $name, $msg);
@@ -152,62 +858,62 @@
          for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list;
 
    } else {
-      $who->message ("Shout what?", cf::NDI_UNIQUE);
+      $pl->message ("Shout what?", cf::NDI_UNIQUE);
    }
-
 };
 
 cf::register_command tell => sub {
-   my ($who, $args) = @_;
+   my ($pl, $args) = @_;
    my ($target, $msg) = split /\s+/, $args, 2;
 
    utf8::decode $msg;
 
-   return if $who->contr->invoke (cf::EVENT_PLAYER_TELL, $target, $msg);
+   return if $pl->contr->invoke (cf::EVENT_PLAYER_TELL, $target, $msg);
 
-   my $name = $who->name;
+   my $name = $pl->name;
 
    if ($target =~ /irc\//) {
       my (undef, $nick) = split /\//, $target, 2;
-      $who->message ("You tell $target: $args");
+      $pl->message ("You tell $target: $args");
       ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $msg);
    } elsif (my $other = cf::player::find_active $target) {
 
       if ($msg) {
          if ($target eq $name) {
-            $who->message ("You are talking to yourself, you freak!", cf::NDI_UNIQUE);
+            $pl->message ("You are talking to yourself, you freak!", cf::NDI_UNIQUE);
          } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) {
-            $who->message ("$target ignores what you say. Give up on it.", cf::NDI_UNIQUE);
+            $pl->message ("$target ignores what you say. Give up on it.", cf::NDI_UNIQUE);
          } else {
+            return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl->contr, $msg);
             utf8::encode $msg; # ->message not yet utf8-ified
             cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg;
 
-            $who->message ("You tell $target: $msg");
+            $pl->message ("You tell $target: $msg");
             $other->ob->message ("$name tells you: $msg");
             $other->ob->{ext_last_tell} = $name;
          }
       } else {
-         $who->message ("What do you want to tell $target?", cf::NDI_UNIQUE);
+         $pl->message ("What do you want to tell $target?", cf::NDI_UNIQUE);
       }
 
    } else {
-      $who->message ("No such player. Your message: $msg", cf::NDI_UNIQUE);
+      $pl->message ("No such player. Your message: $msg", cf::NDI_UNIQUE);
    }
 };
 
 cf::register_command reply => sub {
-   my ($who, $args) = @_;
-   my $name = $who->name;
+   my ($pl, $args) = @_;
+   my $name = $pl->name;
 
    utf8::decode $args;
 
-   return if $who->contr->invoke (cf::EVENT_PLAYER_TELL, $who->{ext_last_tell}, $args);
+   return if $pl->contr->invoke (cf::EVENT_PLAYER_TELL, $pl->{ext_last_tell}, $args);
 
-   if ($who->{ext_last_tell} =~ /irc\//) {
-      my (undef, $nick) = split /\//, $who->{ext_last_tell}, 2;
-      $who->message ("You tell " . $who->{ext_last_tell} . ": $args");
+   if ($pl->{ext_last_tell} =~ /irc\//) {
+      my (undef, $nick) = split /\//, $pl->{ext_last_tell}, 2;
+      $pl->message ("You tell " . $pl->{ext_last_tell} . ": $args");
       ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $args);
-   } elsif (my $other = cf::player::find_active $who->{ext_last_tell}) {
+   } elsif (my $other = cf::player::find_active $pl->{ext_last_tell}) {
 
       if ($args) {
          $other->ob->{ext_ignore_tell}{$name} >= time
@@ -217,37 +923,37 @@
             utf8::encode $args; # ->message not yet utf8-ified
             cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $other->ob->name, $args;
 
-            $who->message ("You tell " . $other->ob->name . ": $args");
+            $pl->message ("You tell " . $other->ob->name . ": $args");
             $other->ob->message ("$name tells you: $args");
-            $who->{ext_last_tell} = $other->ob->name;
+            $pl->{ext_last_tell} = $other->ob->name;
          } else {
-            $who->message ($other->ob->name . " ignores what you say. Give up on it.", cf::NDI_UNIQUE);
+            $pl->message ($other->ob->name . " ignores what you say. Give up on it.", cf::NDI_UNIQUE);
          }
       } else {
-         $who->message ("What do you want to tell ".$other->ob->name."?", cf::NDI_UNIQUE);
+         $pl->message ("What do you want to tell ".$other->ob->name."?", cf::NDI_UNIQUE);
       }
 
    } else {
-      $who->message ("Can't reply, player left. Your message: $args".$who->{ext_last_tell}, cf::NDI_UNIQUE);
+      $pl->message ("Can't reply, player left. Your message: $args".$pl->{ext_last_tell}, cf::NDI_UNIQUE);
    }
 };
 
 cf::register_command ignore => sub {
-   my ($who, $args) = @_;
+   my ($pl, $args) = @_;
    my ($target, $type, $timeout) = split /\s+/, $args;
 
    if ($args eq "list") {
-      clean_timeouts $who;
+      clean_timeouts $pl;
 
-      if ((my @ignored_tell = sort keys %{$who->{ext_ignore_tell}})
-          + (my @ignored_shout = sort keys %{$who->{ext_ignore_shout}})) {
-         $who->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE);
-         $who->message ((join ", ", @ignored_tell), cf::NDI_UNIQUE);
-         $who->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE);
-         $who->message ((join ", ", @ignored_shout), cf::NDI_UNIQUE);
-         $who->message ("To stop ignoring one, use unignore.", cf::NDI_UNIQUE);
+      if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}})
+          + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) {
+         $pl->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE);
+         $pl->message ((join ", ", @ignored_tell), cf::NDI_UNIQUE);
+         $pl->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE);
+         $pl->message ((join ", ", @ignored_shout), cf::NDI_UNIQUE);
+         $pl->message ("To stop ignoring one, use unignore.", cf::NDI_UNIQUE);
       } else {
-         $who->message ("Not ignoring anyone", cf::NDI_UNIQUE);
+         $pl->message ("Not ignoring anyone", cf::NDI_UNIQUE);
       }
 
    } elsif ($target && $type) {
@@ -257,24 +963,24 @@
 
       if (cf::player::exists $target) {
          if ($type eq "tell") {
-            $who->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_UNIQUE);
-            $who->{ext_ignore_tell}{$target}  = $absolute_timeout;
+            $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_UNIQUE);
+            $pl->{ext_ignore_tell}{$target}  = $absolute_timeout;
          } elsif ($type eq "shout") {
-            $who->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_UNIQUE);
-            $who->{ext_ignore_shout}{$target} = $absolute_timeout;
+            $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_UNIQUE);
+            $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
          } elsif ($type eq "all") {
-            $who->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_UNIQUE);
-            $who->{ext_ignore_tell}{$target}  = $absolute_timeout;
-            $who->{ext_ignore_shout}{$target} = $absolute_timeout;
+            $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_UNIQUE);
+            $pl->{ext_ignore_tell}{$target}  = $absolute_timeout;
+            $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
          } else {
-            $who->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE);
+            $pl->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE);
          }
       } else {
-         $who->message ("No such player: $target", cf::NDI_UNIQUE);
+         $pl->message ("No such player: $target", cf::NDI_UNIQUE);
       }
 
    } else {
-      $who->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
+      $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
                    . "will ignore a player for <timeout> hours.\n"
                    . "Usage: ignore list\n"
                    . "will show you a list of players currently ignored.", cf::NDI_UNIQUE);
@@ -282,59 +988,36 @@
 };
 
 cf::register_command unignore => sub {
-   my ($who, $args) = @_;
+   my ($pl, $args) = @_;
    my ($target, $type) = split /\s+/, $args;
 
    if ($args eq "") {
-      if ($who->{ext_ignore_tell}) {
-         $who->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE);
-         $who->message ((join ", ", sort keys %{ $who->{ext_ignore_tell} }), cf::NDI_UNIQUE);
-         $who->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE);
-         $who->message ((join ", ", sort keys %{ $who->{ext_ignore_shout} }), cf::NDI_UNIQUE);
+      if ($pl->{ext_ignore_tell}) {
+         $pl->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE);
+         $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_UNIQUE);
+         $pl->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE);
+         $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_UNIQUE);
       } else {
-         $who->message ("Not ignoring anyone", cf::NDI_UNIQUE);
+         $pl->message ("Not ignoring anyone", cf::NDI_UNIQUE);
       }
    } else {
       if (cf::player::exists $target) {
          if ($type eq "tell") {
-            $who->message ("Not ignoring private messages from $target anymore.", cf::NDI_UNIQUE);
-            delete $who->{ext_ignore_tell} {$target};
+            $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_UNIQUE);
+            delete $pl->{ext_ignore_tell} {$target};
          } elsif ($type eq "shout") {
-            $who->message ("Not ignoring shouts from $target anymore.", cf::NDI_UNIQUE);
-            delete $who->{ext_ignore_shout}{$target};
+            $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_UNIQUE);
+            delete $pl->{ext_ignore_shout}{$target};
          } elsif ($type eq "all") {
-            $who->message ("Not ignoring anything from $target anymore.", cf::NDI_UNIQUE);
-            delete $who->{ext_ignore_tell} {$target};
-            delete $who->{ext_ignore_shout}{$target};
+            $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_UNIQUE);
+            delete $pl->{ext_ignore_tell} {$target};
+            delete $pl->{ext_ignore_shout}{$target};
          } else {
-            $who->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE);
+            $pl->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE);
          }
       } else {
-         $who->message ("No such player or ambiguous name: $target", cf::NDI_UNIQUE);
-      }
-   }
-};
-
-cf::register_command seen => sub {
-   my ($who, $args) = @_;
-
-   if (my ($login) = $args =~ /(\S+)/) {
-      if ($login eq $who->name) {
-         $who->message ("Very funny, $login. Ha. Ha.", cf::NDI_UNIQUE);
-      } elsif (cf::player::find_active $login) {
-         $who->message ("$login is right here on this server!", cf::NDI_UNIQUE);
-      } elsif (cf::player::exists $login
-               and stat sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($login) x 2) {
-         my $time = (stat _)[9];
-
-         $who->message ("$login was last seen here "
-                        . (POSIX::strftime "%Y-%m-%d %H:%M:%S +0000", gmtime $time)
-                        . " which was " . (int +(time - $time) / 3600) . " hours ago.", cf::NDI_UNIQUE);
-      } else {
-         $who->message ("No player named $login is known to me.", cf::NDI_UNIQUE);
+         $pl->message ("No such player or ambiguous name: $target", cf::NDI_UNIQUE);
       }
-   } else {
-      $who->message ("Usage: seen <player>", cf::NDI_UNIQUE);
    }
 };