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.33 by pippijn, Fri Mar 2 15:09:05 2007 UTC vs.
Revision 1.71 by root, Tue Sep 23 00:24:52 2008 UTC

1#! perl 1#! perl # mandatory depends=irc
2 2
3use POSIX (); 3use POSIX ();
4 4
5# miscellaneous commands 5# miscellaneous commands
6
7sub who_listing(;$$) {
8 my ($privileged, $select) = @_;
9
10 my ($numwiz, $numafk) = (0, 0);
11 my @pl;
12
13 foreach my $pl (cf::player::list) {
14 my $ns = $pl->ns or next;
15 my $ob = $pl->ob;
16
17 next unless $ob->map
18 && ($privileged || !$pl->hidden);
19
20 $numwiz++ if $ob->flag (cf::FLAG_WIZ);
21 $numafk++ if $ns->afk;
22
23 push @pl, $pl;
24 }
25
26 (
27 "Total Players in The World. (" . (scalar @pl) . ") -- WIZ($numwiz) AFK($numafk) BOT(0)",
28 (grep /$select/,
29 map {
30 my ($pl, $ob, $ns) = ($_, $_->ob, $_->ns);
31
32 "* " . $ob->name . "/" . $ob->level . " " . (length $pl->own_title ? $pl->own_title : "the " . $pl->title)
33 . ($pl->gender ? " [f]" : " [m]")
34 . ($pl->peaceful ? " [peaceful]" : " [HOSTILE]")
35 . ($ns->afk ? " [AFK]" : "")
36 . ($ob->flag (cf::FLAG_WIZ) ? " [WIZ]" : "")
37 . " [" . $pl->ns->version . "]"
38 . " [" . ($pl->peaceful || $privileged ? $ob->map->visible_name : $ob->region->name) . "]"
39 . (sprintf " [rtt %.3fs]", $pl->ns->tcpi_rtt * 1e-6)
40 . ($privileged ? " " . $pl->ns->host : "")
41 } sort { (lc $a->ob->name) cmp (lc $b->ob->name) } @pl
42 ),
43 eval { "* IRC: " . join ", ", ext::irc::users },
44 )
45}
46
47cf::register_command who => sub {
48 my ($ob, $arg) = @_;
49
50 $ob->speed_left ($ob->speed_left - 4);
51
52 $ob->send_msg ("c/who" => (join "\r", who_listing $ob->may ("extended_who"), $arg), cf::NDI_DK_ORANGE | cf::NDI_REPLY | cf::NDI_CLEAR | cf::NDI_DEF);
53};
54
55cf::register_command seen => sub {
56 my ($pl, $args) = @_;
57
58 cf::async {
59 if (my ($login) = $args =~ /(\S+)/) {
60 if ($login eq $pl->name) {
61 $pl->message ("Very funny, $login. Ha. Ha.", cf::NDI_REPLY);
62 } elsif (cf::player::find_active $login) {
63 $pl->message ("$login is right here on this server!", cf::NDI_REPLY);
64 } elsif (cf::player::exists $login
65 and stat cf::player::path $login) {
66 my $time = (stat _)[9];
67
68 $pl->message ("$login was last seen here "
69 . (POSIX::strftime "%Y-%m-%d %H:%M:%S +0000", gmtime $time)
70 . " which was " . (int +(time - $time) / 3600) . " hours ago.", cf::NDI_REPLY);
71 } else {
72 $pl->message ("No player named $login is known to me.", cf::NDI_REPLY);
73 }
74 } else {
75 $pl->message ("Usage: seen <player>", cf::NDI_REPLY);
76 }
77 };
78};
79
80cf::register_command body => sub {
81 my ($ob) = @_;
82
83 # Too hard to try and make a header that lines everything up, so just
84 # give a description. (comment from C++)
85 my $reply =
86 "The first column is the name of the body location.\r"
87 . "The second column is how many of those locations your body has.\r"
88 . "The third column is how many slots in that location are available.\n\n";
89
90 $reply .= sprintf " %-20s %3s %5s\n", "Location", "You", "Avail";
91 for (0 .. cf::NUM_BODY_LOCATIONS - 1) {
92 my $msg = cf::object::slot_nonuse_name $_;
93 $msg =~ s/^.*? a //;
94 $reply .= sprintf " %-20s %3d %5d\n", $msg, $ob->slot_info ($_), $ob->slot_used ($_)
95 if $ob->slot_info ($_) or $ob->slot_used ($_);
96 }
97
98 $reply .= "You are not allowed to wear armor\r"
99 unless $ob->flag (cf::FLAG_USE_ARMOUR);
100 $reply .= "You are not allowed to use weapons\r"
101 unless $ob->flag (cf::FLAG_USE_WEAPON);
102
103 $ob->send_msg ("c/body" => $reply, cf::NDI_REPLY);
104};
105
106cf::register_command mark => sub {
107 my ($pl, $arg) = @_;
108
109 if (length $arg) {
110 my $ob = $pl->find_best_object_match ($arg);
111
112 return $pl->reply (undef, "Could not find an object that matches $arg")
113 unless $ob;
114
115 $pl->contr->mark ($ob);
116 $pl->reply (undef, (sprintf "Marked item %s", $ob->name, $ob->title));
117 } else {
118 my $ob = $pl->find_marked_object;
119
120 $pl->reply (undef, $ob
121 ? (sprintf "%s %s * is marked.", $ob->name, $ob->title)
122 : "You have no marked object.");
123 }
124};
125
126for my $cmd ("run", "fire") {
127 my $oncmd = "${cmd}_on";
128 cf::register_command $cmd => sub {
129 my ($ob, $arg) = @_;
130
131 $ob->reply (undef, "Can't $cmd into a non adjacent square.")
132 if $arg < 0 or $arg >= 9;
133
134 $ob->contr->$oncmd (1);
135 $ob->move_player ($arg);
136 };
137
138 cf::register_command "${cmd}_stop" => sub {
139 my ($ob) = @_;
140
141 $ob->contr->$oncmd (0);
142 };
143}
144
145cf::register_command mapinfo => sub {
146 my ($ob) = @_;
147
148 my $observe = $ob->contr->observe;
149
150 my $map = $observe->map
151 or return;
152
153 my $msg = sprintf "%s (%s)\r%s", $map->name, $map->path, $observe->region->longname;
154 $msg .= sprintf "\rplayers: %d difficulty: %d size: %d start: %dx%d timeout: %d",
155 (scalar $map->players), $map->difficulty, $map->width, $map->height, $map->enter_x, $map->enter_y, $map->timeout
156 if $ob->flag (cf::FLAG_WIZ);
157
158 $ob->send_msg ("c/mapinfo" => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
159};
160
161cf::register_command whereami => sub {
162 my ($ob) = @_;
163
164 my $reg = $ob->contr->observe->region;
165 $ob->send_msg ("c/who" => (sprintf "You are %s.\n\n%s", $reg->longname, $reg->msg), cf::NDI_REPLY | cf::NDI_CLEAR);
166};
167
168cf::register_command whereabouts => sub {
169 my ($ob, $arg) = @_;
170
171 my %count;
172
173 for my $pl (cf::player::list) {
174 ++$count{$pl->ob->region->longname};
175 }
176
177 my $msg = "T<In the world currently there are:>\n\n"
178 . join "", map { sprintf " C<%3d >player(s) %s\r", $count{$_}, $_ } sort keys %count;
179
180 $ob->send_msg ("c/who" => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
181};
182
183cf::register_command hiscore => sub {
184 my ($ob, $arg) = @_;
185
186 my $url = $cf::CFG{hiscore_url};
187 $ob->send_msg (log => "See $url", cf::NDI_REPLY);
188};
189
190sub _set_mode($$$@) {
191 my ($name, $ob, $arg, $slot, @choices) = @_;
192
193 my $oldmode = $ob->contr->$slot;
194
195 return $ob->reply (undef, "$name is set to $choices[$oldmode]")
196 unless $arg;
197
198 my ($idx) = grep $choices[$_] eq $arg, 0 .. $#choices
199 or return $ob->reply (undef, "$name: Unknown options '$arg', valid options are @choices"), 1;
200
201 $ob->contr->$slot ($idx);
202 $ob->reply (undef, "$name" . ($oldmode == $ob->contr->unapply ? "" : " now") . " set to " . $choices[$ob->contr->$slot]);
203}
204
205cf::register_command applymode => sub {
206 my ($ob, $arg) = @_;
207
208 _set_mode "applymode", $ob, $arg, unapply => qw(nochoice never always);
209};
210
211cf::register_command petmode => sub {
212 my ($ob, $arg) = @_;
213
214 _set_mode "petmode", $ob, $arg, petmode => qw(normal sad defend arena);
215};
216
217cf::register_command usekeys => sub {
218 my ($ob, $arg) = @_;
219
220 _set_mode "usekeys", $ob, $arg, usekeys => qw(inventory keyrings containers);
221};
222
223cf::register_command hintmode => sub {
224 my ($ob, $arg) = @_;
225
226 _set_mode "hintmode", $ob, $arg, hintmode => qw(show mark hide);
227};
228
229cf::register_command afk => sub {
230 my ($ob, $arg) = @_;
231
232 $ob->contr->ns->afk ($ob->contr->ns->afk ? 0 : 1);
233 $ob->reply (undef, $ob->contr->ns->afk ? "You are now AFK" : "You are no longer AFK");
234};
235
236cf::register_command sound => sub {
237 my ($ob, $arg) = @_;
238
239 $ob->contr->ns->sound ($ob->contr->ns->sound ? 0 : 1);
240 $ob->reply (undef, $ob->contr->ns->sound ? "The sounds are enabled." : "Silence is golden...");
241};
242
243cf::register_command brace => sub {
244 my ($ob, $arg) = @_;
245
246 $ob->contr->braced ($ob->contr->braced ? 0 : 1);
247 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced.");
248};
249
250cf::register_command 'output-rate' => sub {
251 my ($ob, $arg) = @_;
252
253 return $ob->reply (undef, sprintf "Output rate is presently %dbps.", $ob->contr->ns->max_rate / $cf::TICK)
254 unless $arg > 0;
255
256 # minimum is 5k/s
257 # maximum is 100k/s, this should be configurable
258 $ob->contr->ns->max_rate ((List::Util::max 5000, List::Util::min 100000, $arg) * $cf::TICK);
259 $ob->reply (undef, sprintf "Output rate now set to %dbps.", $ob->contr->ns->max_rate / $cf::TICK);
260};
261
262cf::register_command 'output-count' => sub {
263 my ($ob, $arg) = @_;
264
265 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count)
266 unless $arg > 0;
267
268 $arg = 4 if $arg < 4;
269
270 $ob->contr->outputs_count ($arg);
271 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count);
272};
273
274cf::register_command 'output-sync' => sub {
275 my ($ob, $arg) = @_;
276
277 return $ob->reply (undef, sprintf "Output sync time is presently %.1fs", $ob->contr->outputs_sync * $cf::TICK)
278 unless length $arg;
279
280 $arg = 0.5 if $arg < 0.5;
281
282 $ob->contr->outputs_sync ($arg / $cf::TICK);
283 $ob->reply (undef, sprintf "Output sync time now set to %.1fs", $ob->contr->outputs_sync * $cf::TICK);
284};
285
286# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to
287# some other level (which may also be 0), this does not get echoed,
288# but it does get set.
289cf::register_command wimpy => sub {
290 my ($ob, $arg) = @_;
291
292 my $wimpy = $ob->run_away;
293 return $ob->reply (undef, "Your current wimpy level is $wimpy.")
294 if $arg eq "";
295
296 return $ob->run_away ($arg) && $ob->reply (undef, "Your new wimpy level is $arg.")
297 if $arg =~ /^\d+$/ and $arg <= 100;
298
299 $ob->reply (undef, "Incorrect parameters for wimpy: $arg");
300};
301
302cf::register_command peaceful => sub {
303 my ($ob, $arg) = @_;
304
305 $ob->reply (undef, "You cannot change your peaceful setting with this command."
306 ." Please speak to the priest in the temple of Gorokh"
307 ." if you want to become hostile or in temple of Valriel"
308 ." if you want to become peaceful again.");
309
310 #$ob->contr->peaceful ($ob->contr->peaceful ? 0 : 1);
311 #$ob->reply (undef, $ob->contr->peaceful ? "You will attack other players." : "You will not attack other players.");
312};
6 313
7sub rename_to($$$) { 314sub rename_to($$$) {
8 my ($ob, $from, $to) = @_; 315 my ($ob, $from, $to) = @_;
9 316
10 $to =~ /^[a-zA-Z0-9.,=#\/%$!^ ]*$/ 317 $to =~ /^[a-zA-Z0-9.,=#\/%$!^ ]*$/
… …
35 342
36 $ob->esrv_update_item (cf::UPD_NAME, $item); 343 $ob->esrv_update_item (cf::UPD_NAME, $item);
37 344
38 1 345 1
39} 346}
40
41sub ext::schmorp_irc::users; # HACK: TODO: replace by signal
42
43sub who_listing(;$) {
44 my ($privileged) = @_;
45
46 my ($numwiz, $numafk) = (0, 0);
47 my @pl;
48
49 foreach my $pl (cf::player::list) {
50 my $ns = $pl->ns or next;
51 my $ob = $pl->ob;
52
53 next unless $ob->map
54 && ($privileged || !$pl->hidden);
55
56 $numwiz++ if $ob->flag (cf::FLAG_WIZ);
57 $numafk++ if $ns->afk;
58
59 push @pl, $pl;
60 }
61
62 (
63 "Total Players in The World. (" . (scalar @pl) . ") -- WIZ($numwiz) AFK($numafk) BOT(0)",
64 (
65 map {
66 my ($pl, $ob, $ns) = ($_, $_->ob, $_->ns);
67
68 "* " . $ob->name . "/" . $ob->level . " " . (length $pl->own_title ? $pl->own_title : "the " . $pl->title)
69 . ($pl->peaceful ? " [peaceful]" : " [HOSTILE]")
70 . ($ns->afk ? " [AFK]" : "")
71 . ($ob->flag (cf::FLAG_WIZ) ? " [WIZ]" : "")
72 . " [" . $pl->ns->version . "]"
73 . " [" . ($pl->peaceful || $privileged ? $ob->map->visible_name : $ob->region->name) . "]"
74 . (sprintf " [rtt %.3fs]", $pl->ns->rtt * 1e-6)
75 . ($privileged ? " " . $pl->ns->host : "")
76 } sort { (lc $a->ob->name) cmp (lc $b->ob->name) } @pl
77 ),
78 eval { "* IRC: " . join ", ", ext::schmorp_irc::users },
79 )
80}
81
82cf::register_command who => sub {
83 my ($ob, $arg) = @_;
84
85 $ob->speed_left ($ob->speed_left - 0.25);
86
87 $ob->reply (undef, (join "\n", who_listing $ob->may ("extended_who")), cf::NDI_UNIQUE | cf::NDI_DK_ORANGE);
88
89 1
90};
91
92cf::register_command body => sub {
93 my ($ob) = @_;
94
95 my @body_locations = ("in your range slot", "on your arm", "on your body", "on your head",
96 "around your neck", "in your skill slot", "on your finger", "around your shoulders",
97 "on your feet", "on your hands", "around your wrists", "around your waist");
98
99 # Too hard to try and make a header that lines everything up, so just
100 # give a description. (comment from C++)
101 $ob->reply (undef, "The first column is the name of the body location.");
102 $ob->reply (undef, "The second column is how many of those locations your body has.");
103 $ob->reply (undef, "The third column is how many slots in that location are available.");
104
105 for (0 .. scalar @body_locations - 1) {
106 $ob->reply (undef, (sprintf "%-30s %5d %5d", $body_locations[$_], $ob->body_info($_), $ob->body_used($_)))
107 if $ob->body_info($_) or $ob->body_used($_);
108 }
109
110 $ob->reply (undef, "You are not allowed to wear armor")
111 unless $ob->flag (cf::FLAG_USE_ARMOUR);
112 $ob->reply (undef, "You are not allowed to use weapons")
113 unless $ob->flag (cf::FLAG_USE_WEAPON);
114
115 1
116};
117
118cf::register_command mark => sub {
119 my ($pl, $arg) = @_;
120
121 if (length $arg) {
122 my $ob = $pl->find_best_object_match ($arg);
123
124 return $pl->reply (undef, "Could not find an object that matches $arg")
125 unless $ob;
126
127 $pl->contr->mark ($ob);
128 $pl->reply (undef, (sprintf "Marked item %s", $ob->name, $ob->title));
129 } else {
130 my $ob = $pl->find_marked_object;
131
132 $pl->reply (undef, $ob
133 ? (sprintf "%s %s * is marked.", $ob->name, $ob->title)
134 : "You have no marked object.");
135 }
136
137 1
138};
139
140cf::register_command who => sub {
141 my ($ob, $arg) = @_;
142
143 $ob->speed_left ($ob->speed_left - 0.25);
144
145 $ob->reply (undef, (join "\n", who_listing $ob->may ("extended_who")), cf::NDI_UNIQUE | cf::NDI_DK_ORANGE);
146
147 1
148};
149
150for my $cmd ("run", "fire") {
151 my $oncmd = "${cmd}_on";
152 cf::register_command $cmd => sub {
153 my ($ob, $arg) = @_;
154
155 $ob->contr->$oncmd (1);
156
157 return $ob->reply (undef, "Can't $cmd into a non adjacent square.")
158 if $arg < 0 or $arg >= 9;
159
160 $ob->move ($arg);
161
162 1
163 };
164
165 cf::register_command "${cmd}_stop" => sub {
166 my ($ob) = @_;
167
168 $ob->contr->$oncmd (0);
169
170 1
171 };
172}
173
174cf::register_command mapinfo => sub {
175 my ($ob) = @_;
176
177 my $map = $ob->map
178 or return;
179 $ob->reply (undef, (sprintf "%s (%s) %s", $map->name, $map->path, $ob->region->longname));
180 $ob->reply (undef, (sprintf "players: %d difficulty: %d size: %d start: %dx%d timeout: %d",
181 $map->players, $map->difficulty, $map->width, $map->height, $map->enter_x, $map->enter_y, $map->timeout))
182 if $ob->flag (cf::FLAG_WIZ);
183 $ob->reply (undef, $map->msg);
184
185 1
186};
187
188cf::register_command whereami => sub {
189 my ($ob) = @_;
190
191 my $reg = $ob->region;
192 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg));
193
194 1
195};
196
197sub _set_mode($$$@) {
198 my ($name, $ob, $arg, $slot, @choices) = @_;
199
200 my $oldmode = $ob->contr->$slot;
201
202 return $ob->reply (undef, "$name is set to $choices[$oldmode]")
203 unless $arg;
204
205 my ($idx) = grep $choices[$_] eq $arg, 0 .. $#choices
206 or return $ob->reply (undef, "$name: Unknown options '$arg', valid options are @choices"), 1;
207
208 $ob->contr->$slot ($idx);
209 $ob->reply (undef, "$name" . ($oldmode == $ob->contr->unapply ? "" : " now") . " set to " . $choices[$ob->contr->$slot]);
210}
211
212cf::register_command applymode => sub {
213 my ($ob, $arg) = @_;
214
215 _set_mode "applymode", $ob, $arg, unapply => qw(nochoice never always);
216
217 1
218};
219
220cf::register_command petmode => sub {
221 my ($ob, $arg) = @_;
222
223 _set_mode "petmode", $ob, $arg, petmode => qw(normal sad defend arena);
224
225 1
226};
227
228cf::register_command usekeys => sub {
229 my ($ob, $arg) = @_;
230
231 _set_mode "usekeys", $ob, $arg, usekeys => qw(inventory keyrings containers);
232
233 1
234};
235
236cf::register_command afk => sub {
237 my ($ob, $arg) = @_;
238
239 $ob->contr->ns->afk ($ob->contr->ns->afk ? 0 : 1);
240 $ob->reply (undef, $ob->contr->ns->afk ? "You are now AFK" : "You are no longer AFK");
241
242 1
243};
244
245cf::register_command sound => sub {
246 my ($ob, $arg) = @_;
247
248 $ob->contr->ns->sound ($ob->contr->ns->sound ? 0 : 1);
249 $ob->reply (undef, $ob->contr->ns->sound ? "The sounds are enabled." : "Silence is golden...");
250
251 1
252};
253
254cf::register_command brace => sub {
255 my ($ob, $arg) = @_;
256
257 $ob->contr->braced ($ob->contr->braced ? 0 : 1);
258 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced.");
259
260 1
261};
262
263cf::register_command 'output-count' => sub {
264 my ($ob, $arg) = @_;
265
266 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count)
267 unless $arg > 0;
268
269 $ob->contr->outputs_count ($arg);
270 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count);
271
272 1
273};
274
275cf::register_command 'output-sync' => sub {
276 my ($ob, $arg) = @_;
277
278 return $ob->reply (undef, "Output sync time is presently " . $ob->contr->outputs_sync)
279 unless $arg > 0;
280
281 $ob->contr->outputs_sync ($arg);
282 $ob->reply (undef, "Output sync time now set to " . $ob->contr->outputs_sync);
283
284 1
285};
286
287# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to
288# some other level (which may also be 0), this does not get echoed,
289# but it does get set.
290cf::register_command wimpy => sub {
291 my ($ob, $arg) = @_;
292
293 my $wimpy = $ob->run_away;
294 return $ob->reply (undef, "Your current wimpy level is $wimpy.")
295 if $arg eq "";
296
297 return $ob->run_away ($arg) && $ob->reply (undef, "Your new wimpy level is $arg.")
298 if $arg =~ /^\d+$/ and $arg <= 100;
299
300 $ob->reply (undef, "Incorrect parameters for wimpy: $arg");
301
302 1
303};
304
305cf::register_command peaceful => sub {
306 my ($ob, $arg) = @_;
307
308 $ob->reply (undef, "You cannot change your peaceful setting with this command."
309 ." Please speak to the priest in the temple of Gorokh"
310 ." if you want to become hostile or in temple of Valriel"
311 ." if you want to become peaceful again.");
312
313 #$ob->contr->peaceful ($ob->contr->peaceful ? 0 : 1);
314 #$ob->reply (undef, $ob->contr->peaceful ? "You will attack other players." : "You will not attack other players.");
315
316 1
317};
318 347
319cf::register_command rename => sub { 348cf::register_command rename => sub {
320 my ($ob, $arg) = @_; 349 my ($ob, $arg) = @_;
321 350
322 $ob->speed_left ($ob->speed_left - 0.25); 351 $ob->speed_left ($ob->speed_left - 0.25);
… …
336 # does not unquote $1 or $3 365 # does not unquote $1 or $3
337 rename_to $ob, $2||$1, $4||$3; 366 rename_to $ob, $2||$1, $4||$3;
338 } else { 367 } else {
339 $ob->reply (undef, 'Syntax error. Rename usage: rename ["oldname"] to "newname"'); 368 $ob->reply (undef, 'Syntax error. Rename usage: rename ["oldname"] to "newname"');
340 } 369 }
341
342 1
343}; 370};
344 371
345cf::register_command uptime => sub { 372cf::register_command uptime => sub {
346 my ($ob, $arg) = @_; 373 my ($ob, $arg) = @_;
347 374
348 my $startup = POSIX::strftime "%Y-%m-%d %H:%M:%S %Z", localtime $cf::UPTIME; 375 my $startup = POSIX::strftime "%Y-%m-%d %H:%M:%S %Z", localtime $cf::UPTIME;
349 my $runtime = sprintf "%.1f", (time - $cf::UPTIME) / 86400; 376 my $runtime = sprintf "%.1f", (time - $cf::UPTIME) / 86400;
350 $ob->reply (undef, "server started $startup, uptime ${runtime}\d"); 377 $ob->send_msg ("c/uptime" => "server started $startup, uptime ${runtime}\d", cf::NDI_REPLY | cf::NDI_CLEAR);
351
352 1
353}; 378};
354 379
355my %IN_MEMORY = ( 380my %IN_MEMORY = (
356 cf::MAP_IN_MEMORY => "I", 381 cf::MAP_ACTIVE => "I",
357 cf::MAP_SWAPPED => "S", 382 cf::MAP_SWAPPED => "S",
358 cf::MAP_LOADING => "L", 383 cf::MAP_LOADING => "L",
359); 384);
360 385
361cf::register_command maps => sub { 386cf::register_command maps => sub {
362 my ($ob, $arg) = @_; 387 my ($ob, $arg) = @_;
363 388
364 no re 'eval'; $arg = qr<$arg>; 389 no re 'eval'; $arg = qr<$arg>;
365 390
366 my $format = "%2s %1s %3s %5s %.60s\n"; 391 my $format = " %2s %1s %3s %5s %.60s\n";
367 392
368 $ob->reply (undef, (sprintf $format, "Pl", "I", "Svd", "Reset", "Name"), cf::NDI_BLACK | cf::NDI_UNIQUE); 393 my $msg = "\n" . sprintf $format, "Pl", "I", "Svd", "Reset", "Name";
369 394
370 for (sort keys %cf::MAP) { 395 for (sort keys %cf::MAP) {
371 my $map = $cf::MAP{$_} 396 my $map = $cf::MAP{$_}
372 or next; 397 or next;
373 398
… …
375 next if $map->{deny_list}; 400 next if $map->{deny_list};
376 401
377 my $svd = int $cf::RUNTIME - $map->{last_save}; 402 my $svd = int $cf::RUNTIME - $map->{last_save};
378 $svd = "++" if $svd > 99; 403 $svd = "++" if $svd > 99;
379 404
380 $ob->reply (undef, 405 $msg .= sprintf $format,
381 (sprintf $format,
382 (scalar $map->players), 406 (scalar $map->players),
383 $IN_MEMORY{$map->in_memory} || "?", 407 $IN_MEMORY{$map->in_memory} || "?",
384 $svd, 408 $svd,
385 (int $map->reset_at - $cf::RUNTIME), 409 (int $map->reset_at - $cf::RUNTIME),
386 $map->visible_name), 410 $map->visible_name;
387 cf::NDI_BLACK | cf::NDI_UNIQUE);
388 }
389
390 1 411 }
391};
392 412
413 $ob->send_msg ("c/mapinfo" => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
414};
415

Diff Legend

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