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.26 by pippijn, Fri Mar 2 11:23:17 2007 UTC vs.
Revision 1.85 by root, Wed Jun 26 06:52:41 2019 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->{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 !Coro::AIO::aio_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->mark;
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 (!(length $arg ? !$arg : $ob->contr->ns->afk));
249 $ob->reply (undef, $ob->contr->ns->afk ? "You are now AFK." : "You are no longer AFK.");
250};
251
252cf::register_command bumpmsg => sub {
253 my ($ob, $arg) = @_;
254
255 $ob->contr->ns->bumpmsg (!(length $arg ? !$arg : $ob->contr->ns->bumpmsg));
256 $ob->reply (undef, $ob->contr->ns->bumpmsg ? "Bumping into walls sounds more painful now." : "Bumping into walls will now be silent.");
257};
258
259cf::register_command brace => sub {
260 my ($ob, $arg) = @_;
261
262 $ob->contr->braced (!(length $arg ? !$arg : $ob->contr->braced));
263 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced.");
264};
265
266cf::register_command sound => sub {
267 my ($ob, $arg) = @_;
268
269 $ob->contr->ns->sound (!(length $arg ? !$arg : $ob->contr->ns->sound));
270 $ob->reply (undef, $ob->contr->ns->sound ? "The sounds are enabled." : "Silence is golden...");
271};
272
273cf::register_command 'output-rate' => sub {
274 my ($ob, $arg) = @_;
275
276 return $ob->reply (undef, sprintf "Output rate is presently %dbps.", $ob->contr->ns->max_rate / $cf::TICK)
277 unless $arg > 0;
278
279 $ob->contr->ns->max_rate ((cf::clamp $arg, $OUTPUT_RATE_MIN, $OUTPUT_RATE_MAX) * $TICK);
280 $ob->reply (undef, sprintf "Output rate now set to %dbps.", $ob->contr->ns->max_rate / $TICK);
281};
282
283cf::register_command 'output-count' => sub {
284 my ($ob, $arg) = @_;
285
286 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count)
287 unless $arg > 0;
288
289 $arg = 4 if $arg < 4;
290
291 $ob->contr->outputs_count ($arg);
292 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count);
293};
294
295cf::register_command 'output-sync' => sub {
296 my ($ob, $arg) = @_;
297
298 return $ob->reply (undef, sprintf "Output sync time is presently %.1fs", $ob->contr->outputs_sync * $cf::TICK)
299 unless length $arg;
300
301 $arg = 0.5 if $arg < 0.5;
302
303 $ob->contr->outputs_sync ($arg / $cf::TICK);
304 $ob->reply (undef, sprintf "Output sync time now set to %.1fs", $ob->contr->outputs_sync * $cf::TICK);
305};
306
307# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to
308# some other level (which may also be 0), this does not get echoed,
309# but it does get set.
310cf::register_command wimpy => sub {
311 my ($ob, $arg) = @_;
312
313 my $wimpy = $ob->run_away;
314 return $ob->reply (undef, "Your current wimpy level is $wimpy.")
315 if $arg eq "";
316
317 return $ob->run_away ($arg) && $ob->reply (undef, "Your new wimpy level is $arg.")
318 if $arg =~ /^\d+$/ and $arg <= 100;
319
320 $ob->reply (undef, "Incorrect parameters for wimpy: $arg");
321};
322
323cf::register_command peaceful => sub {
324 my ($ob, $arg) = @_;
325
326 $ob->reply (undef, "You cannot change your peaceful setting with this command."
327 ." Please speak to the priest in the temple of Gorokh"
328 ." if you want to become hostile or in temple of Valriel"
329 ." if you want to become peaceful again.");
330
331 #$ob->contr->peaceful ($ob->contr->peaceful ? 0 : 1);
332 #$ob->reply (undef, $ob->contr->peaceful ? "You will attack other players." : "You will not attack other players.");
333};
6 334
7sub rename_to($$$) { 335sub rename_to($$$) {
8 my ($ob, $from, $to) = @_; 336 my ($ob, $from, $to) = @_;
9 337
10 $to =~ /^[a-zA-Z0-9.,=#\/%$!^ ]*$/ 338 $to =~ /^[a-zA-Z0-9.,=#\/%$!^ ]*$/
17 345
18 if (length $from) { 346 if (length $from) {
19 $item = $ob->find_best_object_match ($from) 347 $item = $ob->find_best_object_match ($from)
20 or return $ob->message ("rename: could not find a matching item to rename."); 348 or return $ob->message ("rename: could not find a matching item to rename.");
21 } else { 349 } else {
22 $item = $ob->find_marked_object () 350 $item = $ob->mark
23 or return $ob->message ("rename: no from name and no marked item found to rename."); 351 or return $ob->message ("rename: no from name and no marked item found to rename.");
24 } 352 }
25 353
26 $item->custom_name (length $to ? $to : undef); 354 $item->custom_name (length $to ? $to : undef);
27 355
35 363
36 $ob->esrv_update_item (cf::UPD_NAME, $item); 364 $ob->esrv_update_item (cf::UPD_NAME, $item);
37 365
38 1 366 1
39} 367}
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 mapinfo => sub {
93 my ($ob) = @_;
94
95 my $map = $ob->map
96 or return;
97 $ob->reply (undef, (sprintf "%s (%s) %s", $map->name, $map->path, $ob->region->longname));
98 $ob->reply (undef, (sprintf "players: %d difficulty: %d size: %d start: %dx%d timeout: %d",
99 $map->players, $map->difficulty, $map->width, $map->height, $map->enter_x, $map->enter_y, $map->timeout))
100 if $ob->flag (cf::FLAG_WIZ);
101 $ob->reply (undef, $map->msg);
102
103 1
104};
105
106cf::register_command whereami => sub {
107 my ($ob) = @_;
108
109 my $reg = $ob->region;
110 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg));
111
112 1
113};
114
115cf::register_command applymode => sub {
116 my ($ob, $arg) = @_;
117 my @types = ("nochoice", "never", "always");
118 my $mapping = {
119 nochoice => 1,
120 never => 2,
121 always => 3,
122 };
123
124 my $oldmode = $ob->contr->unapply;
125 my $oldmode_name = $types[$oldmode];
126
127 return $ob->reply (undef, "applymode is set to $oldmode_name")
128 unless $arg;
129
130 return $ob->reply (undef, "applymode: Unknown options '$arg', valid options are @types")
131 unless $mapping->{$arg};
132
133 $ob->contr->unapply ($mapping->{$arg} - 1); # HACK: because of the $mapping->{$arg} check before, where $arg should not be 0
134 # but $arg would be 0 if a user enters an incorrect value
135 $ob->reply (undef, "applymode" . ($oldmode == $ob->contr->unapply ? "" : " now") . " set to " . $types[$ob->contr->unapply]);
136
137 1
138};
139
140cf::register_command petmode => sub {
141 my ($ob, $arg) = @_;
142 my @types = ("normal", "sad", "defend", "arena");
143 my $mapping = {
144 normal => 1,
145 sad => 2,
146 defend => 3,
147 arena => 4,
148 };
149
150 my $oldtype = $ob->contr->petmode;
151 my $oldtype_name = $types[$oldtype];
152
153 return $ob->reply (undef, "petmode is set to $oldtype_name")
154 unless $arg;
155
156 return $ob->reply (undef, "petmode: Unknown options '$arg', valid options are @types")
157 unless $mapping->{$arg};
158
159 $ob->contr->petmode ($mapping->{$arg} - 1); # HACK: because of the $mapping->{$arg} check before, where $arg should not be 0
160 # but $arg would be 0 if a user enters an incorrect value
161 $ob->reply (undef, "petmode" . ($oldtype == $ob->contr->petmode ? "" : " now") . " set to " . $types[$ob->contr->petmode]);
162
163 1
164};
165
166cf::register_command usekeys => sub {
167 my ($ob, $arg) = @_;
168 my @types = ("inventory", "keyrings", "containers");
169 my $mapping = {
170 inventory => 1,
171 keyrings => 2,
172 containers => 3,
173 };
174
175 my $oldtype = $ob->contr->usekeys;
176 my $oldtype_name = $types[$oldtype];
177
178 return $ob->reply (undef, "usekeys is set to $oldtype_name")
179 unless $arg;
180
181 return $ob->reply (undef, "usekeys: Unknown options '$arg', valid options are @types")
182 unless $mapping->{$arg};
183
184 $ob->contr->usekeys ($mapping->{$arg} - 1); # HACK: because of the $mapping->{$arg} check before, where $arg should not be 0
185 # but $arg would be 0 if a user enters an incorrect value
186 $ob->reply (undef, "usekeys" . ($oldtype == $ob->contr->usekeys ? "" : " now") . " set to " . $types[$ob->contr->usekeys]);
187
188 1
189};
190
191cf::register_command afk => sub {
192 my ($ob, $arg) = @_;
193
194 $ob->contr->ns->afk ($ob->contr->ns->afk ? 0 : 1);
195 $ob->reply (undef, $ob->contr->ns->afk ? "You are now AFK" : "You are no longer AFK");
196
197 1
198};
199
200cf::register_command sound => sub {
201 my ($ob, $arg) = @_;
202
203 $ob->contr->ns->sound ($ob->contr->ns->sound ? 0 : 1);
204 $ob->reply (undef, $ob->contr->ns->sound ? "The sounds are enabled." : "Silence is golden...");
205
206 1
207};
208
209cf::register_command brace => sub {
210 my ($ob, $arg) = @_;
211
212 $ob->contr->braced ($ob->contr->braced ? 0 : 1);
213 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced.");
214
215 1
216};
217
218cf::register_command 'output-count' => sub {
219 my ($ob, $arg) = @_;
220
221 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count)
222 unless $arg > 0;
223
224 $ob->contr->outputs_count ($arg);
225 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count);
226
227 1
228};
229
230cf::register_command 'output-sync' => sub {
231 my ($ob, $arg) = @_;
232
233 return $ob->reply (undef, "Output sync time is presently " . $ob->contr->outputs_sync)
234 unless $arg > 0;
235
236 $ob->contr->outputs_sync ($arg);
237 $ob->reply (undef, "Output sync time now set to " . $ob->contr->outputs_sync);
238
239 1
240};
241
242# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to
243# some other level (which may also be 0), this does not get echoed,
244# but it does get set.
245cf::register_command wimpy => sub {
246 my ($ob, $arg) = @_;
247
248 my $wimpy = $ob->run_away;
249 return $ob->reply (undef, "Your current wimpy level is $wimpy.")
250 if $arg eq "";
251
252 return $ob->run_away ($arg) && $ob->reply (undef, "Your new wimpy level is $arg.")
253 if $arg =~ /^\d+$/ and $arg <= 100;
254
255 $ob->reply (undef, "Incorrect parameters for wimpy: $arg");
256
257 1
258};
259
260cf::register_command peaceful => sub {
261 my ($ob, $arg) = @_;
262
263 $ob->reply (undef, "You cannot change your peaceful setting with this command."
264 ." Please speak to the priest in the temple of Gorokh"
265 ." if you want to become hostile or in temple of Valriel"
266 ." if you want to become peaceful again.");
267
268 #$ob->contr->peaceful ($ob->contr->peaceful ? 0 : 1);
269 #$ob->reply (undef, $ob->contr->peaceful ? "You will attack other players." : "You will not attack other players.");
270
271 1
272};
273 368
274cf::register_command rename => sub { 369cf::register_command rename => sub {
275 my ($ob, $arg) = @_; 370 my ($ob, $arg) = @_;
276 371
277 $ob->speed_left ($ob->speed_left - 0.25); 372 $ob->speed_left ($ob->speed_left - 0.25);
291 # does not unquote $1 or $3 386 # does not unquote $1 or $3
292 rename_to $ob, $2||$1, $4||$3; 387 rename_to $ob, $2||$1, $4||$3;
293 } else { 388 } else {
294 $ob->reply (undef, 'Syntax error. Rename usage: rename ["oldname"] to "newname"'); 389 $ob->reply (undef, 'Syntax error. Rename usage: rename ["oldname"] to "newname"');
295 } 390 }
296
297 1
298}; 391};
299 392
300cf::register_command uptime => sub { 393cf::register_command uptime => sub {
301 my ($ob, $arg) = @_; 394 my ($ob, $arg) = @_;
302 395
303 my $startup = POSIX::strftime "%Y-%m-%d %H:%M:%S %Z", localtime $cf::UPTIME; 396 my $startup = POSIX::strftime "%Y-%m-%d %H:%M:%S %Z", localtime $cf::UPTIME;
304 my $runtime = sprintf "%.1f", (time - $cf::UPTIME) / 86400; 397 my $runtime = sprintf "%.1f", (time - $cf::UPTIME) / 86400;
305 $ob->reply (undef, "server started $startup, uptime ${runtime}\d"); 398 $ob->send_msg ("c/uptime" => "server started $startup, uptime ${runtime}\d", cf::NDI_REPLY | cf::NDI_CLEAR);
306
307 1
308}; 399};
309 400
310my %IN_MEMORY = ( 401my %MAP_STATE = (
402 cf::MAP_ACTIVE => "A",
311 cf::MAP_IN_MEMORY => "I", 403 cf::MAP_INACTIVE => "I",
312 cf::MAP_SWAPPED => "S", 404 cf::MAP_SWAPPED => "S",
313 cf::MAP_LOADING => "L",
314); 405);
315 406
316cf::register_command maps => sub { 407cf::register_command maps => sub {
317 my ($ob, $arg) = @_; 408 my ($ob, $arg) = @_;
318 409
319 no re 'eval'; $arg = qr<$arg>; 410 $arg = eval {
411 no re 'eval';
412 local $SIG{__DIE__};
413 qr<$arg>
414 };
320 415
321 my $format = "%2s %1s %3s %5s %.60s\n"; 416 my $format = " %2s %1s %3s %5s %.60s\n";
322 417
323 $ob->reply (undef, (sprintf $format, "Pl", "I", "Svd", "Reset", "Name"), cf::NDI_BLACK | cf::NDI_UNIQUE); 418 my $msg = "\n" . sprintf $format, "Pl", "S", "Svd", "Reset", "Name";
324 419
325 for (sort keys %cf::MAP) { 420 for (sort keys %cf::MAP) {
326 my $map = $cf::MAP{$_} 421 my $map = $cf::MAP{$_}
327 or next; 422 or next;
328 423
330 next if $map->{deny_list}; 425 next if $map->{deny_list};
331 426
332 my $svd = int $cf::RUNTIME - $map->{last_save}; 427 my $svd = int $cf::RUNTIME - $map->{last_save};
333 $svd = "++" if $svd > 99; 428 $svd = "++" if $svd > 99;
334 429
335 $ob->reply (undef, 430 $msg .= sprintf $format,
336 (sprintf $format,
337 (scalar $map->players), 431 (scalar $map->players),
338 $IN_MEMORY{$map->in_memory} || "?", 432 $MAP_STATE{$map->state} || "?",
339 $svd, 433 $svd,
340 (int $map->reset_at - $cf::RUNTIME), 434 (int $map->reset_at - $cf::RUNTIME),
341 $map->visible_name), 435 $map->visible_name;
342 cf::NDI_BLACK | cf::NDI_UNIQUE);
343 }
344
345 1 436 }
346};
347 437
438 $ob->send_msg ("c/mapinfo" => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
439};
440

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines