--- deliantra/server/ext/chat.ext	2008/08/29 02:07:09	1.42
+++ deliantra/server/ext/chat.ext	2008/09/19 01:39:45	1.44
@@ -150,7 +150,7 @@
    },
    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 => {
@@ -169,7 +169,7 @@
          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.",
       },
    },
@@ -252,7 +252,7 @@
          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?",
       },
    },
@@ -268,7 +268,7 @@
    },
    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 => {
@@ -287,7 +287,7 @@
          self => "You sniff <other>.",
       },
       self => {
-         other => "<self> sniffs himself.",
+         other => "<self> sniffs G<him|her>self.",
          self => "You sniff yourself.",
       },
    },
@@ -297,9 +297,9 @@
          self => "You nod solemnly.",
       },
       params => {
-         target => "<self> nods solemnly to you.",
-         other => "<self> nods solemnly to <other>.",
-         self => "You nod solemnly to <other>.",
+         target => "<self> nods solemnly at you.",
+         other => "<self> nods solemnly at <other>.",
+         self => "You nod solemnly at <other>.",
       },
       self => {
       },
@@ -315,7 +315,7 @@
          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.",
       },
    },
@@ -348,18 +348,18 @@
          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>.",
+         target => "<self> slashes G<his|her> wrist and bleeds all over you.",
+         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 => {
@@ -369,7 +369,7 @@
    },
    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 => {
@@ -378,13 +378,13 @@
          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 => {
@@ -393,7 +393,7 @@
          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.",
       },
    },
@@ -408,13 +408,13 @@
          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 => {
@@ -423,7 +423,7 @@
          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.",
       },
    },
@@ -449,7 +449,7 @@
    },
    snap => {
       noparams => {
-         other => "<self> snaps his fingers.",
+         other => "<self> snaps G<his|her> fingers.",
          self => "PRONTO! you snap your fingers.",
       },
       params => {
@@ -468,7 +468,7 @@
          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??",
       },
    },
@@ -492,11 +492,11 @@
       },
       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.",
+         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 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!",
       },
    },
@@ -515,7 +515,7 @@
    },
    shake => {
       noparams => {
-         other => "<self> shakes his head.",
+         other => "<self> shakes G<his|her> head.",
          self => "You shake your head.",
       },
       params => {
@@ -530,7 +530,7 @@
    },
    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 => {
@@ -539,7 +539,7 @@
          self => "You lick <other>.",
       },
       self => {
-         other => "<self> licks himself - YUCK.",
+         other => "<self> licks G<him|her>self - YUCK.",
          self => "You lick yourself.",
       },
    },
@@ -555,7 +555,7 @@
    },
    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 => {
@@ -629,7 +629,7 @@
          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.",
       },
    },
@@ -653,7 +653,7 @@
          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.",
       },
    },
@@ -709,11 +709,14 @@
             $emote{self}  ||= "My god! Is that LEGAL?";
 
             $emote{other} =~ s/<self>/$name/;
+
+            $_ = $pl->expand_cfpod ($_)
+               for values %emote;
             
-            send_msg $_, $cf::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";
@@ -729,11 +732,14 @@
             $emote{other}  =~ s/<other>/$tname/;
             $emote{other}  =~ s/<self>/$name/;
             
-            send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
+            $_ = $pl->expand_cfpod ($_)
+               for values %emote;
+
+            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";
-            $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
+            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 | cf::NDI_VERBATIM);
          } else {
             my %emote = %{ $emotes->{$emotion}->{noparams} || {} };
 
@@ -742,10 +748,13 @@
             
             $emote{other} =~ s/<self>/$name/;
 
-            send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
+            $_ = $pl->expand_cfpod ($_)
+               for values %emote;
+
+            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 ($cf::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);
          }
       };
    };
@@ -837,7 +846,7 @@
       send_irc ("[%s] %s", $name, $msg);
 
       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 ($cf::CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY);
@@ -861,7 +870,7 @@
       send_irc ("\007\0034{%s} %s\n", $name, $msg);
 
       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 ($cf::CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY);