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.30 by pippijn, Fri Mar 2 14:24:53 2007 UTC vs.
Revision 1.42 by root, Thu May 3 04:50:27 2007 UTC

1#! perl 1#! perl # MANDATORY
2 2
3use POSIX (); 3use POSIX ();
4 4
5# miscellaneous commands 5# miscellaneous commands
6 6
… …
17 17
18 if (length $from) { 18 if (length $from) {
19 $item = $ob->find_best_object_match ($from) 19 $item = $ob->find_best_object_match ($from)
20 or return $ob->message ("rename: could not find a matching item to rename."); 20 or return $ob->message ("rename: could not find a matching item to rename.");
21 } else { 21 } else {
22 $item = $ob->find_marked_object () 22 $item = $ob->find_marked_object
23 or return $ob->message ("rename: no from name and no marked item found to rename."); 23 or return $ob->message ("rename: no from name and no marked item found to rename.");
24 } 24 }
25 25
26 $item->custom_name (length $to ? $to : undef); 26 $item->custom_name (length $to ? $to : undef);
27 27
… …
38 1 38 1
39} 39}
40 40
41sub ext::schmorp_irc::users; # HACK: TODO: replace by signal 41sub ext::schmorp_irc::users; # HACK: TODO: replace by signal
42 42
43sub who_listing(;$) { 43sub who_listing(;$$) {
44 my ($privileged) = @_; 44 my ($privileged, $select) = @_;
45 45
46 my ($numwiz, $numafk) = (0, 0); 46 my ($numwiz, $numafk) = (0, 0);
47 my @pl; 47 my @pl;
48 48
49 foreach my $pl (cf::player::list) { 49 foreach my $pl (cf::player::list) {
… …
59 push @pl, $pl; 59 push @pl, $pl;
60 } 60 }
61 61
62 ( 62 (
63 "Total Players in The World. (" . (scalar @pl) . ") -- WIZ($numwiz) AFK($numafk) BOT(0)", 63 "Total Players in The World. (" . (scalar @pl) . ") -- WIZ($numwiz) AFK($numafk) BOT(0)",
64 ( 64 (grep /$select/,
65 map { 65 map {
66 my ($pl, $ob, $ns) = ($_, $_->ob, $_->ns); 66 my ($pl, $ob, $ns) = ($_, $_->ob, $_->ns);
67 67
68 "* " . $ob->name . "/" . $ob->level . " " . (length $pl->own_title ? $pl->own_title : "the " . $pl->title) 68 "* " . $ob->name . "/" . $ob->level . " " . (length $pl->own_title ? $pl->own_title : "the " . $pl->title)
69 . ($pl->peaceful ? " [peaceful]" : " [HOSTILE]") 69 . ($pl->peaceful ? " [peaceful]" : " [HOSTILE]")
70 . ($ns->afk ? " [AFK]" : "") 70 . ($ns->afk ? " [AFK]" : "")
71 . ($ob->flag (cf::FLAG_WIZ) ? " [WIZ]" : "") 71 . ($ob->flag (cf::FLAG_WIZ) ? " [WIZ]" : "")
72 . " [" . $pl->ns->version . "]" 72 . " [" . $pl->ns->version . "]"
73 . " [" . ($pl->peaceful || $privileged ? $ob->map->visible_name : $ob->region->name) . "]" 73 . " [" . ($pl->peaceful || $privileged ? $ob->map->visible_name : $ob->region->name) . "]"
74 . (sprintf " [rtt %.3fs]", $pl->ns->rtt * 1e-6) 74 . (sprintf " [rtt %.3fs]", $pl->ns->rtt * 1e-6)
75 . ($privileged ? " " . $pl->ns->host : "") 75 . ($privileged ? " " . $pl->ns->host : "")
76 } sort { (lc $a->ob->name) cmp (lc $b->ob->name) } @pl 76 } sort { (lc $a->ob->name) cmp (lc $b->ob->name) } @pl
77 ), 77 ),
78 eval { "* IRC: " . join ", ", ext::schmorp_irc::users }, 78 eval { "* IRC: " . join ", ", ext::schmorp_irc::users },
79 ) 79 )
80} 80}
81 81
82cf::register_command who => sub { 82cf::register_command who => sub {
83 my ($ob, $arg) = @_; 83 my ($ob, $arg) = @_;
84 84
85 $ob->speed_left ($ob->speed_left - 0.25); 85 $ob->speed_left ($ob->speed_left - 4);
86 86
87 $ob->reply (undef, (join "\n", who_listing $ob->may ("extended_who")), cf::NDI_UNIQUE | cf::NDI_DK_ORANGE); 87 $ob->reply (undef, (join "\n", who_listing $ob->may ("extended_who"), $arg), cf::NDI_UNIQUE | cf::NDI_DK_ORANGE);
88 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);
89 1 112 }
90}; 113};
91 114
92cf::register_command body => sub { 115cf::register_command body => sub {
93 my ($ob) = @_; 116 my ($ob) = @_;
94 117
… …
116}; 139};
117 140
118cf::register_command mark => sub { 141cf::register_command mark => sub {
119 my ($pl, $arg) = @_; 142 my ($pl, $arg) = @_;
120 143
121 unless (length $arg) { 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 {
122 my $ob = $pl->find_marked_object; 153 my $ob = $pl->find_marked_object;
123 154
124 $pl->reply (undef, $ob 155 $pl->reply (undef, $ob
125 ? (sprintf "%s %s * is marked.", $ob->name, $ob->title) 156 ? (sprintf "%s %s * is marked.", $ob->name, $ob->title)
126 : "You have no marked object."); 157 : "You have no marked object.");
127 } else {
128 my $ob = $pl->find_best_object_match ($arg);
129
130 return $pl->reply (undef, "Could not find an object that matches $arg")
131 unless $ob;
132
133 $pl->contr->mark ($ob);
134 $pl->reply (undef, (sprintf "Marked item %s", $ob->name, $ob->title));
135 }
136
137 1 158 }
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 159
147 1 160 1
148}; 161};
149 162
150for my $cmd ("run", "fire") { 163for my $cmd ("run", "fire") {
151 my $oncmd = "${cmd}_on"; 164 my $oncmd = "${cmd}_on";
152 cf::register_command $cmd => sub { 165 cf::register_command $cmd => sub {
153 my ($ob, $arg) = @_; 166 my ($ob, $arg) = @_;
154 167
155 return $ob->reply (undef, "Can't $cmd into a non adjacent square.") 168 $ob->reply (undef, "Can't $cmd into a non adjacent square.")
156 if $arg < 0 or $arg >= 9; 169 if $arg < 0 or $arg >= 9;
157 170
158 $ob->contr->$oncmd (1); 171 $ob->contr->$oncmd (1);
159 $ob->move ($arg); 172 $ob->move_player ($arg);
160 173
161 1 174 1
162 }; 175 };
163 176
164 cf::register_command "${cmd}_stop" => sub { 177 cf::register_command "${cmd}_stop" => sub {
165 my ($ob) = @_; 178 my ($ob) = @_;
166 179
167 $ob->contr->$oncmd (0); 180 $ob->contr->$oncmd (0);
168 181
… …
191 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg)); 204 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg));
192 205
193 1 206 1
194}; 207};
195 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
196cf::register_command applymode => sub { 224cf::register_command applymode => sub {
197 my ($ob, $arg) = @_; 225 my ($ob, $arg) = @_;
198 my @types = ("nochoice", "never", "always");
199 my $mapping = {
200 nochoice => 1,
201 never => 2,
202 always => 3,
203 };
204 226
205 my $oldmode = $ob->contr->unapply; 227 _set_mode "applymode", $ob, $arg, unapply => qw(nochoice never always);
206 my $oldmode_name = $types[$oldmode];
207
208 return $ob->reply (undef, "applymode is set to $oldmode_name")
209 unless $arg;
210
211 return $ob->reply (undef, "applymode: Unknown options '$arg', valid options are @types")
212 unless $mapping->{$arg};
213
214 $ob->contr->unapply ($mapping->{$arg} - 1); # HACK: because of the $mapping->{$arg} check before, where $arg should not be 0
215 # but $arg would be 0 if a user enters an incorrect value
216 $ob->reply (undef, "applymode" . ($oldmode == $ob->contr->unapply ? "" : " now") . " set to " . $types[$ob->contr->unapply]);
217 228
218 1 229 1
219}; 230};
220 231
221cf::register_command petmode => sub { 232cf::register_command petmode => sub {
222 my ($ob, $arg) = @_; 233 my ($ob, $arg) = @_;
223 my @types = ("normal", "sad", "defend", "arena");
224 my $mapping = {
225 normal => 1,
226 sad => 2,
227 defend => 3,
228 arena => 4,
229 };
230 234
231 my $oldtype = $ob->contr->petmode; 235 _set_mode "petmode", $ob, $arg, petmode => qw(normal sad defend arena);
232 my $oldtype_name = $types[$oldtype];
233
234 return $ob->reply (undef, "petmode is set to $oldtype_name")
235 unless $arg;
236
237 return $ob->reply (undef, "petmode: Unknown options '$arg', valid options are @types")
238 unless $mapping->{$arg};
239
240 $ob->contr->petmode ($mapping->{$arg} - 1); # HACK: because of the $mapping->{$arg} check before, where $arg should not be 0
241 # but $arg would be 0 if a user enters an incorrect value
242 $ob->reply (undef, "petmode" . ($oldtype == $ob->contr->petmode ? "" : " now") . " set to " . $types[$ob->contr->petmode]);
243 236
244 1 237 1
245}; 238};
246 239
247cf::register_command usekeys => sub { 240cf::register_command usekeys => sub {
248 my ($ob, $arg) = @_; 241 my ($ob, $arg) = @_;
249 my @types = ("inventory", "keyrings", "containers");
250 my $mapping = {
251 inventory => 1,
252 keyrings => 2,
253 containers => 3,
254 };
255 242
256 my $oldtype = $ob->contr->usekeys; 243 _set_mode "usekeys", $ob, $arg, usekeys => qw(inventory keyrings containers);
257 my $oldtype_name = $types[$oldtype];
258
259 return $ob->reply (undef, "usekeys is set to $oldtype_name")
260 unless $arg;
261
262 return $ob->reply (undef, "usekeys: Unknown options '$arg', valid options are @types")
263 unless $mapping->{$arg};
264
265 $ob->contr->usekeys ($mapping->{$arg} - 1); # HACK: because of the $mapping->{$arg} check before, where $arg should not be 0
266 # but $arg would be 0 if a user enters an incorrect value
267 $ob->reply (undef, "usekeys" . ($oldtype == $ob->contr->usekeys ? "" : " now") . " set to " . $types[$ob->contr->usekeys]);
268 244
269 1 245 1
270}; 246};
271 247
272cf::register_command afk => sub { 248cf::register_command afk => sub {
… …
294 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced."); 270 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced.");
295 271
296 1 272 1
297}; 273};
298 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
299cf::register_command 'output-count' => sub { 288cf::register_command 'output-count' => sub {
300 my ($ob, $arg) = @_; 289 my ($ob, $arg) = @_;
301 290
302 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count) 291 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count)
303 unless $arg > 0; 292 unless $arg > 0;
304 293
294 $arg = 4 if $arg < 4;
295
305 $ob->contr->outputs_count ($arg); 296 $ob->contr->outputs_count ($arg);
306 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count); 297 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count);
307 298
308 1 299 1
309}; 300};
310 301
311cf::register_command 'output-sync' => sub { 302cf::register_command 'output-sync' => sub {
312 my ($ob, $arg) = @_; 303 my ($ob, $arg) = @_;
313 304
314 return $ob->reply (undef, "Output sync time is presently " . $ob->contr->outputs_sync) 305 return $ob->reply (undef, sprintf "Output sync time is presently %.1fs", $ob->contr->outputs_sync * $cf::TICK)
315 unless $arg > 0; 306 unless length $arg;
316 307
308 $arg = 0.5 if $arg < 0.5;
309
317 $ob->contr->outputs_sync ($arg); 310 $ob->contr->outputs_sync ($arg / $cf::TICK);
318 $ob->reply (undef, "Output sync time now set to " . $ob->contr->outputs_sync); 311 $ob->reply (undef, sprintf "Output sync time now set to %.1fs", $ob->contr->outputs_sync * $cf::TICK);
319 312
320 1 313 1
321}; 314};
322 315
323# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to 316# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to

Diff Legend

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