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.56 by root, Sun Jul 22 17:10:06 2007 UTC

1#! perl 1#! perl # mandatory depends=irc
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
… …
36 $ob->esrv_update_item (cf::UPD_NAME, $item); 36 $ob->esrv_update_item (cf::UPD_NAME, $item);
37 37
38 1 38 1
39} 39}
40 40
41sub ext::schmorp_irc::users; # HACK: TODO: replace by signal
42
43sub who_listing(;$) { 41sub who_listing(;$$) {
44 my ($privileged) = @_; 42 my ($privileged, $select) = @_;
45 43
46 my ($numwiz, $numafk) = (0, 0); 44 my ($numwiz, $numafk) = (0, 0);
47 my @pl; 45 my @pl;
48 46
49 foreach my $pl (cf::player::list) { 47 foreach my $pl (cf::player::list) {
… …
59 push @pl, $pl; 57 push @pl, $pl;
60 } 58 }
61 59
62 ( 60 (
63 "Total Players in The World. (" . (scalar @pl) . ") -- WIZ($numwiz) AFK($numafk) BOT(0)", 61 "Total Players in The World. (" . (scalar @pl) . ") -- WIZ($numwiz) AFK($numafk) BOT(0)",
64 ( 62 (grep /$select/,
65 map { 63 map {
66 my ($pl, $ob, $ns) = ($_, $_->ob, $_->ns); 64 my ($pl, $ob, $ns) = ($_, $_->ob, $_->ns);
67 65
68 "* " . $ob->name . "/" . $ob->level . " " . (length $pl->own_title ? $pl->own_title : "the " . $pl->title) 66 "* " . $ob->name . "/" . $ob->level . " " . (length $pl->own_title ? $pl->own_title : "the " . $pl->title)
67 . ($pl->gender ? " [f]" : " [m]")
69 . ($pl->peaceful ? " [peaceful]" : " [HOSTILE]") 68 . ($pl->peaceful ? " [peaceful]" : " [HOSTILE]")
70 . ($ns->afk ? " [AFK]" : "") 69 . ($ns->afk ? " [AFK]" : "")
71 . ($ob->flag (cf::FLAG_WIZ) ? " [WIZ]" : "") 70 . ($ob->flag (cf::FLAG_WIZ) ? " [WIZ]" : "")
72 . " [" . $pl->ns->version . "]" 71 . " [" . $pl->ns->version . "]"
73 . " [" . ($pl->peaceful || $privileged ? $ob->map->visible_name : $ob->region->name) . "]" 72 . " [" . ($pl->peaceful || $privileged ? $ob->map->visible_name : $ob->region->name) . "]"
74 . (sprintf " [rtt %.3fs]", $pl->ns->rtt * 1e-6) 73 . (sprintf " [rtt %.3fs]", $pl->ns->rtt * 1e-6)
75 . ($privileged ? " " . $pl->ns->host : "") 74 . ($privileged ? " " . $pl->ns->host : "")
76 } sort { (lc $a->ob->name) cmp (lc $b->ob->name) } @pl 75 } sort { (lc $a->ob->name) cmp (lc $b->ob->name) } @pl
77 ), 76 ),
78 eval { "* IRC: " . join ", ", ext::schmorp_irc::users }, 77 eval { "* IRC: " . join ", ", ext::irc::users },
79 ) 78 )
80} 79}
81 80
82cf::register_command who => sub { 81cf::register_command who => sub {
83 my ($ob, $arg) = @_; 82 my ($ob, $arg) = @_;
84 83
85 $ob->speed_left ($ob->speed_left - 0.25); 84 $ob->speed_left ($ob->speed_left - 4);
86 85
87 $ob->reply (undef, (join "\n", who_listing $ob->may ("extended_who")), cf::NDI_UNIQUE | cf::NDI_DK_ORANGE); 86 $ob->reply (undef, (join "\n", who_listing $ob->may ("extended_who"), $arg), cf::NDI_UNIQUE | cf::NDI_DK_ORANGE);
88 87
88 1
89};
90
91cf::register_command seen => sub {
92 my ($pl, $args) = @_;
93
94 if (my ($login) = $args =~ /(\S+)/) {
95 if ($login eq $pl->name) {
96 $pl->message ("Very funny, $login. Ha. Ha.", cf::NDI_UNIQUE);
97 } elsif (cf::player::find_active $login) {
98 $pl->message ("$login is right here on this server!", cf::NDI_UNIQUE);
99 } elsif (cf::player::exists $login
100 and stat cf::player::path $login) {
101 my $time = (stat _)[9];
102
103 $pl->message ("$login was last seen here "
104 . (POSIX::strftime "%Y-%m-%d %H:%M:%S +0000", gmtime $time)
105 . " which was " . (int +(time - $time) / 3600) . " hours ago.", cf::NDI_UNIQUE);
106 } else {
107 $pl->message ("No player named $login is known to me.", cf::NDI_UNIQUE);
108 }
109 } else {
110 $pl->message ("Usage: seen <player>", cf::NDI_UNIQUE);
89 1 111 }
90}; 112};
91 113
92cf::register_command body => sub { 114cf::register_command body => sub {
93 my ($ob) = @_; 115 my ($ob) = @_;
94 116
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 117 # Too hard to try and make a header that lines everything up, so just
100 # give a description. (comment from C++) 118 # give a description. (comment from C++)
119 my $reply =
101 $ob->reply (undef, "The first column is the name of the body location."); 120 "The first column is the name of the body location.\n\n"
102 $ob->reply (undef, "The second column is how many of those locations your body has."); 121 . "The second column is how many of those locations your body has.\n\n"
103 $ob->reply (undef, "The third column is how many slots in that location are available."); 122 . "The third column is how many slots in that location are available.\n\n";
104 123
105 for (0 .. scalar @body_locations - 1) { 124 $reply .= sprintf " %-20s %3s %5s\n", "Location", "You", "Avail";
106 $ob->reply (undef, (sprintf "%-30s %5d %5d", $body_locations[$_], $ob->body_info($_), $ob->body_used($_))) 125 for (0 .. cf::NUM_BODY_LOCATIONS - 1) {
126 my $msg = cf::object::slot_nonuse_name $_;
127 $msg =~ s/^.*? a //;
128 $reply .= sprintf " %-20s %3d %5d\n", $msg, $ob->slot_info ($_), $ob->slot_used ($_)
107 if $ob->body_info($_) or $ob->body_used($_); 129 if $ob->slot_info ($_) or $ob->slot_used ($_);
108 } 130 }
109 131
110 $ob->reply (undef, "You are not allowed to wear armor") 132 $reply .= "You are not allowed to wear armor\n\n"
111 unless $ob->flag (cf::FLAG_USE_ARMOUR); 133 unless $ob->flag (cf::FLAG_USE_ARMOUR);
112 $ob->reply (undef, "You are not allowed to use weapons") 134 $reply .= "You are not allowed to use weapons\n\n"
113 unless $ob->flag (cf::FLAG_USE_WEAPON); 135 unless $ob->flag (cf::FLAG_USE_WEAPON);
136
137 $ob->reply (undef, $reply);
114 138
115 1 139 1
116}; 140};
117 141
118cf::register_command mark => sub { 142cf::register_command mark => sub {
119 my ($pl, $arg) = @_; 143 my ($pl, $arg) = @_;
120 144
121 unless (length $arg) { 145 if (length $arg) {
146 my $ob = $pl->find_best_object_match ($arg);
147
148 return $pl->reply (undef, "Could not find an object that matches $arg")
149 unless $ob;
150
151 $pl->contr->mark ($ob);
152 $pl->reply (undef, (sprintf "Marked item %s", $ob->name, $ob->title));
153 } else {
122 my $ob = $pl->find_marked_object; 154 my $ob = $pl->find_marked_object;
123 155
124 $pl->reply (undef, $ob 156 $pl->reply (undef, $ob
125 ? (sprintf "%s %s * is marked.", $ob->name, $ob->title) 157 ? (sprintf "%s %s * is marked.", $ob->name, $ob->title)
126 : "You have no marked object."); 158 : "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 159 }
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 160
147 1 161 1
148}; 162};
149 163
150for my $cmd ("run", "fire") { 164for my $cmd ("run", "fire") {
151 my $oncmd = "${cmd}_on"; 165 my $oncmd = "${cmd}_on";
152 cf::register_command $cmd => sub { 166 cf::register_command $cmd => sub {
153 my ($ob, $arg) = @_; 167 my ($ob, $arg) = @_;
154 168
155 return $ob->reply (undef, "Can't $cmd into a non adjacent square.") 169 $ob->reply (undef, "Can't $cmd into a non adjacent square.")
156 if $arg < 0 or $arg >= 9; 170 if $arg < 0 or $arg >= 9;
157 171
158 $ob->contr->$oncmd (1); 172 $ob->contr->$oncmd (1);
159 $ob->move ($arg); 173 $ob->move_player ($arg);
160 174
161 1 175 1
162 }; 176 };
163 177
164 cf::register_command "${cmd}_stop" => sub { 178 cf::register_command "${cmd}_stop" => sub {
165 my ($ob) = @_; 179 my ($ob) = @_;
166 180
167 $ob->contr->$oncmd (0); 181 $ob->contr->$oncmd (0);
168 182
… …
171} 185}
172 186
173cf::register_command mapinfo => sub { 187cf::register_command mapinfo => sub {
174 my ($ob) = @_; 188 my ($ob) = @_;
175 189
190 my $observe = $ob->contr->observe;
191
176 my $map = $ob->map 192 my $map = $observe->map
177 or return; 193 or return;
178 $ob->reply (undef, (sprintf "%s (%s) %s", $map->name, $map->path, $ob->region->longname)); 194 $ob->reply (undef, (sprintf "%s (%s) %s", $map->name, $map->path, $observe->region->longname));
179 $ob->reply (undef, (sprintf "players: %d difficulty: %d size: %d start: %dx%d timeout: %d", 195 $ob->reply (undef, (sprintf "players: %d difficulty: %d size: %d start: %dx%d timeout: %d",
180 $map->players, $map->difficulty, $map->width, $map->height, $map->enter_x, $map->enter_y, $map->timeout)) 196 (scalar $map->players), $map->difficulty, $map->width, $map->height, $map->enter_x, $map->enter_y, $map->timeout))
181 if $ob->flag (cf::FLAG_WIZ); 197 if $ob->flag (cf::FLAG_WIZ);
182 $ob->reply (undef, $map->msg); 198 $ob->reply (undef, $map->msg);
183 199
184 1 200 1
185}; 201};
186 202
187cf::register_command whereami => sub { 203cf::register_command whereami => sub {
188 my ($ob) = @_; 204 my ($ob) = @_;
189 205
190 my $reg = $ob->region; 206 my $reg = $ob->contr->observe->region;
191 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg)); 207 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg));
192 208
193 1 209 1
194}; 210};
195 211
212sub _set_mode($$$@) {
213 my ($name, $ob, $arg, $slot, @choices) = @_;
214
215 my $oldmode = $ob->contr->$slot;
216
217 return $ob->reply (undef, "$name is set to $choices[$oldmode]")
218 unless $arg;
219
220 my ($idx) = grep $choices[$_] eq $arg, 0 .. $#choices
221 or return $ob->reply (undef, "$name: Unknown options '$arg', valid options are @choices"), 1;
222
223 $ob->contr->$slot ($idx);
224 $ob->reply (undef, "$name" . ($oldmode == $ob->contr->unapply ? "" : " now") . " set to " . $choices[$ob->contr->$slot]);
225}
226
196cf::register_command applymode => sub { 227cf::register_command applymode => sub {
197 my ($ob, $arg) = @_; 228 my ($ob, $arg) = @_;
198 my @types = ("nochoice", "never", "always");
199 my $mapping = {
200 nochoice => 1,
201 never => 2,
202 always => 3,
203 };
204 229
205 my $oldmode = $ob->contr->unapply; 230 _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 231
218 1 232 1
219}; 233};
220 234
221cf::register_command petmode => sub { 235cf::register_command petmode => sub {
222 my ($ob, $arg) = @_; 236 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 237
231 my $oldtype = $ob->contr->petmode; 238 _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 239
244 1 240 1
245}; 241};
246 242
247cf::register_command usekeys => sub { 243cf::register_command usekeys => sub {
248 my ($ob, $arg) = @_; 244 my ($ob, $arg) = @_;
249 my @types = ("inventory", "keyrings", "containers");
250 my $mapping = {
251 inventory => 1,
252 keyrings => 2,
253 containers => 3,
254 };
255 245
256 my $oldtype = $ob->contr->usekeys; 246 _set_mode "usekeys", $ob, $arg, usekeys => qw(inventory keyrings containers);
257 my $oldtype_name = $types[$oldtype];
258 247
259 return $ob->reply (undef, "usekeys is set to $oldtype_name") 248 1
260 unless $arg; 249};
261 250
262 return $ob->reply (undef, "usekeys: Unknown options '$arg', valid options are @types") 251cf::register_command hintmode => sub {
263 unless $mapping->{$arg}; 252 my ($ob, $arg) = @_;
264 253
265 $ob->contr->usekeys ($mapping->{$arg} - 1); # HACK: because of the $mapping->{$arg} check before, where $arg should not be 0 254 _set_mode "hintmode", $ob, $arg, hintmode => qw(show mark hide);
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 255
269 1 256 1
270}; 257};
271 258
272cf::register_command afk => sub { 259cf::register_command afk => sub {
… …
294 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced."); 281 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced.");
295 282
296 1 283 1
297}; 284};
298 285
286cf::register_command 'output-rate' => sub {
287 my ($ob, $arg) = @_;
288
289 return $ob->reply (undef, sprintf "Output rate is presently %dbps.", $ob->contr->ns->max_rate / $cf::TICK)
290 unless $arg > 0;
291
292 # minimum is 5k/s
293 $ob->contr->ns->max_rate ((List::Util::max 5000, $arg) * $cf::TICK);
294 $ob->reply (undef, sprintf "Output rate now set to %dbps.", $ob->contr->ns->max_rate / $cf::TICK);
295
296 1
297};
298
299cf::register_command 'output-count' => sub { 299cf::register_command 'output-count' => sub {
300 my ($ob, $arg) = @_; 300 my ($ob, $arg) = @_;
301 301
302 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count) 302 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count)
303 unless $arg > 0; 303 unless $arg > 0;
304 304
305 $arg = 4 if $arg < 4;
306
305 $ob->contr->outputs_count ($arg); 307 $ob->contr->outputs_count ($arg);
306 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count); 308 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count);
307 309
308 1 310 1
309}; 311};
310 312
311cf::register_command 'output-sync' => sub { 313cf::register_command 'output-sync' => sub {
312 my ($ob, $arg) = @_; 314 my ($ob, $arg) = @_;
313 315
314 return $ob->reply (undef, "Output sync time is presently " . $ob->contr->outputs_sync) 316 return $ob->reply (undef, sprintf "Output sync time is presently %.1fs", $ob->contr->outputs_sync * $cf::TICK)
315 unless $arg > 0; 317 unless length $arg;
316 318
319 $arg = 0.5 if $arg < 0.5;
320
317 $ob->contr->outputs_sync ($arg); 321 $ob->contr->outputs_sync ($arg / $cf::TICK);
318 $ob->reply (undef, "Output sync time now set to " . $ob->contr->outputs_sync); 322 $ob->reply (undef, sprintf "Output sync time now set to %.1fs", $ob->contr->outputs_sync * $cf::TICK);
319 323
320 1 324 1
321}; 325};
322 326
323# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to 327# 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