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.20 by elmex, Thu Jun 28 08:34:42 2007 UTC vs.
Revision 1.25 by root, Mon Jul 23 21:17:14 2007 UTC

… …
4# implement a replacement for the built-in say/chat/shout/tell/reply commands 4# implement a replacement for the built-in say/chat/shout/tell/reply commands
5# adds ignore/unignore functionality 5# adds ignore/unignore functionality
6 6
7use NPC_Dialogue; 7use NPC_Dialogue;
8use POSIX (); # for strftime only 8use POSIX (); # for strftime only
9
10our $SAY_CHANNEL = {
11 id => "say",
12 title => "Map",
13 reply => "say ",
14 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
15};
16
17our $CHAT_CHANNEL = {
18 id => "chat",
19 title => "Chat",
20 reply => "chat ",
21 tooltip => "Player chat and shouts, global to the server.",
22};
9 23
10sub clean_timeouts($) { 24sub clean_timeouts($) {
11 my ($player) = @_; 25 my ($player) = @_;
12 my $NOW = time; 26 my $NOW = time;
13 27
… …
38 prio => -1000, 52 prio => -1000,
39 on_login => sub { 53 on_login => sub {
40 my ($pl) = @_; 54 my ($pl) = @_;
41 55
42 clean_timeouts $pl->ob; 56 clean_timeouts $pl->ob;
57 $pl->ns->send_msg ($SAY_CHANNEL);
58 $pl->ns->send_msg ($CHAT_CHANNEL);
43 }, 59 },
44); 60);
45 61
46cf::register_command listen => sub { 62cf::register_command listen => sub {
47 my ($pl, $msg) = @_; 63 my ($pl, $msg) = @_;
… …
51 $msg = 10 if $msg > 10; 67 $msg = 10 if $msg > 10;
52 68
53 my $prev_listen = $player->listening; 69 my $prev_listen = $player->listening;
54 $player->listening ($msg); 70 $player->listening ($msg);
55 if ($prev_listen == $player->listening) { 71 if ($prev_listen == $player->listening) {
56 $pl->message ("Your verbose level stayed $prev_listen.", cf::NDI_UNIQUE); 72 $pl->message ("Your verbose level stays at $prev_listen.", cf::NDI_UNIQUE);
57 } else { 73 } else {
58 $pl->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_UNIQUE); 74 $pl->message ("Your verbose level is now " . $player->listening . ". (previously: $prev_listen)", cf::NDI_UNIQUE);
59 } 75 }
60 } else { 76 } else {
61 $pl->message ("Your verbose level is " . $player->listening . ".", cf::NDI_UNIQUE); 77 $pl->message ("Your verbose level is " . $player->listening . ".", cf::NDI_UNIQUE);
… …
64 80
65cf::register_command cointoss => sub { 81cf::register_command cointoss => sub {
66 my ($pl, $msg) = @_; 82 my ($pl, $msg) = @_;
67 83
68 my $name = $pl->name; 84 my $name = $pl->name;
85 my $coin = int rand 2 ? "Heads" : "Tails";
69 86
70 if (int rand 2) {
71 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) { 87 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
72 next 88 next
73 if $other->ob == $pl; 89 if $other->ob == $pl;
74 $other->ob->message ("$name flips a coin.... Heads!", cf::NDI_GREY | cf::NDI_UNIQUE);
75 }
76
77 $pl->message ("You flip a coin.... Heads!", cf::NDI_GREY | cf::NDI_UNIQUE);
78 } else {
79 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
80 next
81 if $other->ob == $pl;
82 $other->ob->message ("$name flips a coin.... Tails!", cf::NDI_GREY | cf::NDI_UNIQUE); 90 $other->ob->message ("$name flips a coin.... $coin!", cf::NDI_GREY | cf::NDI_UNIQUE);
83 }
84
85 $pl->message ("You flip a coin.... Tails!", cf::NDI_GREY | cf::NDI_UNIQUE);
86 } 91 }
92
93 $pl->message ("You flip a coin.... $coin!", cf::NDI_GREY | cf::NDI_UNIQUE);
87}; 94};
88 95
89cf::register_command orcknuckle => sub { 96cf::register_command orcknuckle => sub {
90 my ($pl, $msg) = @_; 97 my ($pl, $msg) = @_;
91 my @orcknuckle = ("none", "beholder", "ghost", "knight", "princess", "dragon", "orc"); 98 my @orcknuckle = ("none", "beholder", "ghost", "knight", "princess", "dragon", "orc");
… …
760cf::register_command me => sub { 767cf::register_command me => sub {
761 my ($pl, $msg) = @_; 768 my ($pl, $msg) = @_;
762 769
763 my $name = $pl->name; 770 my $name = $pl->name;
764 771
765 $_->ob->message ("* $name $msg", cf::NDI_GREY | cf::NDI_UNIQUE) 772 $_->ns->send_msg ($SAY_CHANNEL => "* $name $msg", cf::NDI_GREY, $_ == $pl ? (reply => 1) : ())
766 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 773 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
767}; 774};
768 775
769cf::register_command say => sub { 776cf::register_command say => sub {
770 my ($pl, $msg) = @_; 777 my ($ob, $msg) = @_;
771 778
772 utf8::decode $msg; 779 utf8::decode $msg;
773 780
774 return if $pl->contr->invoke (cf::EVENT_PLAYER_SAY, $msg); 781 return if $ob->contr->invoke (cf::EVENT_PLAYER_SAY, $msg);
775 782
776 if ($msg) { 783 if ($msg) {
777 my $name = $pl->name; 784 my $name = $ob->name;
778
779 $_->ob->message ("$name says: $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
780 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 785 my @plonmap = grep $ob->on_same_map_as ($_->ob), cf::player::list;
786
787 $_->ns->send_msg ($SAY_CHANNEL => "$name says: $msg", cf::NDI_GREY, $_ == $ob ? (reply => 1) : ())
788 for @plonmap;
781 789
782 # npcs, magic_ears etc. 790 # npcs, magic_ears etc.
783 # first find all objects and their first-level inventories 791 # first find all objects and their first-level inventories
784 # within a 5x5 square that have something resembling 792 # within a 5x5 square that have something resembling
785 # dialogue or support on_say. 793 # dialogue or support on_say.
786 my ($map, $x, $y) = ($pl->map, $pl->x - 2, $pl->y - 2); 794 my ($map, $x, $y) = ($ob->map, $ob->x - 2, $ob->y - 2);
787 795
788 for my $npc ( 796 for my $npc (
789 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $pl->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_, 797 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $ob->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_,
790 map +($_, $_->inv), 798 map +($_, $_->inv),
791 grep $_, 799 grep $_,
792 map $map->at ($x + $_ % 5, $y + (int $_ / 5)), 800 map $map->at ($x + $_ % 5, $y + (int $_ / 5)),
793 0..24 801 0..24
794 ) { 802 ) {
795 # if some listener teleported us somewhere else, stop right here 803 # if some listener teleported us somewhere else, stop right here
796 last unless $map->path == $pl->map->path; 804 last unless $map->path == $ob->map->path;
797 805
798 my $dialog = new NPC_Dialogue pl => $pl->contr, npc => $npc; 806 my $dialog = new NPC_Dialogue pl => $ob->contr, npc => $npc;
799 my ($reply, @kw) = $dialog->tell ($msg); 807 my ($reply, @kw) = $dialog->tell ($msg);
800 808
801 if (defined $reply) { 809 if (defined $reply) {
802 if ($npc->type == cf::MAGIC_EAR) { 810 if ($npc->type == cf::MAGIC_EAR) {
803 if (length $reply) { 811 if (length $reply) {
804 $_->ob->message ($reply, cf::NDI_BROWN | cf::NDI_UNIQUE) 812 $_->ns->send_msg ($SAY_CHANNEL => $reply, cf::NDI_BROWN)
805 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 813 for @plonmap;
806 } 814 }
807 $npc->use_trigger; 815 $npc->use_trigger;
808 } else { 816 } else {
809 if (length $reply) { 817 if (length $reply) {
810 $_->ob->message ($npc->name . " says: $reply", cf::NDI_BROWN | cf::NDI_UNIQUE) 818 $_->ns->send_msg ($SAY_CHANNEL => $npc->name . " says: $reply", cf::NDI_BROWN)
811 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 819 for @plonmap;
812 } 820 }
813 } 821 }
814 } 822 }
815 823
816 if (@kw) { 824 if (@kw) {
817 $_->ob->message ("[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN | cf::NDI_UNIQUE) 825 $_->ns->send_msg ($SAY_CHANNEL => "[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN)
818 for grep $pl->on_same_map_as ($_->ob), cf::player::list; 826 for @plonmap;
819 } 827 }
820 } 828 }
821 829
822 } else { 830 } else {
823 $pl->message ("What do you want to say?", cf::NDI_UNIQUE); 831 $ob->contr->send_msg ($SAY_CHANNEL => "What do you want to say?", 0, reply => 1);
824 } 832 }
825}; 833};
826 834
827cf::register_command chat => sub { 835cf::register_command chat => sub {
828 my ($pl, $msg) = @_; 836 my ($pl, $msg) = @_;
… …
836 my $NOW = time; 844 my $NOW = time;
837 845
838 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg; 846 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
839 send_irc ("[%s] %s", $name, $msg); 847 send_irc ("[%s] %s", $name, $msg);
840 848
841 $_->ob->message ("$name chats: $msg", cf::NDI_BLUE) 849 $_->ns->send_msg ($CHAT_CHANNEL => "$name chats: $msg", cf::NDI_BLUE, $_ == $pl ? (reply => 1) : ())
842 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list; 850 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list;
843 851
844 } else { 852 } else {
845 $pl->message ("Chat what?", cf::NDI_UNIQUE); 853 $pl->ns->send_msg ($CHAT_CHANNEL => "Chat what?");
846 } 854 }
847}; 855};
848 856
849cf::register_command shout => sub { 857cf::register_command shout => sub {
850 my ($pl, $msg) = @_; 858 my ($pl, $msg) = @_;
… …
858 my $name = $pl->name; 866 my $name = $pl->name;
859 867
860 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg; 868 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
861 send_irc ("\007\0034{%s} %s\n", $name, $msg); 869 send_irc ("\007\0034{%s} %s\n", $name, $msg);
862 870
863 $_->ob->message ("$name shouts: $msg", cf::NDI_RED) 871 $_->ns->send_msg ($CHAT_CHANNEL => "$name shouts: $msg", cf::NDI_RED, $_ == $pl ? (reply => 1) : ())
864 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;
865 873
866 } else { 874 } else {
867 $pl->message ("Shout what?", cf::NDI_UNIQUE); 875 $pl->ns->send_msg ($CHAT_CHANNEL => "Shout what?");
868 } 876 }
869}; 877};
870 878
871cf::register_command tell => sub { 879cf::register_command tell => sub {
872 my ($pl, $args) = @_; 880 my ($ob, $args) = @_;
873 my ($target, $msg) = split /\s+/, $args, 2; 881 my ($target, $msg) = split /\s+/, $args, 2;
874 882
875 utf8::decode $msg; 883 utf8::decode $msg;
876 884
885 my $pl = $ob->contr;
886 my $ns = $pl->ns
887 or return;
888 my $name = $ob->name;
889
877 return if $pl->contr->invoke (cf::EVENT_PLAYER_TELL, $target, $msg); 890 return if $pl->invoke (cf::EVENT_PLAYER_TELL, $target, $msg);
878 891
879 my $name = $pl->name; 892 my $pl_channel = {
893 id => "tell-$target",
894 title => "$target",
895 reply => "tell $target ",
896 tooltip => "Private messages from/to $target",
897 };
880 898
881 if ($target =~ /irc\//) { 899 if ($target =~ /irc\//) {
882 my (undef, $nick) = split /\//, $target, 2; 900 my (undef, $nick) = split /\//, $target, 2;
883 $pl->message ("You tell $target: $args"); 901 $ns->send_msg ($pl_channel => "You tell $target: $args", reply => 1);
884 send_irc ("(%s) %s: %s\n", $name, $nick, $msg); 902 send_irc ("(%s) %s: %s\n", $name, $nick, $msg);
885 } elsif (my $other = cf::player::find_active $target) { 903 } elsif (my $other = cf::player::find_active $target) {
904 my $other_channel = {
905 id => "tell-$name",
906 title => "$name",
907 reply => "tell $name ",
908 tooltip => "Private messages from/to $name",
909 };
886 910
887 if ($msg) { 911 if ($msg) {
888 if ($target eq $name) { 912 if ($target eq $name) {
889 $pl->message ("You are talking to yourself, you freak!", cf::NDI_UNIQUE); 913 $ns->send_msg ($pl_channel => "You are talking to yourself, you freak!", reply => 1);
890 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) { 914 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) {
891 $pl->message ("$target ignores what you say. Give up on it.", cf::NDI_UNIQUE); 915 $ns->send_msg ($pl_channel => "$target ignores what you say. Give up on it.", reply => 1);
892 } else { 916 } else {
893 return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl->contr, $msg); 917 return if $other->invoke (cf::EVENT_PLAYER_TOLD, $pl, $msg);
894 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg; 918 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg;
895 919
896 $pl->message ("You tell $target: $msg"); 920 $ns->send_msg ($pl_channel => "You tell $target: $msg", reply => 1);
897 $other->ob->message ("$name tells you: $msg"); 921 $other->ns->send_msg ($other_channel => "$name tells you: $msg");
898 $other->ob->{ext_last_tell} = $name;
899 } 922 }
900 } else { 923 } else {
901 $pl->message ("What do you want to tell $target?", cf::NDI_UNIQUE); 924 $ns->send_msg ($pl_channel => "What do you want to tell $target?");
902 } 925 }
903 926
904 } else { 927 } else {
905 $pl->message ("No such player. Your message: $msg", cf::NDI_UNIQUE); 928 $ns->send_msg ($pl_channel => "No such player. Your message: $msg");
906 }
907};
908
909cf::register_command reply => sub {
910 my ($pl, $args) = @_;
911 my $name = $pl->name;
912
913 utf8::decode $args;
914
915 return if $pl->contr->invoke (cf::EVENT_PLAYER_TELL, $pl->{ext_last_tell}, $args);
916
917 if ($pl->{ext_last_tell} =~ /irc\//) {
918 my (undef, $nick) = split /\//, $pl->{ext_last_tell}, 2;
919 $pl->message ("You tell " . $pl->{ext_last_tell} . ": $args");
920 send_irc ("(%s) %s: %s\n", $name, $nick, $args);
921 } elsif (my $other = cf::player::find_active $pl->{ext_last_tell}) {
922
923 if ($args) {
924 $other->ob->{ext_ignore_tell}{$name} >= time
925 or delete $other->ob->{ext_ignore_tell}{$name};
926
927 if ($other->ob->{ext_ignore_tell}{$name} < time) {
928 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $other->ob->name, $args;
929
930 $pl->message ("You tell " . $other->ob->name . ": $args");
931 $other->ob->message ("$name tells you: $args");
932 $pl->{ext_last_tell} = $other->ob->name;
933 } else {
934 $pl->message ($other->ob->name . " ignores what you say. Give up on it.", cf::NDI_UNIQUE);
935 }
936 } else {
937 $pl->message ("What do you want to tell ".$other->ob->name."?", cf::NDI_UNIQUE);
938 }
939
940 } else {
941 $pl->message ("Can't reply, player left. Your message: $args".$pl->{ext_last_tell}, cf::NDI_UNIQUE);
942 } 929 }
943}; 930};
944 931
945cf::register_command ignore => sub { 932cf::register_command ignore => sub {
946 my ($pl, $args) = @_; 933 my ($pl, $args) = @_;

Diff Legend

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