[ViewVC] Diff of: cvs/deliantra/server/ext/commands.ext

Comparing deliantra/server/ext/commands.ext (file contents):
Revision 1.24 by pippijn, Fri Mar 2 11:07:59 2007 UTC vs.
Revision 1.63 by root, Sun Oct 7 15:52:05 2007 UTC

…		…
1	#! perl	1	#! perl # mandatory depends=irc
2		2
3	use POSIX ();	3	use POSIX ();
4		4
5	# miscellaneous commands	5	# miscellaneous commands
		6
		7	sub who_listing(;$$) {
		8	my ($privileged, $select) = @_;
		9
		10	my ($numwiz, $numafk) = (0, 0);
		11	my @pl;
		12
		13	foreach my $pl (cf::player::list) {
		14	my $ns = $pl->ns or next;
		15	my $ob = $pl->ob;
		16
		17	next unless $ob->map
		18	&& ($privileged \|\| !$pl->hidden);
		19
		20	$numwiz++ if $ob->flag (cf::FLAG_WIZ);
		21	$numafk++ if $ns->afk;
		22
		23	push @pl, $pl;
		24	}
		25
		26	(
		27	"Total Players in The World. (" . (scalar @pl) . ") -- WIZ($numwiz) AFK($numafk) BOT(0)",
		28	(grep /$select/,
		29	map {
		30	my ($pl, $ob, $ns) = ($_, $_->ob, $_->ns);
		31
		32	"* " . $ob->name . "/" . $ob->level . " " . (length $pl->own_title ? $pl->own_title : "the " . $pl->title)
		33	. ($pl->gender ? " [f]" : " [m]")
		34	. ($pl->peaceful ? " [peaceful]" : " [HOSTILE]")
		35	. ($ns->afk ? " [AFK]" : "")
		36	. ($ob->flag (cf::FLAG_WIZ) ? " [WIZ]" : "")
		37	. " [" . $pl->ns->version . "]"
		38	. " [" . ($pl->peaceful \|\| $privileged ? $ob->map->visible_name : $ob->region->name) . "]"
		39	. (sprintf " [rtt %.3fs]", $pl->ns->tcpi_rtt * 1e-6)
		40	. ($privileged ? " " . $pl->ns->host : "")
		41	} sort { (lc $a->ob->name) cmp (lc $b->ob->name) } @pl
		42	),
		43	eval { "* IRC: " . join ", ", ext::irc::users },
		44	)
		45	}
		46
		47	cf::register_command who => sub {
		48	my ($ob, $arg) = @_;
		49
		50	$ob->speed_left ($ob->speed_left - 4);
		51
		52	my $CHANNEL = {
		53	id => "who",
		54	title => "Players",
		55	reply => undef,
		56	tooltip => "Shows players who are currently online",
		57	};
		58
		59	$ob->send_msg ($CHANNEL => (join "\n\n", who_listing $ob->may ("extended_who"), $arg), cf::NDI_DK_ORANGE \| cf::NDI_REPLY \| cf::NDI_CLEAR \| cf::NDI_DEF);
		60	};
		61
		62	cf::register_command seen => sub {
		63	my ($pl, $args) = @_;
		64
		65	if (my ($login) = $args =~ /(\S+)/) {
		66	if ($login eq $pl->name) {
		67	$pl->message ("Very funny, $login. Ha. Ha.", cf::NDI_REPLY);
		68	} elsif (cf::player::find_active $login) {
		69	$pl->message ("$login is right here on this server!", cf::NDI_REPLY);
		70	} elsif (cf::player::exists $login
		71	and stat cf::player::path $login) {
		72	my $time = (stat _)[9];
		73
		74	$pl->message ("$login was last seen here "
		75	. (POSIX::strftime "%Y-%m-%d %H:%M:%S +0000", gmtime $time)
		76	. " which was " . (int +(time - $time) / 3600) . " hours ago.", cf::NDI_REPLY);
		77	} else {
		78	$pl->message ("No player named $login is known to me.", cf::NDI_REPLY);
		79	}
		80	} else {
		81	$pl->message ("Usage: seen <player>", cf::NDI_REPLY);
		82	}
		83	};
		84
		85	cf::register_command body => sub {
		86	my ($ob) = @_;
		87
		88	# Too hard to try and make a header that lines everything up, so just
		89	# give a description. (comment from C++)
		90	my $reply =
		91	"The first column is the name of the body location.\n\n"
		92	. "The second column is how many of those locations your body has.\n\n"
		93	. "The third column is how many slots in that location are available.\n\n";
		94
		95	$reply .= sprintf " %-20s %3s %5s\n", "Location", "You", "Avail";
		96	for (0 .. cf::NUM_BODY_LOCATIONS - 1) {
		97	my $msg = cf::object::slot_nonuse_name $_;
		98	$msg =~ s/^.*? a //;
		99	$reply .= sprintf " %-20s %3d %5d\n", $msg, $ob->slot_info ($_), $ob->slot_used ($_)
		100	if $ob->slot_info ($_) or $ob->slot_used ($_);
		101	}
		102
		103	$reply .= "You are not allowed to wear armor\n\n"
		104	unless $ob->flag (cf::FLAG_USE_ARMOUR);
		105	$reply .= "You are not allowed to use weapons\n\n"
		106	unless $ob->flag (cf::FLAG_USE_WEAPON);
		107
		108	my $CHANNEL = {
		109	id => "body",
		110	title => "Body Parts",
		111	reply => undef,
		112	tooltip => "Shows which body parts you posess and are available",
		113	};
		114
		115	$ob->send_msg ($CHANNEL => $reply, cf::NDI_REPLY);
		116	};
		117
		118	cf::register_command mark => sub {
		119	my ($pl, $arg) = @_;
		120
		121	if (length $arg) {
		122	my $ob = $pl->find_best_object_match ($arg);
		123
		124	return $pl->reply (undef, "Could not find an object that matches $arg")
		125	unless $ob;
		126
		127	$pl->contr->mark ($ob);
		128	$pl->reply (undef, (sprintf "Marked item %s", $ob->name, $ob->title));
		129	} else {
		130	my $ob = $pl->find_marked_object;
		131
		132	$pl->reply (undef, $ob
		133	? (sprintf "%s %s * is marked.", $ob->name, $ob->title)
		134	: "You have no marked object.");
		135	}
		136	};
		137
		138	for my $cmd ("run", "fire") {
		139	my $oncmd = "${cmd}_on";
		140	cf::register_command $cmd => sub {
		141	my ($ob, $arg) = @_;
		142
		143	$ob->reply (undef, "Can't $cmd into a non adjacent square.")
		144	if $arg < 0 or $arg >= 9;
		145
		146	$ob->contr->$oncmd (1);
		147	$ob->move_player ($arg);
		148	};
		149
		150	cf::register_command "${cmd}_stop" => sub {
		151	my ($ob) = @_;
		152
		153	$ob->contr->$oncmd (0);
		154	};
		155	}
		156
		157	our $MAPINFO_CHANNEL = {
		158	id => "mapinfo",
		159	title => "Map Info",
		160	reply => undef,
		161	tooltip => "Information about the map",
		162	};
		163
		164	cf::register_command mapinfo => sub {
		165	my ($ob) = @_;
		166
		167	my $observe = $ob->contr->observe;
		168
		169	my $map = $observe->map
		170	or return;
		171
		172	my $msg = sprintf "%s (%s) %s", $map->name, $map->path, $observe->region->longname;
		173	$msg .= sprintf "\n\nplayers: %d difficulty: %d size: %d start: %dx%d timeout: %d",
		174	(scalar $map->players), $map->difficulty, $map->width, $map->height, $map->enter_x, $map->enter_y, $map->timeout
		175	if $ob->flag (cf::FLAG_WIZ);
		176
		177	$ob->send_msg ($MAPINFO_CHANNEL => $msg, cf::NDI_REPLY \| cf::NDI_CLEAR);
		178	};
		179
		180	cf::register_command whereami => sub {
		181	my ($ob) = @_;
		182
		183	my $reg = $ob->contr->observe->region;
		184	$ob->send_msg ($MAPINFO_CHANNEL => (sprintf "You are %s.\n%s", $reg->longname, $reg->msg), cf::NDI_REPLY \| cf::NDI_CLEAR);
		185	};
		186
		187	cf::register_command whereabouts => sub {
		188	my ($ob, $arg) = @_;
		189
		190	my %count;
		191
		192	for my $pl (cf::player::list) {
		193	++$count{$pl->ob->region->longname};
		194	}
		195
		196	my $msg = "In the world currently there are:\n\n"
		197	. join "", map "$count{$_} player(s) $_\n\n", sort keys %count;
		198
		199	$ob->send_msg ($MAPINFO_CHANNEL => $msg, cf::NDI_REPLY \| cf::NDI_CLEAR);
		200	};
		201
		202	cf::register_command hiscore => sub {
		203	my ($ob, $arg) = @_;
		204
		205	my $url = $cf::CFG{hiscore_url};
		206	$ob->send_msg (log => "See $url", cf::NDI_REPLY);
		207	};
		208
		209	sub _set_mode($$$@) {
		210	my ($name, $ob, $arg, $slot, @choices) = @_;
		211
		212	my $oldmode = $ob->contr->$slot;
		213
		214	return $ob->reply (undef, "$name is set to $choices[$oldmode]")
		215	unless $arg;
		216
		217	my ($idx) = grep $choices[$_] eq $arg, 0 .. $#choices
		218	or return $ob->reply (undef, "$name: Unknown options '$arg', valid options are @choices"), 1;
		219
		220	$ob->contr->$slot ($idx);
		221	$ob->reply (undef, "$name" . ($oldmode == $ob->contr->unapply ? "" : " now") . " set to " . $choices[$ob->contr->$slot]);
		222	}
		223
		224	cf::register_command applymode => sub {
		225	my ($ob, $arg) = @_;
		226
		227	_set_mode "applymode", $ob, $arg, unapply => qw(nochoice never always);
		228	};
		229
		230	cf::register_command petmode => sub {
		231	my ($ob, $arg) = @_;
		232
		233	_set_mode "petmode", $ob, $arg, petmode => qw(normal sad defend arena);
		234	};
		235
		236	cf::register_command usekeys => sub {
		237	my ($ob, $arg) = @_;
		238
		239	_set_mode "usekeys", $ob, $arg, usekeys => qw(inventory keyrings containers);
		240	};
		241
		242	cf::register_command hintmode => sub {
		243	my ($ob, $arg) = @_;
		244
		245	_set_mode "hintmode", $ob, $arg, hintmode => qw(show mark hide);
		246	};
		247
		248	cf::register_command afk => sub {
		249	my ($ob, $arg) = @_;
		250
		251	$ob->contr->ns->afk ($ob->contr->ns->afk ? 0 : 1);
		252	$ob->reply (undef, $ob->contr->ns->afk ? "You are now AFK" : "You are no longer AFK");
		253	};
		254
		255	cf::register_command sound => sub {
		256	my ($ob, $arg) = @_;
		257
		258	$ob->contr->ns->sound ($ob->contr->ns->sound ? 0 : 1);
		259	$ob->reply (undef, $ob->contr->ns->sound ? "The sounds are enabled." : "Silence is golden...");
		260	};
		261
		262	cf::register_command brace => sub {
		263	my ($ob, $arg) = @_;
		264
		265	$ob->contr->braced ($ob->contr->braced ? 0 : 1);
		266	$ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced.");
		267	};
		268
		269	cf::register_command 'output-rate' => sub {
		270	my ($ob, $arg) = @_;
		271
		272	return $ob->reply (undef, sprintf "Output rate is presently %dbps.", $ob->contr->ns->max_rate / $cf::TICK)
		273	unless $arg > 0;
		274
		275	# minimum is 5k/s
		276	# maximum is 100k/s, this should be configurable
		277	$ob->contr->ns->max_rate ((List::Util::max 5000, List::Util::min 100000, $arg) * $cf::TICK);
		278	$ob->reply (undef, sprintf "Output rate now set to %dbps.", $ob->contr->ns->max_rate / $cf::TICK);
		279	};
		280
		281	cf::register_command 'output-count' => sub {
		282	my ($ob, $arg) = @_;
		283
		284	return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count)
		285	unless $arg > 0;
		286
		287	$arg = 4 if $arg < 4;
		288
		289	$ob->contr->outputs_count ($arg);
		290	$ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count);
		291	};
		292
		293	cf::register_command 'output-sync' => sub {
		294	my ($ob, $arg) = @_;
		295
		296	return $ob->reply (undef, sprintf "Output sync time is presently %.1fs", $ob->contr->outputs_sync * $cf::TICK)
		297	unless length $arg;
		298
		299	$arg = 0.5 if $arg < 0.5;
		300
		301	$ob->contr->outputs_sync ($arg / $cf::TICK);
		302	$ob->reply (undef, sprintf "Output sync time now set to %.1fs", $ob->contr->outputs_sync * $cf::TICK);
		303	};
		304
		305	# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to
		306	# some other level (which may also be 0), this does not get echoed,
		307	# but it does get set.
		308	cf::register_command wimpy => sub {
		309	my ($ob, $arg) = @_;
		310
		311	my $wimpy = $ob->run_away;
		312	return $ob->reply (undef, "Your current wimpy level is $wimpy.")
		313	if $arg eq "";
		314
		315	return $ob->run_away ($arg) && $ob->reply (undef, "Your new wimpy level is $arg.")
		316	if $arg =~ /^\d+$/ and $arg <= 100;
		317
		318	$ob->reply (undef, "Incorrect parameters for wimpy: $arg");
		319	};
		320
		321	cf::register_command peaceful => sub {
		322	my ($ob, $arg) = @_;
		323
		324	$ob->reply (undef, "You cannot change your peaceful setting with this command."
		325	." Please speak to the priest in the temple of Gorokh"
		326	." if you want to become hostile or in temple of Valriel"
		327	." if you want to become peaceful again.");
		328
		329	#$ob->contr->peaceful ($ob->contr->peaceful ? 0 : 1);
		330	#$ob->reply (undef, $ob->contr->peaceful ? "You will attack other players." : "You will not attack other players.");
		331	};
6		332
7	sub rename_to($$$) {	333	sub rename_to($$$) {
8	my ($ob, $from, $to) = @_;	334	my ($ob, $from, $to) = @_;
9		335
10	$to =~ /^[a-zA-Z0-9.,=#\/%$!^ ]*$/	336	$to =~ /^[a-zA-Z0-9.,=#\/%$!^ ]*$/
17		343
18	if (length $from) {	344	if (length $from) {
19	$item = $ob->find_best_object_match ($from)	345	$item = $ob->find_best_object_match ($from)
20	or return $ob->message ("rename: could not find a matching item to rename.");	346	or return $ob->message ("rename: could not find a matching item to rename.");
21	} else {	347	} else {
22	$item = $ob->find_marked_object ()	348	$item = $ob->find_marked_object
23	or return $ob->message ("rename: no from name and no marked item found to rename.");	349	or return $ob->message ("rename: no from name and no marked item found to rename.");
24	}	350	}
25		351
26	$item->custom_name (length $to ? $to : undef);	352	$item->custom_name (length $to ? $to : undef);
27		353
…		…
35		361
36	$ob->esrv_update_item (cf::UPD_NAME, $item);	362	$ob->esrv_update_item (cf::UPD_NAME, $item);
37		363
38	1	364	1
39	}	365	}
40
41	sub ext::schmorp_irc::users; # HACK: TODO: replace by signal
42
43	sub who_listing(;$) {
44	my ($privileged) = @_;
45
46	my ($numwiz, $numafk) = (0, 0);
47	my @pl;
48
49	foreach my $pl (cf::player::list) {
50	my $ns = $pl->ns or next;
51	my $ob = $pl->ob;
52
53	next unless $ob->map
54	&& ($privileged \|\| !$pl->hidden);
55
56	$numwiz++ if $ob->flag (cf::FLAG_WIZ);
57	$numafk++ if $ns->afk;
58
59	push @pl, $pl;
60	}
61
62	(
63	"Total Players in The World. (" . (scalar @pl) . ") -- WIZ($numwiz) AFK($numafk) BOT(0)",
64	(
65	map {
66	my ($pl, $ob, $ns) = ($_, $_->ob, $_->ns);
67
68	"* " . $ob->name . "/" . $ob->level . " " . (length $pl->own_title ? $pl->own_title : "the " . $pl->title)
69	. ($pl->peaceful ? " [peaceful]" : " [HOSTILE]")
70	. ($ns->afk ? " [AFK]" : "")
71	. ($ob->flag (cf::FLAG_WIZ) ? " [WIZ]" : "")
72	. " [" . $pl->ns->version . "]"
73	. " [" . ($pl->peaceful \|\| $privileged ? $ob->map->visible_name : $ob->region->name) . "]"
74	. (sprintf " [rtt %.3fs]", $pl->ns->rtt * 1e-6)
75	. ($privileged ? " " . $pl->ns->host : "")
76	} sort { (lc $a->ob->name) cmp (lc $b->ob->name) } @pl
77	),
78	eval { "* IRC: " . join ", ", ext::schmorp_irc::users },
79	)
80	}
81
82	cf::register_command who => sub {
83	my ($ob, $arg) = @_;
84
85	$ob->speed_left ($ob->speed_left - 0.25);
86
87	$ob->reply (undef, (join "\n", who_listing $ob->may ("extended_who")), cf::NDI_UNIQUE \| cf::NDI_DK_ORANGE);
88
89	1
90	};
91
92	cf::register_command applymode => sub {
93	my ($ob, $arg) = @_;
94	my @types = ("nochoice", "never", "always");
95	my $mapping = {
96	nochoice => 1,
97	never => 2,
98	always => 3,
99	};
100
101	my $oldmode = $ob->contr->unapply;
102	my $oldmode_name = $types[$oldmode];
103
104	return $ob->reply (undef, "applymode is set to $oldmode_name")
105	unless $arg;
106
107	return $ob->reply (undef, "applymode: Unknown options '$arg', valid options are @types")
108	unless $mapping->{$arg};
109
110	$ob->contr->unapply ($mapping->{$arg} - 1); # HACK: because of the $mapping->{$arg} check before, where $arg should not be 0
111	# but $arg would be 0 if a user enters an incorrect value
112	$ob->reply (undef, "applymode" . ($oldmode == $ob->contr->unapply ? "" : " now") . " set to " . $types[$ob->contr->unapply]);
113
114	1
115	};
116
117	cf::register_command petmode => sub {
118	my ($ob, $arg) = @_;
119	my @types = ("normal", "sad", "defend", "arena");
120	my $mapping = {
121	normal => 1,
122	sad => 2,
123	defend => 3,
124	arena => 4,
125	};
126
127	my $oldtype = $ob->contr->petmode;
128	my $oldtype_name = $types[$oldtype];
129
130	return $ob->reply (undef, "petmode is set to $oldtype_name")
131	unless $arg;
132
133	return $ob->reply (undef, "petmode: Unknown options '$arg', valid options are @types")
134	unless $mapping->{$arg};
135
136	$ob->contr->petmode ($mapping->{$arg} - 1); # HACK: because of the $mapping->{$arg} check before, where $arg should not be 0
137	# but $arg would be 0 if a user enters an incorrect value
138	$ob->reply (undef, "petmode" . ($oldtype == $ob->contr->petmode ? "" : " now") . " set to " . $types[$ob->contr->petmode]);
139
140	1
141	};
142
143	cf::register_command usekeys => sub {
144	my ($ob, $arg) = @_;
145	my @types = ("inventory", "keyrings", "containers");
146	my $mapping = {
147	inventory => 1,
148	keyrings => 2,
149	containers => 3,
150	};
151
152	my $oldtype = $ob->contr->usekeys;
153	my $oldtype_name = $types[$oldtype];
154
155	return $ob->reply (undef, "usekeys is set to $oldtype_name")
156	unless $arg;
157
158	return $ob->reply (undef, "usekeys: Unknown options '$arg', valid options are @types")
159	unless $mapping->{$arg};
160
161	$ob->contr->usekeys ($mapping->{$arg} - 1); # HACK: because of the $mapping->{$arg} check before, where $arg should not be 0
162	# but $arg would be 0 if a user enters an incorrect value
163	$ob->reply (undef, "usekeys" . ($oldtype == $ob->contr->usekeys ? "" : " now") . " set to " . $types[$ob->contr->usekeys]);
164
165	1
166	};
167
168	cf::register_command afk => sub {
169	my ($ob, $arg) = @_;
170
171	$ob->contr->ns->afk ($ob->contr->ns->afk ? 0 : 1);
172	$ob->reply (undef, $ob->contr->ns->afk ? "You are now AFK" : "You are no longer AFK");
173
174	1
175	};
176
177	cf::register_command sound => sub {
178	my ($ob, $arg) = @_;
179
180	$ob->contr->ns->sound ($ob->contr->ns->sound ? 0 : 1);
181	$ob->reply (undef, $ob->contr->ns->sound ? "The sounds are enabled." : "Silence is golden...");
182
183	1
184	};
185
186	cf::register_command brace => sub {
187	my ($ob, $arg) = @_;
188
189	$ob->contr->braced ($ob->contr->braced ? 0 : 1);
190	$ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced.");
191
192	1
193	};
194
195	cf::register_command 'output-count' => sub {
196	my ($ob, $arg) = @_;
197
198	return $ob->reply (undef, "Output count is presently " . $ob->contr->outputs_count)
199	unless $arg > 0;
200
201	$ob->contr->outputs_count ($arg);
202	$ob->reply (undef, "Output count now set to " . $ob->contr->outputs_count);
203
204	1
205	};
206
207	cf::register_command 'output-sync' => sub {
208	my ($ob, $arg) = @_;
209
210	return $ob->reply (undef, "Output sync time is presently " . $ob->contr->outputs_sync)
211	unless $arg > 0;
212
213	$ob->contr->outputs_sync ($arg);
214	$ob->reply (undef, "Output sync time now set to " . $ob->contr->outputs_sync);
215
216	1
217	};
218
219	# XXX: This has a bug. After one sets his wimpy level to 0 and resets it to
220	# some other level (which may also be 0), this does not get echoed,
221	# but it does get set.
222	cf::register_command wimpy => sub {
223	my ($ob, $arg) = @_;
224
225	my $wimpy = $ob->run_away;
226	return $ob->reply (undef, "Your current wimpy level is $wimpy.")
227	if $arg eq "";
228
229	return $ob->run_away ($arg) && $ob->reply (undef, "Your new wimpy level is $arg.")
230	if $arg =~ /^\d+$/ and $arg <= 100;
231
232	$ob->reply (undef, "Incorrect parameters for wimpy: $arg");
233
234	1
235	};
236
237	cf::register_command peaceful => sub {
238	my ($ob, $arg) = @_;
239
240	$ob->reply (undef, "You cannot change your peaceful setting with this command."
241	." Please speak to the priest in the temple of Gorokh"
242	." if you want to become hostile or in temple of Valriel"
243	." if you want to become peaceful again.");
244
245	#$ob->contr->peaceful ($ob->contr->peaceful ? 0 : 1);
246	#$ob->reply (undef, $ob->contr->peaceful ? "You will attack other players." : "You will not attack other players.");
247
248	1
249	};
250		366
251	cf::register_command rename => sub {	367	cf::register_command rename => sub {
252	my ($ob, $arg) = @_;	368	my ($ob, $arg) = @_;
253		369
254	$ob->speed_left ($ob->speed_left - 0.25);	370	$ob->speed_left ($ob->speed_left - 0.25);
…		…
268	# does not unquote $1 or $3	384	# does not unquote $1 or $3
269	rename_to $ob, $2\|\|$1, $4\|\|$3;	385	rename_to $ob, $2\|\|$1, $4\|\|$3;
270	} else {	386	} else {
271	$ob->reply (undef, 'Syntax error. Rename usage: rename ["oldname"] to "newname"');	387	$ob->reply (undef, 'Syntax error. Rename usage: rename ["oldname"] to "newname"');
272	}	388	}
273
274	1
275	};	389	};
276		390
277	cf::register_command uptime => sub {	391	cf::register_command uptime => sub {
278	my ($ob, $arg) = @_;	392	my ($ob, $arg) = @_;
279		393
280	my $startup = POSIX::strftime "%Y-%m-%d %H:%M:%S %Z", localtime $cf::UPTIME;	394	my $startup = POSIX::strftime "%Y-%m-%d %H:%M:%S %Z", localtime $cf::UPTIME;
281	my $runtime = sprintf "%.1f", (time - $cf::UPTIME) / 86400;	395	my $runtime = sprintf "%.1f", (time - $cf::UPTIME) / 86400;
282	$ob->reply (undef, "server started $startup, uptime ${runtime}\d");	396	$ob->send_msg (log => "server started $startup, uptime ${runtime}\d", cf::NDI_REPLY);
283
284	1
285	};	397	};
286		398
287	my %IN_MEMORY = (	399	my %IN_MEMORY = (
288	cf::MAP_IN_MEMORY => "I",	400	cf::MAP_IN_MEMORY => "I",
289	cf::MAP_SWAPPED => "S",	401	cf::MAP_SWAPPED => "S",
…		…
295		407
296	no re 'eval'; $arg = qr<$arg>;	408	no re 'eval'; $arg = qr<$arg>;
297		409
298	my $format = "%2s %1s %3s %5s %.60s\n";	410	my $format = "%2s %1s %3s %5s %.60s\n";
299		411
300	$ob->reply (undef, (sprintf $format, "Pl", "I", "Svd", "Reset", "Name"), cf::NDI_BLACK \| cf::NDI_UNIQUE);	412	$ob->send_msg ($MAPINFO_CHANNEL => (sprintf $format, "Pl", "I", "Svd", "Reset", "Name"), cf::NDI_REPLY \| cf::NDI_CLEAR);
301		413
302	for (sort keys %cf::MAP) {	414	for (sort keys %cf::MAP) {
303	my $map = $cf::MAP{$_}	415	my $map = $cf::MAP{$_}
304	or next;	416	or next;
305		417
…		…
307	next if $map->{deny_list};	419	next if $map->{deny_list};
308		420
309	my $svd = int $cf::RUNTIME - $map->{last_save};	421	my $svd = int $cf::RUNTIME - $map->{last_save};
310	$svd = "++" if $svd > 99;	422	$svd = "++" if $svd > 99;
311		423
312	$ob->reply (undef,	424	$ob->send_msg ($MAPINFO_CHANNEL =>
313	(sprintf $format,	425	(sprintf $format,
314	(scalar $map->players),	426	(scalar $map->players),
315	$IN_MEMORY{$map->in_memory} \|\| "?",	427	$IN_MEMORY{$map->in_memory} \|\| "?",
316	$svd,	428	$svd,
317	(int $map->reset_at - $cf::RUNTIME),	429	(int $map->reset_at - $cf::RUNTIME),
318	$map->visible_name),	430	$map->visible_name)
319	cf::NDI_BLACK \| cf::NDI_UNIQUE);	431	);
320	}
321
322	1	432	}
323	};	433	};
324		434

Diff Legend

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

Comparing deliantra/server/ext/commands.ext (file contents): Revision 1.24 by pippijn, Fri Mar 2 11:07:59 2007 UTC vs. Revision 1.63 by root, Sun Oct 7 15:52:05 2007 UTC

Diff Legend

Comparing deliantra/server/ext/commands.ext (file contents):
Revision 1.24 by pippijn, Fri Mar 2 11:07:59 2007 UTC vs.
Revision 1.63 by root, Sun Oct 7 15:52:05 2007 UTC