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.42 by root, Thu May 3 04:50:27 2007 UTC vs.
Revision 1.53 by root, Fri Jul 6 02:51:21 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
… …
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
42
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);
47 my @pl; 45 my @pl;
… …
64 (grep /$select/, 62 (grep /$select/,
65 map { 63 map {
66 my ($pl, $ob, $ns) = ($_, $_->ob, $_->ns); 64 my ($pl, $ob, $ns) = ($_, $_->ob, $_->ns);
67 65
68 "* " . $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]")
69 . ($pl->peaceful ? " [peaceful]" : " [HOSTILE]") 68 . ($pl->peaceful ? " [peaceful]" : " [HOSTILE]")
70 . ($ns->afk ? " [AFK]" : "") 69 . ($ns->afk ? " [AFK]" : "")
71 . ($ob->flag (cf::FLAG_WIZ) ? " [WIZ]" : "") 70 . ($ob->flag (cf::FLAG_WIZ) ? " [WIZ]" : "")
72 . " [" . $pl->ns->version . "]" 71 . " [" . $pl->ns->version . "]"
73 . " [" . ($pl->peaceful || $privileged ? $ob->map->visible_name : $ob->region->name) . "]" 72 . " [" . ($pl->peaceful || $privileged ? $ob->map->visible_name : $ob->region->name) . "]"
74 . (sprintf " [rtt %.3fs]", $pl->ns->rtt * 1e-6) 73 . (sprintf " [rtt %.3fs]", $pl->ns->rtt * 1e-6)
75 . ($privileged ? " " . $pl->ns->host : "") 74 . ($privileged ? " " . $pl->ns->host : "")
76 } sort { (lc $a->ob->name) cmp (lc $b->ob->name) } @pl 75 } sort { (lc $a->ob->name) cmp (lc $b->ob->name) } @pl
77 ), 76 ),
78 eval { "* IRC: " . join ", ", ext::schmorp_irc::users }, 77 eval { "* IRC: " . join ", ", ext::irc::users },
79 ) 78 )
80} 79}
81 80
82cf::register_command who => sub { 81cf::register_command who => sub {
83 my ($ob, $arg) = @_; 82 my ($ob, $arg) = @_;
… …
113}; 112};
114 113
115cf::register_command body => sub { 114cf::register_command body => sub {
116 my ($ob) = @_; 115 my ($ob) = @_;
117 116
118 my @body_locations = ("in your range slot", "on your arm", "on your body", "on your head",
119 "around your neck", "in your skill slot", "on your finger", "around your shoulders",
120 "on your feet", "on your hands", "around your wrists", "around your waist");
121
122 # 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
123 # give a description. (comment from C++) 118 # give a description. (comment from C++)
119 my $reply =
124 $ob->reply (undef, "The first column is the name of the body location."); 120 "The first column is the name of the body location.\n\n"
125 $ob->reply (undef, "The second column is how many of those locations your body has."); 121 . "The second column is how many of those locations your body has.\n\n"
126 $ob->reply (undef, "The third column is how many slots in that location are available."); 122 . "The third column is how many slots in that location are available.\n\n";
127 123
128 for (0 .. scalar @body_locations - 1) { 124 $reply .= sprintf " %-20s %3s %5s\n", "Location", "You", "Avail";
129 $ob->reply (undef, (sprintf "%-30s %5d %5d", $body_locations[$_], $ob->body_info($_), $ob->body_used($_))) 125 for (0 .. cf::NUM_BODY_LOCATIONS - 1) {
126 my $msg = cf::object::slot_nonuse_name $_;
127 $msg =~ s/^.*? a //;
128 $reply .= sprintf " %-20s %3d %5d\n", $msg, $ob->slot_info ($_), $ob->slot_used ($_)
130 if $ob->body_info($_) or $ob->body_used($_); 129 if $ob->slot_info ($_) or $ob->slot_used ($_);
131 } 130 }
132 131
133 $ob->reply (undef, "You are not allowed to wear armor") 132 $reply .= "You are not allowed to wear armor\n\n"
134 unless $ob->flag (cf::FLAG_USE_ARMOUR); 133 unless $ob->flag (cf::FLAG_USE_ARMOUR);
135 $ob->reply (undef, "You are not allowed to use weapons") 134 $reply .= "You are not allowed to use weapons\n\n"
136 unless $ob->flag (cf::FLAG_USE_WEAPON); 135 unless $ob->flag (cf::FLAG_USE_WEAPON);
136
137 $ob->reply (undef, $reply);
137 138
138 1 139 1
139}; 140};
140 141
141cf::register_command mark => sub { 142cf::register_command mark => sub {
… …
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 (scalar $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);
195 $ob->reply (undef, $map->msg); 196 $ob->reply (undef, $map->msg);
196 197
197 1 198 1
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