[ViewVC] Diff of: cvs/deliantra/server/ext/chat.ext

Comparing deliantra/server/ext/chat.ext (file contents):
Revision 1.37 by root, Mon Nov 12 23:27:51 2007 UTC vs.
Revision 1.44 by root, Fri Sep 19 01:39:45 2008 UTC

 #! perl # depends=irc mandatory
-# implement a replacement for the built-in say/chat/shout/tell/reply commands
+# implement a replacement for the built-in say/chat/shout/tell commands
 # adds ignore/unignore functionality
 use NPC_Dialogue;
 use POSIX (); # for strftime only
-our $SAY_CHANNEL = {
-   id      => "say",
-   title   => "Map",
-   reply   => "say ",
-   tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
-};
-our $CHAT_CHANNEL = {
-   id      => "chat",
-   title   => "Chat",
-   reply   => "chat ",
-   tooltip => "Player chat and shouts, global to the server.",
-};
 sub tell_channel($) {
    my ($target) = @_;
    {
    on_login => sub {
       my ($pl) = @_;
       clean_timeouts $pl->ob;
-      $pl->send_msg ($SAY_CHANNEL);
+      $pl->send_msg ($cf::SAY_CHANNEL);
-      $pl->send_msg ($CHAT_CHANNEL);
+      $pl->send_msg ($cf::CHAT_CHANNEL);
    },
 );
+# TODO: remove once safe
 cf::register_command listen => sub {
-   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) {
-         $pl->message ("Your verbose level stays at $prev_listen.", cf::NDI_REPLY);
-      } else {
-         $pl->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_REPLY);
-      }
-   } else {
-      $pl->message ("Your verbose level is " . $player->listening . ".", cf::NDI_REPLY);
-   }
 };
 cf::register_command cointoss => sub {
    my ($ob, $msg) = @_;
    my $pl = $ob->contr;
    my $name = $ob->name;
    my $coin = int rand 2 ? "Heads" : "Tails";
-   send_msg $_, $SAY_CHANNEL => "$name flips a coin.... $coin!", cf::NDI_GREY, "msg_say"
+   send_msg $_, $cf::SAY_CHANNEL => "$name flips a coin.... $coin!", cf::NDI_GREY, "msg_say"
       for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list;
-   $pl->send_msg ($SAY_CHANNEL => "You flip a coin.... $coin!", cf::NDI_GREY | cf::NDI_REPLY);
+   $pl->send_msg ($cf::SAY_CHANNEL => "You flip a coin.... $coin!", cf::NDI_GREY | cf::NDI_REPLY);
 };
 cf::register_command orcknuckle => sub {
    my ($ob, $msg) = @_;
    my @orcknuckle =  ("beholder", "ghost", "knight", "princess", "dragon", "orc");
    my ($i, $j, $k, $l) = (rand 5, rand 5, rand 5, rand 6);
    my $result = "$orcknuckle[$i], $orcknuckle[$j], $orcknuckle[$k], $orcknuckle[$l]";
-   send_msg $_, $SAY_CHANNEL => "$name throws his orc-knuckles and rolls $result!", cf::NDI_GREY, "msg_say"
+   send_msg $_, $cf::SAY_CHANNEL => "$name throws his orc-knuckles and rolls $result!", cf::NDI_GREY, "msg_say"
       for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list;
-   $pl->send_msg ($SAY_CHANNEL => "You roll $result!", cf::NDI_GREY | cf::NDI_REPLY);
+   $pl->send_msg ($cf::SAY_CHANNEL => "You roll $result!", cf::NDI_GREY | cf::NDI_REPLY);
 };
 my $emotes = {
    growl => {
       noparams => {
       self => {
       },
    },
    scream => {
       noparams => {
-         other => "<self> screams at the top of his lungs!",
+         other => "<self> screams at the top of G<his|her> lungs!",
          self => "ARRRRRRRRRRGH!!!!!",
       },
       params => {
       },
       self => {
          target => "<self> pukes on your clothes!",
          other => "<self> pukes on <other>.",
          self => "You puke on <other>.",
       },
       self => {
-         other => "<self> pukes on his clothes.",
+         other => "<self> pukes on G<his|her> clothes.",
          self => "You puke on yourself.",
       },
    },
    strut => {
       noparams => {
          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...",
+         other => "<self> winks at G<him|her>self - something strange is going on...",
          self => "You wink at yourself?? What are you up to?",
       },
    },
    pout => {
       noparams => {
       self => {
       },
    },
    cackle => {
       noparams => {
-         other => "<self> throws back his head and cackles with insane glee!",
+         other => "<self> throws back G<his|her> head and cackles with insane glee!",
          self => "You cackle gleefully.",
       },
       params => {
       },
       self => {
          target => "<self> sniffs you.",
          other => "<self> sniffs <other>",
          self => "You sniff <other>.",
       },
       self => {
-         other => "<self> sniffs himself.",
+         other => "<self> sniffs G<him|her>self.",
          self => "You sniff yourself.",
       },
    },
    nod => {
       noparams => {
          other => "<self> nods solemnly.",
          self => "You nod solemnly.",
       },
       params => {
-         target => "<self> nods solemnly to you.",
+         target => "<self> nods solemnly at you.",
-         other => "<self> nods solemnly to <other>.",
+         other => "<self> nods solemnly at <other>.",
-         self => "You nod solemnly to <other>.",
+         self => "You nod solemnly at <other>.",
       },
       self => {
       },
    },
    frown => {
          target => "<self> frowns darkly at you.",
          other => "<self> frowns darkly at <other>.",
          self => "You frown darkly at <other>.",
       },
       self => {
-         other => "<self> frowns at himself.",
+         other => "<self> frowns at G<him|her>self.",
          self => "You frown at yourself.",
       },
    },
    snicker => {
       noparams => {
       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.",
+         target => "<self> slashes G<his|her> wrist and bleeds all over you.",
-         other => "<self> slashes his wrist and bleeds all over <other>.",
+         other => "<self> slashes G<his|her> 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.",
+         other => "<self> performs some satanic ritual while wiping G<his|her> blood on G<him|her>self.",
          self => "Very impressive! You wipe your blood all over yourself.",
       },
    },
    twiddle => {
       noparams => {
-         other => "<self> patiently twiddles his thumbs.",
+         other => "<self> patiently twiddles G<his|her> thumbs.",
          self => "You patiently twiddle your thumbs.",
       },
       params => {
       },
       self => {
       },
    },
    spit => {
       noparams => {
-         other => "<self> spits over his left shoulder.",
+         other => "<self> spits over G<his|her> 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.",
+         other => "<self> drools all over G<him|her>self.",
          self => "You drool all over yourself.",
       },
    },
    glare => {
       noparams => {
-         other => "<self> glares around him.",
+         other => "<self> glares around G<him|her>.",
          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?",
+         other => "<self> glares at G<his|her> feet, what is bothering G<him|her>?",
          self => "You glare icily at your feet, they are suddenly very cold.",
       },
    },
    bow => {
       noparams => {
          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.",
+         other => "<self> folds up like a jackknife and kisses G<his|her> own toes.",
          self => "You kiss your toes.",
       },
    },
    dance => {
       noparams => {
-         other => "<self> expresses himself through interpretive dance.",
+         other => "<self> expresses G<him|her>self 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!",
+         other => "<self> embraces G<him|her>self and begins to dance!",
          self => "You skip and dance around by yourself.",
       },
    },
    snore => {
       noparams => {
       self => {
       },
    },
    snap => {
       noparams => {
-         other => "<self> snaps his fingers.",
+         other => "<self> snaps G<his|her> fingers.",
          self => "PRONTO! you snap your fingers.",
       },
       params => {
       },
       self => {
          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.",
+         other => "<self> waves goodbye to G<him|her>self.",
          self => "Are you going on adventures as well??",
       },
    },
    smile => {
       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.",
+         other => "<self> sneezes on <other> and a film of snot covers G<him|her>.",
-         self => "You sneeze at <other> and a film of snot shoots onto him.",
+         self => "You sneeze at <other> and a film of snot shoots onto G<him|her>.",
       },
       self => {
-         other => "<self> sneezes, and covers himself in a slimy substance.",
+         other => "<self> sneezes, and covers G<him|her>self in a slimy substance.",
          self => "You sneeze on yourself, what a mess!",
       },
    },
    bounce => {
       noparams => {
       self => {
       },
    },
    shake => {
       noparams => {
-         other => "<self> shakes his head.",
+         other => "<self> shakes G<his|her> head.",
          self => "You shake your head.",
       },
       params => {
          target => "<self> shakes your hand.",
          other => "<self> shakes <other>'s hand.",
          self => "You are shaken by yourself.",
       },
    },
    lick => {
       noparams => {
-         other => "<self> licks his mouth and smiles.",
+         other => "<self> licks G<his|her> 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.",
+         other => "<self> licks G<him|her>self - YUCK.",
          self => "You lick yourself.",
       },
    },
    flip => {
       noparams => {
       self => {
       },
    },
    think => {
       noparams => {
-         other => "<self> closes his eyes and thinks really hard.",
+         other => "<self> closes G<his|her> eyes and thinks really hard.",
          self => "Anything in particular that you'd care to think about?",
       },
       params => {
       },
       self => {
          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.",
+         other => "<self> sobs quietly to G<him|her>self.",
          self => "You cry to yourself.",
       },
    },
    sulk => {
       noparams => {
       params => {
          target => "<self> whistles at <other>.",
          self => "You whistle at <other>.",
       },
       self => {
-         other => "<self> whistles to himself in boredom.",
+         other => "<self> whistles to G<him|her>self in boredom.",
          self => "You whistle while you work.",
       },
    },
    groan => {
       noparams => {
             $emote{other} ||= "You look away from <self>.";
             $emote{self}  ||= "My god! Is that LEGAL?";
             $emote{other} =~ s/<self>/$name/;
+            $_ = $pl->expand_cfpod ($_)
+               for values %emote;
-            send_msg $_, $CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
+            send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
                for grep { $ob->on_same_map_as ($_->ob) && $_ != $ob} cf::player::list;
-            $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
+            $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
          } elsif ($tname) {
             my $target = cf::player::find $tname
                or return send_msg $pl, tell_channel $tname, "$tname is not around.", cf::NDI_DK_ORANGE | cf::NDI_REPLY, "msg_chat";
             my %emote = %{ $emotes->{$emotion}->{params} || {} };
             $emote{other}  ||= "<self> is eyeing <other> quizzically.";
             $emote{self}   ||= "You are still nuts.";
-            $emote{target} ||= "You get the distinct feeling that <other> is nuts.";
+            $emote{target} ||= "You get the distinct feeling that <self> is nuts.";
             $emote{self}   =~ s/<other>/$tname/;
             $emote{target} =~ s/<self>/$name/;
             $emote{other}  =~ s/<other>/$tname/;
             $emote{other}  =~ s/<self>/$name/;
+            $_ = $pl->expand_cfpod ($_)
+               for values %emote;
-            send_msg $_, $CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
+            send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
                for grep { $_ != $pl && $_ != $target && $ob->on_same_map_as ($_->ob) } cf::player::list;
-            send_msg $target, tell_channel $name, $emote{target}, cf::NDI_GREY, "msg_shout";
+            send_msg $target, tell_channel $name, $emote{target}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_shout";
-            $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
+            $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
          } else {
             my %emote = %{ $emotes->{$emotion}->{noparams} || {} };
             $emote{other} ||= "<self> dances with glee.";
             $emote{self}  ||= "You are a nut.";
             $emote{other} =~ s/<self>/$name/;
+            $_ = $pl->expand_cfpod ($_)
+               for values %emote;
-            send_msg $_, $CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
+            send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
                for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl } cf::player::list;
-            $pl->send_msg ($CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
+            $pl->send_msg ($cf::CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
          }
       };
    };
 }
 cf::register_command me => sub {
    my ($pl, $msg) = @_;
    my $name = $pl->name;
-   send_msg $_, $SAY_CHANNEL => "* $name $msg", cf::NDI_GREY | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_say"
+   send_msg $_, $cf::SAY_CHANNEL => "* $name $msg", cf::NDI_GREY | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_say"
       for grep $pl->on_same_map_as ($_->ob), cf::player::list;
 };
 cf::register_command say => sub {
    my ($ob, $msg) = @_;
    if ($msg) {
       my $name = $ob->name;
       my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list;
-      send_msg $_, $SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY, "msg_say"
+      send_msg $_, $cf::SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY, "msg_say"
          for grep $_ != $ob->contr, @plonmap;
-      $ob->contr->send_msg ($SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | cf::NDI_REPLY);
+      $ob->contr->send_msg ($cf::SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | cf::NDI_REPLY);
       # npcs, magic_ears etc.
       # first find all objects and their first-level inventories
       # within a 5x5 square that have something resembling
       # dialogue or support on_say.
       my ($map, $x, $y) = ($ob->map, $ob->x - 2, $ob->y - 2);
       for my $npc (
-         grep +($_->invoke (cf::EVENT_OBJECT_SAY, $ob->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_,
+         grep +($_->invoke (cf::EVENT_OBJECT_SAY, $ob->contr, $msg) && return) || $_->has_dialogue,
             map +($_, $_->inv),
                grep $_,
                   map $map->at ($x + $_ % 5, $y + (int $_ / 5)),
                      0..24
       ) {
          my ($reply, @kw) = $dialog->tell ($msg);
          if (defined $reply) {
             if ($npc->type == cf::MAGIC_EAR) {
                if (length $reply) {
-                  send_msg $_, $SAY_CHANNEL => $reply, cf::NDI_BROWN, "msg_say"
+                  send_msg $_, $cf::SAY_CHANNEL => $reply, cf::NDI_BROWN, "msg_say"
                      for @plonmap;
                }
                $npc->use_trigger;
             } else {
                if (length $reply) {
-                  send_msg $_, $SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN, "msg_say"
+                  send_msg $_, $cf::SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN, "msg_say"
                      for @plonmap;
                }
             }
          }
          if (@kw) {
-            $_->send_msg ($SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
+            $_->send_msg ($cf::SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
                for @plonmap;
          }
       }
    } else {
-      $ob->send_msg ($SAY_CHANNEL => "What do you want to say?", cf::NDI_GREY | cf::NDI_REPLY);
+      $ob->send_msg ($cf::SAY_CHANNEL => "What do you want to say?", cf::NDI_GREY | cf::NDI_REPLY);
    }
 };
 cf::register_command chat => sub {
    my ($ob, $msg) = @_;
       my $NOW = time;
       cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
       send_irc ("[%s] %s", $name, $msg);
-      send_msg $_, $CHAT_CHANNEL => "$name chats: $msg", cf::NDI_BLUE | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_chat"
+      send_msg $_, $cf::CHAT_CHANNEL => "$name chats: $msg", cf::NDI_BLUE | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_chat"
-         for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list;
+         for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW } cf::player::list;
    } else {
-      $pl->send_msg ($CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY);
+      $pl->send_msg ($cf::CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY);
    }
 };
 cf::register_command shout => sub {
    my ($ob, $msg) = @_;
       my $name = $ob->name;
       cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
       send_irc ("\007\0034{%s} %s\n", $name, $msg);
-      send_msg $_, $CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_shout"
+      send_msg $_, $cf::CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_shout"
-         for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list;
+         for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW } cf::player::list;
    } else {
-      $pl->send_msg ($CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY);
+      $pl->send_msg ($cf::CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY);
    }
 };
 cf::register_command tell => sub {
    my ($ob, $args) = @_;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/ext/chat.ext (file contents): Revision 1.37 by root, Mon Nov 12 23:27:51 2007 UTC vs. Revision 1.44 by root, Fri Sep 19 01:39:45 2008 UTC

Diff Legend

Comparing deliantra/server/ext/chat.ext (file contents):
Revision 1.37 by root, Mon Nov 12 23:27:51 2007 UTC vs.
Revision 1.44 by root, Fri Sep 19 01:39:45 2008 UTC