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.33 by pippijn, Fri Mar 2 15:09:05 2007 UTC vs.
Revision 1.54 by root, Fri Jul 6 03:52:51 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
… …
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 {
… …
135 } 159 }
136 160
137 1 161 1
138}; 162};
139 163
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") { 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
169 $ob->reply (undef, "Can't $cmd into a non adjacent square.")
170 if $arg < 0 or $arg >= 9;
171
155 $ob->contr->$oncmd (1); 172 $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); 173 $ob->move_player ($arg);
161 174
162 1 175 1
163 }; 176 };
164 177
165 cf::register_command "${cmd}_stop" => sub { 178 cf::register_command "${cmd}_stop" => sub {
166 my ($ob) = @_; 179 my ($ob) = @_;
167 180
168 $ob->contr->$oncmd (0); 181 $ob->contr->$oncmd (0);
169 182
… …
172} 185}
173 186
174cf::register_command mapinfo => sub { 187cf::register_command mapinfo => sub {
175 my ($ob) = @_; 188 my ($ob) = @_;
176 189
177 my $map = $ob->map 190 my $map = $ob->contr->observe->map
178 or return; 191 or return;
179 $ob->reply (undef, (sprintf "%s (%s) %s", $map->name, $map->path, $ob->region->longname)); 192 $ob->reply (undef, (sprintf "%s (%s) %s", $map->name, $map->path, $ob->region->longname));
180 $ob->reply (undef, (sprintf "players: %d difficulty: %d size: %d start: %dx%d timeout: %d", 193 $ob->reply (undef, (sprintf "players: %d difficulty: %d size: %d start: %dx%d timeout: %d",
181 $map->players, $map->difficulty, $map->width, $map->height, $map->enter_x, $map->enter_y, $map->timeout)) 194 (scalar $map->players), $map->difficulty, $map->width, $map->height, $map->enter_x, $map->enter_y, $map->timeout))
182 if $ob->flag (cf::FLAG_WIZ); 195 if $ob->flag (cf::FLAG_WIZ);
183 $ob->reply (undef, $map->msg); 196 $ob->reply (undef, $map->msg);
184 197
185 1 198 1
186}; 199};
187 200
188cf::register_command whereami => sub { 201cf::register_command whereami => sub {
189 my ($ob) = @_; 202 my ($ob) = @_;
190 203
191 my $reg = $ob->region; 204 my $reg = $ob->contr->observe->region;
192 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg)); 205 $ob->reply (undef, (sprintf "You are %s.\n%s", $reg->longname, $reg->msg));
193 206
194 1 207 1
195}; 208};
196 209
… …
231 _set_mode "usekeys", $ob, $arg, usekeys => qw(inventory keyrings containers); 244 _set_mode "usekeys", $ob, $arg, usekeys => qw(inventory keyrings containers);
232 245
233 1 246 1
234}; 247};
235 248
249cf::register_command hintmode => sub {
250 my ($ob, $arg) = @_;
251
252 _set_mode "hintmode", $ob, $arg, hintmode => qw(show mark hide);
253
254 1
255};
256
236cf::register_command afk => sub { 257cf::register_command afk => sub {
237 my ($ob, $arg) = @_; 258 my ($ob, $arg) = @_;
238 259
239 $ob->contr->ns->afk ($ob->contr->ns->afk ? 0 : 1); 260 $ob->contr->ns->afk ($ob->contr->ns->afk ? 0 : 1);
240 $ob->reply (undef, $ob->contr->ns->afk ? "You are now AFK" : "You are no longer AFK"); 261 $ob->reply (undef, $ob->contr->ns->afk ? "You are now AFK" : "You are no longer AFK");
… …
258 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced."); 279 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced.");
259 280
260 1 281 1
261}; 282};
262 283
284cf::register_command 'output-rate' => sub {
285 my ($ob, $arg) = @_;
286
287 return $ob->reply (undef, sprintf "Output rate is presently %dbps.", $ob->contr->ns->max_rate / $cf::TICK)
288 unless $arg > 0;
289
290 # minimum is 5k/s
291 $ob->contr->ns->max_rate ((List::Util::max 5000, $arg) * $cf::TICK);
292 $ob->reply (undef, sprintf "Output rate now set to %dbps.", $ob->contr->ns->max_rate / $cf::TICK);
293
294 1
295};
296
263cf::register_command 'output-count' => sub { 297cf::register_command 'output-count' => sub {
264 my ($ob, $arg) = @_; 298 my ($ob, $arg) = @_;
265 299
266 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count) 300 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count)
267 unless $arg > 0; 301 unless $arg > 0;
268 302
303 $arg = 4 if $arg < 4;
304
269 $ob->contr->outputs_count ($arg); 305 $ob->contr->outputs_count ($arg);
270 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count); 306 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count);
271 307
272 1 308 1
273}; 309};
274 310
275cf::register_command 'output-sync' => sub { 311cf::register_command 'output-sync' => sub {
276 my ($ob, $arg) = @_; 312 my ($ob, $arg) = @_;
277 313
278 return $ob->reply (undef, "Output sync time is presently " . $ob->contr->outputs_sync) 314 return $ob->reply (undef, sprintf "Output sync time is presently %.1fs", $ob->contr->outputs_sync * $cf::TICK)
279 unless $arg > 0; 315 unless length $arg;
280 316
317 $arg = 0.5 if $arg < 0.5;
318
281 $ob->contr->outputs_sync ($arg); 319 $ob->contr->outputs_sync ($arg / $cf::TICK);
282 $ob->reply (undef, "Output sync time now set to " . $ob->contr->outputs_sync); 320 $ob->reply (undef, sprintf "Output sync time now set to %.1fs", $ob->contr->outputs_sync * $cf::TICK);
283 321
284 1 322 1
285}; 323};
286 324
287# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to 325# 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