ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/commands.ext
(Generate patch)

Comparing deliantra/server/ext/commands.ext (file contents):
Revision 1.43 by root, Mon May 7 03:05:58 2007 UTC vs.
Revision 1.47 by root, Mon Jun 11 22:18:03 2007 UTC

1#! perl # MANDATORY 1#! perl # mandatory depends=irc
2 2
3use POSIX (); 3use POSIX ();
4 4
5# miscellaneous commands 5# miscellaneous commands
6 6
… …
35 35
36 $ob->esrv_update_item (cf::UPD_NAME, $item); 36 $ob->esrv_update_item (cf::UPD_NAME, $item);
37 37
38 1 38 1
39} 39}
40
41sub ext::schmorp_irc::users; # HACK: TODO: replace by signal
42 40
43sub who_listing(;$$) { 41sub who_listing(;$$) {
44 my ($privileged, $select) = @_; 42 my ($privileged, $select) = @_;
45 43
46 my ($numwiz, $numafk) = (0, 0); 44 my ($numwiz, $numafk) = (0, 0);
… …
73 . " [" . ($pl->peaceful || $privileged ? $ob->map->visible_name : $ob->region->name) . "]" 71 . " [" . ($pl->peaceful || $privileged ? $ob->map->visible_name : $ob->region->name) . "]"
74 . (sprintf " [rtt %.3fs]", $pl->ns->rtt * 1e-6) 72 . (sprintf " [rtt %.3fs]", $pl->ns->rtt * 1e-6)
75 . ($privileged ? " " . $pl->ns->host : "") 73 . ($privileged ? " " . $pl->ns->host : "")
76 } sort { (lc $a->ob->name) cmp (lc $b->ob->name) } @pl 74 } sort { (lc $a->ob->name) cmp (lc $b->ob->name) } @pl
77 ), 75 ),
78 eval { "* IRC: " . join ", ", ext::schmorp_irc::users }, 76 eval { "* IRC: " . join ", ", ext::irc::users },
79 ) 77 )
80} 78}
81 79
82cf::register_command who => sub { 80cf::register_command who => sub {
83 my ($ob, $arg) = @_; 81 my ($ob, $arg) = @_;
… …
115cf::register_command body => sub { 113cf::register_command body => sub {
116 my ($ob) = @_; 114 my ($ob) = @_;
117 115
118 # Too hard to try and make a header that lines everything up, so just 116 # Too hard to try and make a header that lines everything up, so just
119 # give a description. (comment from C++) 117 # give a description. (comment from C++)
118 my $reply =
120 $ob->reply (undef, "The first column is the name of the body location."); 119 "The first column is the name of the body location.\n"
121 $ob->reply (undef, "The second column is how many of those locations your body has."); 120 . "The second column is how many of those locations your body has.\n"
122 $ob->reply (undef, "The third column is how many slots in that location are available."); 121 . "The third column is how many slots in that location are available.\n";
123 122
123 $reply .= sprintf "%-20s %3s %5s\n", "Location", "You", "Avail";
124 for (0 .. cf::NUM_BODY_LOCATIONS - 1) { 124 for (0 .. cf::NUM_BODY_LOCATIONS - 1) {
125 $ob->reply (undef, (sprintf "%-30s %5d %5d", cf::object::slot_use_name ($_), $ob->slot_info ($_), $ob->slot_used ($_))) 125 my $msg = cf::object::slot_nonuse_name $_;
126 $msg =~ s/^.*? a //;
127 $reply .= sprintf "%-20s %3d %5d\n", $msg, $ob->slot_info ($_), $ob->slot_used ($_)
126 if $ob->slot_info ($_) or $ob->slot_used ($_); 128 if $ob->slot_info ($_) or $ob->slot_used ($_);
127 } 129 }
128 130
129 $ob->reply (undef, "You are not allowed to wear armor") 131 $reply .= "You are not allowed to wear armor\n"
130 unless $ob->flag (cf::FLAG_USE_ARMOUR); 132 unless $ob->flag (cf::FLAG_USE_ARMOUR);
131 $ob->reply (undef, "You are not allowed to use weapons") 133 $reply .= "You are not allowed to use weapons\n"
132 unless $ob->flag (cf::FLAG_USE_WEAPON); 134 unless $ob->flag (cf::FLAG_USE_WEAPON);
135
136 $ob->reply (undef, $reply);
133 137
134 1 138 1
135}; 139};
136 140
137cf::register_command mark => sub { 141cf::register_command mark => sub {

Diff Legend

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