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.83 by root, Sat Aug 13 23:22:46 2011 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 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 368
319cf::register_command rename => sub { 369cf::register_command rename => sub {
320 my ($ob, $arg) = @_; 370 my ($ob, $arg) = @_;
321 371
322 $ob->speed_left ($ob->speed_left - 0.25); 372 $ob->speed_left ($ob->speed_left - 0.25);
… …
336 # does not unquote $1 or $3 386 # does not unquote $1 or $3
337 rename_to $ob, $2||$1, $4||$3; 387 rename_to $ob, $2||$1, $4||$3;
338 } else { 388 } else {
339 $ob->reply (undef, 'Syntax error. Rename usage: rename ["oldname"] to "newname"'); 389 $ob->reply (undef, 'Syntax error. Rename usage: rename ["oldname"] to "newname"');
340 } 390 }
341
342 1
343}; 391};
344 392
345cf::register_command uptime => sub { 393cf::register_command uptime => sub {
346 my ($ob, $arg) = @_; 394 my ($ob, $arg) = @_;
347 395
348 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;
349 my $runtime = sprintf "%.1f", (time - $cf::UPTIME) / 86400; 397 my $runtime = sprintf "%.1f", (time - $cf::UPTIME) / 86400;
350 $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);
351
352 1
353}; 399};
354 400
355my %IN_MEMORY = ( 401my %MAP_STATE = (
402 cf::MAP_ACTIVE => "A",
356 cf::MAP_IN_MEMORY => "I", 403 cf::MAP_INACTIVE => "I",
357 cf::MAP_SWAPPED => "S", 404 cf::MAP_SWAPPED => "S",
358 cf::MAP_LOADING => "L",
359); 405);
360 406
361cf::register_command maps => sub { 407cf::register_command maps => sub {
362 my ($ob, $arg) = @_; 408 my ($ob, $arg) = @_;
363 409
364 no re 'eval'; $arg = qr<$arg>; 410 no re 'eval'; $arg = qr<$arg>;
365 411
366 my $format = "%2s %1s %3s %5s %.60s\n"; 412 my $format = " %2s %1s %3s %5s %.60s\n";
367 413
368 $ob->reply (undef, (sprintf $format, "Pl", "I", "Svd", "Reset", "Name"), cf::NDI_BLACK | cf::NDI_UNIQUE); 414 my $msg = "\n" . sprintf $format, "Pl", "S", "Svd", "Reset", "Name";
369 415
370 for (sort keys %cf::MAP) { 416 for (sort keys %cf::MAP) {
371 my $map = $cf::MAP{$_} 417 my $map = $cf::MAP{$_}
372 or next; 418 or next;
373 419
… …
375 next if $map->{deny_list}; 421 next if $map->{deny_list};
376 422
377 my $svd = int $cf::RUNTIME - $map->{last_save}; 423 my $svd = int $cf::RUNTIME - $map->{last_save};
378 $svd = "++" if $svd > 99; 424 $svd = "++" if $svd > 99;
379 425
380 $ob->reply (undef, 426 $msg .= sprintf $format,
381 (sprintf $format,
382 (scalar $map->players), 427 (scalar $map->players),
383 $IN_MEMORY{$map->in_memory} || "?", 428 $MAP_STATE{$map->state} || "?",
384 $svd, 429 $svd,
385 (int $map->reset_at - $cf::RUNTIME), 430 (int $map->reset_at - $cf::RUNTIME),
386 $map->visible_name), 431 $map->visible_name;
387 cf::NDI_BLACK | cf::NDI_UNIQUE);
388 }
389
390 1 432 }
391};
392 433
434 $ob->send_msg ("c/mapinfo" => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
435};
436

Diff Legend

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