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

Diff Legend

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