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.20 by elmex, Thu Jun 28 08:34:42 2007 UTC vs.
Revision 1.54 by root, Thu Apr 22 12:50:24 2010 UTC

1#! perl # depends=irc 1#! perl # depends=irc mandatory
2#CONVERSION: PARTIAL
3 2
4# 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
5# adds ignore/unignore functionality 4# adds ignore/unignore functionality
6 5
7use NPC_Dialogue; 6use NPC_Dialogue;
8use POSIX (); # for strftime only 7use POSIX (); # for strftime only
8
9sub tell_channel($) {
10 my ($target) = @_;
11
12 {
13 id => "tell-$target",
14 title => "$target",
15 reply => "tell $target ",
16 tooltip => "Private messages from/to $target",
17 }
18}
19
20sub send_msg($$$$$) {
21 my ($pl, $channel, $msg, $flags, $sound) = @_;
22 $pl->play_sound (cf::sound::find $sound) if defined $sound;
23 $pl->send_msg ($channel, $msg, $flags);
24 ()
25}
9 26
10sub clean_timeouts($) { 27sub clean_timeouts($) {
11 my ($player) = @_; 28 my ($player) = @_;
12 my $NOW = time; 29 my $NOW = time;
13 30
14 for my $hash (@$player{qw(ext_ignore_shout ext_ignore_tell)}) { 31 for my $hash (@$player{qw(ext_ignore_shout ext_ignore_tell)}) {
15 while (my ($k, $v) = each %$hash) { 32 while (my ($k, $v) = each %$hash) {
16 if ($v < $NOW) { 33 if ($v < $NOW) {
17 $player->message ("Your ignore on $k has expired.", cf::NDI_GREEN | cf::NDI_UNIQUE); 34 $player->message ("Your ignore on $k has expired.", cf::NDI_GREEN);
18 delete $hash->{$k}; 35 delete $hash->{$k};
19 } elsif (!cf::player::exists $k) { 36 } elsif (!cf::player::exists $k) {
20 $player->message ("Your ignore on $k is no longer valid (no such user).", cf::NDI_GREEN | cf::NDI_UNIQUE); 37 $player->message ("Your ignore on $k is no longer valid (no such user).", cf::NDI_GREEN);
21 delete $hash->{$k}; 38 delete $hash->{$k};
22 } 39 }
23 } 40 }
24 } 41 }
25} 42}
37cf::player->attach ( 54cf::player->attach (
38 prio => -1000, 55 prio => -1000,
39 on_login => sub { 56 on_login => sub {
40 my ($pl) = @_; 57 my ($pl) = @_;
41 58
59 cf::async {
42 clean_timeouts $pl->ob; 60 clean_timeouts $pl->ob;
61 };
62
63 $pl->send_msg ($cf::SAY_CHANNEL);
64 $pl->send_msg ($cf::CHAT_CHANNEL);
43 }, 65 },
44); 66);
45 67
68# TODO: remove once safe
46cf::register_command listen => sub { 69cf::register_command listen => sub {
47 my ($pl, $msg) = @_;
48 my $player = cf::player::find_active $pl->name;
49
50 if ($msg ne "") {
51 $msg = 10 if $msg > 10;
52
53 my $prev_listen = $player->listening;
54 $player->listening ($msg);
55 if ($prev_listen == $player->listening) {
56 $pl->message ("Your verbose level stayed $prev_listen.", cf::NDI_UNIQUE);
57 } else {
58 $pl->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_UNIQUE);
59 }
60 } else {
61 $pl->message ("Your verbose level is " . $player->listening . ".", cf::NDI_UNIQUE);
62 }
63}; 70};
64 71
65cf::register_command cointoss => sub { 72cf::register_command cointoss => sub {
66 my ($pl, $msg) = @_; 73 my ($ob, $msg) = @_;
67 74
75 my $pl = $ob->contr;
68 my $name = $pl->name; 76 my $name = $ob->name;
69 77
70 if (int rand 2) { 78 my $coin = (cf::rndm 2) ? "Heads" : "Tails";
79
80 send_msg $_, $cf::SAY_CHANNEL => "$name flips a coin.... $coin!", cf::NDI_GREY, "msg_say"
71 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 81 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list;
72 next
73 if $other->ob == $pl;
74 $other->ob->message ("$name flips a coin.... Heads!", cf::NDI_GREY | cf::NDI_UNIQUE);
75 }
76
77 $pl->message ("You flip a coin.... Heads!", cf::NDI_GREY | cf::NDI_UNIQUE);
78 } else {
79 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
80 next
81 if $other->ob == $pl;
82 $other->ob->message ("$name flips a coin.... Tails!", cf::NDI_GREY | cf::NDI_UNIQUE);
83 }
84
85 $pl->message ("You flip a coin.... Tails!", cf::NDI_GREY | cf::NDI_UNIQUE);
86 } 82
83 $pl->send_msg ($cf::SAY_CHANNEL => "You flip a coin.... $coin!", cf::NDI_GREY | cf::NDI_REPLY);
87}; 84};
88 85
89cf::register_command orcknuckle => sub { 86cf::register_command orcknuckle => sub {
90 my ($pl, $msg) = @_; 87 my ($ob, $msg) = @_;
88
89 my $pl = $ob->contr;
90 my $name = $ob->name;
91
91 my @orcknuckle = ("none", "beholder", "ghost", "knight", "princess", "dragon", "orc"); 92 my @orcknuckle = ("beholder", "ghost", "knight", "princess", "dragon", "orc");
92 93 my ($i, $j, $k, $l) = map +(cf::rndm $_), 5, 5, 5, 6;
93 my $name = $pl->name;
94
95 my ($i, $j, $k, $l) = ((int rand 5) + 1, (int rand 5) + 1, (int rand 5) + 1, (int rand 6) + 1);
96 my $result = "$orcknuckle[$i], $orcknuckle[$j], $orcknuckle[$k], $orcknuckle[$l]"; 94 my $result = "$orcknuckle[$i], $orcknuckle[$j], $orcknuckle[$k], $orcknuckle[$l]";
97 95
96 send_msg $_, $cf::SAY_CHANNEL => "$name throws his orc-knuckles and rolls $result!", cf::NDI_GREY, "msg_say"
98 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 97 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list;
99 next
100 if $other->ob == $pl;
101 $other->ob->message ("$name rolls $result!", cf::NDI_GREY | cf::NDI_UNIQUE);
102 } 98
103
104 $pl->message ("You roll $result!", cf::NDI_GREY | cf::NDI_UNIQUE); 99 $pl->send_msg ($cf::SAY_CHANNEL => "You roll $result!", cf::NDI_GREY | cf::NDI_REPLY);
105}; 100};
106 101
107my $emotes = { 102my $emotes = {
108 growl => { 103 growl => {
109 noparams => { 104 noparams => {
155 self => { 150 self => {
156 }, 151 },
157 }, 152 },
158 scream => { 153 scream => {
159 noparams => { 154 noparams => {
160 other => "<self> screams at the top of his lungs!", 155 other => "<self> screams at the top of G<his|her> lungs!",
161 self => "ARRRRRRRRRRGH!!!!!", 156 self => "ARRRRRRRRRRGH!!!!!",
162 }, 157 },
163 params => { 158 params => {
164 }, 159 },
165 self => { 160 self => {
174 target => "<self> pukes on your clothes!", 169 target => "<self> pukes on your clothes!",
175 other => "<self> pukes on <other>.", 170 other => "<self> pukes on <other>.",
176 self => "You puke on <other>.", 171 self => "You puke on <other>.",
177 }, 172 },
178 self => { 173 self => {
179 other => "<self> pukes on his clothes.", 174 other => "<self> pukes on G<his|her> clothes.",
180 self => "You puke on yourself.", 175 self => "You puke on yourself.",
181 }, 176 },
182 }, 177 },
183 strut => { 178 strut => {
184 noparams => { 179 noparams => {
223 }, 218 },
224 }, 219 },
225 kiss => { 220 kiss => {
226 noparams => { 221 noparams => {
227 other => "<self> makes a weird facial contortion", 222 other => "<self> makes a weird facial contortion",
228 self => "All the lonely people..", 223 self => "All the lonely people...",
229 }, 224 },
230 params => { 225 params => {
231 target => "<self> kisses you.", 226 target => "<self> kisses you.",
232 other => "<self> kisses <other>.", 227 other => "<self> kisses <other>.",
233 self => "You kiss <other>.", 228 self => "You kiss <other>.",
234 }, 229 },
235 self => { 230 self => {
236 }, 231 },
237 }, 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 },
248 smother => {
249 noparams => {
250 other => "<self> makes weird facial contortions",
251 self => "All the lonely people...",
252 },
253 params => {
254 target => "<self> smothers you with kisses.",
255 other => "<self> smothers <other> with kisses.",
256 self => "You smother <other> with kisses.",
257 },
258 self => {
259 },
260 },
238 wink => { 261 wink => {
239 noparams => { 262 noparams => {
240 other => "<self> winks suggestively.", 263 other => "<self> winks suggestively.",
241 self => "Have you got something in your eye?", 264 self => "Have you got something in your eye?",
242 }, 265 },
244 target => "<self> winks at you.", 267 target => "<self> winks at you.",
245 other => "<self> winks at <other>.", 268 other => "<self> winks at <other>.",
246 self => "You wink suggestively at <other>.", 269 self => "You wink suggestively at <other>.",
247 }, 270 },
248 self => { 271 self => {
249 other => "<self> winks at himself - something strange is going on...", 272 other => "<self> winks at G<him|her>self - something strange is going on...",
250 self => "You wink at yourself?? What are you up to?", 273 self => "You wink at yourself?? What are you up to?",
251 }, 274 },
252 }, 275 },
253 pout => { 276 pout => {
254 noparams => { 277 noparams => {
260 self => { 283 self => {
261 }, 284 },
262 }, 285 },
263 cackle => { 286 cackle => {
264 noparams => { 287 noparams => {
265 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!",
266 self => "You cackle gleefully.", 289 self => "You cackle gleefully.",
267 }, 290 },
268 params => { 291 params => {
269 }, 292 },
270 self => { 293 self => {
279 target => "<self> sniffs you.", 302 target => "<self> sniffs you.",
280 other => "<self> sniffs <other>", 303 other => "<self> sniffs <other>",
281 self => "You sniff <other>.", 304 self => "You sniff <other>.",
282 }, 305 },
283 self => { 306 self => {
284 other => "<self> sniffs himself.", 307 other => "<self> sniffs G<him|her>self.",
285 self => "You sniff yourself.", 308 self => "You sniff yourself.",
286 }, 309 },
287 }, 310 },
288 nod => { 311 nod => {
289 noparams => { 312 noparams => {
290 other => "<self> nods solemnly.", 313 other => "<self> nods solemnly.",
291 self => "You nod solemnly.", 314 self => "You nod solemnly.",
292 }, 315 },
293 params => { 316 params => {
294 target => "<self> nods solemnly to you.", 317 target => "<self> nods solemnly at you.",
295 other => "<self> nods solemnly to <other>.", 318 other => "<self> nods solemnly at <other>.",
296 self => "You nod solemnly to <other>.", 319 self => "You nod solemnly at <other>.",
297 }, 320 },
298 self => { 321 self => {
299 }, 322 },
300 }, 323 },
301 frown => { 324 frown => {
307 target => "<self> frowns darkly at you.", 330 target => "<self> frowns darkly at you.",
308 other => "<self> frowns darkly at <other>.", 331 other => "<self> frowns darkly at <other>.",
309 self => "You frown darkly at <other>.", 332 self => "You frown darkly at <other>.",
310 }, 333 },
311 self => { 334 self => {
312 other => "<self> frowns at himself.", 335 other => "<self> frowns at G<him|her>self.",
313 self => "You frown at yourself.", 336 self => "You frown at yourself.",
314 }, 337 },
315 }, 338 },
316 snicker => { 339 snicker => {
317 noparams => { 340 noparams => {
340 noparams => { 363 noparams => {
341 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?",
342 self => "You bleed all over your nice new armour.", 365 self => "You bleed all over your nice new armour.",
343 }, 366 },
344 params => { 367 params => {
345 target => "<self> slashes his wrist and bleeds all over you.", 368 target => "<self> slashes G<his|her> wrist and bleeds all over you.",
346 other => "<self> slashes his wrist and bleeds all over <other>.", 369 other => "<self> slashes G<his|her> wrist and bleeds all over <other>.",
347 self => "You slash your wrist and bleed all over <other>", 370 self => "You slash your wrist and bleed all over <other>",
348 }, 371 },
349 self => { 372 self => {
350 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.",
351 self => "Very impressive! You wipe your blood all over yourself.", 374 self => "Very impressive! You wipe your blood all over yourself.",
352 }, 375 },
353 }, 376 },
354 twiddle => { 377 twiddle => {
355 noparams => { 378 noparams => {
356 other => "<self> patiently twiddles his thumbs.", 379 other => "<self> patiently twiddles G<his|her> thumbs.",
357 self => "You patiently twiddle your thumbs.", 380 self => "You patiently twiddle your thumbs.",
358 }, 381 },
359 params => { 382 params => {
360 }, 383 },
361 self => { 384 self => {
362 }, 385 },
363 }, 386 },
364 spit => { 387 spit => {
365 noparams => { 388 noparams => {
366 other => "<self> spits over his left shoulder.", 389 other => "<self> spits over G<his|her> left shoulder.",
367 self => "You spit over your left shoulder.", 390 self => "You spit over your left shoulder.",
368 }, 391 },
369 params => { 392 params => {
370 target => "<self> spits in your face!", 393 target => "<self> spits in your face!",
371 other => "<self> spits in <other>'s face.", 394 other => "<self> spits in <other>'s face.",
372 self => "You spit on <other>.", 395 self => "You spit on <other>.",
373 }, 396 },
374 self => { 397 self => {
375 other => "<self> drools all over himself.", 398 other => "<self> drools all over G<him|her>self.",
376 self => "You drool all over yourself.", 399 self => "You drool all over yourself.",
377 }, 400 },
378 }, 401 },
379 glare => { 402 glare => {
380 noparams => { 403 noparams => {
381 other => "<self> glares around him.", 404 other => "<self> glares around G<him|her>.",
382 self => "You glare at nothing in particular.", 405 self => "You glare at nothing in particular.",
383 }, 406 },
384 params => { 407 params => {
385 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.",
386 other => "<self> glares at <other>.", 409 other => "<self> glares at <other>.",
387 self => "You glare icily at <other>.", 410 self => "You glare icily at <other>.",
388 }, 411 },
389 self => { 412 self => {
390 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>?",
391 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.",
392 }, 415 },
393 }, 416 },
394 bow => { 417 bow => {
395 noparams => { 418 noparams => {
400 target => "<self> bows before you.", 423 target => "<self> bows before you.",
401 other => "<self> bows before <other>.", 424 other => "<self> bows before <other>.",
402 self => "You bow before <other>.", 425 self => "You bow before <other>.",
403 }, 426 },
404 self => { 427 self => {
405 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.",
406 self => "You kiss your toes.", 429 self => "You kiss your toes.",
407 }, 430 },
408 }, 431 },
409 dance => { 432 dance => {
410 noparams => { 433 noparams => {
411 other => "<self> expresses himself through interpretive dance.", 434 other => "<self> expresses G<him|her>self through interpretive dance.",
412 self => "You dance with glee.", 435 self => "You dance with glee.",
413 }, 436 },
414 params => { 437 params => {
415 target => "<self> grabs you, and begins dancing!", 438 target => "<self> grabs you, and begins dancing!",
416 other => "Yipe! <self> and <other> are doing the Macarena!", 439 other => "Yipe! <self> and <other> are doing the Macarena!",
417 self => "You grab <other> and begin doing the Cha-Cha!", 440 self => "You grab <other> and begin doing the Cha-Cha!",
418 }, 441 },
419 self => { 442 self => {
420 other => "<self> embraces himself and begins to dance!", 443 other => "<self> embraces G<him|her>self and begins to dance!",
421 self => "You skip and dance around by yourself.", 444 self => "You skip and dance around by yourself.",
422 }, 445 },
423 }, 446 },
424 snore => { 447 snore => {
425 noparams => { 448 noparams => {
441 self => { 464 self => {
442 }, 465 },
443 }, 466 },
444 snap => { 467 snap => {
445 noparams => { 468 noparams => {
446 other => "<self> snaps his fingers.", 469 other => "<self> snaps G<his|her> fingers.",
447 self => "PRONTO! you snap your fingers.", 470 self => "PRONTO! you snap your fingers.",
448 }, 471 },
449 params => { 472 params => {
450 }, 473 },
451 self => { 474 self => {
460 target => "<self> waves goodbye to you. Have a good journey.", 483 target => "<self> waves goodbye to you. Have a good journey.",
461 other => "<self> waves goodbye to <other>.", 484 other => "<self> waves goodbye to <other>.",
462 self => "You wave goodbye to <other>.", 485 self => "You wave goodbye to <other>.",
463 }, 486 },
464 self => { 487 self => {
465 other => "<self> waves goodbye to himself.", 488 other => "<self> waves goodbye to G<him|her>self.",
466 self => "Are you going on adventures as well??", 489 self => "Are you going on adventures as well??",
467 }, 490 },
468 }, 491 },
469 smile => { 492 smile => {
470 noparams => { 493 noparams => {
484 other => "<self> sneezes.", 507 other => "<self> sneezes.",
485 self => "Gesundheit!", 508 self => "Gesundheit!",
486 }, 509 },
487 params => { 510 params => {
488 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.",
489 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>.",
490 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>.",
491 }, 514 },
492 self => { 515 self => {
493 other => "<self> sneezes, and covers himself in a slimy substance.", 516 other => "<self> sneezes, and covers G<him|her>self in a slimy substance.",
494 self => "You sneeze on yourself, what a mess!", 517 self => "You sneeze on yourself, what a mess!",
495 }, 518 },
496 }, 519 },
497 bounce => { 520 bounce => {
498 noparams => { 521 noparams => {
507 self => { 530 self => {
508 }, 531 },
509 }, 532 },
510 shake => { 533 shake => {
511 noparams => { 534 noparams => {
512 other => "<self> shakes his head.", 535 other => "<self> shakes G<his|her> head.",
513 self => "You shake your head.", 536 self => "You shake your head.",
514 }, 537 },
515 params => { 538 params => {
516 target => "<self> shakes your hand.", 539 target => "<self> shakes your hand.",
517 other => "<self> shakes <other>'s hand.", 540 other => "<self> shakes <other>'s hand.",
522 self => "You are shaken by yourself.", 545 self => "You are shaken by yourself.",
523 }, 546 },
524 }, 547 },
525 lick => { 548 lick => {
526 noparams => { 549 noparams => {
527 other => "<self> licks his mouth and smiles.", 550 other => "<self> licks G<his|her> mouth and smiles.",
528 self => "You lick your mouth and smile.", 551 self => "You lick your mouth and smile.",
529 }, 552 },
530 params => { 553 params => {
531 target => "<self> licks you.", 554 target => "<self> licks you.",
532 other => "<self> licks <other>.", 555 other => "<self> licks <other>.",
533 self => "You lick <other>.", 556 self => "You lick <other>.",
534 }, 557 },
535 self => { 558 self => {
536 other => "<self> licks himself - YUCK.", 559 other => "<self> licks G<him|her>self - YUCK.",
537 self => "You lick yourself.", 560 self => "You lick yourself.",
538 }, 561 },
539 }, 562 },
540 flip => { 563 flip => {
541 noparams => { 564 noparams => {
547 self => { 570 self => {
548 }, 571 },
549 }, 572 },
550 think => { 573 think => {
551 noparams => { 574 noparams => {
552 other => "<self> closes his eyes and thinks really hard.", 575 other => "<self> closes G<his|her> eyes and thinks really hard.",
553 self => "Anything in particular that you'd care to think about?", 576 self => "Anything in particular that you'd care to think about?",
554 }, 577 },
555 params => { 578 params => {
556 }, 579 },
557 self => { 580 self => {
621 target => "<self> cries on your shoulder.", 644 target => "<self> cries on your shoulder.",
622 other => "<self> cries on <other>'s shoulder.", 645 other => "<self> cries on <other>'s shoulder.",
623 self => "You cry on <other>'s shoulder.", 646 self => "You cry on <other>'s shoulder.",
624 }, 647 },
625 self => { 648 self => {
626 other => "<self> sobs quietly to himself.", 649 other => "<self> sobs quietly to G<him|her>self.",
627 self => "You cry to yourself.", 650 self => "You cry to yourself.",
628 }, 651 },
629 }, 652 },
630 sulk => { 653 sulk => {
631 noparams => { 654 noparams => {
645 params => { 668 params => {
646 target => "<self> whistles at <other>.", 669 target => "<self> whistles at <other>.",
647 self => "You whistle at <other>.", 670 self => "You whistle at <other>.",
648 }, 671 },
649 self => { 672 self => {
650 other => "<self> whistles to himself in boredom.", 673 other => "<self> whistles to G<him|her>self in boredom.",
651 self => "You whistle while you work.", 674 self => "You whistle while you work.",
652 }, 675 },
653 }, 676 },
654 groan => { 677 groan => {
655 noparams => { 678 noparams => {
686 }, 709 },
687}; 710};
688 711
689for my $emotion (keys %$emotes) { 712for my $emotion (keys %$emotes) {
690 cf::register_command $emotion => sub { 713 cf::register_command $emotion => sub {
691 my ($pl, $tname) = @_; 714 my ($ob, $tname) = @_;
715
716 my $pl = $ob->contr;
692 717
693 cf::async { 718 cf::async {
694 my $name = $pl->name; 719 my $name = $ob->name;
720 $Coro::current->{desc} = "emote handler for $name";
695 721
696 if ($tname eq $name) { 722 if ($tname eq $name) {
697 my $emote = $emotes->{$emotion}->{self}; 723 my %emote = %{ $emotes->{$emotion}->{self} || {} };
698 724
699 $emote->{other} = "You look away from <self>." 725 $emote{other} ||= "You look away from <self>.";
700 if !$emote->{other};
701 $emote->{self} = "My god! Is that LEGAL?" 726 $emote{self} ||= "My god! Is that LEGAL?";
702 if !$emote->{self};
703 727
704 $emote->{other} =~ s/<self>/$name/; 728 $emote{other} =~ s/<self>/$name/;
729
730 $_ = $pl->expand_cfpod ($_)
731 for values %emote;
705 732
733 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
706 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 734 for grep { $ob->on_same_map_as ($_->ob) && $_ != $ob} cf::player::list;
707 next
708 if $other->ob == $pl;
709 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
710 }
711 735
712 $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 736 $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
713 } elsif ($tname) { 737 } elsif ($tname) {
714 my $target = cf::player::find $tname 738 my $target = cf::player::find $tname
715 or return $pl->reply (undef, "$tname is not around."); 739 or return send_msg $pl, tell_channel $tname, "$tname is not around.", cf::NDI_DK_ORANGE | cf::NDI_REPLY, "msg_chat";
716 740
717 my $emote = $emotes->{$emotion}->{params}; 741 my %emote = %{ $emotes->{$emotion}->{params} || {} };
718 742
719 $emote->{other} = "<self> is eyeing <other> quizzically." 743 $emote{other} ||= "<self> is eyeing <other> quizzically.";
720 if !$emote->{other};
721 $emote->{self} = "You are still nuts." 744 $emote{self} ||= "You are still nuts.";
722 if !$emote->{self};
723 $emote->{target} = "You get the distinct feeling that <other> is nuts." 745 $emote{target} ||= "You get the distinct feeling that <self> is nuts.";
724 if !$emote->{target};
725 746
726 $emote->{self} =~ s/<other>/$tname/; 747 $emote{self} =~ s/<other>/$tname/;
727 $emote->{target} =~ s/<self>/$name/; 748 $emote{target} =~ s/<self>/$name/;
728 $emote->{other} =~ s/<other>/$tname/; 749 $emote{other} =~ s/<other>/$tname/;
729 $emote->{other} =~ s/<self>/$name/; 750 $emote{other} =~ s/<self>/$name/;
730 751
731 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 752 $_ = $pl->expand_cfpod ($_)
732 next 753 for values %emote;
733 if $other->ob == $pl or $other == $target;
734 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
735 }
736 754
737 $target->ob->message ($emote->{target}, cf::NDI_GREY | cf::NDI_UNIQUE); 755 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
738 $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 756 for grep { $_ != $pl && $_ != $target && $ob->on_same_map_as ($_->ob) } cf::player::list;
757
758 send_msg $target, tell_channel $name, $emote{target}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_shout";
759 $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
739 } else { 760 } else {
740 my $emote = $emotes->{$emotion}->{noparams}; 761 my %emote = %{ $emotes->{$emotion}->{noparams} || {} };
741 $emote->{other} =~ s/<self>/$name/;
742 762
743 $emote->{other} = "<self> dances with glee." 763 $emote{other} ||= "<self> dances with glee.";
744 if !$emote->{other};
745 $emote->{self} = "You are a nut." 764 $emote{self} ||= "You are a nut.";
746 if !$emote->{self};
747 765
766 $emote{other} =~ s/<self>/$name/;
767
768 $_ = $pl->expand_cfpod ($_)
769 for values %emote;
770
771 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
748 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 772 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl } cf::player::list;
749 next
750 if $other->ob == $pl;
751 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
752 }
753 773
754 $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 774 $pl->send_msg ($cf::CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
755 } 775 }
756 }; 776 };
757 }; 777 };
758} 778}
759 779
760cf::register_command me => sub {
761 my ($pl, $msg) = @_;
762
763 my $name = $pl->name;
764
765 $_->ob->message ("* $name $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
766 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
767};
768
769cf::register_command say => sub { 780cf::register_command say => sub {
770 my ($pl, $msg) = @_; 781 my ($ob, $msg) = @_;
771 782
772 utf8::decode $msg; 783 utf8::decode $msg;
773 784
774 return if $pl->contr->invoke (cf::EVENT_PLAYER_SAY, $msg); 785 return if $ob->contr->invoke (cf::EVENT_PLAYER_SAY, $msg);
775 786
776 if ($msg) { 787 if ($msg) {
777 my $name = $pl->name; 788 my $name = $ob->name;
778
779 $_->ob->message ("$name says: $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
780 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 789 my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list;
790
791 send_msg $_, $cf::SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY, "msg_say"
792 for grep $_ != $ob->contr, @plonmap;
793 $ob->contr->send_msg ($cf::SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | cf::NDI_REPLY);
794
795 my @npc;
781 796
782 # npcs, magic_ears etc. 797 # npcs, magic_ears etc.
783 # first find all objects and their first-level inventories 798 # first find all objects and their first-level inventories
784 # within a 5x5 square that have something resembling 799 # within a 5x5 square that have something resembling
785 # dialogue or support on_say. 800 # dialogue or support on_say.
801 # we prefer the nearest items NOT in the player, otherwise in player.
786 my ($map, $x, $y) = ($pl->map, $pl->x - 2, $pl->y - 2); 802 my ($map, $x, $y) = ($ob->map, $ob->x, $ob->y);
787 803
788 for my $npc ( 804 for my $dir (
789 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $pl->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_, 805 0,
790 map +($_, $_->inv), 806 1, 3, 5, 7,
791 grep $_, 807 2, 4, 6, 8,
792 map $map->at ($x + $_ % 5, $y + (int $_ / 5)), 808 9 .. cf::SIZEOFFREE2
793 0..24
794 ) { 809 ) {
810 @npc = grep $_->should_invoke (cf::EVENT_OBJECT_SAY) || $_->has_dialogue,
811 map +($_, $_->inv),
812 grep $_ != $ob,
813 $map->at ($x, $y, $dir)
814 and last;
815 }
816
817 unless (@npc) {
818 # nothing found, try the player inventory
819 @npc = grep $_->should_invoke (cf::EVENT_OBJECT_SAY) || $_->has_dialogue,
820 $ob->inv;
821 }
822
823 for my $npc (@npc) {
824 return if $npc->invoke (cf::EVENT_OBJECT_SAY);
825
795 # if some listener teleported us somewhere else, stop right here 826 # if some listener teleported us somewhere else, stop right here
796 last unless $map->path == $pl->map->path; 827 last unless $map->path == $ob->map->path;
797 828
829 if ($npc->has_dialogue) {
798 my $dialog = new NPC_Dialogue pl => $pl->contr, npc => $npc; 830 my $dialog = new NPC_Dialogue pl => $ob->contr, npc => $npc;
799 my ($reply, @kw) = $dialog->tell ($msg); 831 my ($reply, @kw) = $dialog->tell ($msg);
800 832
801 if (defined $reply) { 833 if (defined $reply) {
802 if ($npc->type == cf::MAGIC_EAR) { 834 if ($npc->type == cf::MAGIC_EAR) {
803 if (length $reply) { 835 send_msg $_, $cf::SAY_CHANNEL => $reply, cf::NDI_BROWN, "msg_say"
804 $_->ob->message ($reply, cf::NDI_BROWN | cf::NDI_UNIQUE) 836 for @plonmap;
805 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
806 }
807 $npc->use_trigger;
808 } else { 837 } else {
809 if (length $reply) { 838 send_msg $_, $cf::SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN, "msg_say"
810 $_->ob->message ($npc->name . " says: $reply", cf::NDI_BROWN | cf::NDI_UNIQUE) 839 for @plonmap;
811 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
812 } 840 }
813 } 841 }
814 }
815 842
816 if (@kw) { 843 if (@kw) {
817 $_->ob->message ("[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN | cf::NDI_UNIQUE) 844 $_->send_msg ($cf::SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
818 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 845 for @plonmap;
846 }
819 } 847 }
820 } 848 }
821 849
822 } else { 850 } else {
823 $pl->message ("What do you want to say?", cf::NDI_UNIQUE); 851 $ob->send_msg ($cf::SAY_CHANNEL => "What do you want to say?", cf::NDI_GREY | cf::NDI_REPLY);
824 } 852 }
825}; 853};
826 854
855
856sub _chat {
857 my ($ob, $msg) = @_;
858
859 my $pl = $ob->contr;
860
861 return if $pl->invoke (cf::EVENT_PLAYER_CHAT, $msg);
862
863 if ($msg) {
864 my $name = $ob->name;
865 my $NOW = time;
866
867 cf::LOG cf::llevDebug, sprintf "QBERT %s\n", $msg;
868 send_irc ("%s", $msg);
869
870 send_msg $_, $cf::CHAT_CHANNEL => $msg, cf::NDI_BLUE | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_chat"
871 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW } cf::player::list;
872
873 } else {
874 $pl->send_msg ($cf::CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY);
875 }
876}
877
827cf::register_command chat => sub { 878cf::register_command chat => sub {
828 my ($pl, $msg) = @_; 879 my ($ob, $msg) = @_;
829 880
830 utf8::decode $msg; 881 utf8::decode $msg;
882 _chat $ob, $ob->name . " chats: $msg";
883};
831 884
885cf::register_command me => sub {
886 my ($ob, $msg) = @_;
887
888 utf8::decode $msg;
889 _chat $ob, "* " . $ob->name . " $msg";
890};
891
892cf::register_command shout => sub {
893 my ($ob, $msg) = @_;
894
895 utf8::decode $msg;
896
897 my $pl = $ob->contr;
898
832 return if $pl->contr->invoke (cf::EVENT_PLAYER_CHAT, $msg); 899 return if $pl->invoke (cf::EVENT_PLAYER_SHOUT, $msg);
833 900
834 if ($msg) { 901 if ($msg) {
835 my $name = $pl->name;
836 my $NOW = time; 902 my $NOW = time;
903 my $name = $ob->name;
837 904
838 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg; 905 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
839 send_irc ("[%s] %s", $name, $msg); 906 send_irc ("\007\0034{%s} %s\n", $name, $msg);
840 907
841 $_->ob->message ("$name chats: $msg", cf::NDI_BLUE) 908 send_msg $_, $cf::CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_shout"
842 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list; 909 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW } cf::player::list;
843 910
844 } else { 911 } else {
845 $pl->message ("Chat what?", cf::NDI_UNIQUE); 912 $pl->send_msg ($cf::CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY);
846 } 913 }
847}; 914};
848 915
849cf::register_command shout => sub { 916cf::register_command tell => sub {
850 my ($pl, $msg) = @_; 917 my ($ob, $args) = @_;
918 my ($target, $msg) = split /\s+/, $args, 2;
851 919
852 utf8::decode $msg; 920 utf8::decode $msg;
853 921
854 return if $pl->contr->invoke (cf::EVENT_PLAYER_SHOUT, $msg); 922 my $pl = $ob->contr;
855 923 my $ns = $pl->ns
856 if ($msg) { 924 or return;
857 my $NOW = time;
858 my $name = $pl->name; 925 my $name = $ob->name;
859 926
860 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
861 send_irc ("\007\0034{%s} %s\n", $name, $msg);
862
863 $_->ob->message ("$name shouts: $msg", cf::NDI_RED)
864 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list;
865
866 } else {
867 $pl->message ("Shout what?", cf::NDI_UNIQUE);
868 }
869};
870
871cf::register_command tell => sub {
872 my ($pl, $args) = @_;
873 my ($target, $msg) = split /\s+/, $args, 2;
874
875 utf8::decode $msg;
876
877 return if $pl->contr->invoke (cf::EVENT_PLAYER_TELL, $target, $msg); 927 return if $pl->invoke (cf::EVENT_PLAYER_TELL, $target, $msg);
878 928
879 my $name = $pl->name; 929 my $pl_channel = tell_channel $target;
880 930
881 if ($target =~ /irc\//) { 931 if ($target =~ /irc\//) {
882 my (undef, $nick) = split /\//, $target, 2; 932 my (undef, $nick) = split /\//, $target, 2;
883 $pl->message ("You tell $target: $args"); 933 $ns->send_msg ($pl_channel => "You tell $target: $args", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
884 send_irc ("(%s) %s: %s\n", $name, $nick, $msg); 934 send_irc ("(%s) %s: %s\n", $name, $nick, $msg);
935
885 } elsif (my $other = cf::player::find_active $target) { 936 } elsif (my $other = cf::player::find_active $target) {
937 my $other_channel = tell_channel $name;
886 938
887 if ($msg) { 939 if ($msg) {
888 if ($target eq $name) { 940 if ($target eq $name) {
889 $pl->message ("You are talking to yourself, you freak!", cf::NDI_UNIQUE); 941 $ns->send_msg ($pl_channel => "You are talking to yourself, you freak!", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
890 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) { 942 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) {
891 $pl->message ("$target ignores what you say. Give up on it.", cf::NDI_UNIQUE); 943 $ns->send_msg ($pl_channel => "$target ignores what you say. Give up on it.", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
892 } else { 944 } else {
893 return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl->contr, $msg); 945 return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl, $msg);
894 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg; 946 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg;
895 947
896 $pl->message ("You tell $target: $msg"); 948 $ns->send_msg ($pl_channel => "You tell $target: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
897 $other->ob->message ("$name tells you: $msg"); 949 send_msg $other, $other_channel => "$name tells you: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF, "msg_tell";
898 $other->ob->{ext_last_tell} = $name;
899 } 950 }
900 } else { 951 } else {
901 $pl->message ("What do you want to tell $target?", cf::NDI_UNIQUE); 952 $ns->send_msg ($pl_channel => "What do you want to tell $target?", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
902 } 953 }
903 954
904 } else { 955 } else {
905 $pl->message ("No such player. Your message: $msg", cf::NDI_UNIQUE); 956 $ns->send_msg ($pl_channel => "No such player. Your message: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
906 }
907};
908
909cf::register_command reply => sub {
910 my ($pl, $args) = @_;
911 my $name = $pl->name;
912
913 utf8::decode $args;
914
915 return if $pl->contr->invoke (cf::EVENT_PLAYER_TELL, $pl->{ext_last_tell}, $args);
916
917 if ($pl->{ext_last_tell} =~ /irc\//) {
918 my (undef, $nick) = split /\//, $pl->{ext_last_tell}, 2;
919 $pl->message ("You tell " . $pl->{ext_last_tell} . ": $args");
920 send_irc ("(%s) %s: %s\n", $name, $nick, $args);
921 } elsif (my $other = cf::player::find_active $pl->{ext_last_tell}) {
922
923 if ($args) {
924 $other->ob->{ext_ignore_tell}{$name} >= time
925 or delete $other->ob->{ext_ignore_tell}{$name};
926
927 if ($other->ob->{ext_ignore_tell}{$name} < time) {
928 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $other->ob->name, $args;
929
930 $pl->message ("You tell " . $other->ob->name . ": $args");
931 $other->ob->message ("$name tells you: $args");
932 $pl->{ext_last_tell} = $other->ob->name;
933 } else {
934 $pl->message ($other->ob->name . " ignores what you say. Give up on it.", cf::NDI_UNIQUE);
935 }
936 } else {
937 $pl->message ("What do you want to tell ".$other->ob->name."?", cf::NDI_UNIQUE);
938 }
939
940 } else {
941 $pl->message ("Can't reply, player left. Your message: $args".$pl->{ext_last_tell}, cf::NDI_UNIQUE);
942 } 957 }
943}; 958};
944 959
945cf::register_command ignore => sub { 960cf::register_command ignore => sub {
946 my ($pl, $args) = @_; 961 my ($pl, $args) = @_;
947 my ($target, $type, $timeout) = split /\s+/, $args; 962 my ($target, $type, $timeout) = split /\s+/, $args;
948 963
964 cf::async {
949 if ($args eq "list") { 965 if ($args eq "list") {
950 clean_timeouts $pl; 966 clean_timeouts $pl;
951 967
952 if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}}) 968 if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}})
953 + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) { 969 + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) {
954 $pl->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE); 970 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
955 $pl->message ((join ", ", @ignored_tell), cf::NDI_UNIQUE); 971 $pl->message ((join ", ", @ignored_tell), cf::NDI_REPLY);
956 $pl->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE); 972 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
957 $pl->message ((join ", ", @ignored_shout), cf::NDI_UNIQUE); 973 $pl->message ((join ", ", @ignored_shout), cf::NDI_REPLY);
958 $pl->message ("To stop ignoring one, use unignore.", cf::NDI_UNIQUE); 974 $pl->message ("To stop ignoring one, use unignore.", cf::NDI_REPLY);
975 } else {
976 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
977 }
978
979 } elsif ($target && $type) {
980 $timeout ne "" or $timeout = 24;
981 my $absolute_timeout = time + $timeout * 3600;
982
983 if (cf::player::exists $target) {
984 if ($type eq "tell") {
985 $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_REPLY);
986 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
987 } elsif ($type eq "shout") {
988 $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_REPLY);
989 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
990 } elsif ($type eq "all") {
991 $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_REPLY);
992 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
993 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
994 } else {
995 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
996 }
997 } else {
998 $pl->message ("No such player: $target", cf::NDI_REPLY);
999 }
1000
959 } else { 1001 } else {
960 $pl->message ("Not ignoring anyone", cf::NDI_UNIQUE); 1002 $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
1003 . "will ignore a player for <timeout> hours.\n"
1004 . "Usage: ignore list\n"
1005 . "will show you a list of players currently ignored.", cf::NDI_REPLY);
961 } 1006 }
962
963 } elsif ($target && $type) {
964
965 $timeout ne "" or $timeout = 24;
966 my $absolute_timeout = time + $timeout * 3600;
967
968 if (cf::player::exists $target) {
969 if ($type eq "tell") {
970 $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_UNIQUE);
971 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
972 } elsif ($type eq "shout") {
973 $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_UNIQUE);
974 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
975 } elsif ($type eq "all") {
976 $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_UNIQUE);
977 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
978 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
979 } else {
980 $pl->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE);
981 }
982 } else {
983 $pl->message ("No such player: $target", cf::NDI_UNIQUE);
984 }
985
986 } else {
987 $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
988 . "will ignore a player for <timeout> hours.\n"
989 . "Usage: ignore list\n"
990 . "will show you a list of players currently ignored.", cf::NDI_UNIQUE);
991 } 1007 };
992}; 1008};
993 1009
994cf::register_command unignore => sub { 1010cf::register_command unignore => sub {
995 my ($pl, $args) = @_; 1011 my ($pl, $args) = @_;
996 my ($target, $type) = split /\s+/, $args; 1012 my ($target, $type) = split /\s+/, $args;
997 1013
1014 cf::async {
998 if ($args eq "") { 1015 if ($args eq "") {
999 if ($pl->{ext_ignore_tell}) { 1016 if ($pl->{ext_ignore_tell}) {
1000 $pl->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE); 1017 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
1001 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_UNIQUE); 1018 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_REPLY);
1002 $pl->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE); 1019 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
1003 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_UNIQUE); 1020 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_REPLY);
1004 } else {
1005 $pl->message ("Not ignoring anyone", cf::NDI_UNIQUE);
1006 }
1007 } else {
1008 if (cf::player::exists $target) {
1009 if ($type eq "tell") {
1010 $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_UNIQUE);
1011 delete $pl->{ext_ignore_tell} {$target};
1012 } elsif ($type eq "shout") {
1013 $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_UNIQUE);
1014 delete $pl->{ext_ignore_shout}{$target};
1015 } elsif ($type eq "all") {
1016 $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_UNIQUE);
1017 delete $pl->{ext_ignore_tell} {$target};
1018 delete $pl->{ext_ignore_shout}{$target};
1019 } else { 1021 } else {
1020 $pl->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE); 1022 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
1021 } 1023 }
1022 } else { 1024 } else {
1025 if (cf::player::exists $target) {
1026 if ($type eq "tell") {
1027 $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_REPLY);
1028 delete $pl->{ext_ignore_tell} {$target};
1029 } elsif ($type eq "shout") {
1030 $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_REPLY);
1031 delete $pl->{ext_ignore_shout}{$target};
1032 } elsif ($type eq "all") {
1033 $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_REPLY);
1034 delete $pl->{ext_ignore_tell} {$target};
1035 delete $pl->{ext_ignore_shout}{$target};
1036 } else {
1037 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
1038 }
1039 } else {
1023 $pl->message ("No such player or ambiguous name: $target", cf::NDI_UNIQUE); 1040 $pl->message ("No such player or ambiguous name: $target", cf::NDI_REPLY);
1041 }
1024 } 1042 }
1025 } 1043 };
1026}; 1044};
1027 1045

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines