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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines