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

Diff Legend

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