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.21 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.39 by root, Fri Apr 11 01:15:49 2008 UTC

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

Diff Legend

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