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

Diff Legend

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