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

Diff Legend

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