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.9 by pippijn, Thu Mar 1 13:01:37 2007 UTC vs.
Revision 1.37 by root, Mon Nov 12 23:27:51 2007 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/reply 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
9our $SAY_CHANNEL = {
10 id => "say",
11 title => "Map",
12 reply => "say ",
13 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
14};
15
16our $CHAT_CHANNEL = {
17 id => "chat",
18 title => "Chat",
19 reply => "chat ",
20 tooltip => "Player chat and shouts, global to the server.",
21};
22
23sub tell_channel($) {
24 my ($target) = @_;
25
26 {
27 id => "tell-$target",
28 title => "$target",
29 reply => "tell $target ",
30 tooltip => "Private messages from/to $target",
31 }
32}
33
34sub send_msg($$$$$) {
35 my ($pl, $channel, $msg, $flags, $sound) = @_;
36 $pl->play_sound (cf::sound::find $sound) if defined $sound;
37 $pl->send_msg ($channel, $msg, $flags);
38 ()
39}
9 40
10sub clean_timeouts($) { 41sub clean_timeouts($) {
11 my ($player) = @_; 42 my ($player) = @_;
12 my $NOW = time; 43 my $NOW = time;
13 44
14 for my $hash (@$player{qw(ext_ignore_shout ext_ignore_tell)}) { 45 for my $hash (@$player{qw(ext_ignore_shout ext_ignore_tell)}) {
15 while (my ($k, $v) = each %$hash) { 46 while (my ($k, $v) = each %$hash) {
16 if ($v < $NOW) { 47 if ($v < $NOW) {
17 $player->message ("Your ignore on $k has expired.", cf::NDI_GREEN | cf::NDI_UNIQUE); 48 $player->message ("Your ignore on $k has expired.", cf::NDI_GREEN);
18 delete $hash->{$k}; 49 delete $hash->{$k};
19 } elsif (!cf::player::exists $k) { 50 } 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); 51 $player->message ("Your ignore on $k is no longer valid (no such user).", cf::NDI_GREEN);
21 delete $hash->{$k}; 52 delete $hash->{$k};
22 } 53 }
23 } 54 }
24 } 55 }
25} 56}
26 57
58# send_irc ($format, @args, $msg)
59# make sure the last argument is the message!
60sub send_irc {
61 my ($format, @args) = @_;
62 my $msg = pop @args;
63 for (split /\n/, $msg) {
64 ext::irc::do_notice (sprintf $format, @args, $_)
65 }
66}
67
27cf::player->attach ( 68cf::player->attach (
28 prio => -1000, 69 prio => -1000,
29 on_login => sub { 70 on_login => sub {
30 my ($pl) = @_; 71 my ($pl) = @_;
31 72
32 clean_timeouts $pl->ob; 73 clean_timeouts $pl->ob;
74
75 $pl->send_msg ($SAY_CHANNEL);
76 $pl->send_msg ($CHAT_CHANNEL);
33 }, 77 },
34); 78);
35 79
36cf::register_command listen => sub { 80cf::register_command listen => sub {
37 my ($pl, $msg) = @_; 81 my ($pl, $msg) = @_;
38 my $player = cf::player::find_active $pl->name; 82 my $player = cf::player::find_active $pl->name;
39 83
40 if ($msg ne "") { 84 if ($msg ne "") {
85 $msg = 10 if $msg > 10;
86
41 my $prev_listen = $player->listening; 87 my $prev_listen = $player->listening;
42 $player->listening ($msg); 88 $player->listening ($msg);
43 if ($prev_listen == $player->listening) { 89 if ($prev_listen == $player->listening) {
44 $pl->message ("Your verbose level stayed $prev_listen.", cf::NDI_UNIQUE); 90 $pl->message ("Your verbose level stays at $prev_listen.", cf::NDI_REPLY);
45 } else { 91 } else {
46 $pl->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_UNIQUE); 92 $pl->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_REPLY);
47 } 93 }
48 } else { 94 } else {
49 $pl->message ("Your verbose level is " . $player->listening . ".", cf::NDI_UNIQUE); 95 $pl->message ("Your verbose level is " . $player->listening . ".", cf::NDI_REPLY);
50 } 96 }
51}; 97};
52 98
53cf::register_command cointoss => sub { 99cf::register_command cointoss => sub {
54 my ($pl, $msg) = @_; 100 my ($ob, $msg) = @_;
55 101
102 my $pl = $ob->contr;
56 my $name = $pl->name; 103 my $name = $ob->name;
57 104
58 if (int rand 2) { 105 my $coin = int rand 2 ? "Heads" : "Tails";
106
107 send_msg $_, $SAY_CHANNEL => "$name flips a coin.... $coin!", cf::NDI_GREY, "msg_say"
59 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 108 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list;
60 next
61 if $other->ob == $pl;
62 $other->ob->message ("$name flips a coin.... Heads!", cf::NDI_GREY | cf::NDI_UNIQUE);
63 }
64
65 $pl->message ("You flip a coin.... Heads!", cf::NDI_GREY | cf::NDI_UNIQUE);
66 } else {
67 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
68 next
69 if $other->ob == $pl;
70 $other->ob->message ("$name flips a coin.... Tails!", cf::NDI_GREY | cf::NDI_UNIQUE);
71 }
72
73 $pl->message ("You flip a coin.... Tails!", cf::NDI_GREY | cf::NDI_UNIQUE);
74 } 109
110 $pl->send_msg ($SAY_CHANNEL => "You flip a coin.... $coin!", cf::NDI_GREY | cf::NDI_REPLY);
111};
112
113cf::register_command orcknuckle => sub {
114 my ($ob, $msg) = @_;
115
116 my $pl = $ob->contr;
117 my $name = $ob->name;
118
119 my @orcknuckle = ("beholder", "ghost", "knight", "princess", "dragon", "orc");
120 my ($i, $j, $k, $l) = (rand 5, rand 5, rand 5, rand 6);
121 my $result = "$orcknuckle[$i], $orcknuckle[$j], $orcknuckle[$k], $orcknuckle[$l]";
122
123 send_msg $_, $SAY_CHANNEL => "$name throws his orc-knuckles and rolls $result!", cf::NDI_GREY, "msg_say"
124 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list;
125
126 $pl->send_msg ($SAY_CHANNEL => "You roll $result!", cf::NDI_GREY | cf::NDI_REPLY);
75}; 127};
76 128
77my $emotes = { 129my $emotes = {
78 growl => { 130 growl => {
79 noparams => { 131 noparams => {
… …
203 self => "You kiss <other>.", 255 self => "You kiss <other>.",
204 }, 256 },
205 self => { 257 self => {
206 }, 258 },
207 }, 259 },
260 smother => {
261 noparams => {
262 other => "<self> makes weird facial contortions",
263 self => "All the lonely people..",
264 },
265 params => {
266 target => "<self> smothers you with kisses.",
267 other => "<self> smothers <other> with kisses.",
268 self => "You smother <other> with kisses.",
269 },
270 self => {
271 },
272 },
208 wink => { 273 wink => {
209 noparams => { 274 noparams => {
210 other => "<self> winks suggestively.", 275 other => "<self> winks suggestively.",
211 self => "Have you got something in your eye?", 276 self => "Have you got something in your eye?",
212 }, 277 },
213 params => { 278 params => {
279 target => "<self> winks at you.",
214 target => "<self> winks at <other>.", 280 other => "<self> winks at <other>.",
215 self => "You wink suggestively at <other>.", 281 self => "You wink suggestively at <other>.",
216 }, 282 },
217 self => { 283 self => {
218 other => "<self> winks at himself - something strange is going on...", 284 other => "<self> winks at himself - something strange is going on...",
219 self => "You wink at yourself?? What are you up to?", 285 self => "You wink at yourself?? What are you up to?",
… …
309 noparams => { 375 noparams => {
310 other => "<self> is bleeding all over the carpet - got a spare tourniquet?", 376 other => "<self> is bleeding all over the carpet - got a spare tourniquet?",
311 self => "You bleed all over your nice new armour.", 377 self => "You bleed all over your nice new armour.",
312 }, 378 },
313 params => { 379 params => {
380 target => "<self> slashes his wrist and bleeds all over you.",
314 target => "<self> slashes his wrist and bleeds all over <other>.", 381 other => "<self> slashes his wrist and bleeds all over <other>.",
315 self => "You slash your wrist and bleed all over <other>", 382 self => "You slash your wrist and bleed all over <other>",
316 }, 383 },
317 self => { 384 self => {
318 other => "<self> performs some satanic ritual while wiping his blood on himself.", 385 other => "<self> performs some satanic ritual while wiping his blood on himself.",
319 self => "Very impressive! You wipe your blood all over yourself.", 386 self => "Very impressive! You wipe your blood all over yourself.",
… …
654 }, 721 },
655}; 722};
656 723
657for my $emotion (keys %$emotes) { 724for my $emotion (keys %$emotes) {
658 cf::register_command $emotion => sub { 725 cf::register_command $emotion => sub {
659 my ($pl, $tname) = @_; 726 my ($ob, $tname) = @_;
727
728 my $pl = $ob->contr;
660 729
661 cf::async { 730 cf::async {
662 my $name = $pl->name; 731 my $name = $ob->name;
732 $Coro::current->{desc} = "emote handler for $name";
663 733
664 if ($tname eq $name) { 734 if ($tname eq $name) {
665 my $emote = $emotes->{$emotion}->{self}; 735 my %emote = %{ $emotes->{$emotion}->{self} || {} };
666 736
667 $emote->{other} = "You look away from <self>." 737 $emote{other} ||= "You look away from <self>.";
668 if !$emote->{other};
669 $emote->{self} = "My god! Is that LEGAL?" 738 $emote{self} ||= "My god! Is that LEGAL?";
670 if !$emote->{self};
671 739
672 $emote->{other} =~ s/<self>/$name/; 740 $emote{other} =~ s/<self>/$name/;
673 741
742 send_msg $_, $CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
674 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 743 for grep { $ob->on_same_map_as ($_->ob) && $_ != $ob} cf::player::list;
675 next
676 if $other->ob == $pl;
677 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
678 }
679 744
680 $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 745 $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
681 } elsif ($tname) { 746 } elsif ($tname) {
682 my $target = cf::player::find $tname 747 my $target = cf::player::find $tname
683 or return $pl->reply (undef, "$tname is not around."); 748 or return send_msg $pl, tell_channel $tname, "$tname is not around.", cf::NDI_DK_ORANGE | cf::NDI_REPLY, "msg_chat";
684 749
685 my $emote = $emotes->{$emotion}->{params}; 750 my %emote = %{ $emotes->{$emotion}->{params} || {} };
686 751
687 $emote->{other} = "<self> is eyeing <other> quizzically." 752 $emote{other} ||= "<self> is eyeing <other> quizzically.";
688 if !$emote->{other};
689 $emote->{self} = "You are still nuts." 753 $emote{self} ||= "You are still nuts.";
690 if !$emote->{self};
691 $emote->{target} = "You get the distinct feeling that <other> is nuts." 754 $emote{target} ||= "You get the distinct feeling that <other> is nuts.";
692 if !$emote->{target};
693 755
694 $emote->{self} =~ s/<other>/$tname/; 756 $emote{self} =~ s/<other>/$tname/;
695 $emote->{target} =~ s/<self>/$name/; 757 $emote{target} =~ s/<self>/$name/;
696 $emote->{other} =~ s/<other>/$tname/; 758 $emote{other} =~ s/<other>/$tname/;
697 $emote->{other} =~ s/<self>/$name/; 759 $emote{other} =~ s/<self>/$name/;
698 760
699 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 761 send_msg $_, $CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
700 next 762 for grep { $_ != $pl && $_ != $target && $ob->on_same_map_as ($_->ob) } cf::player::list;
701 if $other->ob == $pl or $other == $target;
702 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
703 }
704 763
705 $target->ob->message ($emote->{target}, cf::NDI_GREY | cf::NDI_UNIQUE); 764 send_msg $target, tell_channel $name, $emote{target}, cf::NDI_GREY, "msg_shout";
706 $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 765 $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
707 } else { 766 } else {
708 my $emote = $emotes->{$emotion}->{noparams}; 767 my %emote = %{ $emotes->{$emotion}->{noparams} || {} };
709 $emote->{other} =~ s/<self>/$name/;
710 768
711 $emote->{other} = "<self> dances with glee." 769 $emote{other} ||= "<self> dances with glee.";
712 if !$emote->{other};
713 $emote->{self} = "You are a nut." 770 $emote{self} ||= "You are a nut.";
714 if !$emote->{self};
715 771
772 $emote{other} =~ s/<self>/$name/;
773
774 send_msg $_, $CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
716 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 775 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl } cf::player::list;
717 next
718 if $other->ob == $pl;
719 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
720 }
721 776
722 $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 777 $pl->send_msg ($CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
723 } 778 }
724 }; 779 };
725 }; 780 };
726} 781}
727 782
728cf::register_command me => sub { 783cf::register_command me => sub {
729 my ($pl, $msg) = @_; 784 my ($pl, $msg) = @_;
730 785
731 my $name = $pl->name; 786 my $name = $pl->name;
732 787
733 $_->ob->message ("* $name $msg", cf::NDI_GREY | cf::NDI_UNIQUE) 788 send_msg $_, $SAY_CHANNEL => "* $name $msg", cf::NDI_GREY | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_say"
734 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 789 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
735}; 790};
736 791
737cf::register_command say => sub { 792cf::register_command say => sub {
738 my ($pl, $msg) = @_; 793 my ($ob, $msg) = @_;
739 794
740 utf8::decode $msg; 795 utf8::decode $msg;
741 796
742 return if $pl->contr->invoke (cf::EVENT_PLAYER_SAY, $msg); 797 return if $ob->contr->invoke (cf::EVENT_PLAYER_SAY, $msg);
743 798
744 if ($msg) { 799 if ($msg) {
745 my $name = $pl->name; 800 my $name = $ob->name;
746
747 utf8::encode $msg; # ->message not yet utf8-ified
748 $_->ob->message ("$name says: $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
749 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 801 my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list;
750 utf8::decode $msg; 802
803 send_msg $_, $SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY, "msg_say"
804 for grep $_ != $ob->contr, @plonmap;
805 $ob->contr->send_msg ($SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | cf::NDI_REPLY);
751 806
752 # npcs, magic_ears etc. 807 # npcs, magic_ears etc.
753 # first find all objects and theirt-level inventories 808 # first find all objects and their first-level inventories
754 # within a 5x5 square # that have something resembling 809 # within a 5x5 square that have something resembling
755 # dialogue or support on_say. 810 # dialogue or support on_say.
756 my ($map, $x, $y) = ($pl->map, $pl->x - 2, $pl->y - 2); 811 my ($map, $x, $y) = ($ob->map, $ob->x - 2, $ob->y - 2);
757 812
758 for my $npc ( 813 for my $npc (
759 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $pl->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_, 814 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $ob->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_,
760 map +($_, $_->inv), 815 map +($_, $_->inv),
761 grep $_, 816 grep $_,
762 map $map->at ($x + $_ % 5, $y + (int $_ / 5)), 817 map $map->at ($x + $_ % 5, $y + (int $_ / 5)),
763 0..24 818 0..24
764 ) { 819 ) {
765 # if some listener teleported us somewhere else, stop right here 820 # if some listener teleported us somewhere else, stop right here
766 last unless $map->path == $pl->map->path; 821 last unless $map->path == $ob->map->path;
767 822
768 my $dialog = new NPC_Dialogue ob => $pl, npc => $npc; 823 my $dialog = new NPC_Dialogue pl => $ob->contr, npc => $npc;
769 my ($reply, @kw) = $dialog->tell ($msg); 824 my ($reply, @kw) = $dialog->tell ($msg);
770 825
771 if (defined $reply) { 826 if (defined $reply) {
772 if ($npc->type == cf::MAGIC_EAR) { 827 if ($npc->type == cf::MAGIC_EAR) {
773 if (length $reply) { 828 if (length $reply) {
774 $_->ob->message ($reply, cf::NDI_BROWN | cf::NDI_UNIQUE) 829 send_msg $_, $SAY_CHANNEL => $reply, cf::NDI_BROWN, "msg_say"
775 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 830 for @plonmap;
776 } 831 }
777 $npc->use_trigger; 832 $npc->use_trigger;
778 } else { 833 } else {
779 if (length $reply) { 834 if (length $reply) {
780 $_->ob->message ($npc->name . " says: $reply", cf::NDI_BROWN | cf::NDI_UNIQUE) 835 send_msg $_, $SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN, "msg_say"
781 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 836 for @plonmap;
782 } 837 }
783 } 838 }
784 } 839 }
785 840
786 if (@kw) { 841 if (@kw) {
787 $_->ob->message ("[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN | cf::NDI_UNIQUE) 842 $_->send_msg ($SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
788 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 843 for @plonmap;
789 } 844 }
790 } 845 }
791 846
792 } else { 847 } else {
793 $pl->message ("What do you want to say?", cf::NDI_UNIQUE); 848 $ob->send_msg ($SAY_CHANNEL => "What do you want to say?", cf::NDI_GREY | cf::NDI_REPLY);
794 } 849 }
795}; 850};
796 851
797cf::register_command chat => sub { 852cf::register_command chat => sub {
798 my ($pl, $msg) = @_; 853 my ($ob, $msg) = @_;
799 854
800 utf8::decode $msg; 855 utf8::decode $msg;
801 856
857 my $pl = $ob->contr;
858
802 return if $pl->contr->invoke (cf::EVENT_PLAYER_CHAT, $msg); 859 return if $pl->invoke (cf::EVENT_PLAYER_CHAT, $msg);
803 860
804 if ($msg) { 861 if ($msg) {
805 my $name = $pl->name; 862 my $name = $ob->name;
806 my $NOW = time; 863 my $NOW = time;
807 864
808 utf8::encode $msg; # ->message not yet utf8-ified
809 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg; 865 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
810 ext::schmorp_irc::do_notice (sprintf "[%s] %s", $name, $msg); 866 send_irc ("[%s] %s", $name, $msg);
811 867
812 $_->ob->message ("$name chats: $msg", cf::NDI_BLUE) 868 send_msg $_, $CHAT_CHANNEL => "$name chats: $msg", cf::NDI_BLUE | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_chat"
813 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list; 869 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list;
814 870
815 } else { 871 } else {
816 $pl->message ("Chat what?", cf::NDI_UNIQUE); 872 $pl->send_msg ($CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY);
817 } 873 }
818}; 874};
819 875
820cf::register_command shout => sub { 876cf::register_command shout => sub {
821 my ($pl, $msg) = @_; 877 my ($ob, $msg) = @_;
822 878
823 utf8::decode $msg; 879 utf8::decode $msg;
824 880
881 my $pl = $ob->contr;
882
825 return if $pl->contr->invoke (cf::EVENT_PLAYER_SHOUT, $msg); 883 return if $pl->invoke (cf::EVENT_PLAYER_SHOUT, $msg);
826 884
827 if ($msg) { 885 if ($msg) {
828 my $NOW = time; 886 my $NOW = time;
829 my $name = $pl->name; 887 my $name = $ob->name;
830 888
831 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg; 889 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
832 ext::schmorp_irc::do_notice (sprintf "\007\0034{%s} %s\n", $name, $msg); 890 send_irc ("\007\0034{%s} %s\n", $name, $msg);
833 891
834 utf8::encode $msg; # ->message not yet utf8-ified 892 send_msg $_, $CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_shout"
835 $_->ob->message ("$name shouts: $msg", cf::NDI_RED)
836 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list; 893 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list;
837 894
838 } else { 895 } else {
839 $pl->message ("Shout what?", cf::NDI_UNIQUE); 896 $pl->send_msg ($CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY);
840 } 897 }
841}; 898};
842 899
843cf::register_command tell => sub { 900cf::register_command tell => sub {
844 my ($pl, $args) = @_; 901 my ($ob, $args) = @_;
845 my ($target, $msg) = split /\s+/, $args, 2; 902 my ($target, $msg) = split /\s+/, $args, 2;
846 903
847 utf8::decode $msg; 904 utf8::decode $msg;
848 905
906 my $pl = $ob->contr;
907 my $ns = $pl->ns
908 or return;
909 my $name = $ob->name;
910
849 return if $pl->contr->invoke (cf::EVENT_PLAYER_TELL, $target, $msg); 911 return if $pl->invoke (cf::EVENT_PLAYER_TELL, $target, $msg);
850 912
851 my $name = $pl->name; 913 my $pl_channel = tell_channel $target;
852 914
853 if ($target =~ /irc\//) { 915 if ($target =~ /irc\//) {
854 my (undef, $nick) = split /\//, $target, 2; 916 my (undef, $nick) = split /\//, $target, 2;
855 $pl->message ("You tell $target: $args"); 917 $ns->send_msg ($pl_channel => "You tell $target: $args", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
856 ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $msg); 918 send_irc ("(%s) %s: %s\n", $name, $nick, $msg);
919
857 } elsif (my $other = cf::player::find_active $target) { 920 } elsif (my $other = cf::player::find_active $target) {
921 my $other_channel = tell_channel $name;
858 922
859 if ($msg) { 923 if ($msg) {
860 if ($target eq $name) { 924 if ($target eq $name) {
861 $pl->message ("You are talking to yourself, you freak!", cf::NDI_UNIQUE); 925 $ns->send_msg ($pl_channel => "You are talking to yourself, you freak!", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
862 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) { 926 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) {
863 $pl->message ("$target ignores what you say. Give up on it.", cf::NDI_UNIQUE); 927 $ns->send_msg ($pl_channel => "$target ignores what you say. Give up on it.", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
864 } else { 928 } else {
865 utf8::encode $msg; # ->message not yet utf8-ified 929 return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl, $msg);
866 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg; 930 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg;
867 931
868 $pl->message ("You tell $target: $msg"); 932 $ns->send_msg ($pl_channel => "You tell $target: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
869 $other->ob->message ("$name tells you: $msg"); 933 send_msg $other, $other_channel => "$name tells you: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF, "msg_tell";
870 $other->ob->{ext_last_tell} = $name;
871 } 934 }
872 } else { 935 } else {
873 $pl->message ("What do you want to tell $target?", cf::NDI_UNIQUE); 936 $ns->send_msg ($pl_channel => "What do you want to tell $target?", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
874 } 937 }
875 938
876 } else { 939 } else {
877 $pl->message ("No such player. Your message: $msg", cf::NDI_UNIQUE); 940 $ns->send_msg ($pl_channel => "No such player. Your message: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
878 }
879};
880
881cf::register_command reply => sub {
882 my ($pl, $args) = @_;
883 my $name = $pl->name;
884
885 utf8::decode $args;
886
887 return if $pl->contr->invoke (cf::EVENT_PLAYER_TELL, $pl->{ext_last_tell}, $args);
888
889 if ($pl->{ext_last_tell} =~ /irc\//) {
890 my (undef, $nick) = split /\//, $pl->{ext_last_tell}, 2;
891 $pl->message ("You tell " . $pl->{ext_last_tell} . ": $args");
892 ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $args);
893 } elsif (my $other = cf::player::find_active $pl->{ext_last_tell}) {
894
895 if ($args) {
896 $other->ob->{ext_ignore_tell}{$name} >= time
897 or delete $other->ob->{ext_ignore_tell}{$name};
898
899 if ($other->ob->{ext_ignore_tell}{$name} < time) {
900 utf8::encode $args; # ->message not yet utf8-ified
901 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $other->ob->name, $args;
902
903 $pl->message ("You tell " . $other->ob->name . ": $args");
904 $other->ob->message ("$name tells you: $args");
905 $pl->{ext_last_tell} = $other->ob->name;
906 } else {
907 $pl->message ($other->ob->name . " ignores what you say. Give up on it.", cf::NDI_UNIQUE);
908 }
909 } else {
910 $pl->message ("What do you want to tell ".$other->ob->name."?", cf::NDI_UNIQUE);
911 }
912
913 } else {
914 $pl->message ("Can't reply, player left. Your message: $args".$pl->{ext_last_tell}, cf::NDI_UNIQUE);
915 } 941 }
916}; 942};
917 943
918cf::register_command ignore => sub { 944cf::register_command ignore => sub {
919 my ($pl, $args) = @_; 945 my ($pl, $args) = @_;
… …
922 if ($args eq "list") { 948 if ($args eq "list") {
923 clean_timeouts $pl; 949 clean_timeouts $pl;
924 950
925 if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}}) 951 if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}})
926 + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) { 952 + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) {
927 $pl->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE); 953 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
928 $pl->message ((join ", ", @ignored_tell), cf::NDI_UNIQUE); 954 $pl->message ((join ", ", @ignored_tell), cf::NDI_REPLY);
929 $pl->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE); 955 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
930 $pl->message ((join ", ", @ignored_shout), cf::NDI_UNIQUE); 956 $pl->message ((join ", ", @ignored_shout), cf::NDI_REPLY);
931 $pl->message ("To stop ignoring one, use unignore.", cf::NDI_UNIQUE); 957 $pl->message ("To stop ignoring one, use unignore.", cf::NDI_REPLY);
932 } else { 958 } else {
933 $pl->message ("Not ignoring anyone", cf::NDI_UNIQUE); 959 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
934 } 960 }
935 961
936 } elsif ($target && $type) { 962 } elsif ($target && $type) {
937 963
938 $timeout ne "" or $timeout = 24; 964 $timeout ne "" or $timeout = 24;
939 my $absolute_timeout = time + $timeout * 3600; 965 my $absolute_timeout = time + $timeout * 3600;
940 966
941 if (cf::player::exists $target) { 967 if (cf::player::exists $target) {
942 if ($type eq "tell") { 968 if ($type eq "tell") {
943 $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_UNIQUE); 969 $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_REPLY);
944 $pl->{ext_ignore_tell}{$target} = $absolute_timeout; 970 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
945 } elsif ($type eq "shout") { 971 } elsif ($type eq "shout") {
946 $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_UNIQUE); 972 $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_REPLY);
947 $pl->{ext_ignore_shout}{$target} = $absolute_timeout; 973 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
948 } elsif ($type eq "all") { 974 } elsif ($type eq "all") {
949 $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_UNIQUE); 975 $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_REPLY);
950 $pl->{ext_ignore_tell}{$target} = $absolute_timeout; 976 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
951 $pl->{ext_ignore_shout}{$target} = $absolute_timeout; 977 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
952 } else { 978 } else {
953 $pl->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE); 979 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
954 } 980 }
955 } else { 981 } else {
956 $pl->message ("No such player: $target", cf::NDI_UNIQUE); 982 $pl->message ("No such player: $target", cf::NDI_REPLY);
957 } 983 }
958 984
959 } else { 985 } else {
960 $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n" 986 $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
961 . "will ignore a player for <timeout> hours.\n" 987 . "will ignore a player for <timeout> hours.\n"
962 . "Usage: ignore list\n" 988 . "Usage: ignore list\n"
963 . "will show you a list of players currently ignored.", cf::NDI_UNIQUE); 989 . "will show you a list of players currently ignored.", cf::NDI_REPLY);
964 } 990 }
965}; 991};
966 992
967cf::register_command unignore => sub { 993cf::register_command unignore => sub {
968 my ($pl, $args) = @_; 994 my ($pl, $args) = @_;
969 my ($target, $type) = split /\s+/, $args; 995 my ($target, $type) = split /\s+/, $args;
970 996
971 if ($args eq "") { 997 if ($args eq "") {
972 if ($pl->{ext_ignore_tell}) { 998 if ($pl->{ext_ignore_tell}) {
973 $pl->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE); 999 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
974 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_UNIQUE); 1000 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_REPLY);
975 $pl->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE); 1001 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
976 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_UNIQUE); 1002 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_REPLY);
977 } else { 1003 } else {
978 $pl->message ("Not ignoring anyone", cf::NDI_UNIQUE); 1004 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
979 } 1005 }
980 } else { 1006 } else {
981 if (cf::player::exists $target) { 1007 if (cf::player::exists $target) {
982 if ($type eq "tell") { 1008 if ($type eq "tell") {
983 $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_UNIQUE); 1009 $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_REPLY);
984 delete $pl->{ext_ignore_tell} {$target}; 1010 delete $pl->{ext_ignore_tell} {$target};
985 } elsif ($type eq "shout") { 1011 } elsif ($type eq "shout") {
986 $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_UNIQUE); 1012 $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_REPLY);
987 delete $pl->{ext_ignore_shout}{$target}; 1013 delete $pl->{ext_ignore_shout}{$target};
988 } elsif ($type eq "all") { 1014 } elsif ($type eq "all") {
989 $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_UNIQUE); 1015 $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_REPLY);
990 delete $pl->{ext_ignore_tell} {$target}; 1016 delete $pl->{ext_ignore_tell} {$target};
991 delete $pl->{ext_ignore_shout}{$target}; 1017 delete $pl->{ext_ignore_shout}{$target};
992 } else { 1018 } else {
993 $pl->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE); 1019 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
994 } 1020 }
995 } else { 1021 } else {
996 $pl->message ("No such player or ambiguous name: $target", cf::NDI_UNIQUE); 1022 $pl->message ("No such player or ambiguous name: $target", cf::NDI_REPLY);
997 } 1023 }
998 } 1024 }
999}; 1025};
1000 1026
1001cf::register_command seen => sub {
1002 my ($pl, $args) = @_;
1003
1004 if (my ($login) = $args =~ /(\S+)/) {
1005 if ($login eq $pl->name) {
1006 $pl->message ("Very funny, $login. Ha. Ha.", cf::NDI_UNIQUE);
1007 } elsif (cf::player::find_active $login) {
1008 $pl->message ("$login is right here on this server!", cf::NDI_UNIQUE);
1009 } elsif (cf::player::exists $login
1010 and stat sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($login) x 2) {
1011 my $time = (stat _)[9];
1012
1013 $pl->message ("$login was last seen here "
1014 . (POSIX::strftime "%Y-%m-%d %H:%M:%S +0000", gmtime $time)
1015 . " which was " . (int +(time - $time) / 3600) . " hours ago.", cf::NDI_UNIQUE);
1016 } else {
1017 $pl->message ("No player named $login is known to me.", cf::NDI_UNIQUE);
1018 }
1019 } else {
1020 $pl->message ("Usage: seen <player>", cf::NDI_UNIQUE);
1021 }
1022};
1023

Diff Legend

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