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

Diff Legend

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