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.31 by root, Fri Mar 2 14:44:52 2007 UTC

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
191 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg)); 191 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg));
192 192
193 1 193 1
194}; 194};
195 195
196sub _set_mode($$$@) {
197 my ($name, $ob, $arg, $slot, @choices) = @_;
198
199 my $oldmode = $ob->contr->$slot;
200
201 return $ob->reply (undef, "$name is set to $choices[$oldmode]")
202 unless $arg;
203
204 my ($idx) = grep $choices[$_] eq $arg, 0 .. $#choices
205 or return $ob->reply (undef, "$name: Unknown options '$arg', valid options are @choices"), 1;
206
207 $ob->contr->$slot ($idx);
208 $ob->reply (undef, "$name" . ($oldmode == $ob->contr->unapply ? "" : " now") . " set to " . $choices[$ob->contr->$slot]);
209}
210
196cf::register_command applymode => sub { 211cf::register_command applymode => sub {
197 my ($ob, $arg) = @_; 212 my ($ob, $arg) = @_;
198 my @types = ("nochoice", "never", "always");
199 my $mapping = {
200 nochoice => 1,
201 never => 2,
202 always => 3,
203 };
204 213
205 my $oldmode = $ob->contr->unapply; 214 _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 215
218 1 216 1
219}; 217};
220 218
221cf::register_command petmode => sub { 219cf::register_command petmode => sub {
222 my ($ob, $arg) = @_; 220 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 221
231 my $oldtype = $ob->contr->petmode; 222 _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 223
244 1 224 1
245}; 225};
246 226
247cf::register_command usekeys => sub { 227cf::register_command usekeys => sub {
248 my ($ob, $arg) = @_; 228 my ($ob, $arg) = @_;
249 my @types = ("inventory", "keyrings", "containers");
250 my $mapping = {
251 inventory => 1,
252 keyrings => 2,
253 containers => 3,
254 };
255 229
256 my $oldtype = $ob->contr->usekeys; 230 _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 231
269 1 232 1
270}; 233};
271 234
272cf::register_command afk => sub { 235cf::register_command afk => sub {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines