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.38 by root, Sun Mar 18 03:05:40 2007 UTC vs.
Revision 1.77 by elmex, Tue Apr 13 10:45:48 2010 UTC

1#! perl # MANDATORY 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->{who_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 my $observe = $ob->contr->observe;
84
85 # Too hard to try and make a header that lines everything up, so just
86 # give a description. (comment from C++)
87 my $reply =
88 "The first column is the name of the body location.\r"
89 . "The second column is how many of those locations your body has.\r"
90 . "The third column is how many slots in that location are available.\r"
91 . "The last column shows the items currently using the slot\n\n";
92
93 # first process all applied items and hash them into their slots
94 my @slot;
95
96 for my $item (grep $_->flag (cf::FLAG_APPLIED), $observe->inv) {
97 $item->slot_info ($_)
98 and push @{ $slot[$_] }, $item
99 for 0 .. cf::NUM_BODY_LOCATIONS-1;
100 }
101
102 $reply .= sprintf " %-20s %3s %5s %s\n", "Location", "You", "Avail", "What";
103 for (0 .. cf::NUM_BODY_LOCATIONS - 1) {
104 my $msg = cf::object::slot_nonuse_name $_;
105 $msg =~ s/^.*? a //;
106 $reply .= sprintf " %-20s %3d %5d %s\n",
107 $msg,
108 $observe->slot_info ($_),
109 $observe->slot_used ($_),
110 join ", ", map $_->query_short_name, @{ $slot[$_] }
111 if $observe->slot_info ($_) || $observe->slot_used ($_);
112 }
113
114 $reply .= "You are not allowed to wear armor\r"
115 unless $observe->flag (cf::FLAG_USE_ARMOUR);
116 $reply .= "You are not allowed to use weapons\r"
117 unless $observe->flag (cf::FLAG_USE_WEAPON);
118
119 $ob->send_msg ("c/body" => $reply, cf::NDI_REPLY | cf::NDI_CLEAR);
120};
121
122#cf::register_command mark => sub {
123# my ($pl, $arg) = @_;
124#
125# if (length $arg) {
126# my $ob = $pl->find_best_object_match ($arg);
127#
128# return $pl->reply (undef, "Could not find an object that matches $arg")
129# unless $ob;
130#
131# $pl->contr->mark ($ob);
132# $pl->reply (undef, (sprintf "Marked item %s", $ob->name, $ob->title));
133# } else {
134# my $ob = $pl->find_marked_object;
135#
136# $pl->reply (undef, $ob
137# ? (sprintf "%s %s * is marked.", $ob->name, $ob->title)
138# : "You have no marked object.");
139# }
140#};
141
142cf::register_command mapinfo => sub {
143 my ($ob) = @_;
144
145 my $observe = $ob->contr->observe;
146
147 my $map = $observe->map
148 or return;
149
150 my $msg = '';
151
152 if ($map->name ne '') {
153 $msg .= sprintf "%s [%s] ", $map->name, $map->visible_name
154 } else {
155 $msg .= sprintf "%s ", $map->visible_name
156 }
157
158 if ($map->visible_name ne $map->path) {
159 $msg .= sprintf "(%s) ", $map->path;
160 }
161
162 $msg .= sprintf "\r%s", $observe->region->longname;
163
164 $msg .= sprintf "\rplayers: %d difficulty: %d"
165 . "\rsize: %dx%d start: %dx%d position: (%d|%d) timeout: %d",
166 (scalar $map->players),
167 $map->difficulty,
168 $map->width, $map->height,
169 $map->enter_x, $map->enter_y,
170 $ob->x, $ob->y,
171 $map->timeout
172 if $ob->flag (cf::FLAG_WIZ);
173
174 $ob->send_msg ("c/mapinfo" => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
175};
176
177cf::register_command whereami => sub {
178 my ($ob) = @_;
179
180 my $reg = $ob->contr->observe->region;
181 $ob->send_msg ("c/who" => (sprintf "You are %s.\n\n%s", $reg->longname, $reg->msg), cf::NDI_REPLY | cf::NDI_CLEAR);
182};
183
184cf::register_command whereabouts => sub {
185 my ($ob, $arg) = @_;
186
187 my %count;
188
189 for my $pl (cf::player::list) {
190 ++$count{$pl->ob->region->longname};
191 }
192
193 my $msg = "T<In the world currently there are:>\n\n"
194 . join "", map { sprintf " C<%3d >player(s) %s\r", $count{$_}, $_ } sort keys %count;
195
196 $ob->send_msg ("c/who" => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
197};
198
199cf::register_command hiscore => sub {
200 my ($ob, $arg) = @_;
201
202 my $url = $cf::CFG{hiscore_url};
203 $ob->send_msg (log => "See $url", cf::NDI_REPLY);
204};
205
206sub _set_mode($$$@) {
207 my ($name, $ob, $arg, $slot, @choices) = @_;
208
209 my $oldmode = $ob->contr->$slot;
210
211 return $ob->reply (undef, "$name is set to $choices[$oldmode]")
212 unless $arg;
213
214 my ($idx) = grep $choices[$_] eq $arg, 0 .. $#choices
215 or return $ob->reply (undef, "$name: Unknown options '$arg', valid options are @choices"), 1;
216
217 $ob->contr->$slot ($idx);
218 $ob->reply (undef, "$name" . ($oldmode == $ob->contr->unapply ? "" : " now") . " set to " . $choices[$ob->contr->$slot]);
219}
220
221cf::register_command applymode => sub {
222 my ($ob, $arg) = @_;
223
224 _set_mode "applymode", $ob, $arg, unapply => qw(nochoice never always);
225};
226
227cf::register_command petmode => sub {
228 my ($ob, $arg) = @_;
229
230 _set_mode "petmode", $ob, $arg, petmode => qw(normal sad defend arena);
231};
232
233cf::register_command usekeys => sub {
234 my ($ob, $arg) = @_;
235
236 _set_mode "usekeys", $ob, $arg, usekeys => qw(inventory keyrings containers);
237};
238
239cf::register_command hintmode => sub {
240 my ($ob, $arg) = @_;
241
242 _set_mode "hintmode", $ob, $arg, hintmode => qw(show mark hide);
243};
244
245cf::register_command afk => sub {
246 my ($ob, $arg) = @_;
247
248 $ob->contr->ns->afk ($ob->contr->ns->afk ? 0 : 1);
249 $ob->reply (undef, $ob->contr->ns->afk ? "You are now AFK" : "You are no longer AFK");
250};
251
252cf::register_command sound => sub {
253 my ($ob, $arg) = @_;
254
255 $ob->contr->ns->sound ($ob->contr->ns->sound ? 0 : 1);
256 $ob->reply (undef, $ob->contr->ns->sound ? "The sounds are enabled." : "Silence is golden...");
257};
258
259cf::register_command brace => sub {
260 my ($ob, $arg) = @_;
261
262 $ob->contr->braced ($ob->contr->braced ? 0 : 1);
263 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced.");
264};
265
266cf::register_command 'output-rate' => sub {
267 my ($ob, $arg) = @_;
268
269 return $ob->reply (undef, sprintf "Output rate is presently %dbps.", $ob->contr->ns->max_rate / $cf::TICK)
270 unless $arg > 0;
271
272 $ob->contr->ns->max_rate ((cf::clamp $arg, $OUTPUT_RATE_MIN, $OUTPUT_RATE_MAX) * $TICK);
273 $ob->reply (undef, sprintf "Output rate now set to %dbps.", $ob->contr->ns->max_rate / $TICK);
274};
275
276cf::register_command 'output-count' => sub {
277 my ($ob, $arg) = @_;
278
279 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count)
280 unless $arg > 0;
281
282 $arg = 4 if $arg < 4;
283
284 $ob->contr->outputs_count ($arg);
285 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count);
286};
287
288cf::register_command 'output-sync' => sub {
289 my ($ob, $arg) = @_;
290
291 return $ob->reply (undef, sprintf "Output sync time is presently %.1fs", $ob->contr->outputs_sync * $cf::TICK)
292 unless length $arg;
293
294 $arg = 0.5 if $arg < 0.5;
295
296 $ob->contr->outputs_sync ($arg / $cf::TICK);
297 $ob->reply (undef, sprintf "Output sync time now set to %.1fs", $ob->contr->outputs_sync * $cf::TICK);
298};
299
300# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to
301# some other level (which may also be 0), this does not get echoed,
302# but it does get set.
303cf::register_command wimpy => sub {
304 my ($ob, $arg) = @_;
305
306 my $wimpy = $ob->run_away;
307 return $ob->reply (undef, "Your current wimpy level is $wimpy.")
308 if $arg eq "";
309
310 return $ob->run_away ($arg) && $ob->reply (undef, "Your new wimpy level is $arg.")
311 if $arg =~ /^\d+$/ and $arg <= 100;
312
313 $ob->reply (undef, "Incorrect parameters for wimpy: $arg");
314};
315
316cf::register_command peaceful => sub {
317 my ($ob, $arg) = @_;
318
319 $ob->reply (undef, "You cannot change your peaceful setting with this command."
320 ." Please speak to the priest in the temple of Gorokh"
321 ." if you want to become hostile or in temple of Valriel"
322 ." if you want to become peaceful again.");
323
324 #$ob->contr->peaceful ($ob->contr->peaceful ? 0 : 1);
325 #$ob->reply (undef, $ob->contr->peaceful ? "You will attack other players." : "You will not attack other players.");
326};
6 327
7sub rename_to($$$) { 328sub rename_to($$$) {
8 my ($ob, $from, $to) = @_; 329 my ($ob, $from, $to) = @_;
9 330
10 $to =~ /^[a-zA-Z0-9.,=#\/%$!^ ]*$/ 331 $to =~ /^[a-zA-Z0-9.,=#\/%$!^ ]*$/
… …
35 356
36 $ob->esrv_update_item (cf::UPD_NAME, $item); 357 $ob->esrv_update_item (cf::UPD_NAME, $item);
37 358
38 1 359 1
39} 360}
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
140for my $cmd ("run", "fire") {
141 my $oncmd = "${cmd}_on";
142 cf::register_command $cmd => sub {
143 my ($ob, $arg) = @_;
144
145 $ob->reply (undef, "Can't $cmd into a non adjacent square.")
146 if $arg < 0 or $arg >= 9;
147
148 $ob->contr->$oncmd (1);
149 $ob->move_player ($arg);
150
151 1
152 };
153
154 cf::register_command "${cmd}_stop" => sub {
155 my ($ob) = @_;
156
157 $ob->contr->$oncmd (0);
158
159 1
160 };
161}
162
163cf::register_command mapinfo => sub {
164 my ($ob) = @_;
165
166 my $map = $ob->map
167 or return;
168 $ob->reply (undef, (sprintf "%s (%s) %s", $map->name, $map->path, $ob->region->longname));
169 $ob->reply (undef, (sprintf "players: %d difficulty: %d size: %d start: %dx%d timeout: %d",
170 $map->players, $map->difficulty, $map->width, $map->height, $map->enter_x, $map->enter_y, $map->timeout))
171 if $ob->flag (cf::FLAG_WIZ);
172 $ob->reply (undef, $map->msg);
173
174 1
175};
176
177cf::register_command whereami => sub {
178 my ($ob) = @_;
179
180 my $reg = $ob->region;
181 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg));
182
183 1
184};
185
186sub _set_mode($$$@) {
187 my ($name, $ob, $arg, $slot, @choices) = @_;
188
189 my $oldmode = $ob->contr->$slot;
190
191 return $ob->reply (undef, "$name is set to $choices[$oldmode]")
192 unless $arg;
193
194 my ($idx) = grep $choices[$_] eq $arg, 0 .. $#choices
195 or return $ob->reply (undef, "$name: Unknown options '$arg', valid options are @choices"), 1;
196
197 $ob->contr->$slot ($idx);
198 $ob->reply (undef, "$name" . ($oldmode == $ob->contr->unapply ? "" : " now") . " set to " . $choices[$ob->contr->$slot]);
199}
200
201cf::register_command applymode => sub {
202 my ($ob, $arg) = @_;
203
204 _set_mode "applymode", $ob, $arg, unapply => qw(nochoice never always);
205
206 1
207};
208
209cf::register_command petmode => sub {
210 my ($ob, $arg) = @_;
211
212 _set_mode "petmode", $ob, $arg, petmode => qw(normal sad defend arena);
213
214 1
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 1
223};
224
225cf::register_command afk => sub {
226 my ($ob, $arg) = @_;
227
228 $ob->contr->ns->afk ($ob->contr->ns->afk ? 0 : 1);
229 $ob->reply (undef, $ob->contr->ns->afk ? "You are now AFK" : "You are no longer AFK");
230
231 1
232};
233
234cf::register_command sound => sub {
235 my ($ob, $arg) = @_;
236
237 $ob->contr->ns->sound ($ob->contr->ns->sound ? 0 : 1);
238 $ob->reply (undef, $ob->contr->ns->sound ? "The sounds are enabled." : "Silence is golden...");
239
240 1
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 1
250};
251
252cf::register_command 'output-rate' => sub {
253 my ($ob, $arg) = @_;
254
255 return $ob->reply (undef, sprintf "Output rate is presently %dbps.", $ob->contr->ns->max_rate / $cf::TICK)
256 unless $arg > 0;
257
258 $ob->contr->ns->max_rate ($arg * $cf::TICK);
259 $ob->reply (undef, sprintf "Output rate now set to %dbps.", $ob->contr->ns->max_rate / $cf::TICK);
260
261 1
262};
263
264cf::register_command 'output-count' => sub {
265 my ($ob, $arg) = @_;
266
267 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count)
268 unless $arg > 0;
269
270 $ob->contr->outputs_count ($arg);
271 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count);
272
273 1
274};
275
276cf::register_command 'output-sync' => sub {
277 my ($ob, $arg) = @_;
278
279 return $ob->reply (undef, sprintf "Output sync time is presently %.1fs", $ob->contr->outputs_sync * $cf::TICK)
280 unless length $arg;
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 1
286};
287
288# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to
289# some other level (which may also be 0), this does not get echoed,
290# but it does get set.
291cf::register_command wimpy => sub {
292 my ($ob, $arg) = @_;
293
294 my $wimpy = $ob->run_away;
295 return $ob->reply (undef, "Your current wimpy level is $wimpy.")
296 if $arg eq "";
297
298 return $ob->run_away ($arg) && $ob->reply (undef, "Your new wimpy level is $arg.")
299 if $arg =~ /^\d+$/ and $arg <= 100;
300
301 $ob->reply (undef, "Incorrect parameters for wimpy: $arg");
302
303 1
304};
305
306cf::register_command peaceful => sub {
307 my ($ob, $arg) = @_;
308
309 $ob->reply (undef, "You cannot change your peaceful setting with this command."
310 ." Please speak to the priest in the temple of Gorokh"
311 ." if you want to become hostile or in temple of Valriel"
312 ." if you want to become peaceful again.");
313
314 #$ob->contr->peaceful ($ob->contr->peaceful ? 0 : 1);
315 #$ob->reply (undef, $ob->contr->peaceful ? "You will attack other players." : "You will not attack other players.");
316
317 1
318};
319 361
320cf::register_command rename => sub { 362cf::register_command rename => sub {
321 my ($ob, $arg) = @_; 363 my ($ob, $arg) = @_;
322 364
323 $ob->speed_left ($ob->speed_left - 0.25); 365 $ob->speed_left ($ob->speed_left - 0.25);
… …
337 # does not unquote $1 or $3 379 # does not unquote $1 or $3
338 rename_to $ob, $2||$1, $4||$3; 380 rename_to $ob, $2||$1, $4||$3;
339 } else { 381 } else {
340 $ob->reply (undef, 'Syntax error. Rename usage: rename ["oldname"] to "newname"'); 382 $ob->reply (undef, 'Syntax error. Rename usage: rename ["oldname"] to "newname"');
341 } 383 }
342
343 1
344}; 384};
345 385
346cf::register_command uptime => sub { 386cf::register_command uptime => sub {
347 my ($ob, $arg) = @_; 387 my ($ob, $arg) = @_;
348 388
349 my $startup = POSIX::strftime "%Y-%m-%d %H:%M:%S %Z", localtime $cf::UPTIME; 389 my $startup = POSIX::strftime "%Y-%m-%d %H:%M:%S %Z", localtime $cf::UPTIME;
350 my $runtime = sprintf "%.1f", (time - $cf::UPTIME) / 86400; 390 my $runtime = sprintf "%.1f", (time - $cf::UPTIME) / 86400;
351 $ob->reply (undef, "server started $startup, uptime ${runtime}\d"); 391 $ob->send_msg ("c/uptime" => "server started $startup, uptime ${runtime}\d", cf::NDI_REPLY | cf::NDI_CLEAR);
352
353 1
354}; 392};
355 393
356my %IN_MEMORY = ( 394my %IN_MEMORY = (
357 cf::MAP_IN_MEMORY => "I", 395 cf::MAP_ACTIVE => "I",
358 cf::MAP_SWAPPED => "S", 396 cf::MAP_SWAPPED => "S",
359 cf::MAP_LOADING => "L", 397 cf::MAP_LOADING => "L",
360); 398);
361 399
362cf::register_command maps => sub { 400cf::register_command maps => sub {
363 my ($ob, $arg) = @_; 401 my ($ob, $arg) = @_;
364 402
365 no re 'eval'; $arg = qr<$arg>; 403 no re 'eval'; $arg = qr<$arg>;
366 404
367 my $format = "%2s %1s %3s %5s %.60s\n"; 405 my $format = " %2s %1s %3s %5s %.60s\n";
368 406
369 $ob->reply (undef, (sprintf $format, "Pl", "I", "Svd", "Reset", "Name"), cf::NDI_BLACK | cf::NDI_UNIQUE); 407 my $msg = "\n" . sprintf $format, "Pl", "I", "Svd", "Reset", "Name";
370 408
371 for (sort keys %cf::MAP) { 409 for (sort keys %cf::MAP) {
372 my $map = $cf::MAP{$_} 410 my $map = $cf::MAP{$_}
373 or next; 411 or next;
374 412
… …
376 next if $map->{deny_list}; 414 next if $map->{deny_list};
377 415
378 my $svd = int $cf::RUNTIME - $map->{last_save}; 416 my $svd = int $cf::RUNTIME - $map->{last_save};
379 $svd = "++" if $svd > 99; 417 $svd = "++" if $svd > 99;
380 418
381 $ob->reply (undef, 419 $msg .= sprintf $format,
382 (sprintf $format,
383 (scalar $map->players), 420 (scalar $map->players),
384 $IN_MEMORY{$map->in_memory} || "?", 421 $IN_MEMORY{$map->in_memory} || "?",
385 $svd, 422 $svd,
386 (int $map->reset_at - $cf::RUNTIME), 423 (int $map->reset_at - $cf::RUNTIME),
387 $map->visible_name), 424 $map->visible_name;
388 cf::NDI_BLACK | cf::NDI_UNIQUE);
389 }
390
391 1 425 }
392};
393 426
427 $ob->send_msg ("c/mapinfo" => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
428};
429

Diff Legend

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