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.17 by root, Sat May 19 11:04:16 2007 UTC vs.
Revision 1.22 by root, Sun Jul 22 14:17:57 2007 UTC

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

Diff Legend

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