ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/chat.ext
(Generate patch)

Comparing deliantra/server/ext/chat.ext (file contents):
Revision 1.36 by root, Wed Oct 24 00:05:32 2007 UTC vs.
Revision 1.49 by root, Mon Jan 26 00:10:38 2009 UTC

1#! perl # depends=irc mandatory 1#! perl # depends=irc mandatory
2 2
3# implement a replacement for the built-in say/chat/shout/tell/reply commands 3# implement a replacement for the built-in say/chat/shout/tell commands
4# adds ignore/unignore functionality 4# adds ignore/unignore functionality
5 5
6use NPC_Dialogue; 6use NPC_Dialogue;
7use POSIX (); # for strftime only 7use POSIX (); # for strftime only
8
9our $SAY_CHANNEL = {
10 id => "say",
11 title => "Map",
12 reply => "say ",
13 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
14};
15
16our $CHAT_CHANNEL = {
17 id => "chat",
18 title => "Chat",
19 reply => "chat ",
20 tooltip => "Player chat and shouts, global to the server.",
21};
22 8
23sub tell_channel($) { 9sub tell_channel($) {
24 my ($target) = @_; 10 my ($target) = @_;
25 11
26 { 12 {
68cf::player->attach ( 54cf::player->attach (
69 prio => -1000, 55 prio => -1000,
70 on_login => sub { 56 on_login => sub {
71 my ($pl) = @_; 57 my ($pl) = @_;
72 58
59 cf::async {
73 clean_timeouts $pl->ob; 60 clean_timeouts $pl->ob;
61 };
74 62
75 $pl->send_msg ($SAY_CHANNEL); 63 $pl->send_msg ($cf::SAY_CHANNEL);
76 $pl->send_msg ($CHAT_CHANNEL); 64 $pl->send_msg ($cf::CHAT_CHANNEL);
77 }, 65 },
78); 66);
79 67
68# TODO: remove once safe
80cf::register_command listen => sub { 69cf::register_command listen => sub {
81 my ($pl, $msg) = @_;
82 my $player = cf::player::find_active $pl->name;
83
84 if ($msg ne "") {
85 $msg = 10 if $msg > 10;
86
87 my $prev_listen = $player->listening;
88 $player->listening ($msg);
89 if ($prev_listen == $player->listening) {
90 $pl->message ("Your verbose level stays at $prev_listen.", cf::NDI_REPLY);
91 } else {
92 $pl->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_REPLY);
93 }
94 } else {
95 $pl->message ("Your verbose level is " . $player->listening . ".", cf::NDI_REPLY);
96 }
97}; 70};
98 71
99cf::register_command cointoss => sub { 72cf::register_command cointoss => sub {
100 my ($ob, $msg) = @_; 73 my ($ob, $msg) = @_;
101 74
102 my $pl = $ob->contr; 75 my $pl = $ob->contr;
103 my $name = $ob->name; 76 my $name = $ob->name;
104 77
105 my $coin = int rand 2 ? "Heads" : "Tails"; 78 my $coin = int rand 2 ? "Heads" : "Tails";
106 79
107 send_msg $_, $SAY_CHANNEL => "$name flips a coin.... $coin!", cf::NDI_GREY, "msg_say" 80 send_msg $_, $cf::SAY_CHANNEL => "$name flips a coin.... $coin!", cf::NDI_GREY, "msg_say"
108 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list; 81 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list;
109 82
110 $pl->send_msg ($SAY_CHANNEL => "You flip a coin.... $coin!", cf::NDI_GREY | cf::NDI_REPLY); 83 $pl->send_msg ($cf::SAY_CHANNEL => "You flip a coin.... $coin!", cf::NDI_GREY | cf::NDI_REPLY);
111}; 84};
112 85
113cf::register_command orcknuckle => sub { 86cf::register_command orcknuckle => sub {
114 my ($ob, $msg) = @_; 87 my ($ob, $msg) = @_;
115 88
118 91
119 my @orcknuckle = ("beholder", "ghost", "knight", "princess", "dragon", "orc"); 92 my @orcknuckle = ("beholder", "ghost", "knight", "princess", "dragon", "orc");
120 my ($i, $j, $k, $l) = (rand 5, rand 5, rand 5, rand 6); 93 my ($i, $j, $k, $l) = (rand 5, rand 5, rand 5, rand 6);
121 my $result = "$orcknuckle[$i], $orcknuckle[$j], $orcknuckle[$k], $orcknuckle[$l]"; 94 my $result = "$orcknuckle[$i], $orcknuckle[$j], $orcknuckle[$k], $orcknuckle[$l]";
122 95
123 send_msg $_, $SAY_CHANNEL => "$name throws his orc-knuckles and rolls $result!", cf::NDI_GREY, "msg_say" 96 send_msg $_, $cf::SAY_CHANNEL => "$name throws his orc-knuckles and rolls $result!", cf::NDI_GREY, "msg_say"
124 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list; 97 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list;
125 98
126 $pl->send_msg ($SAY_CHANNEL => "You roll $result!", cf::NDI_GREY | cf::NDI_REPLY); 99 $pl->send_msg ($cf::SAY_CHANNEL => "You roll $result!", cf::NDI_GREY | cf::NDI_REPLY);
127}; 100};
128 101
129my $emotes = { 102my $emotes = {
130 growl => { 103 growl => {
131 noparams => { 104 noparams => {
177 self => { 150 self => {
178 }, 151 },
179 }, 152 },
180 scream => { 153 scream => {
181 noparams => { 154 noparams => {
182 other => "<self> screams at the top of his lungs!", 155 other => "<self> screams at the top of G<his|her> lungs!",
183 self => "ARRRRRRRRRRGH!!!!!", 156 self => "ARRRRRRRRRRGH!!!!!",
184 }, 157 },
185 params => { 158 params => {
186 }, 159 },
187 self => { 160 self => {
196 target => "<self> pukes on your clothes!", 169 target => "<self> pukes on your clothes!",
197 other => "<self> pukes on <other>.", 170 other => "<self> pukes on <other>.",
198 self => "You puke on <other>.", 171 self => "You puke on <other>.",
199 }, 172 },
200 self => { 173 self => {
201 other => "<self> pukes on his clothes.", 174 other => "<self> pukes on G<his|her> clothes.",
202 self => "You puke on yourself.", 175 self => "You puke on yourself.",
203 }, 176 },
204 }, 177 },
205 strut => { 178 strut => {
206 noparams => { 179 noparams => {
255 self => "You kiss <other>.", 228 self => "You kiss <other>.",
256 }, 229 },
257 self => { 230 self => {
258 }, 231 },
259 }, 232 },
233 smother => {
234 noparams => {
235 other => "<self> makes weird facial contortions",
236 self => "All the lonely people..",
237 },
238 params => {
239 target => "<self> smothers you with kisses.",
240 other => "<self> smothers <other> with kisses.",
241 self => "You smother <other> with kisses.",
242 },
243 self => {
244 },
245 },
260 wink => { 246 wink => {
261 noparams => { 247 noparams => {
262 other => "<self> winks suggestively.", 248 other => "<self> winks suggestively.",
263 self => "Have you got something in your eye?", 249 self => "Have you got something in your eye?",
264 }, 250 },
266 target => "<self> winks at you.", 252 target => "<self> winks at you.",
267 other => "<self> winks at <other>.", 253 other => "<self> winks at <other>.",
268 self => "You wink suggestively at <other>.", 254 self => "You wink suggestively at <other>.",
269 }, 255 },
270 self => { 256 self => {
271 other => "<self> winks at himself - something strange is going on...", 257 other => "<self> winks at G<him|her>self - something strange is going on...",
272 self => "You wink at yourself?? What are you up to?", 258 self => "You wink at yourself?? What are you up to?",
273 }, 259 },
274 }, 260 },
275 pout => { 261 pout => {
276 noparams => { 262 noparams => {
282 self => { 268 self => {
283 }, 269 },
284 }, 270 },
285 cackle => { 271 cackle => {
286 noparams => { 272 noparams => {
287 other => "<self> throws back his head and cackles with insane glee!", 273 other => "<self> throws back G<his|her> head and cackles with insane glee!",
288 self => "You cackle gleefully.", 274 self => "You cackle gleefully.",
289 }, 275 },
290 params => { 276 params => {
291 }, 277 },
292 self => { 278 self => {
301 target => "<self> sniffs you.", 287 target => "<self> sniffs you.",
302 other => "<self> sniffs <other>", 288 other => "<self> sniffs <other>",
303 self => "You sniff <other>.", 289 self => "You sniff <other>.",
304 }, 290 },
305 self => { 291 self => {
306 other => "<self> sniffs himself.", 292 other => "<self> sniffs G<him|her>self.",
307 self => "You sniff yourself.", 293 self => "You sniff yourself.",
308 }, 294 },
309 }, 295 },
310 nod => { 296 nod => {
311 noparams => { 297 noparams => {
312 other => "<self> nods solemnly.", 298 other => "<self> nods solemnly.",
313 self => "You nod solemnly.", 299 self => "You nod solemnly.",
314 }, 300 },
315 params => { 301 params => {
316 target => "<self> nods solemnly to you.", 302 target => "<self> nods solemnly at you.",
317 other => "<self> nods solemnly to <other>.", 303 other => "<self> nods solemnly at <other>.",
318 self => "You nod solemnly to <other>.", 304 self => "You nod solemnly at <other>.",
319 }, 305 },
320 self => { 306 self => {
321 }, 307 },
322 }, 308 },
323 frown => { 309 frown => {
329 target => "<self> frowns darkly at you.", 315 target => "<self> frowns darkly at you.",
330 other => "<self> frowns darkly at <other>.", 316 other => "<self> frowns darkly at <other>.",
331 self => "You frown darkly at <other>.", 317 self => "You frown darkly at <other>.",
332 }, 318 },
333 self => { 319 self => {
334 other => "<self> frowns at himself.", 320 other => "<self> frowns at G<him|her>self.",
335 self => "You frown at yourself.", 321 self => "You frown at yourself.",
336 }, 322 },
337 }, 323 },
338 snicker => { 324 snicker => {
339 noparams => { 325 noparams => {
362 noparams => { 348 noparams => {
363 other => "<self> is bleeding all over the carpet - got a spare tourniquet?", 349 other => "<self> is bleeding all over the carpet - got a spare tourniquet?",
364 self => "You bleed all over your nice new armour.", 350 self => "You bleed all over your nice new armour.",
365 }, 351 },
366 params => { 352 params => {
367 target => "<self> slashes his wrist and bleeds all over you.", 353 target => "<self> slashes G<his|her> wrist and bleeds all over you.",
368 other => "<self> slashes his wrist and bleeds all over <other>.", 354 other => "<self> slashes G<his|her> wrist and bleeds all over <other>.",
369 self => "You slash your wrist and bleed all over <other>", 355 self => "You slash your wrist and bleed all over <other>",
370 }, 356 },
371 self => { 357 self => {
372 other => "<self> performs some satanic ritual while wiping his blood on himself.", 358 other => "<self> performs some satanic ritual while wiping G<his|her> blood on G<him|her>self.",
373 self => "Very impressive! You wipe your blood all over yourself.", 359 self => "Very impressive! You wipe your blood all over yourself.",
374 }, 360 },
375 }, 361 },
376 twiddle => { 362 twiddle => {
377 noparams => { 363 noparams => {
378 other => "<self> patiently twiddles his thumbs.", 364 other => "<self> patiently twiddles G<his|her> thumbs.",
379 self => "You patiently twiddle your thumbs.", 365 self => "You patiently twiddle your thumbs.",
380 }, 366 },
381 params => { 367 params => {
382 }, 368 },
383 self => { 369 self => {
384 }, 370 },
385 }, 371 },
386 spit => { 372 spit => {
387 noparams => { 373 noparams => {
388 other => "<self> spits over his left shoulder.", 374 other => "<self> spits over G<his|her> left shoulder.",
389 self => "You spit over your left shoulder.", 375 self => "You spit over your left shoulder.",
390 }, 376 },
391 params => { 377 params => {
392 target => "<self> spits in your face!", 378 target => "<self> spits in your face!",
393 other => "<self> spits in <other>'s face.", 379 other => "<self> spits in <other>'s face.",
394 self => "You spit on <other>.", 380 self => "You spit on <other>.",
395 }, 381 },
396 self => { 382 self => {
397 other => "<self> drools all over himself.", 383 other => "<self> drools all over G<him|her>self.",
398 self => "You drool all over yourself.", 384 self => "You drool all over yourself.",
399 }, 385 },
400 }, 386 },
401 glare => { 387 glare => {
402 noparams => { 388 noparams => {
403 other => "<self> glares around him.", 389 other => "<self> glares around G<him|her>.",
404 self => "You glare at nothing in particular.", 390 self => "You glare at nothing in particular.",
405 }, 391 },
406 params => { 392 params => {
407 target => "<self> glares icily at you, you feel cold to your bones.", 393 target => "<self> glares icily at you, you feel cold to your bones.",
408 other => "<self> glares at <other>.", 394 other => "<self> glares at <other>.",
409 self => "You glare icily at <other>.", 395 self => "You glare icily at <other>.",
410 }, 396 },
411 self => { 397 self => {
412 other => "<self> glares at his feet, what is bothering him?", 398 other => "<self> glares at G<his|her> feet, what is bothering G<him|her>?",
413 self => "You glare icily at your feet, they are suddenly very cold.", 399 self => "You glare icily at your feet, they are suddenly very cold.",
414 }, 400 },
415 }, 401 },
416 bow => { 402 bow => {
417 noparams => { 403 noparams => {
422 target => "<self> bows before you.", 408 target => "<self> bows before you.",
423 other => "<self> bows before <other>.", 409 other => "<self> bows before <other>.",
424 self => "You bow before <other>.", 410 self => "You bow before <other>.",
425 }, 411 },
426 self => { 412 self => {
427 other => "<self> folds up like a jackknife and kisses his own toes.", 413 other => "<self> folds up like a jackknife and kisses G<his|her> own toes.",
428 self => "You kiss your toes.", 414 self => "You kiss your toes.",
429 }, 415 },
430 }, 416 },
431 dance => { 417 dance => {
432 noparams => { 418 noparams => {
433 other => "<self> expresses himself through interpretive dance.", 419 other => "<self> expresses G<him|her>self through interpretive dance.",
434 self => "You dance with glee.", 420 self => "You dance with glee.",
435 }, 421 },
436 params => { 422 params => {
437 target => "<self> grabs you, and begins dancing!", 423 target => "<self> grabs you, and begins dancing!",
438 other => "Yipe! <self> and <other> are doing the Macarena!", 424 other => "Yipe! <self> and <other> are doing the Macarena!",
439 self => "You grab <other> and begin doing the Cha-Cha!", 425 self => "You grab <other> and begin doing the Cha-Cha!",
440 }, 426 },
441 self => { 427 self => {
442 other => "<self> embraces himself and begins to dance!", 428 other => "<self> embraces G<him|her>self and begins to dance!",
443 self => "You skip and dance around by yourself.", 429 self => "You skip and dance around by yourself.",
444 }, 430 },
445 }, 431 },
446 snore => { 432 snore => {
447 noparams => { 433 noparams => {
463 self => { 449 self => {
464 }, 450 },
465 }, 451 },
466 snap => { 452 snap => {
467 noparams => { 453 noparams => {
468 other => "<self> snaps his fingers.", 454 other => "<self> snaps G<his|her> fingers.",
469 self => "PRONTO! you snap your fingers.", 455 self => "PRONTO! you snap your fingers.",
470 }, 456 },
471 params => { 457 params => {
472 }, 458 },
473 self => { 459 self => {
482 target => "<self> waves goodbye to you. Have a good journey.", 468 target => "<self> waves goodbye to you. Have a good journey.",
483 other => "<self> waves goodbye to <other>.", 469 other => "<self> waves goodbye to <other>.",
484 self => "You wave goodbye to <other>.", 470 self => "You wave goodbye to <other>.",
485 }, 471 },
486 self => { 472 self => {
487 other => "<self> waves goodbye to himself.", 473 other => "<self> waves goodbye to G<him|her>self.",
488 self => "Are you going on adventures as well??", 474 self => "Are you going on adventures as well??",
489 }, 475 },
490 }, 476 },
491 smile => { 477 smile => {
492 noparams => { 478 noparams => {
506 other => "<self> sneezes.", 492 other => "<self> sneezes.",
507 self => "Gesundheit!", 493 self => "Gesundheit!",
508 }, 494 },
509 params => { 495 params => {
510 target => "<self> sneezes on you, you feel the snot cover you. EEEEEEW.", 496 target => "<self> sneezes on you, you feel the snot cover you. EEEEEEW.",
511 other => "<self> sneezes on <other> and a film of snot covers him.", 497 other => "<self> sneezes on <other> and a film of snot covers G<him|her>.",
512 self => "You sneeze at <other> and a film of snot shoots onto him.", 498 self => "You sneeze at <other> and a film of snot shoots onto G<him|her>.",
513 }, 499 },
514 self => { 500 self => {
515 other => "<self> sneezes, and covers himself in a slimy substance.", 501 other => "<self> sneezes, and covers G<him|her>self in a slimy substance.",
516 self => "You sneeze on yourself, what a mess!", 502 self => "You sneeze on yourself, what a mess!",
517 }, 503 },
518 }, 504 },
519 bounce => { 505 bounce => {
520 noparams => { 506 noparams => {
529 self => { 515 self => {
530 }, 516 },
531 }, 517 },
532 shake => { 518 shake => {
533 noparams => { 519 noparams => {
534 other => "<self> shakes his head.", 520 other => "<self> shakes G<his|her> head.",
535 self => "You shake your head.", 521 self => "You shake your head.",
536 }, 522 },
537 params => { 523 params => {
538 target => "<self> shakes your hand.", 524 target => "<self> shakes your hand.",
539 other => "<self> shakes <other>'s hand.", 525 other => "<self> shakes <other>'s hand.",
544 self => "You are shaken by yourself.", 530 self => "You are shaken by yourself.",
545 }, 531 },
546 }, 532 },
547 lick => { 533 lick => {
548 noparams => { 534 noparams => {
549 other => "<self> licks his mouth and smiles.", 535 other => "<self> licks G<his|her> mouth and smiles.",
550 self => "You lick your mouth and smile.", 536 self => "You lick your mouth and smile.",
551 }, 537 },
552 params => { 538 params => {
553 target => "<self> licks you.", 539 target => "<self> licks you.",
554 other => "<self> licks <other>.", 540 other => "<self> licks <other>.",
555 self => "You lick <other>.", 541 self => "You lick <other>.",
556 }, 542 },
557 self => { 543 self => {
558 other => "<self> licks himself - YUCK.", 544 other => "<self> licks G<him|her>self - YUCK.",
559 self => "You lick yourself.", 545 self => "You lick yourself.",
560 }, 546 },
561 }, 547 },
562 flip => { 548 flip => {
563 noparams => { 549 noparams => {
569 self => { 555 self => {
570 }, 556 },
571 }, 557 },
572 think => { 558 think => {
573 noparams => { 559 noparams => {
574 other => "<self> closes his eyes and thinks really hard.", 560 other => "<self> closes G<his|her> eyes and thinks really hard.",
575 self => "Anything in particular that you'd care to think about?", 561 self => "Anything in particular that you'd care to think about?",
576 }, 562 },
577 params => { 563 params => {
578 }, 564 },
579 self => { 565 self => {
643 target => "<self> cries on your shoulder.", 629 target => "<self> cries on your shoulder.",
644 other => "<self> cries on <other>'s shoulder.", 630 other => "<self> cries on <other>'s shoulder.",
645 self => "You cry on <other>'s shoulder.", 631 self => "You cry on <other>'s shoulder.",
646 }, 632 },
647 self => { 633 self => {
648 other => "<self> sobs quietly to himself.", 634 other => "<self> sobs quietly to G<him|her>self.",
649 self => "You cry to yourself.", 635 self => "You cry to yourself.",
650 }, 636 },
651 }, 637 },
652 sulk => { 638 sulk => {
653 noparams => { 639 noparams => {
667 params => { 653 params => {
668 target => "<self> whistles at <other>.", 654 target => "<self> whistles at <other>.",
669 self => "You whistle at <other>.", 655 self => "You whistle at <other>.",
670 }, 656 },
671 self => { 657 self => {
672 other => "<self> whistles to himself in boredom.", 658 other => "<self> whistles to G<him|her>self in boredom.",
673 self => "You whistle while you work.", 659 self => "You whistle while you work.",
674 }, 660 },
675 }, 661 },
676 groan => { 662 groan => {
677 noparams => { 663 noparams => {
723 709
724 $emote{other} ||= "You look away from <self>."; 710 $emote{other} ||= "You look away from <self>.";
725 $emote{self} ||= "My god! Is that LEGAL?"; 711 $emote{self} ||= "My god! Is that LEGAL?";
726 712
727 $emote{other} =~ s/<self>/$name/; 713 $emote{other} =~ s/<self>/$name/;
714
715 $_ = $pl->expand_cfpod ($_)
716 for values %emote;
728 717
729 send_msg $_, $CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat" 718 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
730 for grep { $ob->on_same_map_as ($_->ob) && $_ != $ob} cf::player::list; 719 for grep { $ob->on_same_map_as ($_->ob) && $_ != $ob} cf::player::list;
731 720
732 $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY); 721 $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
733 } elsif ($tname) { 722 } elsif ($tname) {
734 my $target = cf::player::find $tname 723 my $target = cf::player::find $tname
735 or return send_msg $pl, tell_channel $tname, "$tname is not around.", cf::NDI_DK_ORANGE | cf::NDI_REPLY, "msg_chat"; 724 or return send_msg $pl, tell_channel $tname, "$tname is not around.", cf::NDI_DK_ORANGE | cf::NDI_REPLY, "msg_chat";
736 725
737 my %emote = %{ $emotes->{$emotion}->{params} || {} }; 726 my %emote = %{ $emotes->{$emotion}->{params} || {} };
738 727
739 $emote{other} ||= "<self> is eyeing <other> quizzically."; 728 $emote{other} ||= "<self> is eyeing <other> quizzically.";
740 $emote{self} ||= "You are still nuts."; 729 $emote{self} ||= "You are still nuts.";
741 $emote{target} ||= "You get the distinct feeling that <other> is nuts."; 730 $emote{target} ||= "You get the distinct feeling that <self> is nuts.";
742 731
743 $emote{self} =~ s/<other>/$tname/; 732 $emote{self} =~ s/<other>/$tname/;
744 $emote{target} =~ s/<self>/$name/; 733 $emote{target} =~ s/<self>/$name/;
745 $emote{other} =~ s/<other>/$tname/; 734 $emote{other} =~ s/<other>/$tname/;
746 $emote{other} =~ s/<self>/$name/; 735 $emote{other} =~ s/<self>/$name/;
747 736
737 $_ = $pl->expand_cfpod ($_)
738 for values %emote;
739
748 send_msg $_, $CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat" 740 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
749 for grep { $_ != $pl && $_ != $target && $ob->on_same_map_as ($_->ob) } cf::player::list; 741 for grep { $_ != $pl && $_ != $target && $ob->on_same_map_as ($_->ob) } cf::player::list;
750 742
751 send_msg $target, tell_channel $name, $emote{target}, cf::NDI_GREY, "msg_shout"; 743 send_msg $target, tell_channel $name, $emote{target}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_shout";
752 $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY); 744 $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
753 } else { 745 } else {
754 my %emote = %{ $emotes->{$emotion}->{noparams} || {} }; 746 my %emote = %{ $emotes->{$emotion}->{noparams} || {} };
755 747
756 $emote{other} ||= "<self> dances with glee."; 748 $emote{other} ||= "<self> dances with glee.";
757 $emote{self} ||= "You are a nut."; 749 $emote{self} ||= "You are a nut.";
758 750
759 $emote{other} =~ s/<self>/$name/; 751 $emote{other} =~ s/<self>/$name/;
760 752
753 $_ = $pl->expand_cfpod ($_)
754 for values %emote;
755
761 send_msg $_, $CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat" 756 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
762 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl } cf::player::list; 757 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl } cf::player::list;
763 758
764 $pl->send_msg ($CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY); 759 $pl->send_msg ($cf::CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
765 } 760 }
766 }; 761 };
767 }; 762 };
768} 763}
769 764
770cf::register_command me => sub {
771 my ($pl, $msg) = @_;
772
773 my $name = $pl->name;
774
775 send_msg $_, $SAY_CHANNEL => "* $name $msg", cf::NDI_GREY | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_say"
776 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
777};
778
779cf::register_command say => sub { 765cf::register_command say => sub {
780 my ($ob, $msg) = @_; 766 my ($ob, $msg) = @_;
781 767
782 utf8::decode $msg; 768 utf8::decode $msg;
783 769
785 771
786 if ($msg) { 772 if ($msg) {
787 my $name = $ob->name; 773 my $name = $ob->name;
788 my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list; 774 my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list;
789 775
790 send_msg $_, $SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY, "msg_say" 776 send_msg $_, $cf::SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY, "msg_say"
791 for grep $_ != $ob->contr, @plonmap; 777 for grep $_ != $ob->contr, @plonmap;
792 $ob->contr->send_msg ($SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | cf::NDI_REPLY); 778 $ob->contr->send_msg ($cf::SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | cf::NDI_REPLY);
793 779
794 # npcs, magic_ears etc. 780 # npcs, magic_ears etc.
795 # first find all objects and their first-level inventories 781 # first find all objects and their first-level inventories
796 # within a 5x5 square that have something resembling 782 # within a 5x5 square that have something resembling
797 # dialogue or support on_say. 783 # dialogue or support on_say.
798 my ($map, $x, $y) = ($ob->map, $ob->x - 2, $ob->y - 2); 784 my ($map, $x, $y) = ($ob->map, $ob->x - 2, $ob->y - 2);
799 785
800 for my $npc ( 786 for my $npc (
801 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $ob->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_, 787 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $ob->contr, $msg) && return) || $_->has_dialogue,
802 map +($_, $_->inv), 788 map +($_, $_->inv),
803 grep $_, 789 grep $_,
804 map $map->at ($x + $_ % 5, $y + (int $_ / 5)), 790 map $map->at ($x + $_ % 5, $y + (int $_ / 5)),
805 0..24 791 0..24
806 ) { 792 ) {
810 my $dialog = new NPC_Dialogue pl => $ob->contr, npc => $npc; 796 my $dialog = new NPC_Dialogue pl => $ob->contr, npc => $npc;
811 my ($reply, @kw) = $dialog->tell ($msg); 797 my ($reply, @kw) = $dialog->tell ($msg);
812 798
813 if (defined $reply) { 799 if (defined $reply) {
814 if ($npc->type == cf::MAGIC_EAR) { 800 if ($npc->type == cf::MAGIC_EAR) {
815 if (length $reply) {
816 send_msg $_, $SAY_CHANNEL => $reply, cf::NDI_BROWN, "msg_say" 801 send_msg $_, $cf::SAY_CHANNEL => $reply, cf::NDI_BROWN, "msg_say"
817 for @plonmap; 802 for @plonmap;
818 }
819 $npc->use_trigger;
820 } else { 803 } else {
821 if (length $reply) {
822 send_msg $_, $SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN, "msg_say" 804 send_msg $_, $cf::SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN, "msg_say"
823 for @plonmap; 805 for @plonmap;
824 }
825 } 806 }
826 } 807 }
827 808
828 if (@kw) { 809 if (@kw) {
829 $_->send_msg ($SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN) 810 $_->send_msg ($cf::SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
830 for @plonmap; 811 for @plonmap;
831 } 812 }
832 } 813 }
833 814
834 } else { 815 } else {
835 $ob->send_msg ($SAY_CHANNEL => "What do you want to say?", cf::NDI_GREY | cf::NDI_REPLY); 816 $ob->send_msg ($cf::SAY_CHANNEL => "What do you want to say?", cf::NDI_GREY | cf::NDI_REPLY);
836 } 817 }
837}; 818};
838 819
839cf::register_command chat => sub { 820
821sub _chat {
840 my ($ob, $msg) = @_; 822 my ($ob, $msg) = @_;
841
842 utf8::decode $msg;
843 823
844 my $pl = $ob->contr; 824 my $pl = $ob->contr;
845 825
846 return if $pl->invoke (cf::EVENT_PLAYER_CHAT, $msg); 826 return if $pl->invoke (cf::EVENT_PLAYER_CHAT, $msg);
847 827
848 if ($msg) { 828 if ($msg) {
849 my $name = $ob->name; 829 my $name = $ob->name;
850 my $NOW = time; 830 my $NOW = time;
851 831
852 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg; 832 cf::LOG cf::llevDebug, sprintf "QBERT %s\n", $msg;
853 send_irc ("[%s] %s", $name, $msg); 833 send_irc ("%s", $msg);
854 834
855 send_msg $_, $CHAT_CHANNEL => "$name chats: $msg", cf::NDI_BLUE | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_chat" 835 send_msg $_, $cf::CHAT_CHANNEL => $msg, cf::NDI_BLUE | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_chat"
856 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list; 836 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW } cf::player::list;
857 837
858 } else { 838 } else {
859 $pl->send_msg ($CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY); 839 $pl->send_msg ($cf::CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY);
860 } 840 }
841}
842
843cf::register_command chat => sub {
844 my ($ob, $msg) = @_;
845
846 utf8::decode $msg;
847 _chat $ob, $ob->name . " chats: $msg";
848};
849
850cf::register_command me => sub {
851 my ($ob, $msg) = @_;
852
853 utf8::decode $msg;
854 _chat $ob, "* " . $ob->name . " $msg";
861}; 855};
862 856
863cf::register_command shout => sub { 857cf::register_command shout => sub {
864 my ($ob, $msg) = @_; 858 my ($ob, $msg) = @_;
865 859
874 my $name = $ob->name; 868 my $name = $ob->name;
875 869
876 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg; 870 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
877 send_irc ("\007\0034{%s} %s\n", $name, $msg); 871 send_irc ("\007\0034{%s} %s\n", $name, $msg);
878 872
879 send_msg $_, $CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_shout" 873 send_msg $_, $cf::CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_shout"
880 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list; 874 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW } cf::player::list;
881 875
882 } else { 876 } else {
883 $pl->send_msg ($CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY); 877 $pl->send_msg ($cf::CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY);
884 } 878 }
885}; 879};
886 880
887cf::register_command tell => sub { 881cf::register_command tell => sub {
888 my ($ob, $args) = @_; 882 my ($ob, $args) = @_;
930 924
931cf::register_command ignore => sub { 925cf::register_command ignore => sub {
932 my ($pl, $args) = @_; 926 my ($pl, $args) = @_;
933 my ($target, $type, $timeout) = split /\s+/, $args; 927 my ($target, $type, $timeout) = split /\s+/, $args;
934 928
929 cf::async {
935 if ($args eq "list") { 930 if ($args eq "list") {
936 clean_timeouts $pl; 931 clean_timeouts $pl;
937 932
938 if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}}) 933 if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}})
939 + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) { 934 + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) {
940 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY); 935 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
941 $pl->message ((join ", ", @ignored_tell), cf::NDI_REPLY); 936 $pl->message ((join ", ", @ignored_tell), cf::NDI_REPLY);
942 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY); 937 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
943 $pl->message ((join ", ", @ignored_shout), cf::NDI_REPLY); 938 $pl->message ((join ", ", @ignored_shout), cf::NDI_REPLY);
944 $pl->message ("To stop ignoring one, use unignore.", cf::NDI_REPLY); 939 $pl->message ("To stop ignoring one, use unignore.", cf::NDI_REPLY);
940 } else {
941 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
942 }
943
944 } elsif ($target && $type) {
945 $timeout ne "" or $timeout = 24;
946 my $absolute_timeout = time + $timeout * 3600;
947
948 if (cf::player::exists $target) {
949 if ($type eq "tell") {
950 $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_REPLY);
951 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
952 } elsif ($type eq "shout") {
953 $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_REPLY);
954 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
955 } elsif ($type eq "all") {
956 $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_REPLY);
957 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
958 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
959 } else {
960 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
961 }
962 } else {
963 $pl->message ("No such player: $target", cf::NDI_REPLY);
964 }
965
945 } else { 966 } else {
946 $pl->message ("Not ignoring anyone", cf::NDI_REPLY); 967 $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
968 . "will ignore a player for <timeout> hours.\n"
969 . "Usage: ignore list\n"
970 . "will show you a list of players currently ignored.", cf::NDI_REPLY);
947 } 971 }
948
949 } elsif ($target && $type) {
950
951 $timeout ne "" or $timeout = 24;
952 my $absolute_timeout = time + $timeout * 3600;
953
954 if (cf::player::exists $target) {
955 if ($type eq "tell") {
956 $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_REPLY);
957 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
958 } elsif ($type eq "shout") {
959 $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_REPLY);
960 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
961 } elsif ($type eq "all") {
962 $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_REPLY);
963 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
964 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
965 } else {
966 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
967 }
968 } else {
969 $pl->message ("No such player: $target", cf::NDI_REPLY);
970 }
971
972 } else {
973 $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
974 . "will ignore a player for <timeout> hours.\n"
975 . "Usage: ignore list\n"
976 . "will show you a list of players currently ignored.", cf::NDI_REPLY);
977 } 972 };
978}; 973};
979 974
980cf::register_command unignore => sub { 975cf::register_command unignore => sub {
981 my ($pl, $args) = @_; 976 my ($pl, $args) = @_;
982 my ($target, $type) = split /\s+/, $args; 977 my ($target, $type) = split /\s+/, $args;
983 978
979 cf::async {
984 if ($args eq "") { 980 if ($args eq "") {
985 if ($pl->{ext_ignore_tell}) { 981 if ($pl->{ext_ignore_tell}) {
986 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY); 982 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
987 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_REPLY); 983 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_REPLY);
988 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY); 984 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
989 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_REPLY); 985 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_REPLY);
990 } else {
991 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
992 }
993 } else {
994 if (cf::player::exists $target) {
995 if ($type eq "tell") {
996 $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_REPLY);
997 delete $pl->{ext_ignore_tell} {$target};
998 } elsif ($type eq "shout") {
999 $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_REPLY);
1000 delete $pl->{ext_ignore_shout}{$target};
1001 } elsif ($type eq "all") {
1002 $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_REPLY);
1003 delete $pl->{ext_ignore_tell} {$target};
1004 delete $pl->{ext_ignore_shout}{$target};
1005 } else { 986 } else {
1006 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY); 987 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
1007 } 988 }
1008 } else { 989 } else {
990 if (cf::player::exists $target) {
991 if ($type eq "tell") {
992 $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_REPLY);
993 delete $pl->{ext_ignore_tell} {$target};
994 } elsif ($type eq "shout") {
995 $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_REPLY);
996 delete $pl->{ext_ignore_shout}{$target};
997 } elsif ($type eq "all") {
998 $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_REPLY);
999 delete $pl->{ext_ignore_tell} {$target};
1000 delete $pl->{ext_ignore_shout}{$target};
1001 } else {
1002 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
1003 }
1004 } else {
1009 $pl->message ("No such player or ambiguous name: $target", cf::NDI_REPLY); 1005 $pl->message ("No such player or ambiguous name: $target", cf::NDI_REPLY);
1006 }
1010 } 1007 }
1011 } 1008 };
1012}; 1009};
1013 1010

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines