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.40 by root, Fri Apr 13 05:32:12 2007 UTC vs.
Revision 1.47 by root, Mon Jun 11 22:18:03 2007 UTC

1#! perl # MANDATORY 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)
69 . ($pl->peaceful ? " [peaceful]" : " [HOSTILE]") 67 . ($pl->peaceful ? " [peaceful]" : " [HOSTILE]")
70 . ($ns->afk ? " [AFK]" : "") 68 . ($ns->afk ? " [AFK]" : "")
71 . ($ob->flag (cf::FLAG_WIZ) ? " [WIZ]" : "") 69 . ($ob->flag (cf::FLAG_WIZ) ? " [WIZ]" : "")
72 . " [" . $pl->ns->version . "]" 70 . " [" . $pl->ns->version . "]"
73 . " [" . ($pl->peaceful || $privileged ? $ob->map->visible_name : $ob->region->name) . "]" 71 . " [" . ($pl->peaceful || $privileged ? $ob->map->visible_name : $ob->region->name) . "]"
74 . (sprintf " [rtt %.3fs]", $pl->ns->rtt * 1e-6) 72 . (sprintf " [rtt %.3fs]", $pl->ns->rtt * 1e-6)
75 . ($privileged ? " " . $pl->ns->host : "") 73 . ($privileged ? " " . $pl->ns->host : "")
76 } sort { (lc $a->ob->name) cmp (lc $b->ob->name) } @pl 74 } sort { (lc $a->ob->name) cmp (lc $b->ob->name) } @pl
77 ), 75 ),
78 eval { "* IRC: " . join ", ", ext::schmorp_irc::users }, 76 eval { "* IRC: " . join ", ", ext::irc::users },
79 ) 77 )
80} 78}
81 79
82cf::register_command who => sub { 80cf::register_command who => sub {
83 my ($ob, $arg) = @_; 81 my ($ob, $arg) = @_;
84 82
85 $ob->speed_left ($ob->speed_left - 0.25); 83 $ob->speed_left ($ob->speed_left - 4);
86 84
87 $ob->reply (undef, (join "\n", who_listing $ob->may ("extended_who")), cf::NDI_UNIQUE | cf::NDI_DK_ORANGE); 85 $ob->reply (undef, (join "\n", who_listing $ob->may ("extended_who"), $arg), cf::NDI_UNIQUE | cf::NDI_DK_ORANGE);
88 86
89 1 87 1
90}; 88};
91 89
92cf::register_command seen => sub { 90cf::register_command seen => sub {
… …
113}; 111};
114 112
115cf::register_command body => sub { 113cf::register_command body => sub {
116 my ($ob) = @_; 114 my ($ob) = @_;
117 115
118 my @body_locations = ("in your range slot", "on your arm", "on your body", "on your head",
119 "around your neck", "in your skill slot", "on your finger", "around your shoulders",
120 "on your feet", "on your hands", "around your wrists", "around your waist");
121
122 # Too hard to try and make a header that lines everything up, so just 116 # Too hard to try and make a header that lines everything up, so just
123 # give a description. (comment from C++) 117 # give a description. (comment from C++)
118 my $reply =
124 $ob->reply (undef, "The first column is the name of the body location."); 119 "The first column is the name of the body location.\n"
125 $ob->reply (undef, "The second column is how many of those locations your body has."); 120 . "The second column is how many of those locations your body has.\n"
126 $ob->reply (undef, "The third column is how many slots in that location are available."); 121 . "The third column is how many slots in that location are available.\n";
127 122
128 for (0 .. scalar @body_locations - 1) { 123 $reply .= sprintf "%-20s %3s %5s\n", "Location", "You", "Avail";
129 $ob->reply (undef, (sprintf "%-30s %5d %5d", $body_locations[$_], $ob->body_info($_), $ob->body_used($_))) 124 for (0 .. cf::NUM_BODY_LOCATIONS - 1) {
125 my $msg = cf::object::slot_nonuse_name $_;
126 $msg =~ s/^.*? a //;
127 $reply .= sprintf "%-20s %3d %5d\n", $msg, $ob->slot_info ($_), $ob->slot_used ($_)
130 if $ob->body_info($_) or $ob->body_used($_); 128 if $ob->slot_info ($_) or $ob->slot_used ($_);
131 } 129 }
132 130
133 $ob->reply (undef, "You are not allowed to wear armor") 131 $reply .= "You are not allowed to wear armor\n"
134 unless $ob->flag (cf::FLAG_USE_ARMOUR); 132 unless $ob->flag (cf::FLAG_USE_ARMOUR);
135 $ob->reply (undef, "You are not allowed to use weapons") 133 $reply .= "You are not allowed to use weapons\n"
136 unless $ob->flag (cf::FLAG_USE_WEAPON); 134 unless $ob->flag (cf::FLAG_USE_WEAPON);
135
136 $ob->reply (undef, $reply);
137 137
138 1 138 1
139}; 139};
140 140
141cf::register_command mark => sub { 141cf::register_command mark => sub {
… …
289 my ($ob, $arg) = @_; 289 my ($ob, $arg) = @_;
290 290
291 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count) 291 return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count)
292 unless $arg > 0; 292 unless $arg > 0;
293 293
294 $arg = 4 if $arg < 4;
295
294 $ob->contr->outputs_count ($arg); 296 $ob->contr->outputs_count ($arg);
295 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count); 297 $ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count);
296 298
297 1 299 1
298}; 300};
… …
300cf::register_command 'output-sync' => sub { 302cf::register_command 'output-sync' => sub {
301 my ($ob, $arg) = @_; 303 my ($ob, $arg) = @_;
302 304
303 return $ob->reply (undef, sprintf "Output sync time is presently %.1fs", $ob->contr->outputs_sync * $cf::TICK) 305 return $ob->reply (undef, sprintf "Output sync time is presently %.1fs", $ob->contr->outputs_sync * $cf::TICK)
304 unless length $arg; 306 unless length $arg;
307
308 $arg = 0.5 if $arg < 0.5;
305 309
306 $ob->contr->outputs_sync ($arg / $cf::TICK); 310 $ob->contr->outputs_sync ($arg / $cf::TICK);
307 $ob->reply (undef, sprintf "Output sync time now set to %.1fs", $ob->contr->outputs_sync * $cf::TICK); 311 $ob->reply (undef, sprintf "Output sync time now set to %.1fs", $ob->contr->outputs_sync * $cf::TICK);
308 312
309 1 313 1

Diff Legend

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