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.26 by pippijn, Fri Mar 2 11:23:17 2007 UTC vs.
Revision 1.33 by pippijn, Fri Mar 2 15:09:05 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
… …
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")), cf::NDI_UNIQUE | cf::NDI_DK_ORANGE);
88 88
89 1 89 1
90}; 90};
91 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 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 1
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
147 1
148};
149
150for my $cmd ("run", "fire") {
151 my $oncmd = "${cmd}_on";
152 cf::register_command $cmd => sub {
153 my ($ob, $arg) = @_;
154
155 $ob->contr->$oncmd (1);
156
157 return $ob->reply (undef, "Can't $cmd into a non adjacent square.")
158 if $arg < 0 or $arg >= 9;
159
160 $ob->move ($arg);
161
162 1
163 };
164
165 cf::register_command "${cmd}_stop" => sub {
166 my ($ob) = @_;
167
168 $ob->contr->$oncmd (0);
169
170 1
171 };
172}
173
92cf::register_command mapinfo => sub { 174cf::register_command mapinfo => sub {
93 my ($ob) = @_; 175 my ($ob) = @_;
94 176
95 my $map = $ob->map 177 my $map = $ob->map
96 or return; 178 or return;
… …
110 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg)); 192 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg));
111 193
112 1 194 1
113}; 195};
114 196
197sub _set_mode($$$@) {
198 my ($name, $ob, $arg, $slot, @choices) = @_;
199
200 my $oldmode = $ob->contr->$slot;
201
202 return $ob->reply (undef, "$name is set to $choices[$oldmode]")
203 unless $arg;
204
205 my ($idx) = grep $choices[$_] eq $arg, 0 .. $#choices
206 or return $ob->reply (undef, "$name: Unknown options '$arg', valid options are @choices"), 1;
207
208 $ob->contr->$slot ($idx);
209 $ob->reply (undef, "$name" . ($oldmode == $ob->contr->unapply ? "" : " now") . " set to " . $choices[$ob->contr->$slot]);
210}
211
115cf::register_command applymode => sub { 212cf::register_command applymode => sub {
116 my ($ob, $arg) = @_; 213 my ($ob, $arg) = @_;
117 my @types = ("nochoice", "never", "always");
118 my $mapping = {
119 nochoice => 1,
120 never => 2,
121 always => 3,
122 };
123 214
124 my $oldmode = $ob->contr->unapply; 215 _set_mode "applymode", $ob, $arg, unapply => qw(nochoice never always);
125 my $oldmode_name = $types[$oldmode];
126
127 return $ob->reply (undef, "applymode is set to $oldmode_name")
128 unless $arg;
129
130 return $ob->reply (undef, "applymode: Unknown options '$arg', valid options are @types")
131 unless $mapping->{$arg};
132
133 $ob->contr->unapply ($mapping->{$arg} - 1); # HACK: because of the $mapping->{$arg} check before, where $arg should not be 0
134 # but $arg would be 0 if a user enters an incorrect value
135 $ob->reply (undef, "applymode" . ($oldmode == $ob->contr->unapply ? "" : " now") . " set to " . $types[$ob->contr->unapply]);
136 216
137 1 217 1
138}; 218};
139 219
140cf::register_command petmode => sub { 220cf::register_command petmode => sub {
141 my ($ob, $arg) = @_; 221 my ($ob, $arg) = @_;
142 my @types = ("normal", "sad", "defend", "arena");
143 my $mapping = {
144 normal => 1,
145 sad => 2,
146 defend => 3,
147 arena => 4,
148 };
149 222
150 my $oldtype = $ob->contr->petmode; 223 _set_mode "petmode", $ob, $arg, petmode => qw(normal sad defend arena);
151 my $oldtype_name = $types[$oldtype];
152
153 return $ob->reply (undef, "petmode is set to $oldtype_name")
154 unless $arg;
155
156 return $ob->reply (undef, "petmode: Unknown options '$arg', valid options are @types")
157 unless $mapping->{$arg};
158
159 $ob->contr->petmode ($mapping->{$arg} - 1); # HACK: because of the $mapping->{$arg} check before, where $arg should not be 0
160 # but $arg would be 0 if a user enters an incorrect value
161 $ob->reply (undef, "petmode" . ($oldtype == $ob->contr->petmode ? "" : " now") . " set to " . $types[$ob->contr->petmode]);
162 224
163 1 225 1
164}; 226};
165 227
166cf::register_command usekeys => sub { 228cf::register_command usekeys => sub {
167 my ($ob, $arg) = @_; 229 my ($ob, $arg) = @_;
168 my @types = ("inventory", "keyrings", "containers");
169 my $mapping = {
170 inventory => 1,
171 keyrings => 2,
172 containers => 3,
173 };
174 230
175 my $oldtype = $ob->contr->usekeys; 231 _set_mode "usekeys", $ob, $arg, usekeys => qw(inventory keyrings containers);
176 my $oldtype_name = $types[$oldtype];
177
178 return $ob->reply (undef, "usekeys is set to $oldtype_name")
179 unless $arg;
180
181 return $ob->reply (undef, "usekeys: Unknown options '$arg', valid options are @types")
182 unless $mapping->{$arg};
183
184 $ob->contr->usekeys ($mapping->{$arg} - 1); # HACK: because of the $mapping->{$arg} check before, where $arg should not be 0
185 # but $arg would be 0 if a user enters an incorrect value
186 $ob->reply (undef, "usekeys" . ($oldtype == $ob->contr->usekeys ? "" : " now") . " set to " . $types[$ob->contr->usekeys]);
187 232
188 1 233 1
189}; 234};
190 235
191cf::register_command afk => sub { 236cf::register_command afk => sub {

Diff Legend

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