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.12 by pippijn, Fri Mar 2 00:29:08 2007 UTC

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

Diff Legend

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