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

Diff Legend

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