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.9 by pippijn, Thu Mar 1 13:01:37 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 } 50 }
51};
53 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);
54 1 74 }
55}; 75};
56 76
57my $emotes = { 77my $emotes = {
58 growl => { 78 growl => {
59 noparams => { 79 noparams => {
… …
634 }, 654 },
635}; 655};
636 656
637for my $emotion (keys %$emotes) { 657for my $emotion (keys %$emotes) {
638 cf::register_command $emotion => sub { 658 cf::register_command $emotion => sub {
639 my ($ob, $tname) = @_; 659 my ($pl, $tname) = @_;
640 660
641 cf::async { 661 cf::async {
642 my $name = $ob->name; 662 my $name = $pl->name;
643 663
644 if ($tname eq $name) { 664 if ($tname eq $name) {
645 my $emote = $emotes->{$emotion}->{self}; 665 my $emote = $emotes->{$emotion}->{self};
646 666
647 $emote->{other} = "You look away from <self>." 667 $emote->{other} = "You look away from <self>."
… …
649 $emote->{self} = "My god! Is that LEGAL?" 669 $emote->{self} = "My god! Is that LEGAL?"
650 if !$emote->{self}; 670 if !$emote->{self};
651 671
652 $emote->{other} =~ s/<self>/$name/; 672 $emote->{other} =~ s/<self>/$name/;
653 673
654 for my $other ( grep { $ob->on_same_map_as ($_->ob) } cf::player::list ) { 674 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
655 next 675 next
656 if $other->ob == $ob; 676 if $other->ob == $pl;
657 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE); 677 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
658 } 678 }
659 679
660 $ob->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 680 $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE);
661 } elsif ($tname) { 681 } elsif ($tname) {
662 my $target = cf::player::find $tname 682 my $target = cf::player::find $tname
663 or return $ob->reply (undef, "$tname is not around."); 683 or return $pl->reply (undef, "$tname is not around.");
664 684
665 my $emote = $emotes->{$emotion}->{params}; 685 my $emote = $emotes->{$emotion}->{params};
666 686
667 $emote->{other} = "<self> is eyeing <other> quizzically." 687 $emote->{other} = "<self> is eyeing <other> quizzically."
668 if !$emote->{other}; 688 if !$emote->{other};
… …
674 $emote->{self} =~ s/<other>/$tname/; 694 $emote->{self} =~ s/<other>/$tname/;
675 $emote->{target} =~ s/<self>/$name/; 695 $emote->{target} =~ s/<self>/$name/;
676 $emote->{other} =~ s/<other>/$tname/; 696 $emote->{other} =~ s/<other>/$tname/;
677 $emote->{other} =~ s/<self>/$name/; 697 $emote->{other} =~ s/<self>/$name/;
678 698
679 for my $other ( grep { $ob->on_same_map_as ($_->ob) } cf::player::list ) { 699 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
680 next 700 next
681 if $other->ob == $ob or $other == $target; 701 if $other->ob == $pl or $other == $target;
682 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE); 702 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
683 } 703 }
684 704
685 $target->ob->message ($emote->{target}, cf::NDI_GREY | cf::NDI_UNIQUE); 705 $target->ob->message ($emote->{target}, cf::NDI_GREY | cf::NDI_UNIQUE);
686 $ob->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 706 $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE);
687 } else { 707 } else {
688 my $emote = $emotes->{$emotion}->{noparams}; 708 my $emote = $emotes->{$emotion}->{noparams};
689 $emote->{other} =~ s/<self>/$name/; 709 $emote->{other} =~ s/<self>/$name/;
690 710
691 $emote->{other} = "<self> dances with glee." 711 $emote->{other} = "<self> dances with glee."
692 if !$emote->{other}; 712 if !$emote->{other};
693 $emote->{self} = "You are a nut." 713 $emote->{self} = "You are a nut."
694 if !$emote->{self}; 714 if !$emote->{self};
695 715
696 for my $other ( grep { $ob->on_same_map_as ($_->ob) } cf::player::list ) { 716 for my $other ( grep { $pl->on_same_map_as ($_->ob) } cf::player::list ) {
697 next 717 next
698 if $other->ob == $ob; 718 if $other->ob == $pl;
699 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE); 719 $other->ob->message ($emote->{other}, cf::NDI_GREY | cf::NDI_UNIQUE);
700 } 720 }
701 721
702 $ob->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE); 722 $pl->message ($emote->{self}, cf::NDI_GREY | cf::NDI_UNIQUE);
703 } 723 }
704 }; 724 };
705 }; 725 };
706} 726}
707 727
728cf::register_command me => sub {
729 my ($pl, $msg) = @_;
730
731 my $name = $pl->name;
732
733 $_->ob->message ("* $name $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
734 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
735};
736
708cf::register_command say => sub { 737cf::register_command say => sub {
709 my ($who, $msg) = @_; 738 my ($pl, $msg) = @_;
710 739
711 utf8::decode $msg; 740 utf8::decode $msg;
712 741
713 return if $who->contr->invoke (cf::EVENT_PLAYER_SAY, $msg); 742 return if $pl->contr->invoke (cf::EVENT_PLAYER_SAY, $msg);
714 743
715 if ($msg) { 744 if ($msg) {
716 my $name = $who->name; 745 my $name = $pl->name;
717 746
718 utf8::encode $msg; # ->message not yet utf8-ified 747 utf8::encode $msg; # ->message not yet utf8-ified
719 $_->ob->message ("$name says: $msg", cf::NDI_GREY | cf::NDI_UNIQUE) 748 $_->ob->message ("$name says: $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
720 for grep $who->on_same_map_as ($_->ob), cf::player::list; 749 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
721 utf8::decode $msg; 750 utf8::decode $msg;
722 751
723 # npcs, magic_ears etc. 752 # npcs, magic_ears etc.
724 # first find all objects and theirt-level inventories 753 # first find all objects and theirt-level inventories
725 # within a 5x5 square # that have something resembling 754 # within a 5x5 square # that have something resembling
726 # dialogue or support on_say. 755 # dialogue or support on_say.
727 my ($map, $x, $y) = ($who->map, $who->x - 2, $who->y - 2); 756 my ($map, $x, $y) = ($pl->map, $pl->x - 2, $pl->y - 2);
728 757
729 for my $npc ( 758 for my $npc (
730 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $who->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_, 759 grep +($_->invoke (cf::EVENT_OBJECT_SAY, $pl->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_,
731 map +($_, $_->inv), 760 map +($_, $_->inv),
732 grep $_, 761 grep $_,
733 map $map->at ($x + $_ % 5, $y + (int $_ / 5)), 762 map $map->at ($x + $_ % 5, $y + (int $_ / 5)),
734 0..24 763 0..24
735 ) { 764 ) {
736 # if some listener teleported us somewhere else, stop right here 765 # if some listener teleported us somewhere else, stop right here
737 last unless $map->path == $who->map->path; 766 last unless $map->path == $pl->map->path;
738 767
739 my $dialog = new NPC_Dialogue ob => $who, npc => $npc; 768 my $dialog = new NPC_Dialogue ob => $pl, npc => $npc;
740 my ($reply, @kw) = $dialog->tell ($msg); 769 my ($reply, @kw) = $dialog->tell ($msg);
741 770
742 if (defined $reply) { 771 if (defined $reply) {
743 if ($npc->type == cf::MAGIC_EAR) { 772 if ($npc->type == cf::MAGIC_EAR) {
744 if (length $reply) { 773 if (length $reply) {
745 $_->ob->message ($reply, cf::NDI_BROWN | cf::NDI_UNIQUE) 774 $_->ob->message ($reply, cf::NDI_BROWN | cf::NDI_UNIQUE)
746 for grep $who->on_same_map_as ($_->ob), cf::player::list; 775 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
747 } 776 }
748 $npc->use_trigger; 777 $npc->use_trigger;
749 } else { 778 } else {
750 if (length $reply) { 779 if (length $reply) {
751 $_->ob->message ($npc->name . " says: $reply", cf::NDI_BROWN | cf::NDI_UNIQUE) 780 $_->ob->message ($npc->name . " says: $reply", cf::NDI_BROWN | cf::NDI_UNIQUE)
752 for grep $who->on_same_map_as ($_->ob), cf::player::list; 781 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
753 } 782 }
754 } 783 }
755 } 784 }
756 785
757 if (@kw) { 786 if (@kw) {
758 $_->ob->message ("[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN | cf::NDI_UNIQUE) 787 $_->ob->message ("[further topics: " . (join ", ", @kw) . "]", cf::NDI_BROWN | cf::NDI_UNIQUE)
759 for grep $who->on_same_map_as ($_->ob), cf::player::list; 788 for grep $pl->on_same_map_as ($_->ob), cf::player::list;
760 } 789 }
761 } 790 }
762 791
763 } else { 792 } else {
764 $who->message ("What do you want to say?", cf::NDI_UNIQUE); 793 $pl->message ("What do you want to say?", cf::NDI_UNIQUE);
765 } 794 }
766
767 1
768}; 795};
769 796
770cf::register_command chat => sub { 797cf::register_command chat => sub {
771 my ($who, $msg) = @_; 798 my ($pl, $msg) = @_;
772 799
773 utf8::decode $msg; 800 utf8::decode $msg;
774 801
775 return if $who->contr->invoke (cf::EVENT_PLAYER_CHAT, $msg); 802 return if $pl->contr->invoke (cf::EVENT_PLAYER_CHAT, $msg);
776 803
777 if ($msg) { 804 if ($msg) {
778 my $name = $who->name; 805 my $name = $pl->name;
779 my $NOW = time; 806 my $NOW = time;
780 807
781 utf8::encode $msg; # ->message not yet utf8-ified 808 utf8::encode $msg; # ->message not yet utf8-ified
782 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg; 809 cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
783 ext::schmorp_irc::do_notice (sprintf "[%s] %s", $name, $msg); 810 ext::schmorp_irc::do_notice (sprintf "[%s] %s", $name, $msg);
784 811
785 $_->ob->message ("$name chats: $msg", cf::NDI_BLUE) 812 $_->ob->message ("$name chats: $msg", cf::NDI_BLUE)
786 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list; 813 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list;
787 814
788 } else { 815 } else {
789 $who->message ("Chat what?", cf::NDI_UNIQUE); 816 $pl->message ("Chat what?", cf::NDI_UNIQUE);
790 } 817 }
791
792 1
793}; 818};
794 819
795cf::register_command shout => sub { 820cf::register_command shout => sub {
796 my ($who, $msg) = @_; 821 my ($pl, $msg) = @_;
797 822
798 utf8::decode $msg; 823 utf8::decode $msg;
799 824
800 return if $who->contr->invoke (cf::EVENT_PLAYER_SHOUT, $msg); 825 return if $pl->contr->invoke (cf::EVENT_PLAYER_SHOUT, $msg);
801 826
802 if ($msg) { 827 if ($msg) {
803 my $NOW = time; 828 my $NOW = time;
804 my $name = $who->name; 829 my $name = $pl->name;
805 830
806 cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg; 831 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); 832 ext::schmorp_irc::do_notice (sprintf "\007\0034{%s} %s\n", $name, $msg);
808 833
809 utf8::encode $msg; # ->message not yet utf8-ified 834 utf8::encode $msg; # ->message not yet utf8-ified
810 $_->ob->message ("$name shouts: $msg", cf::NDI_RED) 835 $_->ob->message ("$name shouts: $msg", cf::NDI_RED)
811 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list; 836 for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list;
812 837
813 } else { 838 } else {
814 $who->message ("Shout what?", cf::NDI_UNIQUE); 839 $pl->message ("Shout what?", cf::NDI_UNIQUE);
815 } 840 }
816
817 1
818}; 841};
819 842
820cf::register_command tell => sub { 843cf::register_command tell => sub {
821 my ($who, $args) = @_; 844 my ($pl, $args) = @_;
822 my ($target, $msg) = split /\s+/, $args, 2; 845 my ($target, $msg) = split /\s+/, $args, 2;
823 846
824 utf8::decode $msg; 847 utf8::decode $msg;
825 848
826 return if $who->contr->invoke (cf::EVENT_PLAYER_TELL, $target, $msg); 849 return if $pl->contr->invoke (cf::EVENT_PLAYER_TELL, $target, $msg);
827 850
828 my $name = $who->name; 851 my $name = $pl->name;
829 852
830 if ($target =~ /irc\//) { 853 if ($target =~ /irc\//) {
831 my (undef, $nick) = split /\//, $target, 2; 854 my (undef, $nick) = split /\//, $target, 2;
832 $who->message ("You tell $target: $args"); 855 $pl->message ("You tell $target: $args");
833 ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $msg); 856 ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $msg);
834 } elsif (my $other = cf::player::find_active $target) { 857 } elsif (my $other = cf::player::find_active $target) {
835 858
836 if ($msg) { 859 if ($msg) {
837 if ($target eq $name) { 860 if ($target eq $name) {
838 $who->message ("You are talking to yourself, you freak!", cf::NDI_UNIQUE); 861 $pl->message ("You are talking to yourself, you freak!", cf::NDI_UNIQUE);
839 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) { 862 } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) {
840 $who->message ("$target ignores what you say. Give up on it.", cf::NDI_UNIQUE); 863 $pl->message ("$target ignores what you say. Give up on it.", cf::NDI_UNIQUE);
841 } else { 864 } else {
842 utf8::encode $msg; # ->message not yet utf8-ified 865 utf8::encode $msg; # ->message not yet utf8-ified
843 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg; 866 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $target, $msg;
844 867
845 $who->message ("You tell $target: $msg"); 868 $pl->message ("You tell $target: $msg");
846 $other->ob->message ("$name tells you: $msg"); 869 $other->ob->message ("$name tells you: $msg");
847 $other->ob->{ext_last_tell} = $name; 870 $other->ob->{ext_last_tell} = $name;
848 } 871 }
849 } else { 872 } else {
850 $who->message ("What do you want to tell $target?", cf::NDI_UNIQUE); 873 $pl->message ("What do you want to tell $target?", cf::NDI_UNIQUE);
851 } 874 }
852 875
853 } else { 876 } else {
854 $who->message ("No such player. Your message: $msg", cf::NDI_UNIQUE); 877 $pl->message ("No such player. Your message: $msg", cf::NDI_UNIQUE);
855 } 878 }
856
857 1
858}; 879};
859 880
860cf::register_command reply => sub { 881cf::register_command reply => sub {
861 my ($who, $args) = @_; 882 my ($pl, $args) = @_;
862 my $name = $who->name; 883 my $name = $pl->name;
863 884
864 utf8::decode $args; 885 utf8::decode $args;
865 886
866 return if $who->contr->invoke (cf::EVENT_PLAYER_TELL, $who->{ext_last_tell}, $args); 887 return if $pl->contr->invoke (cf::EVENT_PLAYER_TELL, $pl->{ext_last_tell}, $args);
867 888
868 if ($who->{ext_last_tell} =~ /irc\//) { 889 if ($pl->{ext_last_tell} =~ /irc\//) {
869 my (undef, $nick) = split /\//, $who->{ext_last_tell}, 2; 890 my (undef, $nick) = split /\//, $pl->{ext_last_tell}, 2;
870 $who->message ("You tell " . $who->{ext_last_tell} . ": $args"); 891 $pl->message ("You tell " . $pl->{ext_last_tell} . ": $args");
871 ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $args); 892 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}) { 893 } elsif (my $other = cf::player::find_active $pl->{ext_last_tell}) {
873 894
874 if ($args) { 895 if ($args) {
875 $other->ob->{ext_ignore_tell}{$name} >= time 896 $other->ob->{ext_ignore_tell}{$name} >= time
876 or delete $other->ob->{ext_ignore_tell}{$name}; 897 or delete $other->ob->{ext_ignore_tell}{$name};
877 898
878 if ($other->ob->{ext_ignore_tell}{$name} < time) { 899 if ($other->ob->{ext_ignore_tell}{$name} < time) {
879 utf8::encode $args; # ->message not yet utf8-ified 900 utf8::encode $args; # ->message not yet utf8-ified
880 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $other->ob->name, $args; 901 cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $other->ob->name, $args;
881 902
882 $who->message ("You tell " . $other->ob->name . ": $args"); 903 $pl->message ("You tell " . $other->ob->name . ": $args");
883 $other->ob->message ("$name tells you: $args"); 904 $other->ob->message ("$name tells you: $args");
884 $who->{ext_last_tell} = $other->ob->name; 905 $pl->{ext_last_tell} = $other->ob->name;
885 } else { 906 } else {
886 $who->message ($other->ob->name . " ignores what you say. Give up on it.", cf::NDI_UNIQUE); 907 $pl->message ($other->ob->name . " ignores what you say. Give up on it.", cf::NDI_UNIQUE);
887 } 908 }
888 } else { 909 } else {
889 $who->message ("What do you want to tell ".$other->ob->name."?", cf::NDI_UNIQUE); 910 $pl->message ("What do you want to tell ".$other->ob->name."?", cf::NDI_UNIQUE);
890 } 911 }
891 912
892 } else { 913 } else {
893 $who->message ("Can't reply, player left. Your message: $args".$who->{ext_last_tell}, cf::NDI_UNIQUE); 914 $pl->message ("Can't reply, player left. Your message: $args".$pl->{ext_last_tell}, cf::NDI_UNIQUE);
894 } 915 }
895
896 1
897}; 916};
898 917
899cf::register_command ignore => sub { 918cf::register_command ignore => sub {
900 my ($who, $args) = @_; 919 my ($pl, $args) = @_;
901 my ($target, $type, $timeout) = split /\s+/, $args; 920 my ($target, $type, $timeout) = split /\s+/, $args;
902 921
903 if ($args eq "list") { 922 if ($args eq "list") {
904 clean_timeouts $who; 923 clean_timeouts $pl;
905 924
906 if ((my @ignored_tell = sort keys %{$who->{ext_ignore_tell}}) 925 if ((my @ignored_tell = sort keys %{$pl->{ext_ignore_tell}})
907 + (my @ignored_shout = sort keys %{$who->{ext_ignore_shout}})) { 926 + (my @ignored_shout = sort keys %{$pl->{ext_ignore_shout}})) {
908 $who->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE); 927 $pl->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE);
909 $who->message ((join ", ", @ignored_tell), cf::NDI_UNIQUE); 928 $pl->message ((join ", ", @ignored_tell), cf::NDI_UNIQUE);
910 $who->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE); 929 $pl->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE);
911 $who->message ((join ", ", @ignored_shout), cf::NDI_UNIQUE); 930 $pl->message ((join ", ", @ignored_shout), cf::NDI_UNIQUE);
912 $who->message ("To stop ignoring one, use unignore.", cf::NDI_UNIQUE); 931 $pl->message ("To stop ignoring one, use unignore.", cf::NDI_UNIQUE);
913 } else { 932 } else {
914 $who->message ("Not ignoring anyone", cf::NDI_UNIQUE); 933 $pl->message ("Not ignoring anyone", cf::NDI_UNIQUE);
915 } 934 }
916 935
917 } elsif ($target && $type) { 936 } elsif ($target && $type) {
918 937
919 $timeout ne "" or $timeout = 24; 938 $timeout ne "" or $timeout = 24;
920 my $absolute_timeout = time + $timeout * 3600; 939 my $absolute_timeout = time + $timeout * 3600;
921 940
922 if (cf::player::exists $target) { 941 if (cf::player::exists $target) {
923 if ($type eq "tell") { 942 if ($type eq "tell") {
924 $who->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_UNIQUE); 943 $pl->message ("Now ignoring private messages from $target for $timeout hours.", cf::NDI_UNIQUE);
925 $who->{ext_ignore_tell}{$target} = $absolute_timeout; 944 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
926 } elsif ($type eq "shout") { 945 } elsif ($type eq "shout") {
927 $who->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_UNIQUE); 946 $pl->message ("Now ignoring shouts from $target for $timeout hours.", cf::NDI_UNIQUE);
928 $who->{ext_ignore_shout}{$target} = $absolute_timeout; 947 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
929 } elsif ($type eq "all") { 948 } elsif ($type eq "all") {
930 $who->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_UNIQUE); 949 $pl->message ("Now ignoring everything from $target for $timeout hours.", cf::NDI_UNIQUE);
931 $who->{ext_ignore_tell}{$target} = $absolute_timeout; 950 $pl->{ext_ignore_tell}{$target} = $absolute_timeout;
932 $who->{ext_ignore_shout}{$target} = $absolute_timeout; 951 $pl->{ext_ignore_shout}{$target} = $absolute_timeout;
933 } else { 952 } else {
934 $who->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE); 953 $pl->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE);
935 } 954 }
936 } else { 955 } else {
937 $who->message ("No such player: $target", cf::NDI_UNIQUE); 956 $pl->message ("No such player: $target", cf::NDI_UNIQUE);
938 } 957 }
939 958
940 } else { 959 } else {
941 $who->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n" 960 $pl->message ("Usage: ignore <player> <tell|shout|all> <timeout>\n"
942 . "will ignore a player for <timeout> hours.\n" 961 . "will ignore a player for <timeout> hours.\n"
943 . "Usage: ignore list\n" 962 . "Usage: ignore list\n"
944 . "will show you a list of players currently ignored.", cf::NDI_UNIQUE); 963 . "will show you a list of players currently ignored.", cf::NDI_UNIQUE);
945 } 964 }
946
947 1
948}; 965};
949 966
950cf::register_command unignore => sub { 967cf::register_command unignore => sub {
951 my ($who, $args) = @_; 968 my ($pl, $args) = @_;
952 my ($target, $type) = split /\s+/, $args; 969 my ($target, $type) = split /\s+/, $args;
953 970
954 if ($args eq "") { 971 if ($args eq "") {
955 if ($who->{ext_ignore_tell}) { 972 if ($pl->{ext_ignore_tell}) {
956 $who->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE); 973 $pl->message ("Currently ignoring private messages from: ", cf::NDI_UNIQUE);
957 $who->message ((join ", ", sort keys %{ $who->{ext_ignore_tell} }), cf::NDI_UNIQUE); 974 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_tell} }), cf::NDI_UNIQUE);
958 $who->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE); 975 $pl->message ("Currently ignoring shouts from: ", cf::NDI_UNIQUE);
959 $who->message ((join ", ", sort keys %{ $who->{ext_ignore_shout} }), cf::NDI_UNIQUE); 976 $pl->message ((join ", ", sort keys %{ $pl->{ext_ignore_shout} }), cf::NDI_UNIQUE);
960 } else { 977 } else {
961 $who->message ("Not ignoring anyone", cf::NDI_UNIQUE); 978 $pl->message ("Not ignoring anyone", cf::NDI_UNIQUE);
962 } 979 }
963 } else { 980 } else {
964 if (cf::player::exists $target) { 981 if (cf::player::exists $target) {
965 if ($type eq "tell") { 982 if ($type eq "tell") {
966 $who->message ("Not ignoring private messages from $target anymore.", cf::NDI_UNIQUE); 983 $pl->message ("Not ignoring private messages from $target anymore.", cf::NDI_UNIQUE);
967 delete $who->{ext_ignore_tell} {$target}; 984 delete $pl->{ext_ignore_tell} {$target};
968 } elsif ($type eq "shout") { 985 } elsif ($type eq "shout") {
969 $who->message ("Not ignoring shouts from $target anymore.", cf::NDI_UNIQUE); 986 $pl->message ("Not ignoring shouts from $target anymore.", cf::NDI_UNIQUE);
970 delete $who->{ext_ignore_shout}{$target}; 987 delete $pl->{ext_ignore_shout}{$target};
971 } elsif ($type eq "all") { 988 } elsif ($type eq "all") {
972 $who->message ("Not ignoring anything from $target anymore.", cf::NDI_UNIQUE); 989 $pl->message ("Not ignoring anything from $target anymore.", cf::NDI_UNIQUE);
973 delete $who->{ext_ignore_tell} {$target}; 990 delete $pl->{ext_ignore_tell} {$target};
974 delete $who->{ext_ignore_shout}{$target}; 991 delete $pl->{ext_ignore_shout}{$target};
975 } else { 992 } else {
976 $who->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE); 993 $pl->message ("You need to specify tell, shout or all.", cf::NDI_UNIQUE);
977 } 994 }
978 } else { 995 } else {
979 $who->message ("No such player or ambiguous name: $target", cf::NDI_UNIQUE); 996 $pl->message ("No such player or ambiguous name: $target", cf::NDI_UNIQUE);
980 } 997 }
981 } 998 }
982
983 1
984}; 999};
985 1000
986cf::register_command seen => sub { 1001cf::register_command seen => sub {
987 my ($who, $args) = @_; 1002 my ($pl, $args) = @_;
988 1003
989 if (my ($login) = $args =~ /(\S+)/) { 1004 if (my ($login) = $args =~ /(\S+)/) {
990 if ($login eq $who->name) { 1005 if ($login eq $pl->name) {
991 $who->message ("Very funny, $login. Ha. Ha.", cf::NDI_UNIQUE); 1006 $pl->message ("Very funny, $login. Ha. Ha.", cf::NDI_UNIQUE);
992 } elsif (cf::player::find_active $login) { 1007 } elsif (cf::player::find_active $login) {
993 $who->message ("$login is right here on this server!", cf::NDI_UNIQUE); 1008 $pl->message ("$login is right here on this server!", cf::NDI_UNIQUE);
994 } elsif (cf::player::exists $login 1009 } elsif (cf::player::exists $login
995 and stat sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($login) x 2) { 1010 and stat sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($login) x 2) {
996 my $time = (stat _)[9]; 1011 my $time = (stat _)[9];
997 1012
998 $who->message ("$login was last seen here " 1013 $pl->message ("$login was last seen here "
999 . (POSIX::strftime "%Y-%m-%d %H:%M:%S +0000", gmtime $time) 1014 . (POSIX::strftime "%Y-%m-%d %H:%M:%S +0000", gmtime $time)
1000 . " which was " . (int +(time - $time) / 3600) . " hours ago.", cf::NDI_UNIQUE); 1015 . " which was " . (int +(time - $time) / 3600) . " hours ago.", cf::NDI_UNIQUE);
1001 } else { 1016 } else {
1002 $who->message ("No player named $login is known to me.", cf::NDI_UNIQUE); 1017 $pl->message ("No player named $login is known to me.", cf::NDI_UNIQUE);
1003 } 1018 }
1004 } else { 1019 } else {
1005 $who->message ("Usage: seen <player>", cf::NDI_UNIQUE); 1020 $pl->message ("Usage: seen <player>", cf::NDI_UNIQUE);
1006 } 1021 }
1007
1008 1
1009}; 1022};
1010 1023

Diff Legend

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