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.41 by root, Wed Apr 25 18:47:50 2007 UTC vs.
Revision 1.62 by root, Sat Sep 8 10:14:09 2007 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 my $CHANNEL = {
53 id => "who",
54 title => "Players",
55 reply => undef,
56 tooltip => "Shows players who are currently online",
57 };
58
59 $ob->send_msg ($CHANNEL => (join "\n\n", who_listing $ob->may ("extended_who"), $arg), cf::NDI_DK_ORANGE | cf::NDI_REPLY | cf::NDI_CLEAR | cf::NDI_DEF);
60};
61
62cf::register_command seen => sub {
63 my ($pl, $args) = @_;
64
65 if (my ($login) = $args =~ /(\S+)/) {
66 if ($login eq $pl->name) {
67 $pl->message ("Very funny, $login. Ha. Ha.", cf::NDI_REPLY);
68 } elsif (cf::player::find_active $login) {
69 $pl->message ("$login is right here on this server!", cf::NDI_REPLY);
70 } elsif (cf::player::exists $login
71 and stat cf::player::path $login) {
72 my $time = (stat _)[9];
73
74 $pl->message ("$login was last seen here "
75 . (POSIX::strftime "%Y-%m-%d %H:%M:%S +0000", gmtime $time)
76 . " which was " . (int +(time - $time) / 3600) . " hours ago.", cf::NDI_REPLY);
77 } else {
78 $pl->message ("No player named $login is known to me.", cf::NDI_REPLY);
79 }
80 } else {
81 $pl->message ("Usage: seen <player>", cf::NDI_REPLY);
82 }
83};
84
85cf::register_command body => sub {
86 my ($ob) = @_;
87
88 # Too hard to try and make a header that lines everything up, so just
89 # give a description. (comment from C++)
90 my $reply =
91 "The first column is the name of the body location.\n\n"
92 . "The second column is how many of those locations your body has.\n\n"
93 . "The third column is how many slots in that location are available.\n\n";
94
95 $reply .= sprintf " %-20s %3s %5s\n", "Location", "You", "Avail";
96 for (0 .. cf::NUM_BODY_LOCATIONS - 1) {
97 my $msg = cf::object::slot_nonuse_name $_;
98 $msg =~ s/^.*? a //;
99 $reply .= sprintf " %-20s %3d %5d\n", $msg, $ob->slot_info ($_), $ob->slot_used ($_)
100 if $ob->slot_info ($_) or $ob->slot_used ($_);
101 }
102
103 $reply .= "You are not allowed to wear armor\n\n"
104 unless $ob->flag (cf::FLAG_USE_ARMOUR);
105 $reply .= "You are not allowed to use weapons\n\n"
106 unless $ob->flag (cf::FLAG_USE_WEAPON);
107
108 my $CHANNEL = {
109 id => "body",
110 title => "Body Parts",
111 reply => undef,
112 tooltip => "Shows which body parts you posess and are available",
113 };
114
115 $ob->send_msg ($CHANNEL => $reply, cf::NDI_REPLY);
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
138for my $cmd ("run", "fire") {
139 my $oncmd = "${cmd}_on";
140 cf::register_command $cmd => sub {
141 my ($ob, $arg) = @_;
142
143 $ob->reply (undef, "Can't $cmd into a non adjacent square.")
144 if $arg < 0 or $arg >= 9;
145
146 $ob->contr->$oncmd (1);
147 $ob->move_player ($arg);
148 };
149
150 cf::register_command "${cmd}_stop" => sub {
151 my ($ob) = @_;
152
153 $ob->contr->$oncmd (0);
154 };
155}
156
157our $MAPINFO_CHANNEL = {
158 id => "mapinfo",
159 title => "Map Info",
160 reply => undef,
161 tooltip => "Information about the map",
162};
163
164cf::register_command mapinfo => sub {
165 my ($ob) = @_;
166
167 my $observe = $ob->contr->observe;
168
169 my $map = $observe->map
170 or return;
171
172 my $msg = sprintf "%s (%s) %s", $map->name, $map->path, $observe->region->longname;
173 $msg .= sprintf "\n\nplayers: %d difficulty: %d size: %d start: %dx%d timeout: %d",
174 (scalar $map->players), $map->difficulty, $map->width, $map->height, $map->enter_x, $map->enter_y, $map->timeout
175 if $ob->flag (cf::FLAG_WIZ);
176
177 $ob->send_msg ($MAPINFO_CHANNEL => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
178};
179
180cf::register_command whereami => sub {
181 my ($ob) = @_;
182
183 my $reg = $ob->contr->observe->region;
184 $ob->send_msg ($MAPINFO_CHANNEL => (sprintf "You are %s.\n%s", $reg->longname, $reg->msg), cf::NDI_REPLY | cf::NDI_CLEAR);
185};
186
187cf::register_command whereabouts => sub {
188 my ($ob, $arg) = @_;
189
190 my %count;
191
192 for my $pl (cf::player::list) {
193 ++$count{$pl->ob->region->longname};
194 }
195
196 my $msg = "In the world currently there are:\n\n"
197 . join "", map "$count{$_} player(s) $_\n\n", sort keys %count;
198
199 $ob->send_msg ($MAPINFO_CHANNEL => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
200};
201
202cf::register_command hiscore => sub {
203 my ($ob, $arg) = @_;
204
205 my $url = $cf::CFG->{hiscore_url};
206 $ob->send_msg (log => "See $url", cf::NDI_REPLY);
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
230cf::register_command petmode => sub {
231 my ($ob, $arg) = @_;
232
233 _set_mode "petmode", $ob, $arg, petmode => qw(normal sad defend arena);
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
242cf::register_command hintmode => sub {
243 my ($ob, $arg) = @_;
244
245 _set_mode "hintmode", $ob, $arg, hintmode => qw(show mark hide);
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
255cf::register_command sound => sub {
256 my ($ob, $arg) = @_;
257
258 $ob->contr->ns->sound ($ob->contr->ns->sound ? 0 : 1);
259 $ob->reply (undef, $ob->contr->ns->sound ? "The sounds are enabled." : "Silence is golden...");
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
269cf::register_command 'output-rate' => sub {
270 my ($ob, $arg) = @_;
271
272 return $ob->reply (undef, sprintf "Output rate is presently %dbps.", $ob->contr->ns->max_rate / $cf::TICK)
273 unless $arg > 0;
274
275 # minimum is 5k/s
276 # maximum is 100k/s, this should be configurable
277 $ob->contr->ns->max_rate ((List::Util::max 5000, List::Util::min 100000, $arg) * $cf::TICK);
278 $ob->reply (undef, sprintf "Output rate now set to %dbps.", $ob->contr->ns->max_rate / $cf::TICK);
279};
280
281cf::register_command 'output-count' => sub {
282 my ($ob, $arg) = @_;
283
284 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count)
285 unless $arg > 0;
286
287 $arg = 4 if $arg < 4;
288
289 $ob->contr->outputs_count ($arg);
290 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count);
291};
292
293cf::register_command 'output-sync' => sub {
294 my ($ob, $arg) = @_;
295
296 return $ob->reply (undef, sprintf "Output sync time is presently %.1fs", $ob->contr->outputs_sync * $cf::TICK)
297 unless length $arg;
298
299 $arg = 0.5 if $arg < 0.5;
300
301 $ob->contr->outputs_sync ($arg / $cf::TICK);
302 $ob->reply (undef, sprintf "Output sync time now set to %.1fs", $ob->contr->outputs_sync * $cf::TICK);
303};
304
305# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to
306# some other level (which may also be 0), this does not get echoed,
307# but it does get set.
308cf::register_command wimpy => sub {
309 my ($ob, $arg) = @_;
310
311 my $wimpy = $ob->run_away;
312 return $ob->reply (undef, "Your current wimpy level is $wimpy.")
313 if $arg eq "";
314
315 return $ob->run_away ($arg) && $ob->reply (undef, "Your new wimpy level is $arg.")
316 if $arg =~ /^\d+$/ and $arg <= 100;
317
318 $ob->reply (undef, "Incorrect parameters for wimpy: $arg");
319};
320
321cf::register_command peaceful => sub {
322 my ($ob, $arg) = @_;
323
324 $ob->reply (undef, "You cannot change your peaceful setting with this command."
325 ." Please speak to the priest in the temple of Gorokh"
326 ." if you want to become hostile or in temple of Valriel"
327 ." if you want to become peaceful again.");
328
329 #$ob->contr->peaceful ($ob->contr->peaceful ? 0 : 1);
330 #$ob->reply (undef, $ob->contr->peaceful ? "You will attack other players." : "You will not attack other players.");
331};
6 332
7sub rename_to($$$) { 333sub rename_to($$$) {
8 my ($ob, $from, $to) = @_; 334 my ($ob, $from, $to) = @_;
9 335
10 $to =~ /^[a-zA-Z0-9.,=#\/%$!^ ]*$/ 336 $to =~ /^[a-zA-Z0-9.,=#\/%$!^ ]*$/
… …
35 361
36 $ob->esrv_update_item (cf::UPD_NAME, $item); 362 $ob->esrv_update_item (cf::UPD_NAME, $item);
37 363
38 1 364 1
39} 365}
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 $arg = 4 if $arg < 4;
295
296 $ob->contr->outputs_count ($arg);
297 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count);
298
299 1
300};
301
302cf::register_command 'output-sync' => sub {
303 my ($ob, $arg) = @_;
304
305 return $ob->reply (undef, sprintf "Output sync time is presently %.1fs", $ob->contr->outputs_sync * $cf::TICK)
306 unless length $arg;
307
308 $arg = 0.5 if $arg < 0.5;
309
310 $ob->contr->outputs_sync ($arg / $cf::TICK);
311 $ob->reply (undef, sprintf "Output sync time now set to %.1fs", $ob->contr->outputs_sync * $cf::TICK);
312
313 1
314};
315
316# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to
317# some other level (which may also be 0), this does not get echoed,
318# but it does get set.
319cf::register_command wimpy => sub {
320 my ($ob, $arg) = @_;
321
322 my $wimpy = $ob->run_away;
323 return $ob->reply (undef, "Your current wimpy level is $wimpy.")
324 if $arg eq "";
325
326 return $ob->run_away ($arg) && $ob->reply (undef, "Your new wimpy level is $arg.")
327 if $arg =~ /^\d+$/ and $arg <= 100;
328
329 $ob->reply (undef, "Incorrect parameters for wimpy: $arg");
330
331 1
332};
333
334cf::register_command peaceful => sub {
335 my ($ob, $arg) = @_;
336
337 $ob->reply (undef, "You cannot change your peaceful setting with this command."
338 ." Please speak to the priest in the temple of Gorokh"
339 ." if you want to become hostile or in temple of Valriel"
340 ." if you want to become peaceful again.");
341
342 #$ob->contr->peaceful ($ob->contr->peaceful ? 0 : 1);
343 #$ob->reply (undef, $ob->contr->peaceful ? "You will attack other players." : "You will not attack other players.");
344
345 1
346};
347 366
348cf::register_command rename => sub { 367cf::register_command rename => sub {
349 my ($ob, $arg) = @_; 368 my ($ob, $arg) = @_;
350 369
351 $ob->speed_left ($ob->speed_left - 0.25); 370 $ob->speed_left ($ob->speed_left - 0.25);
… …
365 # does not unquote $1 or $3 384 # does not unquote $1 or $3
366 rename_to $ob, $2||$1, $4||$3; 385 rename_to $ob, $2||$1, $4||$3;
367 } else { 386 } else {
368 $ob->reply (undef, 'Syntax error. Rename usage: rename ["oldname"] to "newname"'); 387 $ob->reply (undef, 'Syntax error. Rename usage: rename ["oldname"] to "newname"');
369 } 388 }
370
371 1
372}; 389};
373 390
374cf::register_command uptime => sub { 391cf::register_command uptime => sub {
375 my ($ob, $arg) = @_; 392 my ($ob, $arg) = @_;
376 393
377 my $startup = POSIX::strftime "%Y-%m-%d %H:%M:%S %Z", localtime $cf::UPTIME; 394 my $startup = POSIX::strftime "%Y-%m-%d %H:%M:%S %Z", localtime $cf::UPTIME;
378 my $runtime = sprintf "%.1f", (time - $cf::UPTIME) / 86400; 395 my $runtime = sprintf "%.1f", (time - $cf::UPTIME) / 86400;
379 $ob->reply (undef, "server started $startup, uptime ${runtime}\d"); 396 $ob->send_msg (log => "server started $startup, uptime ${runtime}\d", cf::NDI_REPLY);
380
381 1
382}; 397};
383 398
384my %IN_MEMORY = ( 399my %IN_MEMORY = (
385 cf::MAP_IN_MEMORY => "I", 400 cf::MAP_IN_MEMORY => "I",
386 cf::MAP_SWAPPED => "S", 401 cf::MAP_SWAPPED => "S",
… …
392 407
393 no re 'eval'; $arg = qr<$arg>; 408 no re 'eval'; $arg = qr<$arg>;
394 409
395 my $format = "%2s %1s %3s %5s %.60s\n"; 410 my $format = "%2s %1s %3s %5s %.60s\n";
396 411
397 $ob->reply (undef, (sprintf $format, "Pl", "I", "Svd", "Reset", "Name"), cf::NDI_BLACK | cf::NDI_UNIQUE); 412 $ob->send_msg ($MAPINFO_CHANNEL => (sprintf $format, "Pl", "I", "Svd", "Reset", "Name"), cf::NDI_REPLY | cf::NDI_CLEAR);
398 413
399 for (sort keys %cf::MAP) { 414 for (sort keys %cf::MAP) {
400 my $map = $cf::MAP{$_} 415 my $map = $cf::MAP{$_}
401 or next; 416 or next;
402 417
… …
404 next if $map->{deny_list}; 419 next if $map->{deny_list};
405 420
406 my $svd = int $cf::RUNTIME - $map->{last_save}; 421 my $svd = int $cf::RUNTIME - $map->{last_save};
407 $svd = "++" if $svd > 99; 422 $svd = "++" if $svd > 99;
408 423
409 $ob->reply (undef, 424 $ob->send_msg ($MAPINFO_CHANNEL =>
410 (sprintf $format, 425 (sprintf $format,
411 (scalar $map->players), 426 (scalar $map->players),
412 $IN_MEMORY{$map->in_memory} || "?", 427 $IN_MEMORY{$map->in_memory} || "?",
413 $svd, 428 $svd,
414 (int $map->reset_at - $cf::RUNTIME), 429 (int $map->reset_at - $cf::RUNTIME),
415 $map->visible_name), 430 $map->visible_name)
416 cf::NDI_BLACK | cf::NDI_UNIQUE); 431 );
417 }
418
419 1 432 }
420}; 433};
421 434

Diff Legend

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