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

Diff Legend

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