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.17 by root, Sat May 19 11:04:16 2007 UTC vs.
Revision 1.46 by root, Thu Dec 18 02:49:22 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines