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.15 by root, Fri Apr 27 00:49:58 2007 UTC vs.
Revision 1.35 by root, Sat Oct 20 05:16:44 2007 UTC

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

Diff Legend

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