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

Diff Legend

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