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.41 by root, Mon Jul 14 23:57:45 2008 UTC vs.
Revision 1.44 by root, Fri Sep 19 01:39:45 2008 UTC

… …
61 $pl->send_msg ($cf::SAY_CHANNEL); 61 $pl->send_msg ($cf::SAY_CHANNEL);
62 $pl->send_msg ($cf::CHAT_CHANNEL); 62 $pl->send_msg ($cf::CHAT_CHANNEL);
63 }, 63 },
64); 64);
65 65
66# TODO: remove once safe
66cf::register_command listen => sub { 67cf::register_command listen => sub {
67 my ($pl, $msg) = @_;
68 my $player = cf::player::find_active $pl->name;
69
70 if ($msg ne "") {
71 $msg = 10 if $msg > 10;
72
73 my $prev_listen = $player->listening;
74 $player->listening ($msg);
75 if ($prev_listen == $player->listening) {
76 $pl->message ("Your verbose level stays at $prev_listen.", cf::NDI_REPLY);
77 } else {
78 $pl->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_REPLY);
79 }
80 } else {
81 $pl->message ("Your verbose level is " . $player->listening . ".", cf::NDI_REPLY);
82 }
83}; 68};
84 69
85cf::register_command cointoss => sub { 70cf::register_command cointoss => sub {
86 my ($ob, $msg) = @_; 71 my ($ob, $msg) = @_;
87 72
… …
163 self => { 148 self => {
164 }, 149 },
165 }, 150 },
166 scream => { 151 scream => {
167 noparams => { 152 noparams => {
168 other => "<self> screams at the top of his lungs!", 153 other => "<self> screams at the top of G<his|her> lungs!",
169 self => "ARRRRRRRRRRGH!!!!!", 154 self => "ARRRRRRRRRRGH!!!!!",
170 }, 155 },
171 params => { 156 params => {
172 }, 157 },
173 self => { 158 self => {
… …
182 target => "<self> pukes on your clothes!", 167 target => "<self> pukes on your clothes!",
183 other => "<self> pukes on <other>.", 168 other => "<self> pukes on <other>.",
184 self => "You puke on <other>.", 169 self => "You puke on <other>.",
185 }, 170 },
186 self => { 171 self => {
187 other => "<self> pukes on his clothes.", 172 other => "<self> pukes on G<his|her> clothes.",
188 self => "You puke on yourself.", 173 self => "You puke on yourself.",
189 }, 174 },
190 }, 175 },
191 strut => { 176 strut => {
192 noparams => { 177 noparams => {
… …
265 target => "<self> winks at you.", 250 target => "<self> winks at you.",
266 other => "<self> winks at <other>.", 251 other => "<self> winks at <other>.",
267 self => "You wink suggestively at <other>.", 252 self => "You wink suggestively at <other>.",
268 }, 253 },
269 self => { 254 self => {
270 other => "<self> winks at himself - something strange is going on...", 255 other => "<self> winks at G<him|her>self - something strange is going on...",
271 self => "You wink at yourself?? What are you up to?", 256 self => "You wink at yourself?? What are you up to?",
272 }, 257 },
273 }, 258 },
274 pout => { 259 pout => {
275 noparams => { 260 noparams => {
… …
281 self => { 266 self => {
282 }, 267 },
283 }, 268 },
284 cackle => { 269 cackle => {
285 noparams => { 270 noparams => {
286 other => "<self> throws back his head and cackles with insane glee!", 271 other => "<self> throws back G<his|her> head and cackles with insane glee!",
287 self => "You cackle gleefully.", 272 self => "You cackle gleefully.",
288 }, 273 },
289 params => { 274 params => {
290 }, 275 },
291 self => { 276 self => {
… …
300 target => "<self> sniffs you.", 285 target => "<self> sniffs you.",
301 other => "<self> sniffs <other>", 286 other => "<self> sniffs <other>",
302 self => "You sniff <other>.", 287 self => "You sniff <other>.",
303 }, 288 },
304 self => { 289 self => {
305 other => "<self> sniffs himself.", 290 other => "<self> sniffs G<him|her>self.",
306 self => "You sniff yourself.", 291 self => "You sniff yourself.",
307 }, 292 },
308 }, 293 },
309 nod => { 294 nod => {
310 noparams => { 295 noparams => {
311 other => "<self> nods solemnly.", 296 other => "<self> nods solemnly.",
312 self => "You nod solemnly.", 297 self => "You nod solemnly.",
313 }, 298 },
314 params => { 299 params => {
315 target => "<self> nods solemnly to you.", 300 target => "<self> nods solemnly at you.",
316 other => "<self> nods solemnly to <other>.", 301 other => "<self> nods solemnly at <other>.",
317 self => "You nod solemnly to <other>.", 302 self => "You nod solemnly at <other>.",
318 }, 303 },
319 self => { 304 self => {
320 }, 305 },
321 }, 306 },
322 frown => { 307 frown => {
… …
328 target => "<self> frowns darkly at you.", 313 target => "<self> frowns darkly at you.",
329 other => "<self> frowns darkly at <other>.", 314 other => "<self> frowns darkly at <other>.",
330 self => "You frown darkly at <other>.", 315 self => "You frown darkly at <other>.",
331 }, 316 },
332 self => { 317 self => {
333 other => "<self> frowns at himself.", 318 other => "<self> frowns at G<him|her>self.",
334 self => "You frown at yourself.", 319 self => "You frown at yourself.",
335 }, 320 },
336 }, 321 },
337 snicker => { 322 snicker => {
338 noparams => { 323 noparams => {
… …
361 noparams => { 346 noparams => {
362 other => "<self> is bleeding all over the carpet - got a spare tourniquet?", 347 other => "<self> is bleeding all over the carpet - got a spare tourniquet?",
363 self => "You bleed all over your nice new armour.", 348 self => "You bleed all over your nice new armour.",
364 }, 349 },
365 params => { 350 params => {
366 target => "<self> slashes his wrist and bleeds all over you.", 351 target => "<self> slashes G<his|her> wrist and bleeds all over you.",
367 other => "<self> slashes his wrist and bleeds all over <other>.", 352 other => "<self> slashes G<his|her> wrist and bleeds all over <other>.",
368 self => "You slash your wrist and bleed all over <other>", 353 self => "You slash your wrist and bleed all over <other>",
369 }, 354 },
370 self => { 355 self => {
371 other => "<self> performs some satanic ritual while wiping his blood on himself.", 356 other => "<self> performs some satanic ritual while wiping G<his|her> blood on G<him|her>self.",
372 self => "Very impressive! You wipe your blood all over yourself.", 357 self => "Very impressive! You wipe your blood all over yourself.",
373 }, 358 },
374 }, 359 },
375 twiddle => { 360 twiddle => {
376 noparams => { 361 noparams => {
377 other => "<self> patiently twiddles his thumbs.", 362 other => "<self> patiently twiddles G<his|her> thumbs.",
378 self => "You patiently twiddle your thumbs.", 363 self => "You patiently twiddle your thumbs.",
379 }, 364 },
380 params => { 365 params => {
381 }, 366 },
382 self => { 367 self => {
383 }, 368 },
384 }, 369 },
385 spit => { 370 spit => {
386 noparams => { 371 noparams => {
387 other => "<self> spits over his left shoulder.", 372 other => "<self> spits over G<his|her> left shoulder.",
388 self => "You spit over your left shoulder.", 373 self => "You spit over your left shoulder.",
389 }, 374 },
390 params => { 375 params => {
391 target => "<self> spits in your face!", 376 target => "<self> spits in your face!",
392 other => "<self> spits in <other>'s face.", 377 other => "<self> spits in <other>'s face.",
393 self => "You spit on <other>.", 378 self => "You spit on <other>.",
394 }, 379 },
395 self => { 380 self => {
396 other => "<self> drools all over himself.", 381 other => "<self> drools all over G<him|her>self.",
397 self => "You drool all over yourself.", 382 self => "You drool all over yourself.",
398 }, 383 },
399 }, 384 },
400 glare => { 385 glare => {
401 noparams => { 386 noparams => {
402 other => "<self> glares around him.", 387 other => "<self> glares around G<him|her>.",
403 self => "You glare at nothing in particular.", 388 self => "You glare at nothing in particular.",
404 }, 389 },
405 params => { 390 params => {
406 target => "<self> glares icily at you, you feel cold to your bones.", 391 target => "<self> glares icily at you, you feel cold to your bones.",
407 other => "<self> glares at <other>.", 392 other => "<self> glares at <other>.",
408 self => "You glare icily at <other>.", 393 self => "You glare icily at <other>.",
409 }, 394 },
410 self => { 395 self => {
411 other => "<self> glares at his feet, what is bothering him?", 396 other => "<self> glares at G<his|her> feet, what is bothering G<him|her>?",
412 self => "You glare icily at your feet, they are suddenly very cold.", 397 self => "You glare icily at your feet, they are suddenly very cold.",
413 }, 398 },
414 }, 399 },
415 bow => { 400 bow => {
416 noparams => { 401 noparams => {
… …
421 target => "<self> bows before you.", 406 target => "<self> bows before you.",
422 other => "<self> bows before <other>.", 407 other => "<self> bows before <other>.",
423 self => "You bow before <other>.", 408 self => "You bow before <other>.",
424 }, 409 },
425 self => { 410 self => {
426 other => "<self> folds up like a jackknife and kisses his own toes.", 411 other => "<self> folds up like a jackknife and kisses G<his|her> own toes.",
427 self => "You kiss your toes.", 412 self => "You kiss your toes.",
428 }, 413 },
429 }, 414 },
430 dance => { 415 dance => {
431 noparams => { 416 noparams => {
432 other => "<self> expresses himself through interpretive dance.", 417 other => "<self> expresses G<him|her>self through interpretive dance.",
433 self => "You dance with glee.", 418 self => "You dance with glee.",
434 }, 419 },
435 params => { 420 params => {
436 target => "<self> grabs you, and begins dancing!", 421 target => "<self> grabs you, and begins dancing!",
437 other => "Yipe! <self> and <other> are doing the Macarena!", 422 other => "Yipe! <self> and <other> are doing the Macarena!",
438 self => "You grab <other> and begin doing the Cha-Cha!", 423 self => "You grab <other> and begin doing the Cha-Cha!",
439 }, 424 },
440 self => { 425 self => {
441 other => "<self> embraces himself and begins to dance!", 426 other => "<self> embraces G<him|her>self and begins to dance!",
442 self => "You skip and dance around by yourself.", 427 self => "You skip and dance around by yourself.",
443 }, 428 },
444 }, 429 },
445 snore => { 430 snore => {
446 noparams => { 431 noparams => {
… …
462 self => { 447 self => {
463 }, 448 },
464 }, 449 },
465 snap => { 450 snap => {
466 noparams => { 451 noparams => {
467 other => "<self> snaps his fingers.", 452 other => "<self> snaps G<his|her> fingers.",
468 self => "PRONTO! you snap your fingers.", 453 self => "PRONTO! you snap your fingers.",
469 }, 454 },
470 params => { 455 params => {
471 }, 456 },
472 self => { 457 self => {
… …
481 target => "<self> waves goodbye to you. Have a good journey.", 466 target => "<self> waves goodbye to you. Have a good journey.",
482 other => "<self> waves goodbye to <other>.", 467 other => "<self> waves goodbye to <other>.",
483 self => "You wave goodbye to <other>.", 468 self => "You wave goodbye to <other>.",
484 }, 469 },
485 self => { 470 self => {
486 other => "<self> waves goodbye to himself.", 471 other => "<self> waves goodbye to G<him|her>self.",
487 self => "Are you going on adventures as well??", 472 self => "Are you going on adventures as well??",
488 }, 473 },
489 }, 474 },
490 smile => { 475 smile => {
491 noparams => { 476 noparams => {
… …
505 other => "<self> sneezes.", 490 other => "<self> sneezes.",
506 self => "Gesundheit!", 491 self => "Gesundheit!",
507 }, 492 },
508 params => { 493 params => {
509 target => "<self> sneezes on you, you feel the snot cover you. EEEEEEW.", 494 target => "<self> sneezes on you, you feel the snot cover you. EEEEEEW.",
510 other => "<self> sneezes on <other> and a film of snot covers him.", 495 other => "<self> sneezes on <other> and a film of snot covers G<him|her>.",
511 self => "You sneeze at <other> and a film of snot shoots onto him.", 496 self => "You sneeze at <other> and a film of snot shoots onto G<him|her>.",
512 }, 497 },
513 self => { 498 self => {
514 other => "<self> sneezes, and covers himself in a slimy substance.", 499 other => "<self> sneezes, and covers G<him|her>self in a slimy substance.",
515 self => "You sneeze on yourself, what a mess!", 500 self => "You sneeze on yourself, what a mess!",
516 }, 501 },
517 }, 502 },
518 bounce => { 503 bounce => {
519 noparams => { 504 noparams => {
… …
528 self => { 513 self => {
529 }, 514 },
530 }, 515 },
531 shake => { 516 shake => {
532 noparams => { 517 noparams => {
533 other => "<self> shakes his head.", 518 other => "<self> shakes G<his|her> head.",
534 self => "You shake your head.", 519 self => "You shake your head.",
535 }, 520 },
536 params => { 521 params => {
537 target => "<self> shakes your hand.", 522 target => "<self> shakes your hand.",
538 other => "<self> shakes <other>'s hand.", 523 other => "<self> shakes <other>'s hand.",
… …
543 self => "You are shaken by yourself.", 528 self => "You are shaken by yourself.",
544 }, 529 },
545 }, 530 },
546 lick => { 531 lick => {
547 noparams => { 532 noparams => {
548 other => "<self> licks his mouth and smiles.", 533 other => "<self> licks G<his|her> mouth and smiles.",
549 self => "You lick your mouth and smile.", 534 self => "You lick your mouth and smile.",
550 }, 535 },
551 params => { 536 params => {
552 target => "<self> licks you.", 537 target => "<self> licks you.",
553 other => "<self> licks <other>.", 538 other => "<self> licks <other>.",
554 self => "You lick <other>.", 539 self => "You lick <other>.",
555 }, 540 },
556 self => { 541 self => {
557 other => "<self> licks himself - YUCK.", 542 other => "<self> licks G<him|her>self - YUCK.",
558 self => "You lick yourself.", 543 self => "You lick yourself.",
559 }, 544 },
560 }, 545 },
561 flip => { 546 flip => {
562 noparams => { 547 noparams => {
… …
568 self => { 553 self => {
569 }, 554 },
570 }, 555 },
571 think => { 556 think => {
572 noparams => { 557 noparams => {
573 other => "<self> closes his eyes and thinks really hard.", 558 other => "<self> closes G<his|her> eyes and thinks really hard.",
574 self => "Anything in particular that you'd care to think about?", 559 self => "Anything in particular that you'd care to think about?",
575 }, 560 },
576 params => { 561 params => {
577 }, 562 },
578 self => { 563 self => {
… …
642 target => "<self> cries on your shoulder.", 627 target => "<self> cries on your shoulder.",
643 other => "<self> cries on <other>'s shoulder.", 628 other => "<self> cries on <other>'s shoulder.",
644 self => "You cry on <other>'s shoulder.", 629 self => "You cry on <other>'s shoulder.",
645 }, 630 },
646 self => { 631 self => {
647 other => "<self> sobs quietly to himself.", 632 other => "<self> sobs quietly to G<him|her>self.",
648 self => "You cry to yourself.", 633 self => "You cry to yourself.",
649 }, 634 },
650 }, 635 },
651 sulk => { 636 sulk => {
652 noparams => { 637 noparams => {
… …
666 params => { 651 params => {
667 target => "<self> whistles at <other>.", 652 target => "<self> whistles at <other>.",
668 self => "You whistle at <other>.", 653 self => "You whistle at <other>.",
669 }, 654 },
670 self => { 655 self => {
671 other => "<self> whistles to himself in boredom.", 656 other => "<self> whistles to G<him|her>self in boredom.",
672 self => "You whistle while you work.", 657 self => "You whistle while you work.",
673 }, 658 },
674 }, 659 },
675 groan => { 660 groan => {
676 noparams => { 661 noparams => {
… …
722 707
723 $emote{other} ||= "You look away from <self>."; 708 $emote{other} ||= "You look away from <self>.";
724 $emote{self} ||= "My god! Is that LEGAL?"; 709 $emote{self} ||= "My god! Is that LEGAL?";
725 710
726 $emote{other} =~ s/<self>/$name/; 711 $emote{other} =~ s/<self>/$name/;
712
713 $_ = $pl->expand_cfpod ($_)
714 for values %emote;
727 715
728 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat" 716 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
729 for grep { $ob->on_same_map_as ($_->ob) && $_ != $ob} cf::player::list; 717 for grep { $ob->on_same_map_as ($_->ob) && $_ != $ob} cf::player::list;
730 718
731 $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY); 719 $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
732 } elsif ($tname) { 720 } elsif ($tname) {
733 my $target = cf::player::find $tname 721 my $target = cf::player::find $tname
734 or return send_msg $pl, tell_channel $tname, "$tname is not around.", cf::NDI_DK_ORANGE | cf::NDI_REPLY, "msg_chat"; 722 or return send_msg $pl, tell_channel $tname, "$tname is not around.", cf::NDI_DK_ORANGE | cf::NDI_REPLY, "msg_chat";
735 723
736 my %emote = %{ $emotes->{$emotion}->{params} || {} }; 724 my %emote = %{ $emotes->{$emotion}->{params} || {} };
… …
742 $emote{self} =~ s/<other>/$tname/; 730 $emote{self} =~ s/<other>/$tname/;
743 $emote{target} =~ s/<self>/$name/; 731 $emote{target} =~ s/<self>/$name/;
744 $emote{other} =~ s/<other>/$tname/; 732 $emote{other} =~ s/<other>/$tname/;
745 $emote{other} =~ s/<self>/$name/; 733 $emote{other} =~ s/<self>/$name/;
746 734
735 $_ = $pl->expand_cfpod ($_)
736 for values %emote;
737
747 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat" 738 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
748 for grep { $_ != $pl && $_ != $target && $ob->on_same_map_as ($_->ob) } cf::player::list; 739 for grep { $_ != $pl && $_ != $target && $ob->on_same_map_as ($_->ob) } cf::player::list;
749 740
750 send_msg $target, tell_channel $name, $emote{target}, cf::NDI_GREY, "msg_shout"; 741 send_msg $target, tell_channel $name, $emote{target}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_shout";
751 $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY); 742 $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
752 } else { 743 } else {
753 my %emote = %{ $emotes->{$emotion}->{noparams} || {} }; 744 my %emote = %{ $emotes->{$emotion}->{noparams} || {} };
754 745
755 $emote{other} ||= "<self> dances with glee."; 746 $emote{other} ||= "<self> dances with glee.";
756 $emote{self} ||= "You are a nut."; 747 $emote{self} ||= "You are a nut.";
757 748
758 $emote{other} =~ s/<self>/$name/; 749 $emote{other} =~ s/<self>/$name/;
759 750
751 $_ = $pl->expand_cfpod ($_)
752 for values %emote;
753
760 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat" 754 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY | cf::NDI_VERBATIM, "msg_chat"
761 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl } cf::player::list; 755 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl } cf::player::list;
762 756
763 $pl->send_msg ($cf::CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY); 757 $pl->send_msg ($cf::CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY | cf::NDI_VERBATIM);
764 } 758 }
765 }; 759 };
766 }; 760 };
767} 761}
768 762
… …
850 844
851 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg; 845 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
852 send_irc ("[%s] %s", $name, $msg); 846 send_irc ("[%s] %s", $name, $msg);
853 847
854 send_msg $_, $cf::CHAT_CHANNEL => "$name chats: $msg", cf::NDI_BLUE | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_chat" 848 send_msg $_, $cf::CHAT_CHANNEL => "$name chats: $msg", cf::NDI_BLUE | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_chat"
855 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list; 849 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW } cf::player::list;
856 850
857 } else { 851 } else {
858 $pl->send_msg ($cf::CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY); 852 $pl->send_msg ($cf::CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY);
859 } 853 }
860}; 854};
… …
874 868
875 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg; 869 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
876 send_irc ("\007\0034{%s} %s\n", $name, $msg); 870 send_irc ("\007\0034{%s} %s\n", $name, $msg);
877 871
878 send_msg $_, $cf::CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_shout" 872 send_msg $_, $cf::CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_shout"
879 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list; 873 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW } cf::player::list;
880 874
881 } else { 875 } else {
882 $pl->send_msg ($cf::CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY); 876 $pl->send_msg ($cf::CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY);
883 } 877 }
884}; 878};

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines