ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/login.ext
(Generate patch)

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.70 by root, Sun Sep 2 12:37:10 2007 UTC vs.
Revision 1.122 by root, Thu Nov 15 07:08:15 2012 UTC

1#! perl # mandatory 1#! perl # mandatory depends=highscore
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7use Deliantra::Util ();
7 8
8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600; 9CONF MAX_DISCONNECT_TIME = 3600;
9
10# paranoia function to overwrite a string-in-place
11sub nuke_str {
12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
13}
14 10
15sub query { 11sub query {
16 my ($ns, $flags, $text) = @_; 12 my ($ns, $flags, $text) = @_;
17 13
18 my $current = $Coro::current; 14 $ns->query ($flags, $text, Coro::rouse_cb);
19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] }); 15 Coro::rouse_wait
20 Coro::schedule while ref $current;
21
22 $current
23} 16}
24 17
25sub can_cleanup { 18sub can_cleanup {
26 my ($pl, $mtime) = @_; 19 my ($pl, $mtime) = @_;
27 20
… …
52 ); 45 );
53 46
54 1 47 1
55} 48}
56 49
50sub safe_spot($) {
51 my ($pl) = @_;
52
53 my $ob = $pl->ob;
54
55 my $m = $ob->map
56 or return;
57 my $x = $ob->x;
58 my $y = $ob->y;
59
60 # never happens normally, but helps when shell users make mistakes
61 $m->linkable
62 or return 1;
63
64 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
65}
66
57sub enter_map { 67sub enter_map {
58 my ($pl) = @_; 68 my ($pl) = @_;
59 69
60 my $ob = $pl->ob; 70 my $ob = $pl->ob;
61 71
… …
64 ? @{delete $ob->{_link_pos}} 74 ? @{delete $ob->{_link_pos}}
65 : ($pl->maplevel, $ob->x, $ob->y); 75 : ($pl->maplevel, $ob->x, $ob->y);
66 76
67 $ob->enter_link; 77 $ob->enter_link;
68 78
79 my $m = cf::map::find $map;
69 if (my $time = delete $pl->{unclean_save}) { 80 my $time = delete $pl->{unclean_save};
70 if (my $m = cf::map::find $map) { 81
82 if ($time && $m) {
71 if ($time < $m->{instantiate_time}) { 83 if ($time < $m->{instantiate_time}) {
72 # the map was reset in the meantime 84 # the map was reset in the meantime
73 my $age = $cf::RUNTIME - $time; 85 my $age = $cf::RUNTIME - $time;
74 86
75 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 87 cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
76 88
77 # for now, just go back to savebed
78 ($map, $x, $y) = $pl->savebed;
79
80 if ($age >= $MAX_DISCONNECT_TIME) { 89 if ($age >= $MAX_DISCONNECT_TIME) {
81 $ob->message (
82 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
83 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
84 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
85 . "H<You disconnected too long without having used a savebed.>",
86 cf::NDI_RED
87 );
88 # kill them.
89 # reminds me of the famous badness 10000 syndrome...
90 $ob->stats->hp (-10000); #] if they survive this they deserved to live
91 $pl->killer ("a cave-in");
92 } else {
93 $ob->message (
94 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
95 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
96 . "Better use a savebed next time, much worse things could have happened... "
97 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
98 cf::NDI_RED
99 );
100 }
101 } else {
102 $ob->message ( 90 $ob->message (
103 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 91 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
104 . "as lots of things could happen when you leave by other means, such as cave-ins, " 92 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
105 . "or monsters suddenly snapping your body. Better use a savebed next time. " 93 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
106 . "H<Always apply a bed of reality to disconnect from the server.>", 94 . "H<You disconnected too long without having used a savebed.>",
107 cf::NDI_RED 95 cf::NDI_RED
108 ); 96 );
97 # kill them.
98 # reminds me of the famous badness 10000 syndrome...
99 $ob->stats->hp (-10000); #] if they survive this they deserved to live
100 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
101 } else {
102 ($map, $x, $y) = $pl->savebed;
103
104 $ob->message (
105 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
106 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
107 . "Better use a savebed next time, much worse things could have happened... "
108 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
109 cf::NDI_RED
110 );
111 }
112 } else {
113 $ob->message (
114 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
115 . "as lots of things could happen when you leave by other means, such as cave-ins, "
116 . "or monsters suddenly snapping your body. Better use a savebed next time. "
117 . "H<Always apply a bed of reality to disconnect from the server.>",
118 cf::NDI_RED
109 } 119 );
110 } 120 }
111 } 121 }
112 122
113 $ob->goto ($map, $x, $y); 123 $ob->goto ($map, $x, $y);
114} 124}
115 125
116# delete a player directory, be non-blocking AND synchronous... 126sub encode_password($) {
117# (thats hard, so we crap out and fork). 127 "!" . unpack "H*", $_[0]
128}
129
130sub compare_password($$) {
131 my ($pass, $token) = @_;
132
133 if ($token =~ /!!(.*)/) {
134 return +(substr $pass, 0, 8) eq pack "H*", $1;
135 } elsif ($token =~ /!(.*)/) {
136 return $pass eq pack "H*", $1;
137 } else {
138 return $token eq crypt $pass, $token;
139 }
140}
141
142# delete a player directory
118sub nuke_playerdir { 143sub nuke_playerdir {
119 my ($user) = @_; 144 my ($user) = @_;
120 145
121 aio_rename "$PLAYERDIR/$user", "$PLAYERDIR/~$Coro::current~deleting~"; 146 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
147
122 system "rm -rf \Q$PLAYERDIR/~$Coro::current~deleting~\E &"; 148 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
149 aio_rename "$PLAYERDIR/$user", $temp;
150 IO::AIO::aio_rmtree $temp;
151}
152
153sub login_done {
154 my ($pl) = @_;
155
156 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
157 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
158 }
159}
160
161sub chargen {
162 my ($ns, $user, $pass) = @_;
163
164 # the rest of this function is character creation
165 $Coro::current->{desc} = "addme($user) chargen";
166
167 # just to make sure nothing is left over
168 # normally, nothing is there.
169 nuke_playerdir $user;
170
171 my $pl = cf::player::new $user;
172 $pl->password (encode_password $pass);
173 $pl->connect ($ns);
174 my $ob = $pl->ob;
175
176 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
177
178 while () {
179 $ob->update_stats;
180 $pl->save_stats;
181
182 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
183 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
184
185 if ($res =~ /^[Nn]/) {
186 last;
187 } elsif ($res > 0 && $res <= 7) {
188 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
189
190 if ($swap > 0 && $swap <= 7) {
191 $ob->swap_stats ($res - 1, $swap - 1);
192 }
193 } else {
194 $ob->roll_stats;
195 }
196
197 Coro::Timer::sleep 0.05;
198 }
199
200 $ob->set_animation (2);
201 $ob->add_statbonus;
202
203 while () {
204 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
205 my $msg = $ob->msg;
206 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
207 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
208
209 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
210 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
211
212 last if $res =~ /[dD]/;
213
214 $pl->chargen_race_next;
215 Coro::Timer::sleep 0.05;
216 }
217
218 # create the playerdir, if necessary, as chargen_race_done did it before
219 # presumably because of unique maps
220 aio_mkdir playerdir $pl, 0770;
221 $pl->chargen_race_done;
222
223 while () {
224 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
225 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
226
227 if ($res =~ /^[fF]/) {
228 $pl->gender (1);
229 last;
230 } elsif ($res =~ /^[mM]/) {
231 $pl->gender (0);
232 last;
233 }
234 Coro::Timer::sleep 0.05;
235 }
236
237 $ob->reply (undef, "Welcome to Deliantra!");
238
239 # XXX: Workaround for delayed client ext protocol handshake
240 $pl->esrv_new_player;
241
242 delete $pl->{deny_save};
123} 243}
124 244
125cf::client->attach (on_addme => sub { 245cf::client->attach (on_addme => sub {
126 my ($ns) = @_; 246 my ($ns) = @_;
127 247
128 if (!$ns->facecache)
129 {
130 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
131
132
133***
134*** WARNING:
135*** Your client does not support face/image caching,
136*** or it has been disabled. Face caching is mandatory
137*** so please enable it or use a newer client.
138***
139*** Look at your client preferences:
140***
141*** CFPlus: all known versions automatically enable the facecache.
142*** cfclient: use the -cache commandline option.
143*** cfclient: map will not redraw automatically (bug).
144*** gcfclient: use -cache commandline option, or enable
145*** gcfclient: Client => Configure => Map & Image => Cache Images.
146*** jcrossclient: your client is broken, use CFPlus or gcfclient.
147***
148***
149EOF
150 if ($ns->version =~ /jcrossclient/) {
151 # let them, for now
152 } else {
153 $ns->flush;
154 return $ns->destroy;
155 }
156
157 # $ns->facecache = true;
158 }
159
160 if ($ns->mapmode < cf::Map1aCmd) {
161 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
162
163
164***
165*** WARNING:
166*** Your client is too old. Please upgrade to a newer version.
167EOF
168
169 $ns->flush;
170 return $ns->destroy;
171 }
172
173 $ns->pl and return $ns->destroy; 248 $ns->pl and return $ns->destroy;
174 249
175 $ns->async (sub { 250 $ns->async (sub {
251 $Coro::current->{desc} = "addme init";
252
176 my ($user, $pass); 253 my ($user, $pass);
177 254
178 $ns->send_packet ("addme_success"); 255 $ns->send_packet ("addme_success");
179 256
180 for (;;) { 257 for (;;) {
… …
185 cf::NDI_BLUE 262 cf::NDI_BLUE
186 ); 263 );
187 264
188 # read username 265 # read username
189 while () { 266 while () {
190 $user = query $ns, 0, "What is your name?\n:"; 267 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
191 268
192 if ($cf::LOGIN_LOCK{$user}) { 269 if ($cf::LOGIN_LOCK{$user}) {
193 $ns->send_drawinfo ( 270 $ns->send_drawinfo (
194 "That username is currently used in another login session. " 271 "That username is currently used in another login session. "
195 . "Chose another, or wait till the other session has ended.", 272 . "Chose another, or wait till the other session has ended.",
196 cf::NDI_RED 273 cf::NDI_RED
197 ); 274 );
198 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 275 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
199 last; 276 last;
200 } else { 277 } else {
201 $ns->send_drawinfo ( 278 $ns->send_drawinfo (
202 "Your username contains illegal characters " 279 "Your username contains illegal characters "
203 . "(only a-z, A-Z and 0-9 are allowed), " 280 . "(only a-z, A-Z and 0-9 are allowed), "
204 . "or is not between 3 and 18 characters in length.", 281 . "or is not between 3 and 20 characters in length.",
205 cf::NDI_RED 282 cf::NDI_RED
206 ); 283 );
207 } 284 }
208 Coro::Timer::sleep 0.4; 285 Coro::Timer::sleep 0.4;
209 } 286 }
210 287
211 check_playing $ns, $user and next; 288 check_playing $ns, $user and next;
289
290 $Coro::current->{desc} = "addme($user) pass";
212 291
213 $ns->send_drawinfo ( 292 $ns->send_drawinfo (
214 "Welcome $user, please enter your password now. " 293 "Welcome $user, please enter your password now. "
215 . "New users should now choose a password. " 294 . "New users should now choose a password. "
216 . "Anything your client lets you enter is fine.", 295 . "Anything your client lets you enter is fine.",
… …
240 } 319 }
241 local $cf::LOGIN_LOCK{$user} = 1; 320 local $cf::LOGIN_LOCK{$user} = 1;
242 321
243 check_playing $ns, $user and next; 322 check_playing $ns, $user and next;
244 323
324 $Coro::current->{desc} = "addme($user) check";
325
245 # try to read the user file and check the password 326 # try to read the user file and check the password
246 if (my $pl = cf::player::find $user) { 327 if (my $pl = cf::player::find $user) {
247 aio_stat $pl->path and next; 328 aio_stat $pl->path and next;
248 my $mtime = (stat _)[9]; 329 my $mtime = (stat _)[9];
249 my $hash = $pl->password; 330 my $token = $pl->password;
250 331
251 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 332 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
252 nuke_str $pass; 333 # player exists and passwords match - we can proceed
334
253 # password matches, wonderful 335 # password matches, wonderful
254 my $pl = cf::player::find $user or next; 336 my $pl = cf::player::find $user or next;
255 $pl->connect ($ns); 337 $pl->connect ($ns);
256 enter_map $pl; 338 enter_map $pl;
339 login_done $pl;
257 last; 340 return;
258 } elsif (can_cleanup $pl, $mtime) { 341 } elsif (can_cleanup $pl, $mtime) {
259 Coro::Timer::sleep 1; 342 Coro::Timer::sleep 1;
260 343
261 $ns->send_drawinfo ( 344 $ns->send_drawinfo (
262 "Player exists, but password does not match. If this is your account, " 345 "Player exists, but password does not match. If this is your account, "
263 . "please try again. If not, you can now decide to take over this account " 346 . "please try again. If not, you can now decide to take over this account "
264 . "because it has not been in-use for some time.", 347 . "because it has not been in-use for some time.",
265 cf::NDI_RED 348 cf::NDI_RED
266 ); 349 );
267 350
268 #TODO: nuke_str
269 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/ 351 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/
270 or next; 352 or next;
271 353
272 # check if the file hasn't changed 354 # check if the file hasn't changed
273 aio_stat cf::player::path $user and next; 355 aio_stat cf::player::path $user and next;
… …
275 357
276 $pl->quit_character; 358 $pl->quit_character;
277 359
278 # fall through to creation 360 # fall through to creation
279 } else { 361 } else {
280 nuke_str $pass;
281
282 Coro::Timer::sleep 1; 362 Coro::Timer::sleep 1;
283 363
284 $ns->send_drawinfo ( 364 $ns->send_drawinfo (
285 "Wrong username or password. Please try again " 365 "Wrong username or password. Please try again "
286 . "(check for Numlock and other semi-obvious error sources).", 366 . "(check for Numlock and other semi-obvious error sources).",
… …
288 ); 368 );
289 next; 369 next;
290 } 370 }
291 } else { 371 } else {
292 # unable to load the playerfile: 372 # unable to load the playerfile:
293 # check wether the player dir exists, which means the file is corrupted or 373 # check whether the player dir exists, which means the file is corrupted or
294 # something very similar. 374 # something very similar.
295 if (!aio_stat cf::player::playerdir $user) { 375 if (!aio_stat cf::player::playerdir $user) {
296 $ns->send_drawinfo ( 376 $ns->send_drawinfo (
297 "Unable to retrieve this player. It might be a locked or broken account. " 377 "Unable to retrieve this player. It might be a locked or broken account. "
298 . "If this is your account, ask a dungeon master for assistance. " 378 . "If this is your account, ask a dungeon master for assistance. "
… …
301 ); 381 );
302 next; 382 next;
303 } 383 }
304 } 384 }
305 385
306 # the rest of this function is character creation
307
308 # just to make sure nothing is left over
309 nuke_playerdir $user;
310
311 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 386 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
312 387
313 if ($pass2 ne $pass) { 388 if ($pass2 ne $pass) {
314 nuke_str $pass;
315 nuke_str $pass2;
316 $ns->send_drawinfo ( 389 $ns->send_drawinfo (
317 "The passwords do not match, please try again.", 390 "The passwords do not match, please try again.",
318 cf::NDI_RED 391 cf::NDI_RED
319 ); 392 );
320 Coro::Timer::sleep 0.5; 393 Coro::Timer::sleep 0.5;
321 next; 394 next;
322 } 395 }
323 396
324 nuke_str $pass2;
325
326 my $pl = cf::player::new $user;
327 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
328 nuke_str $pass;
329 $pl->connect ($ns);
330 my $ob = $pl->ob;
331
332 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
333
334 while () {
335 $ob->update_stats;
336 $pl->save_stats;
337
338 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
339 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
340
341 if ($res =~ /^[Nn]/) {
342 last;
343 } elsif ($res > 0 && $res <= 7) {
344 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
345
346 if ($swap > 0 && $swap <= 7) {
347 $ob->swap_stats ($res - 1, $swap - 1);
348 }
349 } else {
350 $ob->roll_stats;
351 }
352
353 Coro::Timer::sleep 0.2;
354 }
355
356 $ob->set_animation (2);
357 $ob->add_statbonus;
358
359 while () {
360 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
361 my $msg = $ob->msg;
362 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
363 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
364
365 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
366 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
367
368 last if $res =~ /[dD]/;
369
370 $pl->chargen_race_next;
371 Coro::Timer::sleep 0.2;
372 }
373
374 $pl->chargen_race_done;
375
376 while () {
377 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
378 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
379
380 if ($res =~ /^[fF]/) {
381 $pl->gender (1);
382 last;
383 } elsif ($res =~ /^[mM]/) {
384 $pl->gender (0);
385 last;
386 }
387 Coro::Timer::sleep 0.2;
388 }
389
390 $ob->reply (undef, "Welcome to Crossfire!");
391
392 delete $pl->{deny_save};
393
394 last; 397 last;
395 } 398 }
399
400 # lock again, too layz to make this nicer
401 local $cf::LOGIN_LOCK{$user} = 1;
402
403 chargen $ns, $user, $pass;
404 login_done $ns->pl;
396 }); 405 });
397}); 406});
398 407
408cf::client->attach (
409 on_version => sub {
410 my ($ns, $arg) = @_;
411
412 $ns->ext_msg (nonces => map { join "", map { chr rand 256 } 0..63 } 1..2);
413 },
414);
415
416#cf::register_async_exticmd create_login => sub {
417# my ($ns, $reply, $user, $pass) = @_;
418#
419# $ns->pl and return $ns->destroy;
420#};
421
422cf::register_async_exticmd login => sub {
423 my ($ns, $reply, $user, $hash) = @_;
424
425 $ns->pl and return $ns->destroy;
426};
427
428cf::register_command password => sub {
429 my ($pl, $arg) = @_;
430
431 unless ($pl->flag (cf::FLAG_WIZ)) {
432 $pl->message (
433 "The password can currently only changed by a DM.",
434 cf::NDI_UNIQUE | cf::NDI_REPLY);
435 return;
436 }
437
438 my (@args) = split /\s+/, $arg;
439 my ($player, $new_pw) = @args;
440
441 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
442 $pl->message (
443 "Usage: password <player> [<new password>]",
444 cf::NDI_UNIQUE | cf::NDI_REPLY);
445 return;
446 }
447
448 if ($new_pw eq '') {
449 $new_pw =
450 join '',
451 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
452 1..9;
453 }
454
455 cf::async {
456 my $plc = cf::player::find $player;
457 if ($plc) {
458 $plc->password (encode_password $new_pw);
459 $pl->message (
460 "Ok, changed password of '$player' to '$new_pw'!",
461 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
462 } else {
463 $pl->message (
464 "Fail! Couldn't set password for '$player', "
465 . "he doesn't seem to exist!",
466 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
467 }
468 };
469};
470
399cf::register_command quit => sub { 471cf::register_command quit => sub {
400 my ($ob, $arg) = @_; 472 my ($ob, $arg) = @_;
401 473
402 $ob->reply (undef, 474 $ob->send_msg (undef,
403 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 475 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
404 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 476 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
405 cf::NDI_UNIQUE | cf::NDI_RED); 477 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
406}; 478};
407 479
408cf::register_command quit_character => sub { 480cf::register_command quit_character => sub {
409 my ($ob, $arg) = @_; 481 my ($ob, $arg) = @_;
410 482
411 my $pl = $ob->contr; 483 my $pl = $ob->contr;
412 484
413 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 485 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
414 if ($_[0] !~ /^[yY]/) { 486 if ($_[0] !~ /^[yY]/) {
415 $ob->reply (undef, 487 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
416 "Ok, not not quitting then.",
417 cf::NDI_UNIQUE | cf::NDI_RED);
418 } else { 488 } else {
419 $ob->reply (undef, 489 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
420 "Ok, quitting, hope to see you again.", 490 cf::async {
421 cf::NDI_UNIQUE | cf::NDI_RED);
422 $pl->ns->flush;
423 cf::async { $pl->quit_character }; 491 $pl->quit_character;
492 };
424 } 493 }
425 }); 494 });
426}; 495};
427 496
428cf::object->attach ( 497cf::object->attach (
… …
434 503
435 my $pl = $ob->contr; 504 my $pl = $ob->contr;
436 505
437 # update respawn position 506 # update respawn position
438 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 507 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
439 cf::async { $pl->save };
440 508
441 $pl->killer ("left"); 509 cf::async {
442 $ob->check_score; 510 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
511 ext::highscore::check $ob;
443 512
444 $ob->reply (undef, "In the future, you will wake up here when you die."); 513 $pl->save;
445 514
515 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
516
517 my $ns = $pl->ns
518 or return;
519
446 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 520 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
447 if ($_[0] !~ /^[yY]/) { 521 if ($_[0] !~ /^[yY]/) {
448 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 522 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
449 $pl->deactivate; 523 $pl->deactivate;
450 $pl->ns->destroy; 524 $pl->ns->destroy;
451 } else { 525 }
452 cf::async { $pl->save };
453 } 526 });
454 }); 527 };
455 }, 528 },
456); 529);
457 530
458cf::player->attach ( 531cf::player->attach (
459 on_login => sub { 532 on_login => sub {
… …
468 541
469 if ($cleanly) { 542 if ($cleanly) {
470 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 543 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
471 } else { 544 } else {
472 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 545 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
473 $pl->{unclean_save} = $cf::RUNTIME; 546 $pl->{unclean_save} = $cf::RUNTIME
547 unless safe_spot $pl;
474 } 548 }
475 }, 549 },
476); 550);
477 551
478#############################################################################
479
480our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
481our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
482
483our $SCHEDULER = cf::async_ext {
484 my $schedule_interval = Coro::Event->timer (after => 1);
485 while () {
486 $schedule_interval->interval ($SCHEDULE_INTERVAL);
487 $schedule_interval->next;
488
489 # this weird form of iteration over values is used because
490 # the hash changes underneath us frequently, and for
491 # keeps a direct reference to the value without (in 5.8 perls)
492 # keeping a reference, so this is prone to crashes or worse.
493 my @players = keys %cf::PLAYER;
494 for (@players) {
495 my $pl = $cf::PLAYER{$_}
496 or next;
497 $pl->valid or next;
498
499 eval {
500 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
501 $pl->save;
502
503 unless ($pl->active || $pl->ns) {
504 # check refcounts, this is tricky and needs to be adjusted to fit server internals
505 my $ob = $pl->ob;
506
507 my $pl_ref = $pl->refcnt_cnt;
508 my $ob_ref = $ob->refcnt_cnt;
509
510 ## pl_ref == $pl + ob->contr + %cf::PLAYER
511 ## ob_ref == $ob + pl->observe + simply being an object
512 if ($pl_ref == 3 && $ob_ref == 3) {
513 warn "player-scheduler destroy ", $ob->name;#d#
514
515 # remove from sight and get fresh "copies"
516 $pl = delete $cf::PLAYER{$ob->name};
517 $ob = $pl->ob;
518
519 $pl->destroy; # destroys $ob
520 } else {
521 my $a_ = $pl->refcnt;#d#
522 my $b_ = $ob->refcnt;#d#
523
524 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
525 }
526 }
527 }
528 };
529 warn $@ if $@;
530 Coro::cede;
531 };
532 }
533};
534
535$SCHEDULER->prio (1);
536

Diff Legend

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