--- deliantra/server/ext/chat.ext 2006/12/21 22:41:34 1.2 +++ deliantra/server/ext/chat.ext 2009/07/19 18:12:29 1.50 @@ -1,12 +1,29 @@ -#! perl -#CONVERSION: PARTIAL +#! 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 +sub tell_channel($) { + my ($target) = @_; + + { + id => "tell-$target", + title => "$target", + reply => "tell $target ", + tooltip => "Private messages from/to $target", + } +} + +sub send_msg($$$$$) { + my ($pl, $channel, $msg, $flags, $sound) = @_; + $pl->play_sound (cf::sound::find $sound) if defined $sound; + $pl->send_msg ($channel, $msg, $flags); + () +} + sub clean_timeouts($) { my ($player) = @_; my $NOW = time; @@ -14,327 +31,995 @@ for my $hash (@$player{qw(ext_ignore_shout ext_ignore_tell)}) { while (my ($k, $v) = each %$hash) { if ($v < $NOW) { - $player->message ("Your ignore on $k has expired.", cf::NDI_GREEN | cf::NDI_UNIQUE); + $player->message ("Your ignore on $k has expired.", cf::NDI_GREEN); delete $hash->{$k}; } elsif (!cf::player::exists $k) { - $player->message ("Your ignore on $k is no longer valid (no such user).", cf::NDI_GREEN | cf::NDI_UNIQUE); + $player->message ("Your ignore on $k is no longer valid (no such user).", cf::NDI_GREEN); delete $hash->{$k}; } } } } +# send_irc ($format, @args, $msg) +# make sure the last argument is the message! +sub send_irc { + my ($format, @args) = @_; + my $msg = pop @args; + for (split /\n/, $msg) { + ext::irc::do_notice (sprintf $format, @args, $_) + } +} + cf::player->attach ( prio => -1000, on_login => sub { my ($pl) = @_; - clean_timeouts $pl->ob; + cf::async { + clean_timeouts $pl->ob; + }; + + $pl->send_msg ($cf::SAY_CHANNEL); + $pl->send_msg ($cf::CHAT_CHANNEL); }, ); +# TODO: remove once safe cf::register_command listen => sub { - my ($who, $msg) = @_; - my $player = cf::player::find $who->name; +}; - if ($msg ne "") { - my $prev_listen = $player->listening; - $player->listening ($msg); - if ($prev_listen == $player->listening) { - $who->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); - } - } else { - $who->message ("Your verbose level is " . $player->listening . ".", cf::NDI_UNIQUE); - } +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 $_, $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 ($cf::SAY_CHANNEL => "You flip a coin.... $coin!", cf::NDI_GREY | cf::NDI_REPLY); }; +cf::register_command orcknuckle => sub { + my ($ob, $msg) = @_; + + my $pl = $ob->contr; + my $name = $ob->name; + + 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 $_, $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 ($cf::SAY_CHANNEL => "You roll $result!", cf::NDI_GREY | cf::NDI_REPLY); +}; + +my $emotes = { + growl => { + noparams => { + other => " growls.", + self => "Grrrrrrrrr....", + }, + params => { + }, + self => { + }, + }, + giggle => { + noparams => { + other => " giggles.", + self => "You giggle.", + }, + params => { + }, + self => { + }, + }, + shiver => { + noparams => { + other => " shivers uncomfortably.", + self => "Brrrrrrrrr.", + }, + params => { + }, + self => { + }, + }, + chuckle => { + noparams => { + other => " chuckles politely.", + self => "You chuckle politely", + }, + params => { + }, + self => { + }, + }, + sigh => { + noparams => { + other => " sighs loudly.", + self => "You sigh.", + }, + params => { + }, + self => { + }, + }, + scream => { + noparams => { + other => " screams at the top of G lungs!", + self => "ARRRRRRRRRRGH!!!!!", + }, + params => { + }, + self => { + }, + }, + puke => { + noparams => { + other => " pukes.", + self => "Bleaaaaaghhhhhhh!", + }, + params => { + target => " pukes on your clothes!", + other => " pukes on .", + self => "You puke on .", + }, + self => { + other => " pukes on G clothes.", + self => "You puke on yourself.", + }, + }, + strut => { + noparams => { + other => " struts proudly.", + self => "Strut your stuff.", + }, + params => { + }, + self => { + }, + }, + cringe => { + noparams => { + other => " cringes in terror!", + self => "You cringe in terror.", + }, + params => { + target => " cringes away from in mortal terror.", + self => "You cringe away from .", + }, + self => { + }, + }, + hiccup => { + noparams => { + other => " hiccups.", + self => "*HIC*", + }, + params => { + }, + self => { + }, + }, + clap => { + noparams => { + other => " gives a round of applause.", + self => "Clap, clap, clap.", + }, + params => { + }, + self => { + }, + }, + kiss => { + noparams => { + other => " makes a weird facial contortion", + self => "All the lonely people...", + }, + params => { + target => " kisses you.", + other => " kisses .", + self => "You kiss .", + }, + self => { + }, + }, + hug => { + noparams => { + other => " makes weird body movements.", + self => "All the lonely people...", + }, + params => { + target => " suddenly grabs and hugs you.", + other => " hugs .", + self => "You hug .", + }, + self => { + other => " tries to hug G, but stumbles and now feels stupid.", + self => "You try and fail to hug yourself.", + }, + }, + smother => { + noparams => { + other => " makes weird facial contortions", + self => "All the lonely people...", + }, + params => { + target => " smothers you with kisses.", + other => " smothers with kisses.", + self => "You smother with kisses.", + }, + self => { + }, + }, + wink => { + noparams => { + other => " winks suggestively.", + self => "Have you got something in your eye?", + }, + params => { + target => " winks at you.", + other => " winks at .", + self => "You wink suggestively at .", + }, + self => { + other => " winks at Gself - something strange is going on...", + self => "You wink at yourself?? What are you up to?", + }, + }, + pout => { + noparams => { + other => " pouts.", + self => "Aww, don't take it so hard.", + }, + params => { + }, + self => { + }, + }, + cackle => { + noparams => { + other => " throws back G head and cackles with insane glee!", + self => "You cackle gleefully.", + }, + params => { + }, + self => { + }, + }, + sniff => { + noparams => { + other => " sniffs sadly.", + self => "You sniff sadly. *SNIFF*", + }, + params => { + target => " sniffs you.", + other => " sniffs ", + self => "You sniff .", + }, + self => { + other => " sniffs Gself.", + self => "You sniff yourself.", + }, + }, + nod => { + noparams => { + other => " nods solemnly.", + self => "You nod solemnly.", + }, + params => { + target => " nods solemnly at you.", + other => " nods solemnly at .", + self => "You nod solemnly at .", + }, + self => { + }, + }, + frown => { + noparams => { + other => " frowns.", + self => "What's bothering you?", + }, + params => { + target => " frowns darkly at you.", + other => " frowns darkly at .", + self => "You frown darkly at .", + }, + self => { + other => " frowns at Gself.", + self => "You frown at yourself.", + }, + }, + snicker => { + noparams => { + other => " snickers softly.", + self => "You snicker softly.", + }, + params => { + }, + self => { + }, + }, + shrug => { + noparams => { + other => " shrugs helplessly.", + self => "You shrug.", + }, + params => { + target => " shrugs at you.", + other => " shrugs at .", + self => "You shrug at .", + }, + self => { + }, + }, + bleed => { + noparams => { + other => " is bleeding all over the carpet - got a spare tourniquet?", + self => "You bleed all over your nice new armour.", + }, + params => { + target => " slashes G wrist and bleeds all over you.", + other => " slashes G wrist and bleeds all over .", + self => "You slash your wrist and bleed all over ", + }, + self => { + other => " performs some satanic ritual while wiping G blood on Gself.", + self => "Very impressive! You wipe your blood all over yourself.", + }, + }, + twiddle => { + noparams => { + other => " patiently twiddles G thumbs.", + self => "You patiently twiddle your thumbs.", + }, + params => { + }, + self => { + }, + }, + spit => { + noparams => { + other => " spits over G left shoulder.", + self => "You spit over your left shoulder.", + }, + params => { + target => " spits in your face!", + other => " spits in 's face.", + self => "You spit on .", + }, + self => { + other => " drools all over Gself.", + self => "You drool all over yourself.", + }, + }, + glare => { + noparams => { + other => " glares around G.", + self => "You glare at nothing in particular.", + }, + params => { + target => " glares icily at you, you feel cold to your bones.", + other => " glares at .", + self => "You glare icily at .", + }, + self => { + other => " glares at G feet, what is bothering G?", + self => "You glare icily at your feet, they are suddenly very cold.", + }, + }, + bow => { + noparams => { + other => " bows deeply.", + self => "You bow deeply.", + }, + params => { + target => " bows before you.", + other => " bows before .", + self => "You bow before .", + }, + self => { + other => " folds up like a jackknife and kisses G own toes.", + self => "You kiss your toes.", + }, + }, + dance => { + noparams => { + other => " expresses Gself through interpretive dance.", + self => "You dance with glee.", + }, + params => { + target => " grabs you, and begins dancing!", + other => "Yipe! and are doing the Macarena!", + self => "You grab and begin doing the Cha-Cha!", + }, + self => { + other => " embraces Gself and begins to dance!", + self => "You skip and dance around by yourself.", + }, + }, + snore => { + noparams => { + other => " snores loudly.", + self => "Zzzzzzzzzzzzzzz.", + }, + params => { + }, + self => { + }, + }, + blush => { + noparams => { + other => " blushes.", + self => "Your cheeks are burning.", + }, + params => { + }, + self => { + }, + }, + snap => { + noparams => { + other => " snaps G fingers.", + self => "PRONTO! you snap your fingers.", + }, + params => { + }, + self => { + }, + }, + wave => { + noparams => { + other => " waves happily.", + self => "You wave.", + }, + params => { + target => " waves goodbye to you. Have a good journey.", + other => " waves goodbye to .", + self => "You wave goodbye to .", + }, + self => { + other => " waves goodbye to Gself.", + self => "Are you going on adventures as well??", + }, + }, + smile => { + noparams => { + other => " smiles happily.", + self => "You smile happily.", + }, + params => { + target => " smiles at you.", + other => " beams a smile at .", + self => "You smile at .", + }, + self => { + }, + }, + sneeze => { + noparams => { + other => " sneezes.", + self => "Gesundheit!", + }, + params => { + target => " sneezes on you, you feel the snot cover you. EEEEEEW.", + other => " sneezes on and a film of snot covers G.", + self => "You sneeze at and a film of snot shoots onto G.", + }, + self => { + other => " sneezes, and covers Gself in a slimy substance.", + self => "You sneeze on yourself, what a mess!", + }, + }, + bounce => { + noparams => { + other => " bounces around.", + self => "BOIINNNNNNGG!", + }, + params => { + target => " bounces around the room with you.", + other => " bounces around the room with .", + self => "You bounce around the room with .", + }, + self => { + }, + }, + shake => { + noparams => { + other => " shakes G head.", + self => "You shake your head.", + }, + params => { + target => " shakes your hand.", + other => " shakes 's hand.", + self => "You shake 's hand.", + }, + self => { + other => " shakes and quivers like a bowlful of jelly.", + self => "You are shaken by yourself.", + }, + }, + lick => { + noparams => { + other => " licks G mouth and smiles.", + self => "You lick your mouth and smile.", + }, + params => { + target => " licks you.", + other => " licks .", + self => "You lick .", + }, + self => { + other => " licks Gself - YUCK.", + self => "You lick yourself.", + }, + }, + flip => { + noparams => { + other => " flips head over heels.", + self => "You flip head over heels.", + }, + params => { + }, + self => { + }, + }, + think => { + noparams => { + other => " closes G eyes and thinks really hard.", + self => "Anything in particular that you'd care to think about?", + }, + params => { + }, + self => { + }, + }, + yawn => { + noparams => { + other => " yawns sleepily.", + self => "You open up your yap and let out a big breeze of stale air.", + }, + params => { + }, + self => { + }, + }, + laugh => { + noparams => { + other => " falls down laughing.", + self => "You fall down laughing.", + }, + params => { + target => " looks at you and falls down on the ground laughing.", + other => " looks at and falls down on the ground laughing.", + self => "You take one look at and fall down laughing.", + }, + self => { + other => " is laughing at something.", + self => "Laugh at yourself all you want, the others won't understand.", + }, + }, + burp => { + noparams => { + other => " burps loudly.", + self => "You burp loudly.", + }, + params => { + }, + self => { + }, + }, + gasp => { + noparams => { + other => " gasps in astonishment.", + self => "You gasp in astonishment.", + }, + params => { + }, + self => { + }, + }, + smirk => { + noparams => { + other => " smirks.", + self => "You smirk.", + }, + params => { + }, + self => { + }, + }, + cry => { + noparams => { + other => " bursts into tears.", + self => "Waaaaaaahhh..", + }, + params => { + target => " cries on your shoulder.", + other => " cries on 's shoulder.", + self => "You cry on 's shoulder.", + }, + self => { + other => " sobs quietly to Gself.", + self => "You cry to yourself.", + }, + }, + sulk => { + noparams => { + other => " sulks in the corner.", + self => "You sulk.", + }, + params => { + }, + self => { + }, + }, + whistle => { + noparams => { + other => " whistles appreciatively.", + self => "You whistle appreciatively.", + }, + params => { + target => " whistles at .", + self => "You whistle at .", + }, + self => { + other => " whistles to Gself in boredom.", + self => "You whistle while you work.", + }, + }, + groan => { + noparams => { + other => " groans loudly.", + self => "You groan loudly.", + }, + params => { + }, + self => { + }, + }, + cough => { + noparams => { + other => " coughs loudly.", + self => "Yuck, try to cover your mouth next time!", + }, + params => { + }, + self => { + }, + }, + grin => { + noparams => { + other => " grins evilly.", + self => "You grin evilly.", + }, + params => { + target => " grins evilly at you.", + other => " grins evilly at .", + self => "You grin at .", + }, + self => { + }, + }, +}; + +for my $emotion (keys %$emotes) { + cf::register_command $emotion => sub { + my ($ob, $tname) = @_; + + my $pl = $ob->contr; + + cf::async { + my $name = $ob->name; + $Coro::current->{desc} = "emote handler for $name"; + + if ($tname eq $name) { + my %emote = %{ $emotes->{$emotion}->{self} || {} }; + + $emote{other} ||= "You look away from ."; + $emote{self} ||= "My god! Is that LEGAL?"; + + $emote{other} =~ s//$name/; + + $_ = $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) && $_ != $ob} cf::player::list; + + $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} ||= " is eyeing quizzically."; + $emote{self} ||= "You are still nuts."; + $emote{target} ||= "You get the distinct feeling that is nuts."; + + $emote{self} =~ s//$tname/; + $emote{target} =~ s//$name/; + $emote{other} =~ s//$tname/; + $emote{other} =~ s//$name/; + + $_ = $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 | 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} || {} }; + + $emote{other} ||= " dances with glee."; + $emote{self} ||= "You are a nut."; + + $emote{other} =~ s//$name/; + + $_ = $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 | cf::NDI_VERBATIM); + } + }; + }; +} + cf::register_command say => sub { - my ($who, $msg) = @_; + my ($ob, $msg) = @_; utf8::decode $msg; - return if $who->contr->invoke (cf::EVENT_PLAYER_SAY, $msg); + return if $ob->contr->invoke (cf::EVENT_PLAYER_SAY, $msg); if ($msg) { - my $name = $who->name; + my $name = $ob->name; + my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list; - 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; - utf8::decode $msg; + send_msg $_, $cf::SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY, "msg_say" + for grep $_ != $ob->contr, @plonmap; + $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 theirt-level inventories - # within a 5x5 square # that have something resembling + # 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) = ($who->map, $who->x - 2, $who->y - 2); + my ($map, $x, $y) = ($ob->map, $ob->x - 2, $ob->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, $ob->contr, $msg) && return) || $_->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 == $ob->map->path; - my $dialog = new NPC_Dialogue ob => $who, npc => $npc; + my $dialog = new NPC_Dialogue pl => $ob->contr, 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; - } - $npc->use_trigger; + send_msg $_, $cf::SAY_CHANNEL => $reply, cf::NDI_BROWN, "msg_say" + for @plonmap; } 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; - } + send_msg $_, $cf::SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN, "msg_say" + for @plonmap; } } 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; + $_->send_msg ($cf::SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN) + for @plonmap; } } } else { - $who->message ("What do you want to say?", cf::NDI_UNIQUE); + $ob->send_msg ($cf::SAY_CHANNEL => "What do you want to say?", cf::NDI_GREY | cf::NDI_REPLY); } }; -cf::register_command chat => sub { - my ($who, $msg) = @_; - utf8::decode $msg; +sub _chat { + my ($ob, $msg) = @_; - return if $who->contr->invoke (cf::EVENT_PLAYER_CHAT, $msg); + my $pl = $ob->contr; + + return if $pl->invoke (cf::EVENT_PLAYER_CHAT, $msg); if ($msg) { - my $name = $who->name; + my $name = $ob->name; my $NOW = time; - utf8::encode $msg; # ->message not yet utf8-ified - cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg; - ext::schmorp_irc::do_notice (sprintf "[%s] %s", $name, $msg); + cf::LOG cf::llevDebug, sprintf "QBERT %s\n", $msg; + send_irc ("%s", $msg); - $_->ob->message ("$name chats: $msg", cf::NDI_BLUE) - for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list; + send_msg $_, $cf::CHAT_CHANNEL => $msg, cf::NDI_BLUE | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_chat" + for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW } cf::player::list; } else { - $who->message ("Chat what?", cf::NDI_UNIQUE); + $pl->send_msg ($cf::CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY); } +} + +cf::register_command chat => sub { + my ($ob, $msg) = @_; + + utf8::decode $msg; + _chat $ob, $ob->name . " chats: $msg"; +}; + +cf::register_command me => sub { + my ($ob, $msg) = @_; + + utf8::decode $msg; + _chat $ob, "* " . $ob->name . " $msg"; }; cf::register_command shout => sub { - my ($who, $msg) = @_; + my ($ob, $msg) = @_; utf8::decode $msg; - return if $who->contr->invoke (cf::EVENT_PLAYER_SHOUT, $msg); + my $pl = $ob->contr; + + return if $pl->invoke (cf::EVENT_PLAYER_SHOUT, $msg); if ($msg) { my $NOW = time; - my $name = $who->name; + my $name = $ob->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); + send_irc ("\007\0034{%s} %s\n", $name, $msg); - utf8::encode $msg; # ->message not yet utf8-ified - $_->ob->message ("$name shouts: $msg", cf::NDI_RED) - for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list; + 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 } cf::player::list; } else { - $who->message ("Shout what?", cf::NDI_UNIQUE); + $pl->send_msg ($cf::CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY); } - }; cf::register_command tell => sub { - my ($who, $args) = @_; + my ($ob, $args) = @_; my ($target, $msg) = split /\s+/, $args, 2; utf8::decode $msg; - return if $who->contr->invoke (cf::EVENT_PLAYER_TELL, $target, $msg); + my $pl = $ob->contr; + my $ns = $pl->ns + or return; + my $name = $ob->name; - my $name = $who->name; + return if $pl->invoke (cf::EVENT_PLAYER_TELL, $target, $msg); + + my $pl_channel = tell_channel $target; if ($target =~ /irc\//) { my (undef, $nick) = split /\//, $target, 2; - $who->message ("You tell $target: $args"); - ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $msg); - } elsif (my $other = cf::player::find $target) { + $ns->send_msg ($pl_channel => "You tell $target: $args", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY); + send_irc ("(%s) %s: %s\n", $name, $nick, $msg); + + } elsif (my $other = cf::player::find_active $target) { + my $other_channel = tell_channel $name; if ($msg) { if ($target eq $name) { - $who->message ("You are talking to yourself, you freak!", cf::NDI_UNIQUE); + $ns->send_msg ($pl_channel => "You are talking to yourself, you freak!", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY); } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) { - $who->message ("$target ignores what you say. Give up on it.", cf::NDI_UNIQUE); + $ns->send_msg ($pl_channel => "$target ignores what you say. Give up on it.", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY); } else { - utf8::encode $msg; # ->message not yet utf8-ified + return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl, $msg); cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg; - $who->message ("You tell $target: $msg"); - $other->ob->message ("$name tells you: $msg"); - $other->ob->{ext_last_tell} = $name; + $ns->send_msg ($pl_channel => "You tell $target: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY); + send_msg $other, $other_channel => "$name tells you: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF, "msg_tell"; } } else { - $who->message ("What do you want to tell $target?", cf::NDI_UNIQUE); + $ns->send_msg ($pl_channel => "What do you want to tell $target?", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY); } } else { - $who->message ("No such player. Your message: $msg", cf::NDI_UNIQUE); - } -}; - -cf::register_command reply => sub { - my ($who, $args) = @_; - my $name = $who->name; - - utf8::decode $args; - - return if $who->contr->invoke (cf::EVENT_PLAYER_TELL, $who->{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"); - ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $args); - } elsif (my $other = cf::player::find $who->{ext_last_tell}) { - - if ($args) { - $other->ob->{ext_ignore_tell}{$name} >= time - or delete $other->ob->{ext_ignore_tell}{$name}; - - if ($other->ob->{ext_ignore_tell}{$name} < time) { - 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"); - $other->ob->message ("$name tells you: $args"); - $who->{ext_last_tell} = $other->ob->name; - } else { - $who->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); - } - - } else { - $who->message ("Can't reply, player left. Your message: $args".$who->{ext_last_tell}, cf::NDI_UNIQUE); + $ns->send_msg ($pl_channel => "No such player. Your message: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY); } }; 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; - - 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); - } else { - $who->message ("Not ignoring anyone", cf::NDI_UNIQUE); - } - - } elsif ($target && $type) { - - $timeout ne "" or $timeout = 24; - my $absolute_timeout = time + $timeout * 3600; - - 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; - } elsif ($type eq "shout") { - $who->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_UNIQUE); - $who->{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; + cf::async { + if ($args eq "list") { + clean_timeouts $pl; + + 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_REPLY); + $pl->message ((join ", ", @ignored_tell), cf::NDI_REPLY); + $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY); + $pl->message ((join ", ", @ignored_shout), cf::NDI_REPLY); + $pl->message ("To stop ignoring one, use unignore.", cf::NDI_REPLY); } else { - $who->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE); + $pl->message ("Not ignoring anyone", cf::NDI_REPLY); } + + } elsif ($target && $type) { + $timeout ne "" or $timeout = 24; + my $absolute_timeout = time + $timeout * 3600; + + if (cf::player::exists $target) { + if ($type eq "tell") { + $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_REPLY); + $pl->{ext_ignore_tell}{$target} = $absolute_timeout; + } elsif ($type eq "shout") { + $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_REPLY); + $pl->{ext_ignore_shout}{$target} = $absolute_timeout; + } elsif ($type eq "all") { + $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_REPLY); + $pl->{ext_ignore_tell}{$target} = $absolute_timeout; + $pl->{ext_ignore_shout}{$target} = $absolute_timeout; + } else { + $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY); + } + } else { + $pl->message ("No such player: $target", cf::NDI_REPLY); + } + } else { - $who->message ("No such player: $target", cf::NDI_UNIQUE); + $pl->message ("Usage: ignore \n" + . "will ignore a player for hours.\n" + . "Usage: ignore list\n" + . "will show you a list of players currently ignored.", cf::NDI_REPLY); } - - } else { - $who->message ("Usage: ignore \n" - . "will ignore a player for hours.\n" - . "Usage: ignore list\n" - . "will show you a list of players currently ignored.", cf::NDI_UNIQUE); - } + }; }; 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); - } else { - $who->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}; - } elsif ($type eq "shout") { - $who->message ("Not ignoring shouts from $target anymore.", cf::NDI_UNIQUE); - delete $who->{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}; + cf::async { + if ($args eq "") { + if ($pl->{ext_ignore_tell}) { + $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY); + $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_REPLY); + $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY); + $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_REPLY); } else { - $who->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE); + $pl->message ("Not ignoring anyone", cf::NDI_REPLY); } } 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 $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); + if (cf::player::exists $target) { + if ($type eq "tell") { + $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_REPLY); + delete $pl->{ext_ignore_tell} {$target}; + } elsif ($type eq "shout") { + $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_REPLY); + delete $pl->{ext_ignore_shout}{$target}; + } elsif ($type eq "all") { + $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_REPLY); + delete $pl->{ext_ignore_tell} {$target}; + delete $pl->{ext_ignore_shout}{$target}; + } else { + $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY); + } + } else { + $pl->message ("No such player or ambiguous name: $target", cf::NDI_REPLY); + } } - } else { - $who->message ("Usage: seen ", cf::NDI_UNIQUE); - } + }; };