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.45 by root, Sat May 19 11:04:16 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines