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.47 by root, Mon Jun 11 22:18:03 2007 UTC vs.
Revision 1.52 by root, Wed Jul 4 17:48:56 2007 UTC

… …
62 (grep /$select/, 62 (grep /$select/,
63 map { 63 map {
64 my ($pl, $ob, $ns) = ($_, $_->ob, $_->ns); 64 my ($pl, $ob, $ns) = ($_, $_->ob, $_->ns);
65 65
66 "* " . $ob->name . "/" . $ob->level . " " . (length $pl->own_title ? $pl->own_title : "the " . $pl->title) 66 "* " . $ob->name . "/" . $ob->level . " " . (length $pl->own_title ? $pl->own_title : "the " . $pl->title)
67 . ($pl->gender ? " [f]" : " [m]")
67 . ($pl->peaceful ? " [peaceful]" : " [HOSTILE]") 68 . ($pl->peaceful ? " [peaceful]" : " [HOSTILE]")
68 . ($ns->afk ? " [AFK]" : "") 69 . ($ns->afk ? " [AFK]" : "")
69 . ($ob->flag (cf::FLAG_WIZ) ? " [WIZ]" : "") 70 . ($ob->flag (cf::FLAG_WIZ) ? " [WIZ]" : "")
70 . " [" . $pl->ns->version . "]" 71 . " [" . $pl->ns->version . "]"
71 . " [" . ($pl->peaceful || $privileged ? $ob->map->visible_name : $ob->region->name) . "]" 72 . " [" . ($pl->peaceful || $privileged ? $ob->map->visible_name : $ob->region->name) . "]"
… …
114 my ($ob) = @_; 115 my ($ob) = @_;
115 116
116 # Too hard to try and make a header that lines everything up, so just 117 # Too hard to try and make a header that lines everything up, so just
117 # give a description. (comment from C++) 118 # give a description. (comment from C++)
118 my $reply = 119 my $reply =
119 "The first column is the name of the body location.\n" 120 "The first column is the name of the body location.\n\n"
120 . "The second column is how many of those locations your body has.\n" 121 . "The second column is how many of those locations your body has.\n\n"
121 . "The third column is how many slots in that location are available.\n"; 122 . "The third column is how many slots in that location are available.\n\n";
122 123
123 $reply .= sprintf "%-20s %3s %5s\n", "Location", "You", "Avail"; 124 $reply .= sprintf " %-20s %3s %5s\n", "Location", "You", "Avail";
124 for (0 .. cf::NUM_BODY_LOCATIONS - 1) { 125 for (0 .. cf::NUM_BODY_LOCATIONS - 1) {
125 my $msg = cf::object::slot_nonuse_name $_; 126 my $msg = cf::object::slot_nonuse_name $_;
126 $msg =~ s/^.*? a //; 127 $msg =~ s/^.*? a //;
127 $reply .= sprintf "%-20s %3d %5d\n", $msg, $ob->slot_info ($_), $ob->slot_used ($_) 128 $reply .= sprintf " %-20s %3d %5d\n", $msg, $ob->slot_info ($_), $ob->slot_used ($_)
128 if $ob->slot_info ($_) or $ob->slot_used ($_); 129 if $ob->slot_info ($_) or $ob->slot_used ($_);
129 } 130 }
130 131
131 $reply .= "You are not allowed to wear armor\n" 132 $reply .= "You are not allowed to wear armor\n\n"
132 unless $ob->flag (cf::FLAG_USE_ARMOUR); 133 unless $ob->flag (cf::FLAG_USE_ARMOUR);
133 $reply .= "You are not allowed to use weapons\n" 134 $reply .= "You are not allowed to use weapons\n\n"
134 unless $ob->flag (cf::FLAG_USE_WEAPON); 135 unless $ob->flag (cf::FLAG_USE_WEAPON);
135 136
136 $ob->reply (undef, $reply); 137 $ob->reply (undef, $reply);
137 138
138 1 139 1
… …
184} 185}
185 186
186cf::register_command mapinfo => sub { 187cf::register_command mapinfo => sub {
187 my ($ob) = @_; 188 my ($ob) = @_;
188 189
189 my $map = $ob->map 190 my $map = $ob->contr->observe->map
190 or return; 191 or return;
191 $ob->reply (undef, (sprintf "%s (%s) %s", $map->name, $map->path, $ob->region->longname)); 192 $ob->reply (undef, (sprintf "%s (%s) %s", $map->name, $map->path, $ob->region->longname));
192 $ob->reply (undef, (sprintf "players: %d difficulty: %d size: %d start: %dx%d timeout: %d", 193 $ob->reply (undef, (sprintf "players: %d difficulty: %d size: %d start: %dx%d timeout: %d",
193 $map->players, $map->difficulty, $map->width, $map->height, $map->enter_x, $map->enter_y, $map->timeout)) 194 $map->players, $map->difficulty, $map->width, $map->height, $map->enter_x, $map->enter_y, $map->timeout))
194 if $ob->flag (cf::FLAG_WIZ); 195 if $ob->flag (cf::FLAG_WIZ);
… …
198}; 199};
199 200
200cf::register_command whereami => sub { 201cf::register_command whereami => sub {
201 my ($ob) = @_; 202 my ($ob) = @_;
202 203
203 my $reg = $ob->region; 204 my $reg = $ob->contr->observe->region;
204 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg)); 205 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg));
205 206
206 1 207 1
207}; 208};
208 209
… …
239 240
240cf::register_command usekeys => sub { 241cf::register_command usekeys => sub {
241 my ($ob, $arg) = @_; 242 my ($ob, $arg) = @_;
242 243
243 _set_mode "usekeys", $ob, $arg, usekeys => qw(inventory keyrings containers); 244 _set_mode "usekeys", $ob, $arg, usekeys => qw(inventory keyrings containers);
245
246 1
247};
248
249cf::register_command hintmode => sub {
250 my ($ob, $arg) = @_;
251
252 _set_mode "hintmode", $ob, $arg, hintmode => qw(show mark hide);
244 253
245 1 254 1
246}; 255};
247 256
248cf::register_command afk => sub { 257cf::register_command afk => sub {

Diff Legend

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