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.37 by root, Mon Nov 12 23:27:51 2007 UTC vs.
Revision 1.56 by root, Sun Sep 5 05:01:39 2010 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 = (cf::rndm 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
116 my $pl = $ob->contr; 89 my $pl = $ob->contr;
117 my $name = $ob->name; 90 my $name = $ob->name;
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) = map +(cf::rndm $_), 5, 5, 5, 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 => {
245 }, 218 },
246 }, 219 },
247 kiss => { 220 kiss => {
248 noparams => { 221 noparams => {
249 other => "<self> makes a weird facial contortion", 222 other => "<self> makes a weird facial contortion",
250 self => "All the lonely people..", 223 self => "All the lonely people...",
251 }, 224 },
252 params => { 225 params => {
253 target => "<self> kisses you.", 226 target => "<self> kisses you.",
254 other => "<self> kisses <other>.", 227 other => "<self> kisses <other>.",
255 self => "You kiss <other>.", 228 self => "You kiss <other>.",
256 }, 229 },
257 self => { 230 self => {
258 }, 231 },
259 }, 232 },
233 hug => {
234 noparams => {
235 other => "<self> makes weird body movements.",
236 self => "All the lonely people...",
237 },
238 params => {
239 target => "<self> suddenly grabs you and gives you a bear hug.",
240 other => "<self> hugs <other>.",
241 self => "You hug <other>.",
242 },
243 self => {
244 other => "<self> tries to hug G<himself|herself>, but stumbles and now feels stupid.",
245 self => "You try and fail to hug yourself.",
246 },
247 },
260 smother => { 248 smother => {
261 noparams => { 249 noparams => {
262 other => "<self> makes weird facial contortions", 250 other => "<self> makes weird facial contortions",
263 self => "All the lonely people..", 251 self => "All the lonely people...",
264 }, 252 },
265 params => { 253 params => {
266 target => "<self> smothers you with kisses.", 254 target => "<self> smothers you with kisses.",
267 other => "<self> smothers <other> with kisses.", 255 other => "<self> smothers <other> with kisses.",
268 self => "You smother <other> with kisses.", 256 self => "You smother <other> with kisses.",
279 target => "<self> winks at you.", 267 target => "<self> winks at you.",
280 other => "<self> winks at <other>.", 268 other => "<self> winks at <other>.",
281 self => "You wink suggestively at <other>.", 269 self => "You wink suggestively at <other>.",
282 }, 270 },
283 self => { 271 self => {
284 other => "<self> winks at himself - something strange is going on...", 272 other => "<self> winks at G<him|her>self - something strange is going on...",
285 self => "You wink at yourself?? What are you up to?", 273 self => "You wink at yourself?? What are you up to?",
286 }, 274 },
287 }, 275 },
288 pout => { 276 pout => {
289 noparams => { 277 noparams => {
295 self => { 283 self => {
296 }, 284 },
297 }, 285 },
298 cackle => { 286 cackle => {
299 noparams => { 287 noparams => {
300 other => "<self> throws back his head and cackles with insane glee!", 288 other => "<self> throws back G<his|her> head and cackles with insane glee!",
301 self => "You cackle gleefully.", 289 self => "You cackle gleefully.",
302 }, 290 },
303 params => { 291 params => {
304 }, 292 },
305 self => { 293 self => {
314 target => "<self> sniffs you.", 302 target => "<self> sniffs you.",
315 other => "<self> sniffs <other>", 303 other => "<self> sniffs <other>",
316 self => "You sniff <other>.", 304 self => "You sniff <other>.",
317 }, 305 },
318 self => { 306 self => {
319 other => "<self> sniffs himself.", 307 other => "<self> sniffs G<him|her>self.",
320 self => "You sniff yourself.", 308 self => "You sniff yourself.",
321 }, 309 },
322 }, 310 },
323 nod => { 311 nod => {
324 noparams => { 312 noparams => {
325 other => "<self> nods solemnly.", 313 other => "<self> nods solemnly.",
326 self => "You nod solemnly.", 314 self => "You nod solemnly.",
327 }, 315 },
328 params => { 316 params => {
329 target => "<self> nods solemnly to you.", 317 target => "<self> nods solemnly at you.",
330 other => "<self> nods solemnly to <other>.", 318 other => "<self> nods solemnly at <other>.",
331 self => "You nod solemnly to <other>.", 319 self => "You nod solemnly at <other>.",
332 }, 320 },
333 self => { 321 self => {
334 }, 322 },
335 }, 323 },
336 frown => { 324 frown => {
342 target => "<self> frowns darkly at you.", 330 target => "<self> frowns darkly at you.",
343 other => "<self> frowns darkly at <other>.", 331 other => "<self> frowns darkly at <other>.",
344 self => "You frown darkly at <other>.", 332 self => "You frown darkly at <other>.",
345 }, 333 },
346 self => { 334 self => {
347 other => "<self> frowns at himself.", 335 other => "<self> frowns at G<him|her>self.",
348 self => "You frown at yourself.", 336 self => "You frown at yourself.",
349 }, 337 },
350 }, 338 },
351 snicker => { 339 snicker => {
352 noparams => { 340 noparams => {
375 noparams => { 363 noparams => {
376 other => "<self> is bleeding all over the carpet - got a spare tourniquet?", 364 other => "<self> is bleeding all over the carpet - got a spare tourniquet?",
377 self => "You bleed all over your nice new armour.", 365 self => "You bleed all over your nice new armour.",
378 }, 366 },
379 params => { 367 params => {
380 target => "<self> slashes his wrist and bleeds all over you.", 368 target => "<self> slashes G<his|her> wrist and bleeds all over you.",
381 other => "<self> slashes his wrist and bleeds all over <other>.", 369 other => "<self> slashes G<his|her> wrist and bleeds all over <other>.",
382 self => "You slash your wrist and bleed all over <other>", 370 self => "You slash your wrist and bleed all over <other>",
383 }, 371 },
384 self => { 372 self => {
385 other => "<self> performs some satanic ritual while wiping his blood on himself.", 373 other => "<self> performs some satanic ritual while wiping G<his|her> blood on G<him|her>self.",
386 self => "Very impressive! You wipe your blood all over yourself.", 374 self => "Very impressive! You wipe your blood all over yourself.",
387 }, 375 },
388 }, 376 },
389 twiddle => { 377 twiddle => {
390 noparams => { 378 noparams => {
391 other => "<self> patiently twiddles his thumbs.", 379 other => "<self> patiently twiddles G<his|her> thumbs.",
392 self => "You patiently twiddle your thumbs.", 380 self => "You patiently twiddle your thumbs.",
393 }, 381 },
394 params => { 382 params => {
395 }, 383 },
396 self => { 384 self => {
397 }, 385 },
398 }, 386 },
399 spit => { 387 spit => {
400 noparams => { 388 noparams => {
401 other => "<self> spits over his left shoulder.", 389 other => "<self> spits over G<his|her> left shoulder.",
402 self => "You spit over your left shoulder.", 390 self => "You spit over your left shoulder.",
403 }, 391 },
404 params => { 392 params => {
405 target => "<self> spits in your face!", 393 target => "<self> spits in your face!",
406 other => "<self> spits in <other>'s face.", 394 other => "<self> spits in <other>'s face.",
407 self => "You spit on <other>.", 395 self => "You spit on <other>.",
408 }, 396 },
409 self => { 397 self => {
410 other => "<self> drools all over himself.", 398 other => "<self> drools all over G<him|her>self.",
411 self => "You drool all over yourself.", 399 self => "You drool all over yourself.",
412 }, 400 },
413 }, 401 },
414 glare => { 402 glare => {
415 noparams => { 403 noparams => {
416 other => "<self> glares around him.", 404 other => "<self> glares around G<him|her>.",
417 self => "You glare at nothing in particular.", 405 self => "You glare at nothing in particular.",
418 }, 406 },
419 params => { 407 params => {
420 target => "<self> glares icily at you, you feel cold to your bones.", 408 target => "<self> glares icily at you, you feel cold to your bones.",
421 other => "<self> glares at <other>.", 409 other => "<self> glares at <other>.",
422 self => "You glare icily at <other>.", 410 self => "You glare icily at <other>.",
423 }, 411 },
424 self => { 412 self => {
425 other => "<self> glares at his feet, what is bothering him?", 413 other => "<self> glares at G<his|her> feet, what is bothering G<him|her>?",
426 self => "You glare icily at your feet, they are suddenly very cold.", 414 self => "You glare icily at your feet, they are suddenly very cold.",
427 }, 415 },
428 }, 416 },
429 bow => { 417 bow => {
430 noparams => { 418 noparams => {
435 target => "<self> bows before you.", 423 target => "<self> bows before you.",
436 other => "<self> bows before <other>.", 424 other => "<self> bows before <other>.",
437 self => "You bow before <other>.", 425 self => "You bow before <other>.",
438 }, 426 },
439 self => { 427 self => {
440 other => "<self> folds up like a jackknife and kisses his own toes.", 428 other => "<self> folds up like a jackknife and kisses G<his|her> own toes.",
441 self => "You kiss your toes.", 429 self => "You kiss your toes.",
442 }, 430 },
443 }, 431 },
444 dance => { 432 dance => {
445 noparams => { 433 noparams => {
446 other => "<self> expresses himself through interpretive dance.", 434 other => "<self> expresses G<him|her>self through interpretive dance.",
447 self => "You dance with glee.", 435 self => "You dance with glee.",
448 }, 436 },
449 params => { 437 params => {
450 target => "<self> grabs you, and begins dancing!", 438 target => "<self> grabs you, and begins dancing!",
451 other => "Yipe! <self> and <other> are doing the Macarena!", 439 other => "Yipe! <self> and <other> are doing the Macarena!",
452 self => "You grab <other> and begin doing the Cha-Cha!", 440 self => "You grab <other> and begin doing the Cha-Cha!",
453 }, 441 },
454 self => { 442 self => {
455 other => "<self> embraces himself and begins to dance!", 443 other => "<self> embraces G<him|her>self and begins to dance!",
456 self => "You skip and dance around by yourself.", 444 self => "You skip and dance around by yourself.",
457 }, 445 },
458 }, 446 },
459 snore => { 447 snore => {
460 noparams => { 448 noparams => {
476 self => { 464 self => {
477 }, 465 },
478 }, 466 },
479 snap => { 467 snap => {
480 noparams => { 468 noparams => {
481 other => "<self> snaps his fingers.", 469 other => "<self> snaps G<his|her> fingers.",
482 self => "PRONTO! you snap your fingers.", 470 self => "PRONTO! you snap your fingers.",
483 }, 471 },
484 params => { 472 params => {
485 }, 473 },
486 self => { 474 self => {
495 target => "<self> waves goodbye to you. Have a good journey.", 483 target => "<self> waves goodbye to you. Have a good journey.",
496 other => "<self> waves goodbye to <other>.", 484 other => "<self> waves goodbye to <other>.",
497 self => "You wave goodbye to <other>.", 485 self => "You wave goodbye to <other>.",
498 }, 486 },
499 self => { 487 self => {
500 other => "<self> waves goodbye to himself.", 488 other => "<self> waves goodbye to G<him|her>self.",
501 self => "Are you going on adventures as well??", 489 self => "Are you going on adventures as well??",
502 }, 490 },
503 }, 491 },
504 smile => { 492 smile => {
505 noparams => { 493 noparams => {
519 other => "<self> sneezes.", 507 other => "<self> sneezes.",
520 self => "Gesundheit!", 508 self => "Gesundheit!",
521 }, 509 },
522 params => { 510 params => {
523 target => "<self> sneezes on you, you feel the snot cover you. EEEEEEW.", 511 target => "<self> sneezes on you, you feel the snot cover you. EEEEEEW.",
524 other => "<self> sneezes on <other> and a film of snot covers him.", 512 other => "<self> sneezes on <other> and a film of snot covers G<him|her>.",
525 self => "You sneeze at <other> and a film of snot shoots onto him.", 513 self => "You sneeze at <other> and a film of snot shoots onto G<him|her>.",
526 }, 514 },
527 self => { 515 self => {
528 other => "<self> sneezes, and covers himself in a slimy substance.", 516 other => "<self> sneezes, and covers G<him|her>self in a slimy substance.",
529 self => "You sneeze on yourself, what a mess!", 517 self => "You sneeze on yourself, what a mess!",
530 }, 518 },
531 }, 519 },
532 bounce => { 520 bounce => {
533 noparams => { 521 noparams => {
542 self => { 530 self => {
543 }, 531 },
544 }, 532 },
545 shake => { 533 shake => {
546 noparams => { 534 noparams => {
547 other => "<self> shakes his head.", 535 other => "<self> shakes G<his|her> head.",
548 self => "You shake your head.", 536 self => "You shake your head.",
549 }, 537 },
550 params => { 538 params => {
551 target => "<self> shakes your hand.", 539 target => "<self> shakes your hand.",
552 other => "<self> shakes <other>'s hand.", 540 other => "<self> shakes <other>'s hand.",
557 self => "You are shaken by yourself.", 545 self => "You are shaken by yourself.",
558 }, 546 },
559 }, 547 },
560 lick => { 548 lick => {
561 noparams => { 549 noparams => {
562 other => "<self> licks his mouth and smiles.", 550 other => "<self> licks G<his|her> mouth and smiles.",
563 self => "You lick your mouth and smile.", 551 self => "You lick your mouth and smile.",
564 }, 552 },
565 params => { 553 params => {
566 target => "<self> licks you.", 554 target => "<self> licks you.",
567 other => "<self> licks <other>.", 555 other => "<self> licks <other>.",
568 self => "You lick <other>.", 556 self => "You lick <other>.",
569 }, 557 },
570 self => { 558 self => {
571 other => "<self> licks himself - YUCK.", 559 other => "<self> licks G<him|her>self - YUCK.",
572 self => "You lick yourself.", 560 self => "You lick yourself.",
573 }, 561 },
574 }, 562 },
575 flip => { 563 flip => {
576 noparams => { 564 noparams => {
582 self => { 570 self => {
583 }, 571 },
584 }, 572 },
585 think => { 573 think => {
586 noparams => { 574 noparams => {
587 other => "<self> closes his eyes and thinks really hard.", 575 other => "<self> closes G<his|her> eyes and thinks really hard.",
588 self => "Anything in particular that you'd care to think about?", 576 self => "Anything in particular that you'd care to think about?",
589 }, 577 },
590 params => { 578 params => {
591 }, 579 },
592 self => { 580 self => {
656 target => "<self> cries on your shoulder.", 644 target => "<self> cries on your shoulder.",
657 other => "<self> cries on <other>'s shoulder.", 645 other => "<self> cries on <other>'s shoulder.",
658 self => "You cry on <other>'s shoulder.", 646 self => "You cry on <other>'s shoulder.",
659 }, 647 },
660 self => { 648 self => {
661 other => "<self> sobs quietly to himself.", 649 other => "<self> sobs quietly to G<him|her>self.",
662 self => "You cry to yourself.", 650 self => "You cry to yourself.",
663 }, 651 },
664 }, 652 },
665 sulk => { 653 sulk => {
666 noparams => { 654 noparams => {
680 params => { 668 params => {
681 target => "<self> whistles at <other>.", 669 target => "<self> whistles at <other>.",
682 self => "You whistle at <other>.", 670 self => "You whistle at <other>.",
683 }, 671 },
684 self => { 672 self => {
685 other => "<self> whistles to himself in boredom.", 673 other => "<self> whistles to G<him|her>self in boredom.",
686 self => "You whistle while you work.", 674 self => "You whistle while you work.",
687 }, 675 },
688 }, 676 },
689 groan => { 677 groan => {
690 noparams => { 678 noparams => {
736 724
737 $emote{other} ||= "You look away from <self>."; 725 $emote{other} ||= "You look away from <self>.";
738 $emote{self} ||= "My god! Is that LEGAL?"; 726 $emote{self} ||= "My god! Is that LEGAL?";
739 727
740 $emote{other} =~ s/<self>/$name/; 728 $emote{other} =~ s/<self>/$name/;
729
730 $_ = $pl->expand_cfpod ($_)
731 for values %emote;
741 732
742 send_msg $_, $CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat" 733 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
743 for grep { $ob->on_same_map_as ($_->ob) && $_ != $ob} cf::player::list; 734 for grep { $ob->on_same_map_as ($_->ob) && $_ != $ob} cf::player::list;
744 735
745 $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY); 736 $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
746 } elsif ($tname) { 737 } elsif ($tname) {
747 my $target = cf::player::find $tname 738 my $target = cf::player::find $tname
748 or return send_msg $pl, tell_channel $tname, "$tname is not around.", cf::NDI_DK_ORANGE | cf::NDI_REPLY, "msg_chat"; 739 or return send_msg $pl, tell_channel $tname, "The player called $tname is not known to this poor server.",
740 cf::NDI_DK_ORANGE | cf::NDI_REPLY, "msg_chat";
741
742 $target->ob->active
743 or return send_msg $pl, tell_channel $tname, "$tname is not around. H<$tname must be logged in.>",
744 cf::NDI_DK_ORANGE | cf::NDI_REPLY, "msg_chat";
749 745
750 my %emote = %{ $emotes->{$emotion}->{params} || {} }; 746 my %emote = %{ $emotes->{$emotion}->{params} || {} };
751 747
752 $emote{other} ||= "<self> is eyeing <other> quizzically."; 748 $emote{other} ||= "<self> is eyeing <other> quizzically.";
753 $emote{self} ||= "You are still nuts."; 749 $emote{self} ||= "You are still nuts.";
754 $emote{target} ||= "You get the distinct feeling that <other> is nuts."; 750 $emote{target} ||= "You get the distinct feeling that <self> is nuts.";
755 751
756 $emote{self} =~ s/<other>/$tname/; 752 $emote{self} =~ s/<other>/$tname/;
757 $emote{target} =~ s/<self>/$name/; 753 $emote{target} =~ s/<self>/$name/;
758 $emote{other} =~ s/<other>/$tname/; 754 $emote{other} =~ s/<other>/$tname/;
759 $emote{other} =~ s/<self>/$name/; 755 $emote{other} =~ s/<self>/$name/;
760 756
757 $_ = $pl->expand_cfpod ($_)
758 for values %emote;
759
761 send_msg $_, $CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat" 760 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
762 for grep { $_ != $pl && $_ != $target && $ob->on_same_map_as ($_->ob) } cf::player::list; 761 for grep { $_ != $pl && $_ != $target && $ob->on_same_map_as ($_->ob) } cf::player::list;
763 762
764 send_msg $target, tell_channel $name, $emote{target}, cf::NDI_GREY, "msg_shout"; 763 send_msg $target, tell_channel $name, $emote{target}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_shout";
765 $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY); 764 $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
766 } else { 765 } else {
767 my %emote = %{ $emotes->{$emotion}->{noparams} || {} }; 766 my %emote = %{ $emotes->{$emotion}->{noparams} || {} };
768 767
769 $emote{other} ||= "<self> dances with glee."; 768 $emote{other} ||= "<self> dances with glee.";
770 $emote{self} ||= "You are a nut."; 769 $emote{self} ||= "You are a nut.";
771 770
772 $emote{other} =~ s/<self>/$name/; 771 $emote{other} =~ s/<self>/$name/;
773 772
773 $_ = $pl->expand_cfpod ($_)
774 for values %emote;
775
774 send_msg $_, $CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat" 776 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
775 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl } cf::player::list; 777 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl } cf::player::list;
776 778
777 $pl->send_msg ($CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY); 779 $pl->send_msg ($cf::CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
778 } 780 }
779 }; 781 };
780 }; 782 };
781} 783}
782 784
783cf::register_command me => sub {
784 my ($pl, $msg) = @_;
785
786 my $name = $pl->name;
787
788 send_msg $_, $SAY_CHANNEL => "* $name $msg", cf::NDI_GREY | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_say"
789 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
790};
791
792cf::register_command say => sub { 785cf::register_command say => sub {
793 my ($ob, $msg) = @_; 786 my ($ob, $msg) = @_;
794 787
795 utf8::decode $msg; 788 utf8::decode $msg;
796 789
798 791
799 if ($msg) { 792 if ($msg) {
800 my $name = $ob->name; 793 my $name = $ob->name;
801 my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list; 794 my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list;
802 795
803 send_msg $_, $SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY, "msg_say" 796 send_msg $_, $cf::SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY, "msg_say"
804 for grep $_ != $ob->contr, @plonmap; 797 for grep $_ != $ob->contr, @plonmap;
805 $ob->contr->send_msg ($SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | cf::NDI_REPLY); 798 $ob->contr->send_msg ($cf::SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | cf::NDI_REPLY);
799
800 my @npc;
806 801
807 # npcs, magic_ears etc. 802 # npcs, magic_ears etc.
808 # first find all objects and their first-level inventories 803 # first find all objects and their first-level inventories
809 # within a 5x5 square that have something resembling 804 # within a 5x5 square that have something resembling
810 # dialogue or support on_say. 805 # dialogue or support on_say.
806 # we prefer the nearest items NOT in the player, otherwise in player.
811 my ($map, $x, $y) = ($ob->map, $ob->x - 2, $ob->y - 2); 807 my ($map, $x, $y) = ($ob->map, $ob->x, $ob->y);
812 808
813 for my $npc ( 809 for my $dir (
814 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $ob->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_, 810 0,
815 map +($_, $_->inv), 811 1, 3, 5, 7,
816 grep $_, 812 2, 4, 6, 8,
817 map $map->at ($x + $_ % 5, $y + (int $_ / 5)), 813 9 .. cf::SIZEOFFREE2
818 0..24
819 ) { 814 ) {
815 @npc = grep $_->should_invoke (cf::EVENT_OBJECT_SAY) || $_->has_dialogue,
816 map +($_, $_->inv),
817 grep $_ != $ob,
818 $map->at ($x, $y, $dir)
819 and last;
820 }
821
822 unless (@npc) {
823 # nothing found, try the player inventory
824 @npc = grep $_->should_invoke (cf::EVENT_OBJECT_SAY) || $_->has_dialogue,
825 $ob->inv;
826 }
827
828 for my $npc (@npc) {
829 return if $npc->invoke (cf::EVENT_OBJECT_SAY, $ob->contr, $msg);
830
820 # if some listener teleported us somewhere else, stop right here 831 # if some listener teleported us somewhere else, stop right here
821 last unless $map->path == $ob->map->path; 832 last unless $map->path == $ob->map->path;
822 833
834 if ($npc->has_dialogue) {
823 my $dialog = new NPC_Dialogue pl => $ob->contr, npc => $npc; 835 my $dialog = new NPC_Dialogue pl => $ob->contr, npc => $npc;
824 my ($reply, @kw) = $dialog->tell ($msg); 836 my ($reply, @kw) = $dialog->tell ($msg);
825 837
826 if (defined $reply) { 838 if (defined $reply) {
827 if ($npc->type == cf::MAGIC_EAR) { 839 if ($npc->type == cf::MAGIC_EAR) {
828 if (length $reply) {
829 send_msg $_, $SAY_CHANNEL => $reply, cf::NDI_BROWN, "msg_say" 840 send_msg $_, $cf::SAY_CHANNEL => $reply, cf::NDI_BROWN, "msg_say"
830 for @plonmap; 841 for @plonmap;
831 }
832 $npc->use_trigger;
833 } else { 842 } else {
834 if (length $reply) {
835 send_msg $_, $SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN, "msg_say" 843 send_msg $_, $cf::SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN, "msg_say"
836 for @plonmap; 844 for @plonmap;
837 } 845 }
838 } 846 }
839 }
840 847
841 if (@kw) { 848 if (@kw) {
842 $_->send_msg ($SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN) 849 $_->send_msg ($cf::SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
843 for @plonmap; 850 for @plonmap;
851 }
844 } 852 }
845 } 853 }
846 854
847 } else { 855 } else {
848 $ob->send_msg ($SAY_CHANNEL => "What do you want to say?", cf::NDI_GREY | cf::NDI_REPLY); 856 $ob->send_msg ($cf::SAY_CHANNEL => "What do you want to say?", cf::NDI_GREY | cf::NDI_REPLY);
849 } 857 }
850}; 858};
851 859
852cf::register_command chat => sub { 860
861sub _chat {
853 my ($ob, $msg) = @_; 862 my ($ob, $msg) = @_;
854
855 utf8::decode $msg;
856 863
857 my $pl = $ob->contr; 864 my $pl = $ob->contr;
858 865
859 return if $pl->invoke (cf::EVENT_PLAYER_CHAT, $msg); 866 return if $pl->invoke (cf::EVENT_PLAYER_CHAT, $msg);
860 867
861 if ($msg) { 868 if ($msg) {
862 my $name = $ob->name; 869 my $name = $ob->name;
863 my $NOW = time; 870 my $NOW = time;
864 871
865 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg; 872 cf::LOG cf::llevDebug, sprintf "QBERT %s\n", $msg;
866 send_irc ("[%s] %s", $name, $msg); 873 send_irc ("%s", $msg);
867 874
868 send_msg $_, $CHAT_CHANNEL => "$name chats: $msg", cf::NDI_BLUE | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_chat" 875 send_msg $_, $cf::CHAT_CHANNEL => $msg, cf::NDI_BLUE | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_chat"
869 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list; 876 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW } cf::player::list;
870 877
871 } else { 878 } else {
872 $pl->send_msg ($CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY); 879 $pl->send_msg ($cf::CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY);
873 } 880 }
881}
882
883cf::register_command chat => sub {
884 my ($ob, $msg) = @_;
885
886 utf8::decode $msg;
887 _chat $ob, $ob->name . " chats: $msg";
888};
889
890cf::register_command me => sub {
891 my ($ob, $msg) = @_;
892
893 utf8::decode $msg;
894 _chat $ob, "* " . $ob->name . " $msg";
874}; 895};
875 896
876cf::register_command shout => sub { 897cf::register_command shout => sub {
877 my ($ob, $msg) = @_; 898 my ($ob, $msg) = @_;
878 899
887 my $name = $ob->name; 908 my $name = $ob->name;
888 909
889 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg; 910 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
890 send_irc ("\007\0034{%s} %s\n", $name, $msg); 911 send_irc ("\007\0034{%s} %s\n", $name, $msg);
891 912
892 send_msg $_, $CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_shout" 913 send_msg $_, $cf::CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_shout"
893 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list; 914 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW } cf::player::list;
894 915
895 } else { 916 } else {
896 $pl->send_msg ($CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY); 917 $pl->send_msg ($cf::CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY);
897 } 918 }
898}; 919};
899 920
900cf::register_command tell => sub { 921cf::register_command tell => sub {
901 my ($ob, $args) = @_; 922 my ($ob, $args) = @_;
943 964
944cf::register_command ignore => sub { 965cf::register_command ignore => sub {
945 my ($pl, $args) = @_; 966 my ($pl, $args) = @_;
946 my ($target, $type, $timeout) = split /\s+/, $args; 967 my ($target, $type, $timeout) = split /\s+/, $args;
947 968
969 cf::async {
948 if ($args eq "list") { 970 if ($args eq "list") {
949 clean_timeouts $pl; 971 clean_timeouts $pl;
950 972
951 if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}}) 973 if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}})
952 + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) { 974 + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) {
953 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY); 975 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
954 $pl->message ((join ", ", @ignored_tell), cf::NDI_REPLY); 976 $pl->message ((join ", ", @ignored_tell), cf::NDI_REPLY);
955 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY); 977 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
956 $pl->message ((join ", ", @ignored_shout), cf::NDI_REPLY); 978 $pl->message ((join ", ", @ignored_shout), cf::NDI_REPLY);
957 $pl->message ("To stop ignoring one, use unignore.", cf::NDI_REPLY); 979 $pl->message ("To stop ignoring one, use unignore.", cf::NDI_REPLY);
980 } else {
981 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
982 }
983
984 } elsif ($target && $type) {
985 $timeout ne "" or $timeout = 24;
986 my $absolute_timeout = time + $timeout * 3600;
987
988 if (cf::player::exists $target) {
989 if ($type eq "tell") {
990 $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_REPLY);
991 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
992 } elsif ($type eq "shout") {
993 $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_REPLY);
994 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
995 } elsif ($type eq "all") {
996 $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_REPLY);
997 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
998 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
999 } else {
1000 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
1001 }
1002 } else {
1003 $pl->message ("No such player: $target", cf::NDI_REPLY);
1004 }
1005
958 } else { 1006 } else {
959 $pl->message ("Not ignoring anyone", cf::NDI_REPLY); 1007 $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
1008 . "will ignore a player for <timeout> hours.\n"
1009 . "Usage: ignore list\n"
1010 . "will show you a list of players currently ignored.", cf::NDI_REPLY);
960 } 1011 }
961
962 } elsif ($target && $type) {
963
964 $timeout ne "" or $timeout = 24;
965 my $absolute_timeout = time + $timeout * 3600;
966
967 if (cf::player::exists $target) {
968 if ($type eq "tell") {
969 $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_REPLY);
970 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
971 } elsif ($type eq "shout") {
972 $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_REPLY);
973 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
974 } elsif ($type eq "all") {
975 $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_REPLY);
976 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
977 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
978 } else {
979 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
980 }
981 } else {
982 $pl->message ("No such player: $target", cf::NDI_REPLY);
983 }
984
985 } else {
986 $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
987 . "will ignore a player for <timeout> hours.\n"
988 . "Usage: ignore list\n"
989 . "will show you a list of players currently ignored.", cf::NDI_REPLY);
990 } 1012 };
991}; 1013};
992 1014
993cf::register_command unignore => sub { 1015cf::register_command unignore => sub {
994 my ($pl, $args) = @_; 1016 my ($pl, $args) = @_;
995 my ($target, $type) = split /\s+/, $args; 1017 my ($target, $type) = split /\s+/, $args;
996 1018
1019 cf::async {
997 if ($args eq "") { 1020 if ($args eq "") {
998 if ($pl->{ext_ignore_tell}) { 1021 if ($pl->{ext_ignore_tell}) {
999 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY); 1022 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
1000 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_REPLY); 1023 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_REPLY);
1001 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY); 1024 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
1002 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_REPLY); 1025 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_REPLY);
1003 } else {
1004 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
1005 }
1006 } else {
1007 if (cf::player::exists $target) {
1008 if ($type eq "tell") {
1009 $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_REPLY);
1010 delete $pl->{ext_ignore_tell} {$target};
1011 } elsif ($type eq "shout") {
1012 $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_REPLY);
1013 delete $pl->{ext_ignore_shout}{$target};
1014 } elsif ($type eq "all") {
1015 $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_REPLY);
1016 delete $pl->{ext_ignore_tell} {$target};
1017 delete $pl->{ext_ignore_shout}{$target};
1018 } else { 1026 } else {
1019 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY); 1027 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
1020 } 1028 }
1021 } else { 1029 } else {
1030 if (cf::player::exists $target) {
1031 if ($type eq "tell") {
1032 $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_REPLY);
1033 delete $pl->{ext_ignore_tell} {$target};
1034 } elsif ($type eq "shout") {
1035 $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_REPLY);
1036 delete $pl->{ext_ignore_shout}{$target};
1037 } elsif ($type eq "all") {
1038 $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_REPLY);
1039 delete $pl->{ext_ignore_tell} {$target};
1040 delete $pl->{ext_ignore_shout}{$target};
1041 } else {
1042 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
1043 }
1044 } else {
1022 $pl->message ("No such player or ambiguous name: $target", cf::NDI_REPLY); 1045 $pl->message ("No such player or ambiguous name: $target", cf::NDI_REPLY);
1046 }
1023 } 1047 }
1024 } 1048 };
1025}; 1049};
1026 1050

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines