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.8 by pippijn, Wed Feb 28 19:41:29 2007 UTC vs.
Revision 1.33 by root, Wed Sep 19 21:56:30 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.",
… …
635}; 702};
636 703
637for my $emotion (keys %$emotes) { 704for my $emotion (keys %$emotes) {
638 cf::register_command $emotion => sub { 705 cf::register_command $emotion => sub {
639 my ($ob, $tname) = @_; 706 my ($ob, $tname) = @_;
707
708 my $pl = $ob->contr;
640 709
641 cf::async { 710 cf::async {
642 my $name = $ob->name; 711 my $name = $ob->name;
712 $Coro::current->{desc} = "emote handler for $name";
643 713
644 if ($tname eq $name) { 714 if ($tname eq $name) {
645 my $emote = $emotes->{$emotion}->{self}; 715 my %emote = %{ $emotes->{$emotion}->{self} || {} };
646 716
647 $emote->{other} = "You look away from <self>." 717 $emote{other} ||= "You look away from <self>.";
648 if !$emote->{other};
649 $emote->{self} = "My god! Is that LEGAL?" 718 $emote{self} ||= "My god! Is that LEGAL?";
650 if !$emote->{self};
651 719
652 $emote->{other} =~ s/<self>/$name/; 720 $emote{other} =~ s/<self>/$name/;
653 721
722 $_->send_msg ($CHAT_CHANNEL, $emote{other}, cf::NDI_GREY)
654 for my $other ( grep { $ob->on_same_map_as ($_->ob) } cf::player::list ) { 723 for grep { $ob->on_same_map_as ($_->ob) && $_ != $ob} cf::player::list;
655 next
656 if $other->ob == $ob;
657 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
658 }
659 724
660 $ob->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 725 $pl->send_msg ($emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
661 } elsif ($tname) { 726 } elsif ($tname) {
662 my $target = cf::player::find $tname 727 my $target = cf::player::find $tname
663 or return $ob->reply (undef, "$tname is not around."); 728 or return $pl->send_msg (tell_channel $tname, "$tname is not around.", cf::NDI_DK_ORANGE | cf::NDI_REPLY);
664 729
665 my $emote = $emotes->{$emotion}->{params}; 730 my %emote = %{ $emotes->{$emotion}->{params} || {} };
666 731
667 $emote->{other} = "<self> is eyeing <other> quizzically." 732 $emote{other} ||= "<self> is eyeing <other> quizzically.";
668 if !$emote->{other};
669 $emote->{self} = "You are still nuts." 733 $emote{self} ||= "You are still nuts.";
670 if !$emote->{self};
671 $emote->{target} = "You get the distinct feeling that <other> is nuts." 734 $emote{target} ||= "You get the distinct feeling that <other> is nuts.";
672 if !$emote->{target};
673 735
674 $emote->{self} =~ s/<other>/$tname/; 736 $emote{self} =~ s/<other>/$tname/;
675 $emote->{target} =~ s/<self>/$name/; 737 $emote{target} =~ s/<self>/$name/;
676 $emote->{other} =~ s/<other>/$tname/; 738 $emote{other} =~ s/<other>/$tname/;
677 $emote->{other} =~ s/<self>/$name/; 739 $emote{other} =~ s/<self>/$name/;
678 740
679 for my $other ( grep { $ob->on_same_map_as ($_->ob) } cf::player::list ) { 741 $_->send_msg ($CHAT_CHANNEL, $emote{other}, cf::NDI_GREY)
680 next 742 for grep { $_ != $pl && $_ != $target && $ob->on_same_map_as ($_->ob) } cf::player::list;
681 if $other->ob == $ob or $other == $target;
682 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
683 }
684 743
685 $target->ob->message ($emote->{target}, cf::NDI_GREY | cf::NDI_UNIQUE); 744 $target->send_msg (tell_channel $name, $emote{target}, cf::NDI_GREY);
686 $ob->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 745 $pl->send_msg (tell_channel $tname, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
687 } else { 746 } else {
688 my $emote = $emotes->{$emotion}->{noparams}; 747 my %emote = %{ $emotes->{$emotion}->{noparams} || {} };
689 $emote->{other} =~ s/<self>/$name/;
690 748
691 $emote->{other} = "<self> dances with glee." 749 $emote{other} ||= "<self> dances with glee.";
692 if !$emote->{other};
693 $emote->{self} = "You are a nut." 750 $emote{self} ||= "You are a nut.";
694 if !$emote->{self};
695 751
752 $emote{other} =~ s/<self>/$name/;
753
754 $_->send_msg ($CHAT_CHANNEL, $emote{other}, cf::NDI_GREY)
696 for my $other ( grep { $ob->on_same_map_as ($_->ob) } cf::player::list ) { 755 for grep { $ob->on_same_map_as ($_->ob) && $_ != $pl } cf::player::list;
697 next
698 if $other->ob == $ob;
699 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
700 }
701 756
702 $ob->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 757 $pl->send_msg ($CHAT_CHANNEL, $emote{self}, cf::NDI_GREY | cf::NDI_REPLY);
703 } 758 }
704 }; 759 };
705 }; 760 };
706} 761}
707 762
708cf::register_command me => sub { 763cf::register_command me => sub {
764 my ($pl, $msg) = @_;
765
766 my $name = $pl->name;
767
768 $_->send_msg ($SAY_CHANNEL => "* $name $msg", cf::NDI_GREY | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0))
769 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
770};
771
772cf::register_command say => sub {
709 my ($ob, $msg) = @_; 773 my ($ob, $msg) = @_;
710
711 my $name = $ob->name;
712
713 $_->ob->message ("* $name $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
714 for grep $ob->on_same_map_as ($_->ob), cf::player::list;
715};
716
717cf::register_command say => sub {
718 my ($who, $msg) = @_;
719 774
720 utf8::decode $msg; 775 utf8::decode $msg;
721 776
722 return if $who->contr->invoke (cf::EVENT_PLAYER_SAY, $msg); 777 return if $ob->contr->invoke (cf::EVENT_PLAYER_SAY, $msg);
723 778
724 if ($msg) { 779 if ($msg) {
725 my $name = $who->name; 780 my $name = $ob->name;
726
727 utf8::encode $msg; # ->message not yet utf8-ified
728 $_->ob->message ("$name says: $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
729 for grep $who->on_same_map_as ($_->ob), cf::player::list; 781 my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list;
730 utf8::decode $msg; 782
783 $_->send_msg ($SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY | ($_ == $ob->contr ? cf::NDI_REPLY : 0))
784 for @plonmap;
731 785
732 # npcs, magic_ears etc. 786 # npcs, magic_ears etc.
733 # first find all objects and theirt-level inventories 787 # first find all objects and their first-level inventories
734 # within a 5x5 square # that have something resembling 788 # within a 5x5 square that have something resembling
735 # dialogue or support on_say. 789 # dialogue or support on_say.
736 my ($map, $x, $y) = ($who->map, $who->x - 2, $who->y - 2); 790 my ($map, $x, $y) = ($ob->map, $ob->x - 2, $ob->y - 2);
737 791
738 for my $npc ( 792 for my $npc (
739 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $who->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_, 793 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $ob->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_,
740 map +($_, $_->inv), 794 map +($_, $_->inv),
741 grep $_, 795 grep $_,
742 map $map->at ($x + $_ % 5, $y + (int $_ / 5)), 796 map $map->at ($x + $_ % 5, $y + (int $_ / 5)),
743 0..24 797 0..24
744 ) { 798 ) {
745 # if some listener teleported us somewhere else, stop right here 799 # if some listener teleported us somewhere else, stop right here
746 last unless $map->path == $who->map->path; 800 last unless $map->path == $ob->map->path;
747 801
748 my $dialog = new NPC_Dialogue ob => $who, npc => $npc; 802 my $dialog = new NPC_Dialogue pl => $ob->contr, npc => $npc;
749 my ($reply, @kw) = $dialog->tell ($msg); 803 my ($reply, @kw) = $dialog->tell ($msg);
750 804
751 if (defined $reply) { 805 if (defined $reply) {
752 if ($npc->type == cf::MAGIC_EAR) { 806 if ($npc->type == cf::MAGIC_EAR) {
753 if (length $reply) { 807 if (length $reply) {
754 $_->ob->message ($reply, cf::NDI_BROWN | cf::NDI_UNIQUE) 808 $_->send_msg ($SAY_CHANNEL => $reply, cf::NDI_BROWN)
755 for grep $who->on_same_map_as ($_->ob), cf::player::list; 809 for @plonmap;
756 } 810 }
757 $npc->use_trigger; 811 $npc->use_trigger;
758 } else { 812 } else {
759 if (length $reply) { 813 if (length $reply) {
760 $_->ob->message ($npc->name . " says: $reply", cf::NDI_BROWN | cf::NDI_UNIQUE) 814 $_->send_msg ($SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN)
761 for grep $who->on_same_map_as ($_->ob), cf::player::list; 815 for @plonmap;
762 } 816 }
763 } 817 }
764 } 818 }
765 819
766 if (@kw) { 820 if (@kw) {
767 $_->ob->message ("[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN | cf::NDI_UNIQUE) 821 $_->send_msg ($SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
768 for grep $who->on_same_map_as ($_->ob), cf::player::list; 822 for @plonmap;
769 } 823 }
770 } 824 }
771 825
772 } else { 826 } else {
773 $who->message ("What do you want to say?", cf::NDI_UNIQUE); 827 $ob->send_msg ($SAY_CHANNEL => "What do you want to say?", cf::NDI_GREY | cf::NDI_REPLY);
774 } 828 }
775
776 1
777}; 829};
778 830
779cf::register_command chat => sub { 831cf::register_command chat => sub {
780 my ($who, $msg) = @_; 832 my ($ob, $msg) = @_;
781 833
782 utf8::decode $msg; 834 utf8::decode $msg;
783 835
836 my $pl = $ob->contr;
837
784 return if $who->contr->invoke (cf::EVENT_PLAYER_CHAT, $msg); 838 return if $pl->invoke (cf::EVENT_PLAYER_CHAT, $msg);
785 839
786 if ($msg) { 840 if ($msg) {
787 my $name = $who->name; 841 my $name = $ob->name;
788 my $NOW = time; 842 my $NOW = time;
789 843
790 utf8::encode $msg; # ->message not yet utf8-ified
791 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg; 844 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
792 ext::schmorp_irc::do_notice (sprintf "[%s] %s", $name, $msg); 845 send_irc ("[%s] %s", $name, $msg);
793 846
794 $_->ob->message ("$name chats: $msg", cf::NDI_BLUE) 847 $_->send_msg ($CHAT_CHANNEL => "$name chats: $msg", cf::NDI_BLUE | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0))
795 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list; 848 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list;
796 849
797 } else { 850 } else {
798 $who->message ("Chat what?", cf::NDI_UNIQUE); 851 $pl->send_msg ($CHAT_CHANNEL => "Chat what?", cf::NDI_BLUE | cf::NDI_DEF | cf::NDI_REPLY);
799 } 852 }
800
801 1
802}; 853};
803 854
804cf::register_command shout => sub { 855cf::register_command shout => sub {
805 my ($who, $msg) = @_; 856 my ($ob, $msg) = @_;
806 857
807 utf8::decode $msg; 858 utf8::decode $msg;
808 859
860 my $pl = $ob->contr;
861
809 return if $who->contr->invoke (cf::EVENT_PLAYER_SHOUT, $msg); 862 return if $pl->invoke (cf::EVENT_PLAYER_SHOUT, $msg);
810 863
811 if ($msg) { 864 if ($msg) {
812 my $NOW = time; 865 my $NOW = time;
813 my $name = $who->name; 866 my $name = $ob->name;
814 867
815 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg; 868 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
816 ext::schmorp_irc::do_notice (sprintf "\007\0034{%s} %s\n", $name, $msg); 869 send_irc ("\007\0034{%s} %s\n", $name, $msg);
817 870
818 utf8::encode $msg; # ->message not yet utf8-ified 871 $_->send_msg ($CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED | cf::NDI_DEF | ($_ == $pl ? cf::NDI_REPLY : 0))
819 $_->ob->message ("$name shouts: $msg", cf::NDI_RED)
820 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list; 872 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list;
821 873
822 } else { 874 } else {
823 $who->message ("Shout what?", cf::NDI_UNIQUE); 875 $pl->send_msg ($CHAT_CHANNEL => "Shout what?", cf::NDI_RED | cf::NDI_DEF | cf::NDI_REPLY);
824 } 876 }
825
826 1
827}; 877};
828 878
829cf::register_command tell => sub { 879cf::register_command tell => sub {
830 my ($who, $args) = @_; 880 my ($ob, $args) = @_;
831 my ($target, $msg) = split /\s+/, $args, 2; 881 my ($target, $msg) = split /\s+/, $args, 2;
832 882
833 utf8::decode $msg; 883 utf8::decode $msg;
834 884
835 return if $who->contr->invoke (cf::EVENT_PLAYER_TELL, $target, $msg); 885 my $pl = $ob->contr;
836 886 my $ns = $pl->ns
887 or return;
837 my $name = $who->name; 888 my $name = $ob->name;
889
890 return if $pl->invoke (cf::EVENT_PLAYER_TELL, $target, $msg);
891
892 my $pl_channel = tell_channel $target;
838 893
839 if ($target =~ /irc\//) { 894 if ($target =~ /irc\//) {
840 my (undef, $nick) = split /\//, $target, 2; 895 my (undef, $nick) = split /\//, $target, 2;
841 $who->message ("You tell $target: $args"); 896 $ns->send_msg ($pl_channel => "You tell $target: $args", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
842 ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $msg); 897 send_irc ("(%s) %s: %s\n", $name, $nick, $msg);
898
843 } elsif (my $other = cf::player::find_active $target) { 899 } elsif (my $other = cf::player::find_active $target) {
900 my $other_channel = tell_channel $name;
844 901
845 if ($msg) { 902 if ($msg) {
846 if ($target eq $name) { 903 if ($target eq $name) {
847 $who->message ("You are talking to yourself, you freak!", cf::NDI_UNIQUE); 904 $ns->send_msg ($pl_channel => "You are talking to yourself, you freak!", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
848 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) { 905 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) {
849 $who->message ("$target ignores what you say. Give up on it.", cf::NDI_UNIQUE); 906 $ns->send_msg ($pl_channel => "$target ignores what you say. Give up on it.", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
850 } else { 907 } else {
851 utf8::encode $msg; # ->message not yet utf8-ified 908 return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl, $msg);
852 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg; 909 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg;
853 910
854 $who->message ("You tell $target: $msg"); 911 $ns->send_msg ($pl_channel => "You tell $target: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
855 $other->ob->message ("$name tells you: $msg"); 912 $other->send_msg ($other_channel => "$name tells you: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF);
856 $other->ob->{ext_last_tell} = $name;
857 } 913 }
858 } else { 914 } else {
859 $who->message ("What do you want to tell $target?", cf::NDI_UNIQUE); 915 $ns->send_msg ($pl_channel => "What do you want to tell $target?", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
860 } 916 }
861 917
862 } else { 918 } else {
863 $who->message ("No such player. Your message: $msg", cf::NDI_UNIQUE); 919 $ns->send_msg ($pl_channel => "No such player. Your message: $msg", cf::NDI_DK_ORANGE | cf::NDI_DEF | cf::NDI_REPLY);
864 } 920 }
865
866 1
867}; 921};
868 922
869cf::register_command reply => sub { 923cf::register_command ignore => sub {
870 my ($who, $args) = @_; 924 my ($pl, $args) = @_;
871 my $name = $who->name; 925 my ($target, $type, $timeout) = split /\s+/, $args;
872 926
873 utf8::decode $args; 927 if ($args eq "list") {
928 clean_timeouts $pl;
874 929
875 return if $who->contr->invoke (cf::EVENT_PLAYER_TELL, $who->{ext_last_tell}, $args); 930 if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}})
931 + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) {
932 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
933 $pl->message ((join ", ", @ignored_tell), cf::NDI_REPLY);
934 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
935 $pl->message ((join ", ", @ignored_shout), cf::NDI_REPLY);
936 $pl->message ("To stop ignoring one, use unignore.", cf::NDI_REPLY);
937 } else {
938 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
939 }
876 940
877 if ($who->{ext_last_tell} =~ /irc\//) { 941 } elsif ($target && $type) {
878 my (undef, $nick) = split /\//, $who->{ext_last_tell}, 2;
879 $who->message ("You tell " . $who->{ext_last_tell} . ": $args");
880 ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $args);
881 } elsif (my $other = cf::player::find_active $who->{ext_last_tell}) {
882 942
883 if ($args) { 943 $timeout ne "" or $timeout = 24;
884 $other->ob->{ext_ignore_tell}{$name} >= time 944 my $absolute_timeout = time + $timeout * 3600;
885 or delete $other->ob->{ext_ignore_tell}{$name};
886 945
887 if ($other->ob->{ext_ignore_tell}{$name} < time) { 946 if (cf::player::exists $target) {
888 utf8::encode $args; # ->message not yet utf8-ified 947 if ($type eq "tell") {
889 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $other->ob->name, $args; 948 $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_REPLY);
890 949 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
891 $who->message ("You tell " . $other->ob->name . ": $args"); 950 } elsif ($type eq "shout") {
892 $other->ob->message ("$name tells you: $args"); 951 $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_REPLY);
893 $who->{ext_last_tell} = $other->ob->name; 952 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
953 } elsif ($type eq "all") {
954 $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_REPLY);
955 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
956 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
894 } else { 957 } else {
895 $who->message ($other->ob->name . " ignores what you say. Give up on it.", cf::NDI_UNIQUE); 958 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
896 } 959 }
897 } else { 960 } else {
898 $who->message ("What do you want to tell ".$other->ob->name."?", cf::NDI_UNIQUE); 961 $pl->message ("No such player: $target", cf::NDI_REPLY);
899 } 962 }
900 963
901 } else { 964 } else {
902 $who->message ("Can't reply, player left. Your message: $args".$who->{ext_last_tell}, cf::NDI_UNIQUE);
903 }
904
905 1
906};
907
908cf::register_command ignore => sub {
909 my ($who, $args) = @_;
910 my ($target, $type, $timeout) = split /\s+/, $args;
911
912 if ($args eq "list") {
913 clean_timeouts $who;
914
915 if ((my @ignored_tell = sort keys %{$who->{ext_ignore_tell}})
916 + (my @ignored_shout = sort keys %{$who->{ext_ignore_shout}})) {
917 $who->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE);
918 $who->message ((join ", ", @ignored_tell), cf::NDI_UNIQUE);
919 $who->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE);
920 $who->message ((join ", ", @ignored_shout), cf::NDI_UNIQUE);
921 $who->message ("To stop ignoring one, use unignore.", cf::NDI_UNIQUE);
922 } else {
923 $who->message ("Not ignoring anyone", cf::NDI_UNIQUE);
924 }
925
926 } elsif ($target && $type) {
927
928 $timeout ne "" or $timeout = 24;
929 my $absolute_timeout = time + $timeout * 3600;
930
931 if (cf::player::exists $target) {
932 if ($type eq "tell") {
933 $who->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_UNIQUE);
934 $who->{ext_ignore_tell}{$target} = $absolute_timeout;
935 } elsif ($type eq "shout") {
936 $who->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_UNIQUE);
937 $who->{ext_ignore_shout}{$target} = $absolute_timeout;
938 } elsif ($type eq "all") {
939 $who->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_UNIQUE);
940 $who->{ext_ignore_tell}{$target} = $absolute_timeout;
941 $who->{ext_ignore_shout}{$target} = $absolute_timeout;
942 } else {
943 $who->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE);
944 }
945 } else {
946 $who->message ("No such player: $target", cf::NDI_UNIQUE);
947 }
948
949 } else {
950 $who->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n" 965 $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
951 . "will ignore a player for <timeout> hours.\n" 966 . "will ignore a player for <timeout> hours.\n"
952 . "Usage: ignore list\n" 967 . "Usage: ignore list\n"
953 . "will show you a list of players currently ignored.", cf::NDI_UNIQUE); 968 . "will show you a list of players currently ignored.", cf::NDI_REPLY);
954 } 969 }
955
956 1
957}; 970};
958 971
959cf::register_command unignore => sub { 972cf::register_command unignore => sub {
960 my ($who, $args) = @_; 973 my ($pl, $args) = @_;
961 my ($target, $type) = split /\s+/, $args; 974 my ($target, $type) = split /\s+/, $args;
962 975
963 if ($args eq "") { 976 if ($args eq "") {
964 if ($who->{ext_ignore_tell}) { 977 if ($pl->{ext_ignore_tell}) {
965 $who->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE); 978 $pl->message ("Currently ignoring private messages from: ", cf::NDI_REPLY);
966 $who->message ((join ", ", sort keys %{ $who->{ext_ignore_tell} }), cf::NDI_UNIQUE); 979 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_REPLY);
967 $who->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE); 980 $pl->message ("Currently ignoring shouts from: ", cf::NDI_REPLY);
968 $who->message ((join ", ", sort keys %{ $who->{ext_ignore_shout} }), cf::NDI_UNIQUE); 981 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_REPLY);
969 } else { 982 } else {
970 $who->message ("Not ignoring anyone", cf::NDI_UNIQUE); 983 $pl->message ("Not ignoring anyone", cf::NDI_REPLY);
971 } 984 }
972 } else { 985 } else {
973 if (cf::player::exists $target) { 986 if (cf::player::exists $target) {
974 if ($type eq "tell") { 987 if ($type eq "tell") {
975 $who->message ("Not ignoring private messages from $target anymore.", cf::NDI_UNIQUE); 988 $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_REPLY);
976 delete $who->{ext_ignore_tell} {$target}; 989 delete $pl->{ext_ignore_tell} {$target};
977 } elsif ($type eq "shout") { 990 } elsif ($type eq "shout") {
978 $who->message ("Not ignoring shouts from $target anymore.", cf::NDI_UNIQUE); 991 $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_REPLY);
979 delete $who->{ext_ignore_shout}{$target}; 992 delete $pl->{ext_ignore_shout}{$target};
980 } elsif ($type eq "all") { 993 } elsif ($type eq "all") {
981 $who->message ("Not ignoring anything from $target anymore.", cf::NDI_UNIQUE); 994 $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_REPLY);
982 delete $who->{ext_ignore_tell} {$target}; 995 delete $pl->{ext_ignore_tell} {$target};
983 delete $who->{ext_ignore_shout}{$target}; 996 delete $pl->{ext_ignore_shout}{$target};
984 } else { 997 } else {
985 $who->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE); 998 $pl->message ("You need to specify tell, shout or all.", cf::NDI_REPLY);
986 } 999 }
987 } else { 1000 } else {
988 $who->message ("No such player or ambiguous name: $target", cf::NDI_UNIQUE); 1001 $pl->message ("No such player or ambiguous name: $target", cf::NDI_REPLY);
989 } 1002 }
990 } 1003 }
991
992 1
993}; 1004};
994 1005
995cf::register_command seen => sub {
996 my ($who, $args) = @_;
997
998 if (my ($login) = $args =~ /(\S+)/) {
999 if ($login eq $who->name) {
1000 $who->message ("Very funny, $login. Ha. Ha.", cf::NDI_UNIQUE);
1001 } elsif (cf::player::find_active $login) {
1002 $who->message ("$login is right here on this server!", cf::NDI_UNIQUE);
1003 } elsif (cf::player::exists $login
1004 and stat sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($login) x 2) {
1005 my $time = (stat _)[9];
1006
1007 $who->message ("$login was last seen here "
1008 . (POSIX::strftime "%Y-%m-%d %H:%M:%S +0000", gmtime $time)
1009 . " which was " . (int +(time - $time) / 3600) . " hours ago.", cf::NDI_UNIQUE);
1010 } else {
1011 $who->message ("No player named $login is known to me.", cf::NDI_UNIQUE);
1012 }
1013 } else {
1014 $who->message ("Usage: seen <player>", cf::NDI_UNIQUE);
1015 }
1016
1017 1
1018};
1019

Diff Legend

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