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

Diff Legend

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