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.6 by pippijn, Wed Feb 28 19:25:27 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;
33 },
34 67
35 1 68 $pl->send_msg ($SAY_CHANNEL);
69 $pl->send_msg ($CHAT_CHANNEL);
70 },
36); 71);
37 72
38cf::register_command listen => sub { 73cf::register_command listen => sub {
39 my ($who, $msg) = @_; 74 my ($pl, $msg) = @_;
40 my $player = cf::player::find_active $who->name; 75 my $player = cf::player::find_active $pl->name;
41 76
42 if ($msg ne "") { 77 if ($msg ne "") {
78 $msg = 10 if $msg > 10;
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 $who->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 $who->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 $who->message ("Your verbose level is " . $player->listening . ".", cf::NDI_UNIQUE); 88 $pl->message ("Your verbose level is " . $player->listening . ".", cf::NDI_REPLY);
52 } 89 }
90};
53 91
92cf::register_command cointoss => sub {
93 my ($ob, $msg) = @_;
94
95 my $pl = $ob->contr;
96 my $name = $ob->name;
97
98 my $coin = int rand 2 ? "Heads" : "Tails";
99
100 $_->send_msg ($SAY_CHANNEL => "$name flips a coin.... $coin!", cf::NDI_GREY)
101 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list;
54 1 102
103 $pl->send_msg ($SAY_CHANNEL => "You flip a coin.... $coin!", cf::NDI_GREY | cf::NDI_REPLY);
104};
105
106cf::register_command orcknuckle => sub {
107 my ($ob, $msg) = @_;
108
109 my $pl = $ob->contr;
110 my $name = $ob->name;
111
112 my @orcknuckle = ("beholder", "ghost", "knight", "princess", "dragon", "orc");
113 my ($i, $j, $k, $l) = (rand 5, rand 5, rand 5, rand 6);
114 my $result = "$orcknuckle[$i], $orcknuckle[$j], $orcknuckle[$k], $orcknuckle[$l]";
115
116 $_->send_msg ($SAY_CHANNEL => "$name throws his orc-knuckles and rolls $result!", cf::NDI_GREY)
117 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl} cf::player::list;
118
119 $pl->send_msg ($SAY_CHANNEL => "You roll $result!", cf::NDI_GREY | cf::NDI_REPLY);
55}; 120};
56 121
57my $emotes = { 122my $emotes = {
58 growl => { 123 growl => {
59 noparams => { 124 noparams => {
… …
189 noparams => { 254 noparams => {
190 other => "<self> winks suggestively.", 255 other => "<self> winks suggestively.",
191 self => "Have you got something in your eye?", 256 self => "Have you got something in your eye?",
192 }, 257 },
193 params => { 258 params => {
259 target => "<self> winks at you.",
194 target => "<self> winks at <other>.", 260 other => "<self> winks at <other>.",
195 self => "You wink suggestively at <other>.", 261 self => "You wink suggestively at <other>.",
196 }, 262 },
197 self => { 263 self => {
198 other => "<self> winks at himself - something strange is going on...", 264 other => "<self> winks at himself - something strange is going on...",
199 self => "You wink at yourself?? What are you up to?", 265 self => "You wink at yourself?? What are you up to?",
… …
289 noparams => { 355 noparams => {
290 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?",
291 self => "You bleed all over your nice new armour.", 357 self => "You bleed all over your nice new armour.",
292 }, 358 },
293 params => { 359 params => {
360 target => "<self> slashes his wrist and bleeds all over you.",
294 target => "<self> slashes his wrist and bleeds all over <other>.", 361 other => "<self> slashes his wrist and bleeds all over <other>.",
295 self => "You slash your wrist and bleed all over <other>", 362 self => "You slash your wrist and bleed all over <other>",
296 }, 363 },
297 self => { 364 self => {
298 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.",
299 self => "Very impressive! You wipe your blood all over yourself.", 366 self => "Very impressive! You wipe your blood all over yourself.",
… …
631 }, 698 },
632 self => { 699 self => {
633 }, 700 },
634 }, 701 },
635}; 702};
703
636for my $emotion (keys %$emotes) { 704for my $emotion (keys %$emotes) {
637 cf::register_command $emotion => sub { 705 cf::register_command $emotion => sub {
638 my ($ob, $tname) = @_; 706 my ($ob, $tname) = @_;
707
708 my $pl = $ob->contr;
639 709
640 cf::async { 710 cf::async {
641 my $name = $ob->name; 711 my $name = $ob->name;
642 712
643 if ($tname eq $name) { 713 if ($tname eq $name) {
644 my $emote = $emotes->{$emotion}->{self}; 714 my %emote = %{ $emotes->{$emotion}->{self} || {} };
715
716 $emote{other} ||= "You look away from <self>.";
717 $emote{self} ||= "My god! Is that LEGAL?";
718
645 $emote->{other} =~ s/<self>/$name/; 719 $emote{other} =~ s/<self>/$name/;
646 720
721 $_->send_msg ($CHAT_CHANNEL, $emote{other}, cf::NDI_GREY)
647 for my $other ( grep { $ob->on_same_map_as ($_->ob) } cf::player::list ) { 722 for grep { $ob->on_same_map_as ($_->ob) && $_ != $ob} cf::player::list;
648 next
649 if $other->ob == $ob;
650 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
651 }
652 723
653 $ob->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 724 $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
654 } elsif ($tname) { 725 } elsif ($tname) {
655 my $target = cf::player::find $tname 726 my $target = cf::player::find $tname
656 or return $ob->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);
657 728
658 my $emote = $emotes->{$emotion}->{params}; 729 my %emote = %{ $emotes->{$emotion}->{params} || {} };
730
731 $emote{other} ||= "<self> is eyeing <other> quizzically.";
732 $emote{self} ||= "You are still nuts.";
733 $emote{target} ||= "You get the distinct feeling that <other> is nuts.";
734
659 $emote->{self} =~ s/<other>/$tname/; 735 $emote{self} =~ s/<other>/$tname/;
660 $emote->{target} =~ s/<self>/$name/; 736 $emote{target} =~ s/<self>/$name/;
661 $emote->{other} =~ s/<other>/$tname/; 737 $emote{other} =~ s/<other>/$tname/;
662 $emote->{other} =~ s/<self>/$name/; 738 $emote{other} =~ s/<self>/$name/;
663 739
664 for my $other ( grep { $ob->on_same_map_as ($_->ob) } cf::player::list ) { 740 $_->send_msg ($CHAT_CHANNEL, $emote{other}, cf::NDI_GREY)
665 next 741 for grep { $_ != $pl && $_ != $target && $ob->on_same_map_as ($_->ob) } cf::player::list;
666 if $other->ob == $ob or $other == $target;
667 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
668 }
669 742
670 $target->ob->message ($emote->{target}, cf::NDI_GREY | cf::NDI_UNIQUE); 743 $target->send_msg (tell_channel $name, $emote{target}, cf::NDI_GREY);
671 $ob->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 744 $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
672 } else { 745 } else {
673 my $emote = $emotes->{$emotion}->{noparams}; 746 my %emote = %{ $emotes->{$emotion}->{noparams} || {} };
674 $emote->{other} =~ s/<self>/$name/; 747
748 $emote{other} ||= "<self> dances with glee.";
749 $emote{self} ||= "You are a nut.";
675 750
751 $emote{other} =~ s/<self>/$name/;
752
753 $_->send_msg ($CHAT_CHANNEL, $emote{other}, cf::NDI_GREY)
676 for my $other ( grep { $ob->on_same_map_as ($_->ob) } cf::player::list ) { 754 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl } cf::player::list;
677 next
678 if $other->ob == $ob;
679 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
680 }
681 755
682 $ob->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 756 $pl->send_msg ($CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
683 } 757 }
684 }; 758 };
685 }; 759 };
686} 760}
687 761
762cf::register_command me => sub {
763 my ($pl, $msg) = @_;
764
765 my $name = $pl->name;
766
767 $_->send_msg ($SAY_CHANNEL => "* $name $msg", cf::NDI_GREY | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0))
768 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
769};
770
688cf::register_command say => sub { 771cf::register_command say => sub {
689 my ($who, $msg) = @_; 772 my ($ob, $msg) = @_;
690 773
691 utf8::decode $msg; 774 utf8::decode $msg;
692 775
693 return if $who->contr->invoke (cf::EVENT_PLAYER_SAY, $msg); 776 return if $ob->contr->invoke (cf::EVENT_PLAYER_SAY, $msg);
694 777
695 if ($msg) { 778 if ($msg) {
696 my $name = $who->name; 779 my $name = $ob->name;
697
698 utf8::encode $msg; # ->message not yet utf8-ified
699 $_->ob->message ("$name says: $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
700 for grep $who->on_same_map_as ($_->ob), cf::player::list; 780 my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list;
701 utf8::decode $msg; 781
782 $_->send_msg ($SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | ($_ == $ob->contr ? cf::NDI_REPLY : 0))
783 for @plonmap;
702 784
703 # npcs, magic_ears etc. 785 # npcs, magic_ears etc.
704 # first find all objects and theirt-level inventories 786 # first find all objects and their first-level inventories
705 # within a 5x5 square # that have something resembling 787 # within a 5x5 square that have something resembling
706 # dialogue or support on_say. 788 # dialogue or support on_say.
707 my ($map, $x, $y) = ($who->map, $who->x - 2, $who->y - 2); 789 my ($map, $x, $y) = ($ob->map, $ob->x - 2, $ob->y - 2);
708 790
709 for my $npc ( 791 for my $npc (
710 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $who->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_, 792 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $ob->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_,
711 map +($_, $_->inv), 793 map +($_, $_->inv),
712 grep $_, 794 grep $_,
713 map $map->at ($x + $_ % 5, $y + (int $_ / 5)), 795 map $map->at ($x + $_ % 5, $y + (int $_ / 5)),
714 0..24 796 0..24
715 ) { 797 ) {
716 # if some listener teleported us somewhere else, stop right here 798 # if some listener teleported us somewhere else, stop right here
717 last unless $map->path == $who->map->path; 799 last unless $map->path == $ob->map->path;
718 800
719 my $dialog = new NPC_Dialogue ob => $who, npc => $npc; 801 my $dialog = new NPC_Dialogue pl => $ob->contr, npc => $npc;
720 my ($reply, @kw) = $dialog->tell ($msg); 802 my ($reply, @kw) = $dialog->tell ($msg);
721 803
722 if (defined $reply) { 804 if (defined $reply) {
723 if ($npc->type == cf::MAGIC_EAR) { 805 if ($npc->type == cf::MAGIC_EAR) {
724 if (length $reply) { 806 if (length $reply) {
725 $_->ob->message ($reply, cf::NDI_BROWN | cf::NDI_UNIQUE) 807 $_->send_msg ($SAY_CHANNEL => $reply, cf::NDI_BROWN)
726 for grep $who->on_same_map_as ($_->ob), cf::player::list; 808 for @plonmap;
727 } 809 }
728 $npc->use_trigger; 810 $npc->use_trigger;
729 } else { 811 } else {
730 if (length $reply) { 812 if (length $reply) {
731 $_->ob->message ($npc->name . " says: $reply", cf::NDI_BROWN | cf::NDI_UNIQUE) 813 $_->send_msg ($SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN)
732 for grep $who->on_same_map_as ($_->ob), cf::player::list; 814 for @plonmap;
733 } 815 }
734 } 816 }
735 } 817 }
736 818
737 if (@kw) { 819 if (@kw) {
738 $_->ob->message ("[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN | cf::NDI_UNIQUE) 820 $_->send_msg ($SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
739 for grep $who->on_same_map_as ($_->ob), cf::player::list; 821 for @plonmap;
740 } 822 }
741 } 823 }
742 824
743 } else { 825 } else {
744 $who->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);
745 } 827 }
746
747 1
748}; 828};
749 829
750cf::register_command chat => sub { 830cf::register_command chat => sub {
751 my ($who, $msg) = @_; 831 my ($ob, $msg) = @_;
752 832
753 utf8::decode $msg; 833 utf8::decode $msg;
754 834
835 my $pl = $ob->contr;
836
755 return if $who->contr->invoke (cf::EVENT_PLAYER_CHAT, $msg); 837 return if $pl->invoke (cf::EVENT_PLAYER_CHAT, $msg);
756 838
757 if ($msg) { 839 if ($msg) {
758 my $name = $who->name; 840 my $name = $ob->name;
759 my $NOW = time; 841 my $NOW = time;
760 842
761 utf8::encode $msg; # ->message not yet utf8-ified
762 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg; 843 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
763 ext::schmorp_irc::do_notice (sprintf "[%s] %s", $name, $msg); 844 send_irc ("[%s] %s", $name, $msg);
764 845
765 $_->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))
766 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;
767 848
768 } else { 849 } else {
769 $who->message ("Chat what?", cf::NDI_UNIQUE); 850 $pl->send_msg ($CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY);
770 } 851 }
771
772 1
773}; 852};
774 853
775cf::register_command shout => sub { 854cf::register_command shout => sub {
776 my ($who, $msg) = @_; 855 my ($ob, $msg) = @_;
777 856
778 utf8::decode $msg; 857 utf8::decode $msg;
779 858
859 my $pl = $ob->contr;
860
780 return if $who->contr->invoke (cf::EVENT_PLAYER_SHOUT, $msg); 861 return if $pl->invoke (cf::EVENT_PLAYER_SHOUT, $msg);
781 862
782 if ($msg) { 863 if ($msg) {
783 my $NOW = time; 864 my $NOW = time;
784 my $name = $who->name; 865 my $name = $ob->name;
785 866
786 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg; 867 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
787 ext::schmorp_irc::do_notice (sprintf "\007\0034{%s} %s\n", $name, $msg); 868 send_irc ("\007\0034{%s} %s\n", $name, $msg);
788 869
789 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))
790 $_->ob->message ("$name shouts: $msg", cf::NDI_RED)
791 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;
792 872
793 } else { 873 } else {
794 $who->message ("Shout what?", cf::NDI_UNIQUE); 874 $pl->send_msg ($CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY);
795 } 875 }
796
797 1
798}; 876};
799 877
800cf::register_command tell => sub { 878cf::register_command tell => sub {
801 my ($who, $args) = @_; 879 my ($ob, $args) = @_;
802 my ($target, $msg) = split /\s+/, $args, 2; 880 my ($target, $msg) = split /\s+/, $args, 2;
803 881
804 utf8::decode $msg; 882 utf8::decode $msg;
805 883
806 return if $who->contr->invoke (cf::EVENT_PLAYER_TELL, $target, $msg); 884 my $pl = $ob->contr;
807 885 my $ns = $pl->ns
886 or return;
808 my $name = $who->name; 887 my $name = $ob->name;
888
889 return if $pl->invoke (cf::EVENT_PLAYER_TELL, $target, $msg);
890
891 my $pl_channel = tell_channel $target;
809 892
810 if ($target =~ /irc\//) { 893 if ($target =~ /irc\//) {
811 my (undef, $nick) = split /\//, $target, 2; 894 my (undef, $nick) = split /\//, $target, 2;
812 $who->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);
813 ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $msg); 896 send_irc ("(%s) %s: %s\n", $name, $nick, $msg);
897
814 } elsif (my $other = cf::player::find_active $target) { 898 } elsif (my $other = cf::player::find_active $target) {
899 my $other_channel = tell_channel $name;
815 900
816 if ($msg) { 901 if ($msg) {
817 if ($target eq $name) { 902 if ($target eq $name) {
818 $who->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);
819 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) { 904 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) {
820 $who->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);
821 } else { 906 } else {
822 utf8::encode $msg; # ->message not yet utf8-ified 907 return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl, $msg);
823 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;
824 909
825 $who->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);
826 $other->ob->message ("$name tells you: $msg"); 911 $other->send_msg ($other_channel => "$name tells you: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF);
827 $other->ob->{ext_last_tell} = $name;
828 } 912 }
829 } else { 913 } else {
830 $who->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);
831 } 915 }
832 916
833 } else { 917 } else {
834 $who->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);
835 } 919 }
836
837 1
838}; 920};
839 921
840cf::register_command reply => sub { 922cf::register_command ignore => sub {
841 my ($who, $args) = @_; 923 my ($pl, $args) = @_;
842 my $name = $who->name; 924 my ($target, $type, $timeout) = split /\s+/, $args;
843 925
844 utf8::decode $args; 926 if ($args eq "list") {
927 clean_timeouts $pl;
845 928
846 return if $who->contr->invoke (cf::EVENT_PLAYER_TELL, $who->{ext_last_tell}, $args); 929 if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}})
930 + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) {
931 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
932 $pl->message ((join ", ", @ignored_tell), cf::NDI_REPLY);
933 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
934 $pl->message ((join ", ", @ignored_shout), cf::NDI_REPLY);
935 $pl->message ("To stop ignoring one, use unignore.", cf::NDI_REPLY);
936 } else {
937 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
938 }
847 939
848 if ($who->{ext_last_tell} =~ /irc\//) { 940 } elsif ($target && $type) {
849 my (undef, $nick) = split /\//, $who->{ext_last_tell}, 2;
850 $who->message ("You tell " . $who->{ext_last_tell} . ": $args");
851 ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $args);
852 } elsif (my $other = cf::player::find_active $who->{ext_last_tell}) {
853 941
854 if ($args) { 942 $timeout ne "" or $timeout = 24;
855 $other->ob->{ext_ignore_tell}{$name} >= time 943 my $absolute_timeout = time + $timeout * 3600;
856 or delete $other->ob->{ext_ignore_tell}{$name};
857 944
858 if ($other->ob->{ext_ignore_tell}{$name} < time) { 945 if (cf::player::exists $target) {
859 utf8::encode $args; # ->message not yet utf8-ified 946 if ($type eq "tell") {
860 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $other->ob->name, $args; 947 $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_REPLY);
861 948 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
862 $who->message ("You tell " . $other->ob->name . ": $args"); 949 } elsif ($type eq "shout") {
863 $other->ob->message ("$name tells you: $args"); 950 $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_REPLY);
864 $who->{ext_last_tell} = $other->ob->name; 951 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
952 } elsif ($type eq "all") {
953 $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_REPLY);
954 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
955 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
865 } else { 956 } else {
866 $who->message ($other->ob->name . " ignores what you say. Give up on it.", cf::NDI_UNIQUE); 957 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
867 } 958 }
868 } else { 959 } else {
869 $who->message ("What do you want to tell ".$other->ob->name."?", cf::NDI_UNIQUE); 960 $pl->message ("No such player: $target", cf::NDI_REPLY);
870 } 961 }
871 962
872 } else { 963 } else {
873 $who->message ("Can't reply, player left. Your message: $args".$who->{ext_last_tell}, cf::NDI_UNIQUE);
874 }
875
876 1
877};
878
879cf::register_command ignore => sub {
880 my ($who, $args) = @_;
881 my ($target, $type, $timeout) = split /\s+/, $args;
882
883 if ($args eq "list") {
884 clean_timeouts $who;
885
886 if ((my @ignored_tell = sort keys %{$who->{ext_ignore_tell}})
887 + (my @ignored_shout = sort keys %{$who->{ext_ignore_shout}})) {
888 $who->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE);
889 $who->message ((join ", ", @ignored_tell), cf::NDI_UNIQUE);
890 $who->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE);
891 $who->message ((join ", ", @ignored_shout), cf::NDI_UNIQUE);
892 $who->message ("To stop ignoring one, use unignore.", cf::NDI_UNIQUE);
893 } else {
894 $who->message ("Not ignoring anyone", cf::NDI_UNIQUE);
895 }
896
897 } elsif ($target && $type) {
898
899 $timeout ne "" or $timeout = 24;
900 my $absolute_timeout = time + $timeout * 3600;
901
902 if (cf::player::exists $target) {
903 if ($type eq "tell") {
904 $who->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_UNIQUE);
905 $who->{ext_ignore_tell}{$target} = $absolute_timeout;
906 } elsif ($type eq "shout") {
907 $who->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_UNIQUE);
908 $who->{ext_ignore_shout}{$target} = $absolute_timeout;
909 } elsif ($type eq "all") {
910 $who->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_UNIQUE);
911 $who->{ext_ignore_tell}{$target} = $absolute_timeout;
912 $who->{ext_ignore_shout}{$target} = $absolute_timeout;
913 } else {
914 $who->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE);
915 }
916 } else {
917 $who->message ("No such player: $target", cf::NDI_UNIQUE);
918 }
919
920 } else {
921 $who->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n" 964 $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
922 . "will ignore a player for <timeout> hours.\n" 965 . "will ignore a player for <timeout> hours.\n"
923 . "Usage: ignore list\n" 966 . "Usage: ignore list\n"
924 . "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);
925 } 968 }
926
927 1
928}; 969};
929 970
930cf::register_command unignore => sub { 971cf::register_command unignore => sub {
931 my ($who, $args) = @_; 972 my ($pl, $args) = @_;
932 my ($target, $type) = split /\s+/, $args; 973 my ($target, $type) = split /\s+/, $args;
933 974
934 if ($args eq "") { 975 if ($args eq "") {
935 if ($who->{ext_ignore_tell}) { 976 if ($pl->{ext_ignore_tell}) {
936 $who->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE); 977 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
937 $who->message ((join ", ", sort keys %{ $who->{ext_ignore_tell} }), cf::NDI_UNIQUE); 978 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_REPLY);
938 $who->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE); 979 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
939 $who->message ((join ", ", sort keys %{ $who->{ext_ignore_shout} }), cf::NDI_UNIQUE); 980 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_REPLY);
940 } else { 981 } else {
941 $who->message ("Not ignoring anyone", cf::NDI_UNIQUE); 982 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
942 } 983 }
943 } else { 984 } else {
944 if (cf::player::exists $target) { 985 if (cf::player::exists $target) {
945 if ($type eq "tell") { 986 if ($type eq "tell") {
946 $who->message ("Not ignoring private messages from $target anymore.", cf::NDI_UNIQUE); 987 $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_REPLY);
947 delete $who->{ext_ignore_tell} {$target}; 988 delete $pl->{ext_ignore_tell} {$target};
948 } elsif ($type eq "shout") { 989 } elsif ($type eq "shout") {
949 $who->message ("Not ignoring shouts from $target anymore.", cf::NDI_UNIQUE); 990 $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_REPLY);
950 delete $who->{ext_ignore_shout}{$target}; 991 delete $pl->{ext_ignore_shout}{$target};
951 } elsif ($type eq "all") { 992 } elsif ($type eq "all") {
952 $who->message ("Not ignoring anything from $target anymore.", cf::NDI_UNIQUE); 993 $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_REPLY);
953 delete $who->{ext_ignore_tell} {$target}; 994 delete $pl->{ext_ignore_tell} {$target};
954 delete $who->{ext_ignore_shout}{$target}; 995 delete $pl->{ext_ignore_shout}{$target};
955 } else { 996 } else {
956 $who->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);
957 } 998 }
958 } else { 999 } else {
959 $who->message ("No such player or ambiguous name: $target", cf::NDI_UNIQUE); 1000 $pl->message ("No such player or ambiguous name: $target", cf::NDI_REPLY);
960 } 1001 }
961 } 1002 }
962
963 1
964}; 1003};
965 1004
966cf::register_command seen => sub {
967 my ($who, $args) = @_;
968
969 if (my ($login) = $args =~ /(\S+)/) {
970 if ($login eq $who->name) {
971 $who->message ("Very funny, $login. Ha. Ha.", cf::NDI_UNIQUE);
972 } elsif (cf::player::find_active $login) {
973 $who->message ("$login is right here on this server!", cf::NDI_UNIQUE);
974 } elsif (cf::player::exists $login
975 and stat sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($login) x 2) {
976 my $time = (stat _)[9];
977
978 $who->message ("$login was last seen here "
979 . (POSIX::strftime "%Y-%m-%d %H:%M:%S +0000", gmtime $time)
980 . " which was " . (int +(time - $time) / 3600) . " hours ago.", cf::NDI_UNIQUE);
981 } else {
982 $who->message ("No player named $login is known to me.", cf::NDI_UNIQUE);
983 }
984 } else {
985 $who->message ("Usage: seen <player>", cf::NDI_UNIQUE);
986 }
987
988 1
989};
990

Diff Legend

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