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.13 by root, Fri Apr 13 05:32:12 2007 UTC vs.
Revision 1.40 by root, Thu May 1 06:33:19 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
32 clean_timeouts $pl->ob; 59 clean_timeouts $pl->ob;
60
61 $pl->send_msg ($cf::SAY_CHANNEL);
62 $pl->send_msg ($cf::CHAT_CHANNEL);
33 }, 63 },
34); 64);
35 65
36cf::register_command listen => sub { 66cf::register_command listen => sub {
37 my ($pl, $msg) = @_; 67 my ($pl, $msg) = @_;
38 my $player = cf::player::find_active $pl->name; 68 my $player = cf::player::find_active $pl->name;
39 69
40 if ($msg ne "") { 70 if ($msg ne "") {
71 $msg = 10 if $msg > 10;
72
41 my $prev_listen = $player->listening; 73 my $prev_listen = $player->listening;
42 $player->listening ($msg); 74 $player->listening ($msg);
43 if ($prev_listen == $player->listening) { 75 if ($prev_listen == $player->listening) {
44 $pl->message ("Your verbose level stayed $prev_listen.", cf::NDI_UNIQUE); 76 $pl->message ("Your verbose level stays at $prev_listen.", cf::NDI_REPLY);
45 } else { 77 } else {
46 $pl->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_UNIQUE); 78 $pl->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_REPLY);
47 } 79 }
48 } else { 80 } else {
49 $pl->message ("Your verbose level is " . $player->listening . ".", cf::NDI_UNIQUE); 81 $pl->message ("Your verbose level is " . $player->listening . ".", cf::NDI_REPLY);
50 } 82 }
51}; 83};
52 84
53cf::register_command cointoss => sub { 85cf::register_command cointoss => sub {
54 my ($pl, $msg) = @_; 86 my ($ob, $msg) = @_;
55 87
88 my $pl = $ob->contr;
56 my $name = $pl->name; 89 my $name = $ob->name;
57 90
58 if (int rand 2) { 91 my $coin = int rand 2 ? "Heads" : "Tails";
92
93 send_msg $_, $cf::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 ) { 94 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 } 95
96 $pl->send_msg ($cf::SAY_CHANNEL => "You flip a coin.... $coin!", cf::NDI_GREY | cf::NDI_REPLY);
75}; 97};
76 98
77cf::register_command orcknuckle => sub { 99cf::register_command orcknuckle => sub {
78 my ($pl, $msg) = @_; 100 my ($ob, $msg) = @_;
101
102 my $pl = $ob->contr;
103 my $name = $ob->name;
104
79 my @orcknuckle = ("none", "beholder", "ghost", "knight", "princess", "dragon", "orc"); 105 my @orcknuckle = ("beholder", "ghost", "knight", "princess", "dragon", "orc");
80 106 my ($i, $j, $k, $l) = (rand 5, rand 5, rand 5, rand 6);
81 my $name = $pl->name;
82
83 my ($i, $j, $k, $l) = ((int rand 5) + 1, (int rand 5) + 1, (int rand 5) + 1, (int rand 6) + 1);
84 my $result = "$orcknuckle[$i], $orcknuckle[$j], $orcknuckle[$k], $orcknuckle[$l]"; 107 my $result = "$orcknuckle[$i], $orcknuckle[$j], $orcknuckle[$k], $orcknuckle[$l]";
85 108
109 send_msg $_, $cf::SAY_CHANNEL => "$name throws his orc-knuckles and rolls $result!", cf::NDI_GREY, "msg_say"
86 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 110 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list;
87 next
88 if $other->ob == $pl;
89 $other->ob->message ("$name rolls $result!", cf::NDI_GREY | cf::NDI_UNIQUE);
90 } 111
91
92 $pl->message ("You roll $result!", cf::NDI_GREY | cf::NDI_UNIQUE); 112 $pl->send_msg ($cf::SAY_CHANNEL => "You roll $result!", cf::NDI_GREY | cf::NDI_REPLY);
93}; 113};
94 114
95my $emotes = { 115my $emotes = {
96 growl => { 116 growl => {
97 noparams => { 117 noparams => {
… …
221 self => "You kiss <other>.", 241 self => "You kiss <other>.",
222 }, 242 },
223 self => { 243 self => {
224 }, 244 },
225 }, 245 },
246 smother => {
247 noparams => {
248 other => "<self> makes weird facial contortions",
249 self => "All the lonely people..",
250 },
251 params => {
252 target => "<self> smothers you with kisses.",
253 other => "<self> smothers <other> with kisses.",
254 self => "You smother <other> with kisses.",
255 },
256 self => {
257 },
258 },
226 wink => { 259 wink => {
227 noparams => { 260 noparams => {
228 other => "<self> winks suggestively.", 261 other => "<self> winks suggestively.",
229 self => "Have you got something in your eye?", 262 self => "Have you got something in your eye?",
230 }, 263 },
… …
674 }, 707 },
675}; 708};
676 709
677for my $emotion (keys %$emotes) { 710for my $emotion (keys %$emotes) {
678 cf::register_command $emotion => sub { 711 cf::register_command $emotion => sub {
679 my ($pl, $tname) = @_; 712 my ($ob, $tname) = @_;
713
714 my $pl = $ob->contr;
680 715
681 cf::async { 716 cf::async {
682 my $name = $pl->name; 717 my $name = $ob->name;
718 $Coro::current->{desc} = "emote handler for $name";
683 719
684 if ($tname eq $name) { 720 if ($tname eq $name) {
685 my $emote = $emotes->{$emotion}->{self}; 721 my %emote = %{ $emotes->{$emotion}->{self} || {} };
686 722
687 $emote->{other} = "You look away from <self>." 723 $emote{other} ||= "You look away from <self>.";
688 if !$emote->{other};
689 $emote->{self} = "My god! Is that LEGAL?" 724 $emote{self} ||= "My god! Is that LEGAL?";
690 if !$emote->{self};
691 725
692 $emote->{other} =~ s/<self>/$name/; 726 $emote{other} =~ s/<self>/$name/;
693 727
728 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
694 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 729 for grep { $ob->on_same_map_as ($_->ob) && $_ != $ob} cf::player::list;
695 next
696 if $other->ob == $pl;
697 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
698 }
699 730
700 $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 731 $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
701 } elsif ($tname) { 732 } elsif ($tname) {
702 my $target = cf::player::find $tname 733 my $target = cf::player::find $tname
703 or return $pl->reply (undef, "$tname is not around."); 734 or return send_msg $pl, tell_channel $tname, "$tname is not around.", cf::NDI_DK_ORANGE | cf::NDI_REPLY, "msg_chat";
704 735
705 my $emote = $emotes->{$emotion}->{params}; 736 my %emote = %{ $emotes->{$emotion}->{params} || {} };
706 737
707 $emote->{other} = "<self> is eyeing <other> quizzically." 738 $emote{other} ||= "<self> is eyeing <other> quizzically.";
708 if !$emote->{other};
709 $emote->{self} = "You are still nuts." 739 $emote{self} ||= "You are still nuts.";
710 if !$emote->{self};
711 $emote->{target} = "You get the distinct feeling that <other> is nuts." 740 $emote{target} ||= "You get the distinct feeling that <self> is nuts.";
712 if !$emote->{target};
713 741
714 $emote->{self} =~ s/<other>/$tname/; 742 $emote{self} =~ s/<other>/$tname/;
715 $emote->{target} =~ s/<self>/$name/; 743 $emote{target} =~ s/<self>/$name/;
716 $emote->{other} =~ s/<other>/$tname/; 744 $emote{other} =~ s/<other>/$tname/;
717 $emote->{other} =~ s/<self>/$name/; 745 $emote{other} =~ s/<self>/$name/;
718 746
719 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 747 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
720 next 748 for grep { $_ != $pl && $_ != $target && $ob->on_same_map_as ($_->ob) } cf::player::list;
721 if $other->ob == $pl or $other == $target;
722 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
723 }
724 749
725 $target->ob->message ($emote->{target}, cf::NDI_GREY | cf::NDI_UNIQUE); 750 send_msg $target, tell_channel $name, $emote{target}, cf::NDI_GREY, "msg_shout";
726 $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 751 $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
727 } else { 752 } else {
728 my $emote = $emotes->{$emotion}->{noparams}; 753 my %emote = %{ $emotes->{$emotion}->{noparams} || {} };
729 $emote->{other} =~ s/<self>/$name/;
730 754
731 $emote->{other} = "<self> dances with glee." 755 $emote{other} ||= "<self> dances with glee.";
732 if !$emote->{other};
733 $emote->{self} = "You are a nut." 756 $emote{self} ||= "You are a nut.";
734 if !$emote->{self};
735 757
758 $emote{other} =~ s/<self>/$name/;
759
760 send_msg $_, $cf::CHAT_CHANNEL, $emote{other}, cf::NDI_GREY, "msg_chat"
736 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 761 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl } cf::player::list;
737 next
738 if $other->ob == $pl;
739 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
740 }
741 762
742 $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 763 $pl->send_msg ($cf::CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
743 } 764 }
744 }; 765 };
745 }; 766 };
746} 767}
747 768
748cf::register_command me => sub { 769cf::register_command me => sub {
749 my ($pl, $msg) = @_; 770 my ($pl, $msg) = @_;
750 771
751 my $name = $pl->name; 772 my $name = $pl->name;
752 773
753 $_->ob->message ("* $name $msg", cf::NDI_GREY | cf::NDI_UNIQUE) 774 send_msg $_, $cf::SAY_CHANNEL => "* $name $msg", cf::NDI_GREY | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_say"
754 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 775 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
755}; 776};
756 777
757cf::register_command say => sub { 778cf::register_command say => sub {
758 my ($pl, $msg) = @_; 779 my ($ob, $msg) = @_;
759 780
760 utf8::decode $msg; 781 utf8::decode $msg;
761 782
762 return if $pl->contr->invoke (cf::EVENT_PLAYER_SAY, $msg); 783 return if $ob->contr->invoke (cf::EVENT_PLAYER_SAY, $msg);
763 784
764 if ($msg) { 785 if ($msg) {
765 my $name = $pl->name; 786 my $name = $ob->name;
766
767 utf8::encode $msg; # ->message not yet utf8-ified
768 $_->ob->message ("$name says: $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
769 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 787 my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list;
770 utf8::decode $msg; 788
789 send_msg $_, $cf::SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY, "msg_say"
790 for grep $_ != $ob->contr, @plonmap;
791 $ob->contr->send_msg ($cf::SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | cf::NDI_REPLY);
771 792
772 # npcs, magic_ears etc. 793 # npcs, magic_ears etc.
773 # first find all objects and theirt-level inventories 794 # first find all objects and their first-level inventories
774 # within a 5x5 square # that have something resembling 795 # within a 5x5 square that have something resembling
775 # dialogue or support on_say. 796 # dialogue or support on_say.
776 my ($map, $x, $y) = ($pl->map, $pl->x - 2, $pl->y - 2); 797 my ($map, $x, $y) = ($ob->map, $ob->x - 2, $ob->y - 2);
777 798
778 for my $npc ( 799 for my $npc (
779 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $pl->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_, 800 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $ob->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_,
780 map +($_, $_->inv), 801 map +($_, $_->inv),
781 grep $_, 802 grep $_,
782 map $map->at ($x + $_ % 5, $y + (int $_ / 5)), 803 map $map->at ($x + $_ % 5, $y + (int $_ / 5)),
783 0..24 804 0..24
784 ) { 805 ) {
785 # if some listener teleported us somewhere else, stop right here 806 # if some listener teleported us somewhere else, stop right here
786 last unless $map->path == $pl->map->path; 807 last unless $map->path == $ob->map->path;
787 808
788 my $dialog = new NPC_Dialogue ob => $pl, npc => $npc; 809 my $dialog = new NPC_Dialogue pl => $ob->contr, npc => $npc;
789 my ($reply, @kw) = $dialog->tell ($msg); 810 my ($reply, @kw) = $dialog->tell ($msg);
790 811
791 if (defined $reply) { 812 if (defined $reply) {
792 if ($npc->type == cf::MAGIC_EAR) { 813 if ($npc->type == cf::MAGIC_EAR) {
793 if (length $reply) { 814 if (length $reply) {
794 $_->ob->message ($reply, cf::NDI_BROWN | cf::NDI_UNIQUE) 815 send_msg $_, $cf::SAY_CHANNEL => $reply, cf::NDI_BROWN, "msg_say"
795 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 816 for @plonmap;
796 } 817 }
797 $npc->use_trigger; 818 $npc->use_trigger;
798 } else { 819 } else {
799 if (length $reply) { 820 if (length $reply) {
800 $_->ob->message ($npc->name . " says: $reply", cf::NDI_BROWN | cf::NDI_UNIQUE) 821 send_msg $_, $cf::SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN, "msg_say"
801 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 822 for @plonmap;
802 } 823 }
803 } 824 }
804 } 825 }
805 826
806 if (@kw) { 827 if (@kw) {
807 $_->ob->message ("[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN | cf::NDI_UNIQUE) 828 $_->send_msg ($cf::SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
808 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 829 for @plonmap;
809 } 830 }
810 } 831 }
811 832
812 } else { 833 } else {
813 $pl->message ("What do you want to say?", cf::NDI_UNIQUE); 834 $ob->send_msg ($cf::SAY_CHANNEL => "What do you want to say?", cf::NDI_GREY | cf::NDI_REPLY);
814 } 835 }
815}; 836};
816 837
817cf::register_command chat => sub { 838cf::register_command chat => sub {
818 my ($pl, $msg) = @_; 839 my ($ob, $msg) = @_;
819 840
820 utf8::decode $msg; 841 utf8::decode $msg;
821 842
843 my $pl = $ob->contr;
844
822 return if $pl->contr->invoke (cf::EVENT_PLAYER_CHAT, $msg); 845 return if $pl->invoke (cf::EVENT_PLAYER_CHAT, $msg);
823 846
824 if ($msg) { 847 if ($msg) {
825 my $name = $pl->name; 848 my $name = $ob->name;
826 my $NOW = time; 849 my $NOW = time;
827 850
828 utf8::encode $msg; # ->message not yet utf8-ified
829 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg; 851 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
830 ext::schmorp_irc::do_notice (sprintf "[%s] %s", $name, $msg); 852 send_irc ("[%s] %s", $name, $msg);
831 853
832 $_->ob->message ("$name chats: $msg", cf::NDI_BLUE) 854 send_msg $_, $cf::CHAT_CHANNEL => "$name chats: $msg", cf::NDI_BLUE | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_chat"
833 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list; 855 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list;
834 856
835 } else { 857 } else {
836 $pl->message ("Chat what?", cf::NDI_UNIQUE); 858 $pl->send_msg ($cf::CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY);
837 } 859 }
838}; 860};
839 861
840cf::register_command shout => sub { 862cf::register_command shout => sub {
841 my ($pl, $msg) = @_; 863 my ($ob, $msg) = @_;
842 864
843 utf8::decode $msg; 865 utf8::decode $msg;
844 866
867 my $pl = $ob->contr;
868
845 return if $pl->contr->invoke (cf::EVENT_PLAYER_SHOUT, $msg); 869 return if $pl->invoke (cf::EVENT_PLAYER_SHOUT, $msg);
846 870
847 if ($msg) { 871 if ($msg) {
848 my $NOW = time; 872 my $NOW = time;
849 my $name = $pl->name; 873 my $name = $ob->name;
850 874
851 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg; 875 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
852 ext::schmorp_irc::do_notice (sprintf "\007\0034{%s} %s\n", $name, $msg); 876 send_irc ("\007\0034{%s} %s\n", $name, $msg);
853 877
854 utf8::encode $msg; # ->message not yet utf8-ified 878 send_msg $_, $cf::CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0), "msg_shout"
855 $_->ob->message ("$name shouts: $msg", cf::NDI_RED)
856 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list; 879 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list;
857 880
858 } else { 881 } else {
859 $pl->message ("Shout what?", cf::NDI_UNIQUE); 882 $pl->send_msg ($cf::CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY);
860 } 883 }
861}; 884};
862 885
863cf::register_command tell => sub { 886cf::register_command tell => sub {
864 my ($pl, $args) = @_; 887 my ($ob, $args) = @_;
865 my ($target, $msg) = split /\s+/, $args, 2; 888 my ($target, $msg) = split /\s+/, $args, 2;
866 889
867 utf8::decode $msg; 890 utf8::decode $msg;
868 891
892 my $pl = $ob->contr;
893 my $ns = $pl->ns
894 or return;
895 my $name = $ob->name;
896
869 return if $pl->contr->invoke (cf::EVENT_PLAYER_TELL, $target, $msg); 897 return if $pl->invoke (cf::EVENT_PLAYER_TELL, $target, $msg);
870 898
871 my $name = $pl->name; 899 my $pl_channel = tell_channel $target;
872 900
873 if ($target =~ /irc\//) { 901 if ($target =~ /irc\//) {
874 my (undef, $nick) = split /\//, $target, 2; 902 my (undef, $nick) = split /\//, $target, 2;
875 $pl->message ("You tell $target: $args"); 903 $ns->send_msg ($pl_channel => "You tell $target: $args", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
876 ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $msg); 904 send_irc ("(%s) %s: %s\n", $name, $nick, $msg);
905
877 } elsif (my $other = cf::player::find_active $target) { 906 } elsif (my $other = cf::player::find_active $target) {
907 my $other_channel = tell_channel $name;
878 908
879 if ($msg) { 909 if ($msg) {
880 if ($target eq $name) { 910 if ($target eq $name) {
881 $pl->message ("You are talking to yourself, you freak!", cf::NDI_UNIQUE); 911 $ns->send_msg ($pl_channel => "You are talking to yourself, you freak!", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
882 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) { 912 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) {
883 $pl->message ("$target ignores what you say. Give up on it.", cf::NDI_UNIQUE); 913 $ns->send_msg ($pl_channel => "$target ignores what you say. Give up on it.", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
884 } else { 914 } else {
885 return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl->contr, $msg); 915 return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl, $msg);
886 utf8::encode $msg; # ->message not yet utf8-ified
887 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg; 916 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg;
888 917
889 $pl->message ("You tell $target: $msg"); 918 $ns->send_msg ($pl_channel => "You tell $target: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
890 $other->ob->message ("$name tells you: $msg"); 919 send_msg $other, $other_channel => "$name tells you: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF, "msg_tell";
891 $other->ob->{ext_last_tell} = $name;
892 } 920 }
893 } else { 921 } else {
894 $pl->message ("What do you want to tell $target?", cf::NDI_UNIQUE); 922 $ns->send_msg ($pl_channel => "What do you want to tell $target?", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
895 } 923 }
896 924
897 } else { 925 } else {
898 $pl->message ("No such player. Your message: $msg", cf::NDI_UNIQUE); 926 $ns->send_msg ($pl_channel => "No such player. Your message: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
899 }
900};
901
902cf::register_command reply => sub {
903 my ($pl, $args) = @_;
904 my $name = $pl->name;
905
906 utf8::decode $args;
907
908 return if $pl->contr->invoke (cf::EVENT_PLAYER_TELL, $pl->{ext_last_tell}, $args);
909
910 if ($pl->{ext_last_tell} =~ /irc\//) {
911 my (undef, $nick) = split /\//, $pl->{ext_last_tell}, 2;
912 $pl->message ("You tell " . $pl->{ext_last_tell} . ": $args");
913 ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $args);
914 } elsif (my $other = cf::player::find_active $pl->{ext_last_tell}) {
915
916 if ($args) {
917 $other->ob->{ext_ignore_tell}{$name} >= time
918 or delete $other->ob->{ext_ignore_tell}{$name};
919
920 if ($other->ob->{ext_ignore_tell}{$name} < time) {
921 utf8::encode $args; # ->message not yet utf8-ified
922 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $other->ob->name, $args;
923
924 $pl->message ("You tell " . $other->ob->name . ": $args");
925 $other->ob->message ("$name tells you: $args");
926 $pl->{ext_last_tell} = $other->ob->name;
927 } else {
928 $pl->message ($other->ob->name . " ignores what you say. Give up on it.", cf::NDI_UNIQUE);
929 }
930 } else {
931 $pl->message ("What do you want to tell ".$other->ob->name."?", cf::NDI_UNIQUE);
932 }
933
934 } else {
935 $pl->message ("Can't reply, player left. Your message: $args".$pl->{ext_last_tell}, cf::NDI_UNIQUE);
936 } 927 }
937}; 928};
938 929
939cf::register_command ignore => sub { 930cf::register_command ignore => sub {
940 my ($pl, $args) = @_; 931 my ($pl, $args) = @_;
… …
943 if ($args eq "list") { 934 if ($args eq "list") {
944 clean_timeouts $pl; 935 clean_timeouts $pl;
945 936
946 if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}}) 937 if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}})
947 + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) { 938 + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) {
948 $pl->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE); 939 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
949 $pl->message ((join ", ", @ignored_tell), cf::NDI_UNIQUE); 940 $pl->message ((join ", ", @ignored_tell), cf::NDI_REPLY);
950 $pl->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE); 941 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
951 $pl->message ((join ", ", @ignored_shout), cf::NDI_UNIQUE); 942 $pl->message ((join ", ", @ignored_shout), cf::NDI_REPLY);
952 $pl->message ("To stop ignoring one, use unignore.", cf::NDI_UNIQUE); 943 $pl->message ("To stop ignoring one, use unignore.", cf::NDI_REPLY);
953 } else { 944 } else {
954 $pl->message ("Not ignoring anyone", cf::NDI_UNIQUE); 945 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
955 } 946 }
956 947
957 } elsif ($target && $type) { 948 } elsif ($target && $type) {
958 949
959 $timeout ne "" or $timeout = 24; 950 $timeout ne "" or $timeout = 24;
960 my $absolute_timeout = time + $timeout * 3600; 951 my $absolute_timeout = time + $timeout * 3600;
961 952
962 if (cf::player::exists $target) { 953 if (cf::player::exists $target) {
963 if ($type eq "tell") { 954 if ($type eq "tell") {
964 $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_UNIQUE); 955 $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_REPLY);
965 $pl->{ext_ignore_tell}{$target} = $absolute_timeout; 956 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
966 } elsif ($type eq "shout") { 957 } elsif ($type eq "shout") {
967 $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_UNIQUE); 958 $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_REPLY);
968 $pl->{ext_ignore_shout}{$target} = $absolute_timeout; 959 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
969 } elsif ($type eq "all") { 960 } elsif ($type eq "all") {
970 $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_UNIQUE); 961 $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_REPLY);
971 $pl->{ext_ignore_tell}{$target} = $absolute_timeout; 962 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
972 $pl->{ext_ignore_shout}{$target} = $absolute_timeout; 963 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
973 } else { 964 } else {
974 $pl->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE); 965 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
975 } 966 }
976 } else { 967 } else {
977 $pl->message ("No such player: $target", cf::NDI_UNIQUE); 968 $pl->message ("No such player: $target", cf::NDI_REPLY);
978 } 969 }
979 970
980 } else { 971 } else {
981 $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n" 972 $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
982 . "will ignore a player for <timeout> hours.\n" 973 . "will ignore a player for <timeout> hours.\n"
983 . "Usage: ignore list\n" 974 . "Usage: ignore list\n"
984 . "will show you a list of players currently ignored.", cf::NDI_UNIQUE); 975 . "will show you a list of players currently ignored.", cf::NDI_REPLY);
985 } 976 }
986}; 977};
987 978
988cf::register_command unignore => sub { 979cf::register_command unignore => sub {
989 my ($pl, $args) = @_; 980 my ($pl, $args) = @_;
990 my ($target, $type) = split /\s+/, $args; 981 my ($target, $type) = split /\s+/, $args;
991 982
992 if ($args eq "") { 983 if ($args eq "") {
993 if ($pl->{ext_ignore_tell}) { 984 if ($pl->{ext_ignore_tell}) {
994 $pl->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE); 985 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
995 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_UNIQUE); 986 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_REPLY);
996 $pl->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE); 987 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
997 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_UNIQUE); 988 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_REPLY);
998 } else { 989 } else {
999 $pl->message ("Not ignoring anyone", cf::NDI_UNIQUE); 990 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
1000 } 991 }
1001 } else { 992 } else {
1002 if (cf::player::exists $target) { 993 if (cf::player::exists $target) {
1003 if ($type eq "tell") { 994 if ($type eq "tell") {
1004 $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_UNIQUE); 995 $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_REPLY);
1005 delete $pl->{ext_ignore_tell} {$target}; 996 delete $pl->{ext_ignore_tell} {$target};
1006 } elsif ($type eq "shout") { 997 } elsif ($type eq "shout") {
1007 $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_UNIQUE); 998 $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_REPLY);
1008 delete $pl->{ext_ignore_shout}{$target}; 999 delete $pl->{ext_ignore_shout}{$target};
1009 } elsif ($type eq "all") { 1000 } elsif ($type eq "all") {
1010 $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_UNIQUE); 1001 $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_REPLY);
1011 delete $pl->{ext_ignore_tell} {$target}; 1002 delete $pl->{ext_ignore_tell} {$target};
1012 delete $pl->{ext_ignore_shout}{$target}; 1003 delete $pl->{ext_ignore_shout}{$target};
1013 } else { 1004 } else {
1014 $pl->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE); 1005 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
1015 } 1006 }
1016 } else { 1007 } else {
1017 $pl->message ("No such player or ambiguous name: $target", cf::NDI_UNIQUE); 1008 $pl->message ("No such player or ambiguous name: $target", cf::NDI_REPLY);
1018 } 1009 }
1019 } 1010 }
1020}; 1011};
1021 1012

Diff Legend

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