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.27 by pippijn, Fri Mar 2 11:41:14 2007 UTC vs.
Revision 1.55 by root, Fri Jul 20 14:13:58 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);
114 136
115 1 137 $ob->reply (undef, $reply);
116};
117 138
139 1
140};
141
118cf::register_command who => sub { 142cf::register_command mark => sub {
143 my ($pl, $arg) = @_;
144
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 {
154 my $ob = $pl->find_marked_object;
155
156 $pl->reply (undef, $ob
157 ? (sprintf "%s %s * is marked.", $ob->name, $ob->title)
158 : "You have no marked object.");
159 }
160
161 1
162};
163
164for my $cmd ("run", "fire") {
165 my $oncmd = "${cmd}_on";
166 cf::register_command $cmd => sub {
119 my ($ob, $arg) = @_; 167 my ($ob, $arg) = @_;
120 168
121 $ob->speed_left ($ob->speed_left - 0.25); 169 $ob->reply (undef, "Can't $cmd into a non adjacent square.")
170 if $arg < 0 or $arg >= 9;
122 171
123 $ob->reply (undef, (join "\n", who_listing $ob->may ("extended_who")), cf::NDI_UNIQUE | cf::NDI_DK_ORANGE); 172 $ob->contr->$oncmd (1);
124 173 $ob->move_player ($arg);
174
175 1
176 };
125 1 177
126}; 178 cf::register_command "${cmd}_stop" => sub {
179 my ($ob) = @_;
180
181 $ob->contr->$oncmd (0);
182
183 1
184 };
185}
127 186
128cf::register_command mapinfo => sub { 187cf::register_command mapinfo => sub {
129 my ($ob) = @_; 188 my ($ob) = @_;
189
190 $ob = $ob->contr->observe;
130 191
131 my $map = $ob->map 192 my $map = $ob->map
132 or return; 193 or return;
133 $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, $ob->region->longname));
134 $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",
135 $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))
136 if $ob->flag (cf::FLAG_WIZ); 197 if $ob->flag (cf::FLAG_WIZ);
137 $ob->reply (undef, $map->msg); 198 $ob->reply (undef, $map->msg);
138 199
139 1 200 1
140}; 201};
141 202
142cf::register_command whereami => sub { 203cf::register_command whereami => sub {
143 my ($ob) = @_; 204 my ($ob) = @_;
144 205
145 my $reg = $ob->region; 206 my $reg = $ob->contr->observe->region;
146 $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));
147 208
148 1 209 1
149}; 210};
150 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
151cf::register_command applymode => sub { 227cf::register_command applymode => sub {
152 my ($ob, $arg) = @_; 228 my ($ob, $arg) = @_;
153 my @types = ("nochoice", "never", "always");
154 my $mapping = {
155 nochoice => 1,
156 never => 2,
157 always => 3,
158 };
159 229
160 my $oldmode = $ob->contr->unapply; 230 _set_mode "applymode", $ob, $arg, unapply => qw(nochoice never always);
161 my $oldmode_name = $types[$oldmode];
162
163 return $ob->reply (undef, "applymode is set to $oldmode_name")
164 unless $arg;
165
166 return $ob->reply (undef, "applymode: Unknown options '$arg', valid options are @types")
167 unless $mapping->{$arg};
168
169 $ob->contr->unapply ($mapping->{$arg} - 1); # HACK: because of the $mapping->{$arg} check before, where $arg should not be 0
170 # but $arg would be 0 if a user enters an incorrect value
171 $ob->reply (undef, "applymode" . ($oldmode == $ob->contr->unapply ? "" : " now") . " set to " . $types[$ob->contr->unapply]);
172 231
173 1 232 1
174}; 233};
175 234
176cf::register_command petmode => sub { 235cf::register_command petmode => sub {
177 my ($ob, $arg) = @_; 236 my ($ob, $arg) = @_;
178 my @types = ("normal", "sad", "defend", "arena");
179 my $mapping = {
180 normal => 1,
181 sad => 2,
182 defend => 3,
183 arena => 4,
184 };
185 237
186 my $oldtype = $ob->contr->petmode; 238 _set_mode "petmode", $ob, $arg, petmode => qw(normal sad defend arena);
187 my $oldtype_name = $types[$oldtype];
188
189 return $ob->reply (undef, "petmode is set to $oldtype_name")
190 unless $arg;
191
192 return $ob->reply (undef, "petmode: Unknown options '$arg', valid options are @types")
193 unless $mapping->{$arg};
194
195 $ob->contr->petmode ($mapping->{$arg} - 1); # HACK: because of the $mapping->{$arg} check before, where $arg should not be 0
196 # but $arg would be 0 if a user enters an incorrect value
197 $ob->reply (undef, "petmode" . ($oldtype == $ob->contr->petmode ? "" : " now") . " set to " . $types[$ob->contr->petmode]);
198 239
199 1 240 1
200}; 241};
201 242
202cf::register_command usekeys => sub { 243cf::register_command usekeys => sub {
203 my ($ob, $arg) = @_; 244 my ($ob, $arg) = @_;
204 my @types = ("inventory", "keyrings", "containers");
205 my $mapping = {
206 inventory => 1,
207 keyrings => 2,
208 containers => 3,
209 };
210 245
211 my $oldtype = $ob->contr->usekeys; 246 _set_mode "usekeys", $ob, $arg, usekeys => qw(inventory keyrings containers);
212 my $oldtype_name = $types[$oldtype];
213 247
214 return $ob->reply (undef, "usekeys is set to $oldtype_name") 248 1
215 unless $arg; 249};
216 250
217 return $ob->reply (undef, "usekeys: Unknown options '$arg', valid options are @types") 251cf::register_command hintmode => sub {
218 unless $mapping->{$arg}; 252 my ($ob, $arg) = @_;
219 253
220 $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);
221 # but $arg would be 0 if a user enters an incorrect value
222 $ob->reply (undef, "usekeys" . ($oldtype == $ob->contr->usekeys ? "" : " now") . " set to " . $types[$ob->contr->usekeys]);
223 255
224 1 256 1
225}; 257};
226 258
227cf::register_command afk => sub { 259cf::register_command afk => sub {
… …
249 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced."); 281 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced.");
250 282
251 1 283 1
252}; 284};
253 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
254cf::register_command 'output-count' => sub { 299cf::register_command 'output-count' => sub {
255 my ($ob, $arg) = @_; 300 my ($ob, $arg) = @_;
256 301
257 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)
258 unless $arg > 0; 303 unless $arg > 0;
259 304
305 $arg = 4 if $arg < 4;
306
260 $ob->contr->outputs_count ($arg); 307 $ob->contr->outputs_count ($arg);
261 $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);
262 309
263 1 310 1
264}; 311};
265 312
266cf::register_command 'output-sync' => sub { 313cf::register_command 'output-sync' => sub {
267 my ($ob, $arg) = @_; 314 my ($ob, $arg) = @_;
268 315
269 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)
270 unless $arg > 0; 317 unless length $arg;
271 318
319 $arg = 0.5 if $arg < 0.5;
320
272 $ob->contr->outputs_sync ($arg); 321 $ob->contr->outputs_sync ($arg / $cf::TICK);
273 $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);
274 323
275 1 324 1
276}; 325};
277 326
278# 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