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.47 by root, Mon Jun 11 22:18:03 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)
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
87 1
88};
89
90cf::register_command seen => sub {
91 my ($pl, $args) = @_;
92
93 if (my ($login) = $args =~ /(\S+)/) {
94 if ($login eq $pl->name) {
95 $pl->message ("Very funny, $login. Ha. Ha.", cf::NDI_UNIQUE);
96 } elsif (cf::player::find_active $login) {
97 $pl->message ("$login is right here on this server!", cf::NDI_UNIQUE);
98 } elsif (cf::player::exists $login
99 and stat cf::player::path $login) {
100 my $time = (stat _)[9];
101
102 $pl->message ("$login was last seen here "
103 . (POSIX::strftime "%Y-%m-%d %H:%M:%S +0000", gmtime $time)
104 . " which was " . (int +(time - $time) / 3600) . " hours ago.", cf::NDI_UNIQUE);
105 } else {
106 $pl->message ("No player named $login is known to me.", cf::NDI_UNIQUE);
107 }
108 } else {
109 $pl->message ("Usage: seen <player>", cf::NDI_UNIQUE);
89 1 110 }
90}; 111};
91 112
92cf::register_command body => sub { 113cf::register_command body => sub {
93 my ($ob) = @_; 114 my ($ob) = @_;
94 115
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 116 # Too hard to try and make a header that lines everything up, so just
100 # give a description. (comment from C++) 117 # give a description. (comment from C++)
118 my $reply =
101 $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"
102 $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"
103 $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";
104 122
105 for (0 .. scalar @body_locations - 1) { 123 $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($_))) 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 ($_)
107 if $ob->body_info($_) or $ob->body_used($_); 128 if $ob->slot_info ($_) or $ob->slot_used ($_);
108 } 129 }
109 130
110 $ob->reply (undef, "You are not allowed to wear armor") 131 $reply .= "You are not allowed to wear armor\n"
111 unless $ob->flag (cf::FLAG_USE_ARMOUR); 132 unless $ob->flag (cf::FLAG_USE_ARMOUR);
112 $ob->reply (undef, "You are not allowed to use weapons") 133 $reply .= "You are not allowed to use weapons\n"
113 unless $ob->flag (cf::FLAG_USE_WEAPON); 134 unless $ob->flag (cf::FLAG_USE_WEAPON);
135
136 $ob->reply (undef, $reply);
114 137
115 1 138 1
116}; 139};
117 140
118cf::register_command mark => sub { 141cf::register_command mark => sub {
… …
135 } 158 }
136 159
137 1 160 1
138}; 161};
139 162
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") { 163for my $cmd ("run", "fire") {
151 my $oncmd = "${cmd}_on"; 164 my $oncmd = "${cmd}_on";
152 cf::register_command $cmd => sub { 165 cf::register_command $cmd => sub {
153 my ($ob, $arg) = @_; 166 my ($ob, $arg) = @_;
154 167
168 $ob->reply (undef, "Can't $cmd into a non adjacent square.")
169 if $arg < 0 or $arg >= 9;
170
155 $ob->contr->$oncmd (1); 171 $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); 172 $ob->move_player ($arg);
161 173
162 1 174 1
163 }; 175 };
164 176
165 cf::register_command "${cmd}_stop" => sub { 177 cf::register_command "${cmd}_stop" => sub {
166 my ($ob) = @_; 178 my ($ob) = @_;
167 179
168 $ob->contr->$oncmd (0); 180 $ob->contr->$oncmd (0);
169 181
… …
258 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced."); 270 $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced.");
259 271
260 1 272 1
261}; 273};
262 274
275cf::register_command 'output-rate' => sub {
276 my ($ob, $arg) = @_;
277
278 return $ob->reply (undef, sprintf "Output rate is presently %dbps.", $ob->contr->ns->max_rate / $cf::TICK)
279 unless $arg > 0;
280
281 # minimum is 2k/s
282 $ob->contr->ns->max_rate ((List::Util::max 2048, $arg) * $cf::TICK);
283 $ob->reply (undef, sprintf "Output rate now set to %dbps.", $ob->contr->ns->max_rate / $cf::TICK);
284
285 1
286};
287
263cf::register_command 'output-count' => sub { 288cf::register_command 'output-count' => sub {
264 my ($ob, $arg) = @_; 289 my ($ob, $arg) = @_;
265 290
266 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)
267 unless $arg > 0; 292 unless $arg > 0;
268 293
294 $arg = 4 if $arg < 4;
295
269 $ob->contr->outputs_count ($arg); 296 $ob->contr->outputs_count ($arg);
270 $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);
271 298
272 1 299 1
273}; 300};
274 301
275cf::register_command 'output-sync' => sub { 302cf::register_command 'output-sync' => sub {
276 my ($ob, $arg) = @_; 303 my ($ob, $arg) = @_;
277 304
278 return $ob->reply (undef, "Output sync time is presently " . $ob->contr->outputs_sync) 305 return $ob->reply (undef, sprintf "Output sync time is presently %.1fs", $ob->contr->outputs_sync * $cf::TICK)
279 unless $arg > 0; 306 unless length $arg;
280 307
308 $arg = 0.5 if $arg < 0.5;
309
281 $ob->contr->outputs_sync ($arg); 310 $ob->contr->outputs_sync ($arg / $cf::TICK);
282 $ob->reply (undef, "Output sync time now set to " . $ob->contr->outputs_sync); 311 $ob->reply (undef, sprintf "Output sync time now set to %.1fs", $ob->contr->outputs_sync * $cf::TICK);
283 312
284 1 313 1
285}; 314};
286 315
287# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to 316# 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