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

Diff Legend

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