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

Diff Legend

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