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

Diff Legend

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