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

Diff Legend

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