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.35 by root, Wed Mar 14 15:44:47 2007 UTC vs.
Revision 1.72 by root, Sun Jan 11 06:08:40 2009 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->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.\r"
89 . "The last column shows the items currently using the slot\n\n";
90
91 # first process all applied items and hash them into their slots
92 my @slot;
93
94 for my $item (grep $_->flag (cf::FLAG_APPLIED), $ob->inv) {
95 $item->slot_info ($_)
96 and push @{ $slot[$_] }, $item
97 for 0 .. cf::NUM_BODY_LOCATIONS-1;
98 }
99
100 $reply .= sprintf " %-20s %3s %5s %s\n", "Location", "You", "Avail", "What";
101 for (0 .. cf::NUM_BODY_LOCATIONS - 1) {
102 my $msg = cf::object::slot_nonuse_name $_;
103 $msg =~ s/^.*? a //;
104 $reply .= sprintf " %-20s %3d %5d %s\n",
105 $msg,
106 $ob->slot_info ($_),
107 $ob->slot_used ($_),
108 join ", ", map $_->query_short_name, @{ $slot[$_] }
109 if $ob->slot_info ($_) || $ob->slot_used ($_);
110 }
111
112 $reply .= "You are not allowed to wear armor\r"
113 unless $ob->flag (cf::FLAG_USE_ARMOUR);
114 $reply .= "You are not allowed to use weapons\r"
115 unless $ob->flag (cf::FLAG_USE_WEAPON);
116
117 $ob->send_msg ("c/body" => $reply, cf::NDI_REPLY);
118};
119
120cf::register_command mark => sub {
121 my ($pl, $arg) = @_;
122
123 if (length $arg) {
124 my $ob = $pl->find_best_object_match ($arg);
125
126 return $pl->reply (undef, "Could not find an object that matches $arg")
127 unless $ob;
128
129 $pl->contr->mark ($ob);
130 $pl->reply (undef, (sprintf "Marked item %s", $ob->name, $ob->title));
131 } else {
132 my $ob = $pl->find_marked_object;
133
134 $pl->reply (undef, $ob
135 ? (sprintf "%s %s * is marked.", $ob->name, $ob->title)
136 : "You have no marked object.");
137 }
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
152 cf::register_command "${cmd}_stop" => sub {
153 my ($ob) = @_;
154
155 $ob->contr->$oncmd (0);
156 };
157}
158
159cf::register_command mapinfo => sub {
160 my ($ob) = @_;
161
162 my $observe = $ob->contr->observe;
163
164 my $map = $observe->map
165 or return;
166
167 my $msg = sprintf "%s (%s)\r%s", $map->name, $map->path, $observe->region->longname;
168 $msg .= sprintf "\rplayers: %d difficulty: %d size: %d start: %dx%d timeout: %d",
169 (scalar $map->players), $map->difficulty, $map->width, $map->height, $map->enter_x, $map->enter_y, $map->timeout
170 if $ob->flag (cf::FLAG_WIZ);
171
172 $ob->send_msg ("c/mapinfo" => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
173};
174
175cf::register_command whereami => sub {
176 my ($ob) = @_;
177
178 my $reg = $ob->contr->observe->region;
179 $ob->send_msg ("c/who" => (sprintf "You are %s.\n\n%s", $reg->longname, $reg->msg), cf::NDI_REPLY | cf::NDI_CLEAR);
180};
181
182cf::register_command whereabouts => sub {
183 my ($ob, $arg) = @_;
184
185 my %count;
186
187 for my $pl (cf::player::list) {
188 ++$count{$pl->ob->region->longname};
189 }
190
191 my $msg = "T<In the world currently there are:>\n\n"
192 . join "", map { sprintf " C<%3d >player(s) %s\r", $count{$_}, $_ } sort keys %count;
193
194 $ob->send_msg ("c/who" => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
195};
196
197cf::register_command hiscore => sub {
198 my ($ob, $arg) = @_;
199
200 my $url = $cf::CFG{hiscore_url};
201 $ob->send_msg (log => "See $url", cf::NDI_REPLY);
202};
203
204sub _set_mode($$$@) {
205 my ($name, $ob, $arg, $slot, @choices) = @_;
206
207 my $oldmode = $ob->contr->$slot;
208
209 return $ob->reply (undef, "$name is set to $choices[$oldmode]")
210 unless $arg;
211
212 my ($idx) = grep $choices[$_] eq $arg, 0 .. $#choices
213 or return $ob->reply (undef, "$name: Unknown options '$arg', valid options are @choices"), 1;
214
215 $ob->contr->$slot ($idx);
216 $ob->reply (undef, "$name" . ($oldmode == $ob->contr->unapply ? "" : " now") . " set to " . $choices[$ob->contr->$slot]);
217}
218
219cf::register_command applymode => sub {
220 my ($ob, $arg) = @_;
221
222 _set_mode "applymode", $ob, $arg, unapply => qw(nochoice never always);
223};
224
225cf::register_command petmode => sub {
226 my ($ob, $arg) = @_;
227
228 _set_mode "petmode", $ob, $arg, petmode => qw(normal sad defend arena);
229};
230
231cf::register_command usekeys => sub {
232 my ($ob, $arg) = @_;
233
234 _set_mode "usekeys", $ob, $arg, usekeys => qw(inventory keyrings containers);
235};
236
237cf::register_command hintmode => sub {
238 my ($ob, $arg) = @_;
239
240 _set_mode "hintmode", $ob, $arg, hintmode => qw(show mark hide);
241};
242
243cf::register_command afk => sub {
244 my ($ob, $arg) = @_;
245
246 $ob->contr->ns->afk ($ob->contr->ns->afk ? 0 : 1);
247 $ob->reply (undef, $ob->contr->ns->afk ? "You are now AFK" : "You are no longer AFK");
248};
249
250cf::register_command sound => sub {
251 my ($ob, $arg) = @_;
252
253 $ob->contr->ns->sound ($ob->contr->ns->sound ? 0 : 1);
254 $ob->reply (undef, $ob->contr->ns->sound ? "The sounds are enabled." : "Silence is golden...");
255};
256
257cf::register_command brace => sub {
258 my ($ob, $arg) = @_;
259
260 $ob->contr->braced ($ob->contr->braced ? 0 : 1);
261 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced.");
262};
263
264cf::register_command 'output-rate' => sub {
265 my ($ob, $arg) = @_;
266
267 return $ob->reply (undef, sprintf "Output rate is presently %dbps.", $ob->contr->ns->max_rate / $cf::TICK)
268 unless $arg > 0;
269
270 # minimum is 5k/s
271 # maximum is 100k/s, this should be configurable
272 $ob->contr->ns->max_rate ((List::Util::max 5000, List::Util::min 100000, $arg) * $cf::TICK);
273 $ob->reply (undef, sprintf "Output rate now set to %dbps.", $ob->contr->ns->max_rate / $cf::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
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->reply (undef, "Can't $cmd into a non adjacent square.")
156 if $arg < 0 or $arg >= 9;
157
158 $ob->contr->$oncmd (1);
159 $ob->move_player ($arg);
160
161 1
162 };
163
164 cf::register_command "${cmd}_stop" => sub {
165 my ($ob) = @_;
166
167 $ob->contr->$oncmd (0);
168
169 1
170 };
171}
172
173cf::register_command mapinfo => sub {
174 my ($ob) = @_;
175
176 my $map = $ob->map
177 or return;
178 $ob->reply (undef, (sprintf "%s (%s) %s", $map->name, $map->path, $ob->region->longname));
179 $ob->reply (undef, (sprintf "players: %d difficulty: %d size: %d start: %dx%d timeout: %d",
180 $map->players, $map->difficulty, $map->width, $map->height, $map->enter_x, $map->enter_y, $map->timeout))
181 if $ob->flag (cf::FLAG_WIZ);
182 $ob->reply (undef, $map->msg);
183
184 1
185};
186
187cf::register_command whereami => sub {
188 my ($ob) = @_;
189
190 my $reg = $ob->region;
191 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg));
192
193 1
194};
195
196sub _set_mode($$$@) {
197 my ($name, $ob, $arg, $slot, @choices) = @_;
198
199 my $oldmode = $ob->contr->$slot;
200
201 return $ob->reply (undef, "$name is set to $choices[$oldmode]")
202 unless $arg;
203
204 my ($idx) = grep $choices[$_] eq $arg, 0 .. $#choices
205 or return $ob->reply (undef, "$name: Unknown options '$arg', valid options are @choices"), 1;
206
207 $ob->contr->$slot ($idx);
208 $ob->reply (undef, "$name" . ($oldmode == $ob->contr->unapply ? "" : " now") . " set to " . $choices[$ob->contr->$slot]);
209}
210
211cf::register_command applymode => sub {
212 my ($ob, $arg) = @_;
213
214 _set_mode "applymode", $ob, $arg, unapply => qw(nochoice never always);
215
216 1
217};
218
219cf::register_command petmode => sub {
220 my ($ob, $arg) = @_;
221
222 _set_mode "petmode", $ob, $arg, petmode => qw(normal sad defend arena);
223
224 1
225};
226
227cf::register_command usekeys => sub {
228 my ($ob, $arg) = @_;
229
230 _set_mode "usekeys", $ob, $arg, usekeys => qw(inventory keyrings containers);
231
232 1
233};
234
235cf::register_command afk => sub {
236 my ($ob, $arg) = @_;
237
238 $ob->contr->ns->afk ($ob->contr->ns->afk ? 0 : 1);
239 $ob->reply (undef, $ob->contr->ns->afk ? "You are now AFK" : "You are no longer AFK");
240
241 1
242};
243
244cf::register_command sound => sub {
245 my ($ob, $arg) = @_;
246
247 $ob->contr->ns->sound ($ob->contr->ns->sound ? 0 : 1);
248 $ob->reply (undef, $ob->contr->ns->sound ? "The sounds are enabled." : "Silence is golden...");
249
250 1
251};
252
253cf::register_command brace => sub {
254 my ($ob, $arg) = @_;
255
256 $ob->contr->braced ($ob->contr->braced ? 0 : 1);
257 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced.");
258
259 1
260};
261
262cf::register_command 'output-rate' => sub {
263 my ($ob, $arg) = @_;
264
265 return $ob->reply (undef, sprintf "Output rate is presently %dbps.", $ob->contr->ns->max_rate / $cf::TICK)
266 unless $arg > 0;
267
268 $ob->contr->ns->max_rate ($arg * $cf::TICK);
269 $ob->reply (undef, sprintf "Output rate now set to%dbps.", $ob->contr->ns->max_rate / $cf::TICK);
270
271 1
272};
273
274cf::register_command 'output-count' => sub {
275 my ($ob, $arg) = @_;
276
277 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count)
278 unless $arg > 0;
279
280 $ob->contr->outputs_count ($arg);
281 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count);
282
283 1
284};
285
286cf::register_command 'output-sync' => sub {
287 my ($ob, $arg) = @_;
288
289 return $ob->reply (undef, "Output sync time is presently " . $ob->contr->outputs_sync)
290 unless $arg > 0;
291
292 $ob->contr->outputs_sync ($arg);
293 $ob->reply (undef, "Output sync time now set to " . $ob->contr->outputs_sync);
294
295 1
296};
297
298# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to
299# some other level (which may also be 0), this does not get echoed,
300# but it does get set.
301cf::register_command wimpy => sub {
302 my ($ob, $arg) = @_;
303
304 my $wimpy = $ob->run_away;
305 return $ob->reply (undef, "Your current wimpy level is $wimpy.")
306 if $arg eq "";
307
308 return $ob->run_away ($arg) && $ob->reply (undef, "Your new wimpy level is $arg.")
309 if $arg =~ /^\d+$/ and $arg <= 100;
310
311 $ob->reply (undef, "Incorrect parameters for wimpy: $arg");
312
313 1
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
327 1
328};
329 361
330cf::register_command rename => sub { 362cf::register_command rename => sub {
331 my ($ob, $arg) = @_; 363 my ($ob, $arg) = @_;
332 364
333 $ob->speed_left ($ob->speed_left - 0.25); 365 $ob->speed_left ($ob->speed_left - 0.25);
… …
347 # does not unquote $1 or $3 379 # does not unquote $1 or $3
348 rename_to $ob, $2||$1, $4||$3; 380 rename_to $ob, $2||$1, $4||$3;
349 } else { 381 } else {
350 $ob->reply (undef, 'Syntax error. Rename usage: rename ["oldname"] to "newname"'); 382 $ob->reply (undef, 'Syntax error. Rename usage: rename ["oldname"] to "newname"');
351 } 383 }
352
353 1
354}; 384};
355 385
356cf::register_command uptime => sub { 386cf::register_command uptime => sub {
357 my ($ob, $arg) = @_; 387 my ($ob, $arg) = @_;
358 388
359 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;
360 my $runtime = sprintf "%.1f", (time - $cf::UPTIME) / 86400; 390 my $runtime = sprintf "%.1f", (time - $cf::UPTIME) / 86400;
361 $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);
362
363 1
364}; 392};
365 393
366my %IN_MEMORY = ( 394my %IN_MEMORY = (
367 cf::MAP_IN_MEMORY => "I", 395 cf::MAP_ACTIVE => "I",
368 cf::MAP_SWAPPED => "S", 396 cf::MAP_SWAPPED => "S",
369 cf::MAP_LOADING => "L", 397 cf::MAP_LOADING => "L",
370); 398);
371 399
372cf::register_command maps => sub { 400cf::register_command maps => sub {
373 my ($ob, $arg) = @_; 401 my ($ob, $arg) = @_;
374 402
375 no re 'eval'; $arg = qr<$arg>; 403 no re 'eval'; $arg = qr<$arg>;
376 404
377 my $format = "%2s %1s %3s %5s %.60s\n"; 405 my $format = " %2s %1s %3s %5s %.60s\n";
378 406
379 $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";
380 408
381 for (sort keys %cf::MAP) { 409 for (sort keys %cf::MAP) {
382 my $map = $cf::MAP{$_} 410 my $map = $cf::MAP{$_}
383 or next; 411 or next;
384 412
… …
386 next if $map->{deny_list}; 414 next if $map->{deny_list};
387 415
388 my $svd = int $cf::RUNTIME - $map->{last_save}; 416 my $svd = int $cf::RUNTIME - $map->{last_save};
389 $svd = "++" if $svd > 99; 417 $svd = "++" if $svd > 99;
390 418
391 $ob->reply (undef, 419 $msg .= sprintf $format,
392 (sprintf $format,
393 (scalar $map->players), 420 (scalar $map->players),
394 $IN_MEMORY{$map->in_memory} || "?", 421 $IN_MEMORY{$map->in_memory} || "?",
395 $svd, 422 $svd,
396 (int $map->reset_at - $cf::RUNTIME), 423 (int $map->reset_at - $cf::RUNTIME),
397 $map->visible_name), 424 $map->visible_name;
398 cf::NDI_BLACK | cf::NDI_UNIQUE);
399 }
400
401 1 425 }
402};
403 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