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.43 by root, Fri Aug 29 06:48:45 2008 UTC vs.
Revision 1.44 by root, Fri Sep 19 01:39:45 2008 UTC

… …
148 self => { 148 self => {
149 }, 149 },
150 }, 150 },
151 scream => { 151 scream => {
152 noparams => { 152 noparams => {
153 other => "<self> screams at the top of his lungs!", 153 other => "<self> screams at the top of G<his|her> lungs!",
154 self => "ARRRRRRRRRRGH!!!!!", 154 self => "ARRRRRRRRRRGH!!!!!",
155 }, 155 },
156 params => { 156 params => {
157 }, 157 },
158 self => { 158 self => {
… …
167 target => "<self> pukes on your clothes!", 167 target => "<self> pukes on your clothes!",
168 other => "<self> pukes on <other>.", 168 other => "<self> pukes on <other>.",
169 self => "You puke on <other>.", 169 self => "You puke on <other>.",
170 }, 170 },
171 self => { 171 self => {
172 other => "<self> pukes on his clothes.", 172 other => "<self> pukes on G<his|her> clothes.",
173 self => "You puke on yourself.", 173 self => "You puke on yourself.",
174 }, 174 },
175 }, 175 },
176 strut => { 176 strut => {
177 noparams => { 177 noparams => {
… …
250 target => "<self> winks at you.", 250 target => "<self> winks at you.",
251 other => "<self> winks at <other>.", 251 other => "<self> winks at <other>.",
252 self => "You wink suggestively at <other>.", 252 self => "You wink suggestively at <other>.",
253 }, 253 },
254 self => { 254 self => {
255 other => "<self> winks at himself - something strange is going on...", 255 other => "<self> winks at G<him|her>self - something strange is going on...",
256 self => "You wink at yourself?? What are you up to?", 256 self => "You wink at yourself?? What are you up to?",
257 }, 257 },
258 }, 258 },
259 pout => { 259 pout => {
260 noparams => { 260 noparams => {
… …
266 self => { 266 self => {
267 }, 267 },
268 }, 268 },
269 cackle => { 269 cackle => {
270 noparams => { 270 noparams => {
271 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!",
272 self => "You cackle gleefully.", 272 self => "You cackle gleefully.",
273 }, 273 },
274 params => { 274 params => {
275 }, 275 },
276 self => { 276 self => {
… …
285 target => "<self> sniffs you.", 285 target => "<self> sniffs you.",
286 other => "<self> sniffs <other>", 286 other => "<self> sniffs <other>",
287 self => "You sniff <other>.", 287 self => "You sniff <other>.",
288 }, 288 },
289 self => { 289 self => {
290 other => "<self> sniffs himself.", 290 other => "<self> sniffs G<him|her>self.",
291 self => "You sniff yourself.", 291 self => "You sniff yourself.",
292 }, 292 },
293 }, 293 },
294 nod => { 294 nod => {
295 noparams => { 295 noparams => {
296 other => "<self> nods solemnly.", 296 other => "<self> nods solemnly.",
297 self => "You nod solemnly.", 297 self => "You nod solemnly.",
298 }, 298 },
299 params => { 299 params => {
300 target => "<self> nods solemnly to you.", 300 target => "<self> nods solemnly at you.",
301 other => "<self> nods solemnly to <other>.", 301 other => "<self> nods solemnly at <other>.",
302 self => "You nod solemnly to <other>.", 302 self => "You nod solemnly at <other>.",
303 }, 303 },
304 self => { 304 self => {
305 }, 305 },
306 }, 306 },
307 frown => { 307 frown => {
… …
313 target => "<self> frowns darkly at you.", 313 target => "<self> frowns darkly at you.",
314 other => "<self> frowns darkly at <other>.", 314 other => "<self> frowns darkly at <other>.",
315 self => "You frown darkly at <other>.", 315 self => "You frown darkly at <other>.",
316 }, 316 },
317 self => { 317 self => {
318 other => "<self> frowns at himself.", 318 other => "<self> frowns at G<him|her>self.",
319 self => "You frown at yourself.", 319 self => "You frown at yourself.",
320 }, 320 },
321 }, 321 },
322 snicker => { 322 snicker => {
323 noparams => { 323 noparams => {
… …
346 noparams => { 346 noparams => {
347 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?",
348 self => "You bleed all over your nice new armour.", 348 self => "You bleed all over your nice new armour.",
349 }, 349 },
350 params => { 350 params => {
351 target => "<self> slashes his wrist and bleeds all over you.", 351 target => "<self> slashes G<his|her> wrist and bleeds all over you.",
352 other => "<self> slashes his wrist and bleeds all over <other>.", 352 other => "<self> slashes G<his|her> wrist and bleeds all over <other>.",
353 self => "You slash your wrist and bleed all over <other>", 353 self => "You slash your wrist and bleed all over <other>",
354 }, 354 },
355 self => { 355 self => {
356 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.",
357 self => "Very impressive! You wipe your blood all over yourself.", 357 self => "Very impressive! You wipe your blood all over yourself.",
358 }, 358 },
359 }, 359 },
360 twiddle => { 360 twiddle => {
361 noparams => { 361 noparams => {
362 other => "<self> patiently twiddles his thumbs.", 362 other => "<self> patiently twiddles G<his|her> thumbs.",
363 self => "You patiently twiddle your thumbs.", 363 self => "You patiently twiddle your thumbs.",
364 }, 364 },
365 params => { 365 params => {
366 }, 366 },
367 self => { 367 self => {
368 }, 368 },
369 }, 369 },
370 spit => { 370 spit => {
371 noparams => { 371 noparams => {
372 other => "<self> spits over his left shoulder.", 372 other => "<self> spits over G<his|her> left shoulder.",
373 self => "You spit over your left shoulder.", 373 self => "You spit over your left shoulder.",
374 }, 374 },
375 params => { 375 params => {
376 target => "<self> spits in your face!", 376 target => "<self> spits in your face!",
377 other => "<self> spits in <other>'s face.", 377 other => "<self> spits in <other>'s face.",
378 self => "You spit on <other>.", 378 self => "You spit on <other>.",
379 }, 379 },
380 self => { 380 self => {
381 other => "<self> drools all over himself.", 381 other => "<self> drools all over G<him|her>self.",
382 self => "You drool all over yourself.", 382 self => "You drool all over yourself.",
383 }, 383 },
384 }, 384 },
385 glare => { 385 glare => {
386 noparams => { 386 noparams => {
387 other => "<self> glares around him.", 387 other => "<self> glares around G<him|her>.",
388 self => "You glare at nothing in particular.", 388 self => "You glare at nothing in particular.",
389 }, 389 },
390 params => { 390 params => {
391 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.",
392 other => "<self> glares at <other>.", 392 other => "<self> glares at <other>.",
393 self => "You glare icily at <other>.", 393 self => "You glare icily at <other>.",
394 }, 394 },
395 self => { 395 self => {
396 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>?",
397 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.",
398 }, 398 },
399 }, 399 },
400 bow => { 400 bow => {
401 noparams => { 401 noparams => {
… …
406 target => "<self> bows before you.", 406 target => "<self> bows before you.",
407 other => "<self> bows before <other>.", 407 other => "<self> bows before <other>.",
408 self => "You bow before <other>.", 408 self => "You bow before <other>.",
409 }, 409 },
410 self => { 410 self => {
411 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.",
412 self => "You kiss your toes.", 412 self => "You kiss your toes.",
413 }, 413 },
414 }, 414 },
415 dance => { 415 dance => {
416 noparams => { 416 noparams => {
417 other => "<self> expresses himself through interpretive dance.", 417 other => "<self> expresses G<him|her>self through interpretive dance.",
418 self => "You dance with glee.", 418 self => "You dance with glee.",
419 }, 419 },
420 params => { 420 params => {
421 target => "<self> grabs you, and begins dancing!", 421 target => "<self> grabs you, and begins dancing!",
422 other => "Yipe! <self> and <other> are doing the Macarena!", 422 other => "Yipe! <self> and <other> are doing the Macarena!",
423 self => "You grab <other> and begin doing the Cha-Cha!", 423 self => "You grab <other> and begin doing the Cha-Cha!",
424 }, 424 },
425 self => { 425 self => {
426 other => "<self> embraces himself and begins to dance!", 426 other => "<self> embraces G<him|her>self and begins to dance!",
427 self => "You skip and dance around by yourself.", 427 self => "You skip and dance around by yourself.",
428 }, 428 },
429 }, 429 },
430 snore => { 430 snore => {
431 noparams => { 431 noparams => {
… …
447 self => { 447 self => {
448 }, 448 },
449 }, 449 },
450 snap => { 450 snap => {
451 noparams => { 451 noparams => {
452 other => "<self> snaps his fingers.", 452 other => "<self> snaps G<his|her> fingers.",
453 self => "PRONTO! you snap your fingers.", 453 self => "PRONTO! you snap your fingers.",
454 }, 454 },
455 params => { 455 params => {
456 }, 456 },
457 self => { 457 self => {
… …
466 target => "<self> waves goodbye to you. Have a good journey.", 466 target => "<self> waves goodbye to you. Have a good journey.",
467 other => "<self> waves goodbye to <other>.", 467 other => "<self> waves goodbye to <other>.",
468 self => "You wave goodbye to <other>.", 468 self => "You wave goodbye to <other>.",
469 }, 469 },
470 self => { 470 self => {
471 other => "<self> waves goodbye to himself.", 471 other => "<self> waves goodbye to G<him|her>self.",
472 self => "Are you going on adventures as well??", 472 self => "Are you going on adventures as well??",
473 }, 473 },
474 }, 474 },
475 smile => { 475 smile => {
476 noparams => { 476 noparams => {
… …
490 other => "<self> sneezes.", 490 other => "<self> sneezes.",
491 self => "Gesundheit!", 491 self => "Gesundheit!",
492 }, 492 },
493 params => { 493 params => {
494 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.",
495 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>.",
496 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>.",
497 }, 497 },
498 self => { 498 self => {
499 other => "<self> sneezes, and covers himself in a slimy substance.", 499 other => "<self> sneezes, and covers G<him|her>self in a slimy substance.",
500 self => "You sneeze on yourself, what a mess!", 500 self => "You sneeze on yourself, what a mess!",
501 }, 501 },
502 }, 502 },
503 bounce => { 503 bounce => {
504 noparams => { 504 noparams => {
… …
513 self => { 513 self => {
514 }, 514 },
515 }, 515 },
516 shake => { 516 shake => {
517 noparams => { 517 noparams => {
518 other => "<self> shakes his head.", 518 other => "<self> shakes G<his|her> head.",
519 self => "You shake your head.", 519 self => "You shake your head.",
520 }, 520 },
521 params => { 521 params => {
522 target => "<self> shakes your hand.", 522 target => "<self> shakes your hand.",
523 other => "<self> shakes <other>'s hand.", 523 other => "<self> shakes <other>'s hand.",
… …
528 self => "You are shaken by yourself.", 528 self => "You are shaken by yourself.",
529 }, 529 },
530 }, 530 },
531 lick => { 531 lick => {
532 noparams => { 532 noparams => {
533 other => "<self> licks his mouth and smiles.", 533 other => "<self> licks G<his|her> mouth and smiles.",
534 self => "You lick your mouth and smile.", 534 self => "You lick your mouth and smile.",
535 }, 535 },
536 params => { 536 params => {
537 target => "<self> licks you.", 537 target => "<self> licks you.",
538 other => "<self> licks <other>.", 538 other => "<self> licks <other>.",
539 self => "You lick <other>.", 539 self => "You lick <other>.",
540 }, 540 },
541 self => { 541 self => {
542 other => "<self> licks himself - YUCK.", 542 other => "<self> licks G<him|her>self - YUCK.",
543 self => "You lick yourself.", 543 self => "You lick yourself.",
544 }, 544 },
545 }, 545 },
546 flip => { 546 flip => {
547 noparams => { 547 noparams => {
… …
553 self => { 553 self => {
554 }, 554 },
555 }, 555 },
556 think => { 556 think => {
557 noparams => { 557 noparams => {
558 other => "<self> closes his eyes and thinks really hard.", 558 other => "<self> closes G<his|her> eyes and thinks really hard.",
559 self => "Anything in particular that you'd care to think about?", 559 self => "Anything in particular that you'd care to think about?",
560 }, 560 },
561 params => { 561 params => {
562 }, 562 },
563 self => { 563 self => {
… …
627 target => "<self> cries on your shoulder.", 627 target => "<self> cries on your shoulder.",
628 other => "<self> cries on <other>'s shoulder.", 628 other => "<self> cries on <other>'s shoulder.",
629 self => "You cry on <other>'s shoulder.", 629 self => "You cry on <other>'s shoulder.",
630 }, 630 },
631 self => { 631 self => {
632 other => "<self> sobs quietly to himself.", 632 other => "<self> sobs quietly to G<him|her>self.",
633 self => "You cry to yourself.", 633 self => "You cry to yourself.",
634 }, 634 },
635 }, 635 },
636 sulk => { 636 sulk => {
637 noparams => { 637 noparams => {
… …
651 params => { 651 params => {
652 target => "<self> whistles at <other>.", 652 target => "<self> whistles at <other>.",
653 self => "You whistle at <other>.", 653 self => "You whistle at <other>.",
654 }, 654 },
655 self => { 655 self => {
656 other => "<self> whistles to himself in boredom.", 656 other => "<self> whistles to G<him|her>self in boredom.",
657 self => "You whistle while you work.", 657 self => "You whistle while you work.",
658 }, 658 },
659 }, 659 },
660 groan => { 660 groan => {
661 noparams => { 661 noparams => {
… …
707 707
708 $emote{other} ||= "You look away from <self>."; 708 $emote{other} ||= "You look away from <self>.";
709 $emote{self} ||= "My god! Is that LEGAL?"; 709 $emote{self} ||= "My god! Is that LEGAL?";
710 710
711 $emote{other} =~ s/<self>/$name/; 711 $emote{other} =~ s/<self>/$name/;
712
713 $_ = $pl->expand_cfpod ($_)
714 for values %emote;
712 715
713 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"
714 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;
715 718
716 $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);
717 } elsif ($tname) { 720 } elsif ($tname) {
718 my $target = cf::player::find $tname 721 my $target = cf::player::find $tname
719 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";
720 723
721 my %emote = %{ $emotes->{$emotion}->{params} || {} }; 724 my %emote = %{ $emotes->{$emotion}->{params} || {} };
… …
727 $emote{self} =~ s/<other>/$tname/; 730 $emote{self} =~ s/<other>/$tname/;
728 $emote{target} =~ s/<self>/$name/; 731 $emote{target} =~ s/<self>/$name/;
729 $emote{other} =~ s/<other>/$tname/; 732 $emote{other} =~ s/<other>/$tname/;
730 $emote{other} =~ s/<self>/$name/; 733 $emote{other} =~ s/<self>/$name/;
731 734
735 $_ = $pl->expand_cfpod ($_)
736 for values %emote;
737
732 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"
733 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;
734 740
735 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";
736 $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);
737 } else { 743 } else {
738 my %emote = %{ $emotes->{$emotion}->{noparams} || {} }; 744 my %emote = %{ $emotes->{$emotion}->{noparams} || {} };
739 745
740 $emote{other} ||= "<self> dances with glee."; 746 $emote{other} ||= "<self> dances with glee.";
741 $emote{self} ||= "You are a nut."; 747 $emote{self} ||= "You are a nut.";
742 748
743 $emote{other} =~ s/<self>/$name/; 749 $emote{other} =~ s/<self>/$name/;
744 750
751 $_ = $pl->expand_cfpod ($_)
752 for values %emote;
753
745 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"
746 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;
747 756
748 $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);
749 } 758 }
750 }; 759 };
751 }; 760 };
752} 761}
753 762

Diff Legend

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