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

Diff Legend

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