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

Diff Legend

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