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.96 by pippijn, Tue Dec 23 18:52:57 2008 UTC vs.
Revision 1.126 by root, Sat Nov 17 11:13:54 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
10# paranoia function to overwrite a string-in-place 11our $VALID_LOGIN = qr<^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z>;
11sub nuke_str {
12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
13}
14 12
15sub query { 13sub query {
16 my ($ns, $flags, $text) = @_; 14 my ($ns, $flags, $text) = @_;
17 15
18 $ns->query ($flags, $text, Coro::rouse_cb); 16 $ns->query ($flags, $text, Coro::rouse_cb);
… …
59 my $m = $ob->map 57 my $m = $ob->map
60 or return; 58 or return;
61 my $x = $ob->x; 59 my $x = $ob->x;
62 my $y = $ob->y; 60 my $y = $ob->y;
63 61
64# return 0;#d# 62 # never happens normally, but helps when shell users make mistakes
65# warn join ":", $m->at ($x, $y);#d# 63 $m->linkable
66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n"; 64 or return 1;
67# return 0;
68 65
69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 66 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
70} 67}
71 68
72sub enter_map { 69sub enter_map {
73 my ($pl) = @_; 70 my ($pl) = @_;
74 71
75 warn $pl->ob->name, ": enter map 1\n";#d#
76 my $ob = $pl->ob; 72 my $ob = $pl->ob;
77 73
78 my ($map, $x, $y) 74 my ($map, $x, $y)
79 = $ob->{_link_pos} 75 = $ob->{_link_pos}
80 ? @{delete $ob->{_link_pos}} 76 ? @{delete $ob->{_link_pos}}
81 : ($pl->maplevel, $ob->x, $ob->y); 77 : ($pl->maplevel, $ob->x, $ob->y);
82 78
83 warn $pl->ob->name, ": enter map 2\n";#d#
84 $ob->enter_link; 79 $ob->enter_link;
85 warn $pl->ob->name, ": enter map 3\n";#d#
86 80
87 my $m = cf::map::find $map; 81 my $m = cf::map::find $map;
88 my $time = delete $pl->{unclean_save}; 82 my $time = delete $pl->{unclean_save};
89 warn $pl->ob->name, ": enter map 4\n";#d#
90 83
91 if ($time && $m) { 84 if ($time && $m) {
92 if ($time < $m->{instantiate_time}) { 85 if ($time < $m->{instantiate_time}) {
93 # the map was reset in the meantime 86 # the map was reset in the meantime
94 my $age = $cf::RUNTIME - $time; 87 my $age = $cf::RUNTIME - $time;
95 88
96 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 89 cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
97 90
98 if ($age >= $MAX_DISCONNECT_TIME) { 91 if ($age >= $MAX_DISCONNECT_TIME) {
99 $ob->message ( 92 $ob->message (
100 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 93 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
101 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. " 94 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
… …
127 cf::NDI_RED 120 cf::NDI_RED
128 ); 121 );
129 } 122 }
130 } 123 }
131 124
132 warn $pl->ob->name, ": enter map 5\n";#d#
133 #$ob->goto ($map, $x, $y); 125 $ob->goto ($map, $x, $y);
134 $ob->goto ($map, $x, $y, sub { 126}
135 warn $pl->ob->name, ": enter map check\n";#d# 127
136 $_[0] 128sub encode_password($) {
137 }, sub { 129 "!" . unpack "H*", $_[0]
138 warn $pl->ob->name, ": enter map done\n";#d# 130}
131
132sub compare_password($$) {
133 my ($pass, $token) = @_;
134
135 if ($token =~ /!!(.*)/) {
136 return +(substr $pass, 0, 8) eq pack "H*", $1;
137 } elsif ($token =~ /!(.*)/) {
138 return $pass eq pack "H*", $1;
139 } else {
140 return $token eq crypt $pass, $token;
139 }); 141 }
140 warn $pl->ob->name, ": enter map 6\n";#d#
141
142} 142}
143 143
144# delete a player directory, be non-blocking AND synchronous... 144# delete a player directory
145# (that's hard, so we crap out and fork).
146sub nuke_playerdir { 145sub nuke_playerdir {
147 my ($user) = @_; 146 my ($user) = @_;
148 147
148 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
149
149 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 150 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
150
151 cf::fork_call {
152 rename "$PLAYERDIR/$user", $temp; 151 aio_rename "$PLAYERDIR/$user", $temp;
153 system "rm", "-rf", $temp; 152 IO::AIO::aio_rmtree $temp;
153}
154
155sub login {
156 my ($pl) = @_;
157
158 # handle character creation, if neccessary
159 # the rest of this function is character creation
160
161 my $ns = $pl->ns;
162 my $ob = $pl->ob;
163
164 $Coro::current->{desc} = "addme(" . $ob->name . ") login";
165
166 delete $pl->{deny_save}; # set by new
167
168 if ($pl->{chargen} eq "init") {
169 # create the playerdir, if necessary, as chargen_race_done did it before
170 # presumably because of unique maps
171 aio_mkdir playerdir $pl, 0770;
172 $pl->save;
173
174 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
175
176 $pl->{chargen} = "stats";
154 }; 177 }
178
179 if ($pl->{chargen} eq "stats") {
180 while () {
181 $ob->update_stats;
182 $pl->save_stats;
183
184 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
185 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
186
187 if ($res =~ /^[Nn]/) {
188 last;
189 } elsif ($res > 0 && $res <= 7) {
190 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
191
192 if ($swap > 0 && $swap <= 7) {
193 $ob->swap_stats ($res - 1, $swap - 1);
194 }
195 } else {
196 $ob->roll_stats;
197 }
198
199 Coro::Timer::sleep 0.05;
200 }
201
202 $ob->set_animation (2);
203 $ob->add_statbonus;
204
205 $pl->{chargen} = "race";
206 }
207
208 if ($pl->{chargen} eq "race") {
209 while () {
210 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
211 my $msg = $ob->msg;
212 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
213 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
214
215 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
216 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
217
218 last if $res =~ /[dD]/;
219
220 $pl->chargen_race_next;
221 Coro::Timer::sleep 0.05;
222 }
223
224 $pl->chargen_race_done;
225 $pl->{chargen} = "gender";
226 }
227
228 if ($pl->{chargen} eq "race") {
229 while () {
230 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
231 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
232
233 if ($res =~ /^[fF]/) {
234 $pl->gender (1);
235 last;
236 } elsif ($res =~ /^[mM]/) {
237 $pl->gender (0);
238 last;
239 }
240 Coro::Timer::sleep 0.05;
241 }
242 $pl->{chargen} = "done";
243 }
244
245 $ns->state (cf::ST_PLAYING);
246
247 if ($pl->{chargen} eq "done") {
248 # XXX: Workaround for delayed client ext protocol handshake
249 $pl->esrv_new_player;
250
251 $pl->{chargen} = "done";
252 }
253
254 $ob->reply (undef, "Welcome to Deliantra!");
255
256 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
257 $pl->ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
258 }
259}
260
261sub chargen {
262 my ($ns, $user, $hasah) = @_;
263
264 # lock again, too lazy to make this nicer
265 local $cf::LOGIN_LOCK{$user} = 1;
266
267 # just to make sure nothing is left over
268 # normally, nothing is there.
269 nuke_playerdir $user;
270
271 my $pl = cf::player::new $user;
272 $pl->password (encode_password $pass);
273 $pl->connect ($ns);
274
275 $pl->{chargen} = "init";
276
277 login $pl;
155} 278}
156 279
157cf::client->attach (on_addme => sub { 280cf::client->attach (on_addme => sub {
158 my ($ns) = @_; 281 my ($ns) = @_;
159 282
160 if (!$ns->facecache)
161 {
162 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
163
164
165***
166*** WARNING:
167*** Your client does not support face/image caching,
168*** or it has been disabled. Face caching is mandatory
169*** so please enable it or use a newer client.
170***
171*** Look at your client preferences:
172***
173*** deliantra: all known versions automatically enable the facecache.
174*** cfclient: use the -cache commandline option.
175*** cfclient: map will not redraw automatically (bug).
176*** gcfclient: use -cache commandline option, or enable
177*** gcfclient: Client => Configure => Map & Image => Cache Images.
178*** jcrossclient: your client is broken, use deliantra or gcfclient.
179***
180***
181EOF
182 if ($ns->version =~ /jcrossclient/) {
183 # let them, for now
184 } else {
185 $ns->flush;
186 return $ns->destroy;
187 }
188
189 # $ns->facecache = true;
190 }
191
192 if ($ns->mapmode < cf::Map1aCmd) {
193 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
194
195
196***
197*** WARNING:
198*** Your client is too old. Please upgrade to a newer version.
199EOF
200
201 $ns->flush;
202 return $ns->destroy;
203 }
204
205 $ns->pl and return $ns->destroy; 283 $ns->{addme}++ and return $ns->destroy;
206 284
207 $ns->async (sub { 285 $ns->async (sub {
208 $Coro::current->{desc} = "addme init"; 286 $Coro::current->{desc} = "addme init";
209 287
210 my ($user, $pass); 288 my ($user, $pass);
… …
227 $ns->send_drawinfo ( 305 $ns->send_drawinfo (
228 "That username is currently used in another login session. " 306 "That username is currently used in another login session. "
229 . "Chose another, or wait till the other session has ended.", 307 . "Chose another, or wait till the other session has ended.",
230 cf::NDI_RED 308 cf::NDI_RED
231 ); 309 );
232 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) { 310 } elsif ($user =~ $VALID_LOGIN) {
233 last; 311 last;
234 } else { 312 } else {
235 $ns->send_drawinfo ( 313 $ns->send_drawinfo (
236 "Your username contains illegal characters " 314 "Your username contains illegal characters "
237 . "(only a-z, A-Z and 0-9 are allowed), " 315 . "(only a-z, A-Z and 0-9 are allowed), "
… …
282 360
283 # try to read the user file and check the password 361 # try to read the user file and check the password
284 if (my $pl = cf::player::find $user) { 362 if (my $pl = cf::player::find $user) {
285 aio_stat $pl->path and next; 363 aio_stat $pl->path and next;
286 my $mtime = (stat _)[9]; 364 my $mtime = (stat _)[9];
287 my $hash = $pl->password; 365 my $token = $pl->password;
288 366
289 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 367 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
290 nuke_str $pass; 368 # player exists and passwords match - we can proceed
369
291 # password matches, wonderful 370 # password matches, wonderful
292 my $pl = cf::player::find $user or next; 371 my $pl = cf::player::find $user or next;
293 $pl->connect ($ns); 372 $pl->connect ($ns);
294 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
295 enter_map $pl; 373 enter_map $pl;
374 login $pl;
296 last; 375 return;
297 } elsif (can_cleanup $pl, $mtime) { 376 } elsif (can_cleanup $pl, $mtime) {
298 Coro::Timer::sleep 1; 377 Coro::Timer::sleep 1;
299 378
300 $ns->send_drawinfo ( 379 $ns->send_drawinfo (
301 "Player exists, but password does not match. If this is your account, " 380 "Player exists, but password does not match. If this is your account, "
302 . "please try again. If not, you can now decide to take over this account " 381 . "please try again. If not, you can now decide to take over this account "
303 . "because it has not been in-use for some time.", 382 . "because it has not been in-use for some time.",
304 cf::NDI_RED 383 cf::NDI_RED
305 ); 384 );
306 385
307 #TODO: nuke_str
308 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/ 386 (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/
309 or next; 387 or next;
310 388
311 # check if the file hasn't changed 389 # check if the file hasn't changed
312 aio_stat cf::player::path $user and next; 390 aio_stat cf::player::path $user and next;
… …
314 392
315 $pl->quit_character; 393 $pl->quit_character;
316 394
317 # fall through to creation 395 # fall through to creation
318 } else { 396 } else {
319 nuke_str $pass;
320
321 Coro::Timer::sleep 1; 397 Coro::Timer::sleep 1;
322 398
323 $ns->send_drawinfo ( 399 $ns->send_drawinfo (
324 "Wrong username or password. Please try again " 400 "Wrong username or password. Please try again "
325 . "(check for Numlock and other semi-obvious error sources).", 401 . "(check for Numlock and other semi-obvious error sources).",
… …
327 ); 403 );
328 next; 404 next;
329 } 405 }
330 } else { 406 } else {
331 # unable to load the playerfile: 407 # unable to load the playerfile:
332 # check wether the player dir exists, which means the file is corrupted or 408 # check whether the player dir exists, which means the file is corrupted or
333 # something very similar. 409 # something very similar.
334 if (!aio_stat cf::player::playerdir $user) { 410 if (!aio_stat cf::player::playerdir $user) {
335 $ns->send_drawinfo ( 411 $ns->send_drawinfo (
336 "Unable to retrieve this player. It might be a locked or broken account. " 412 "Unable to retrieve this player. It might be a locked or broken account. "
337 . "If this is your account, ask a dungeon master for assistance. " 413 . "If this is your account, ask a dungeon master for assistance. "
… …
340 ); 416 );
341 next; 417 next;
342 } 418 }
343 } 419 }
344 420
345 # the rest of this function is character creation
346 $Coro::current->{desc} = "addme($user) chargen";
347
348 # just to make sure nothing is left over
349 nuke_playerdir $user;
350
351 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 421 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
352 422
353 if ($pass2 ne $pass) { 423 if ($pass2 ne $pass) {
354 nuke_str $pass;
355 nuke_str $pass2;
356 $ns->send_drawinfo ( 424 $ns->send_drawinfo (
357 "The passwords do not match, please try again.", 425 "The passwords do not match, please try again.",
358 cf::NDI_RED 426 cf::NDI_RED
359 ); 427 );
360 Coro::Timer::sleep 0.5; 428 Coro::Timer::sleep 0.5;
361 next; 429 next;
362 } 430 }
363 431
364 nuke_str $pass2;
365
366 my $pl = cf::player::new $user;
367 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
368 nuke_str $pass;
369 $pl->connect ($ns);
370 my $ob = $pl->ob;
371
372 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
373
374 while () {
375 $ob->update_stats;
376 $pl->save_stats;
377
378 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
379 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
380
381 if ($res =~ /^[Nn]/) {
382 last;
383 } elsif ($res > 0 && $res <= 7) {
384 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
385
386 if ($swap > 0 && $swap <= 7) {
387 $ob->swap_stats ($res - 1, $swap - 1);
388 }
389 } else {
390 $ob->roll_stats;
391 }
392
393 Coro::Timer::sleep 0.05;
394 }
395
396 $ob->set_animation (2);
397 $ob->add_statbonus;
398
399 while () {
400 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
401 my $msg = $ob->msg;
402 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
403 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
404
405 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
406 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
407
408 last if $res =~ /[dD]/;
409
410 $pl->chargen_race_next;
411 Coro::Timer::sleep 0.2;
412 }
413
414 # create the playerdir, if necessary, as chargen_race_done did it before
415 # presumably because of unique maps
416 aio_mkdir playerdir $pl, 0770;
417 $pl->chargen_race_done;
418
419 while () {
420 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
421 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
422
423 if ($res =~ /^[fF]/) {
424 $pl->gender (1);
425 last;
426 } elsif ($res =~ /^[mM]/) {
427 $pl->gender (0);
428 last;
429 }
430 Coro::Timer::sleep 0.2;
431 }
432
433 $ob->reply (undef, "Welcome to Deliantra!");
434
435 # XXX: Workaround for delayed client ext protocol handshake
436 $pl->esrv_new_player;
437
438 delete $pl->{deny_save};
439
440 last; 432 last;
441 } 433 }
434
435 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
442 }); 436 });
443}); 437});
438
439cf::client->attach (
440 on_version => sub {
441 my ($ns, $arg) = @_;
442
443 # perl probably uses lrand48, which is not secure at all
444 # maybe require linux and use /dev/urandom.
445 $ns->{nonces} = [map { join "", map { chr rand 256 } 0..63 } 1..2];
446 $ns->ext_msg (nonces => @{ $ns->{nonces} });
447 },
448);
449
450cf::register_async_exticmd create_login => sub {
451 my ($ns, $reply, $user, $pass) = @_;
452
453 $ns->{addme}++ and return $ns->destroy;
454
455 $ns->async (sub {
456 my $fail = sub {
457 $reply->(0, $_[0]);
458 $ns->flush; # does not ensure that the data reaches the client - TODO
459 # need to do this in another thread, as this one gets canceled
460 Coro::async_pool {
461 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
462 $ns->destroy if $ns->valid;
463 };
464 Coro::schedule; # do the destroy, should not return
465 };
466
467 $user =~ $VALID_LOGIN
468 or return $fail (
469 "Your username contains illegal characters (only a-z, A-Z and 0-9 are allowed), "
470 . "or is not between 3 and 20 characters in length."
471 );
472
473 cf::player::find $user
474 and return $fail->("User '$user' already exists - choose another login name.");
475
476 chargen $ns, $user, Deliantra::Util::hash_pw $pass;
477 });
478};
479
480cf::register_async_exticmd login => sub {
481 my ($ns, $reply, $user, $hash) = @_;
482
483 $ns->{addme}++ and return $ns->destroy;
484
485 $ns->async (sub {
486 local $cf::LOGIN_LOCK{$user} = 1;
487
488 $Coro::current->{desc} = "login($user) check";
489
490 my $fail = sub {
491 $reply->(0, $_[0]);
492 $ns->flush; # does not ensure that the data reaches the client - TODO
493 # need to do this in another thread, as this one gets canceled
494 Coro::async_pool {
495 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
496 $ns->destroy if $ns->valid;
497 };
498 Coro::schedule; # do the destroy, should not return
499 };
500
501 # try to read the user file and check the password
502 my $pl = cf::player::find $user
503 or return $fail->("User '$user' does not exist - wrong spelling?");
504
505 aio_stat $pl->path
506 and return $ns->destroy;
507
508 my $mtime = (stat _)[9];
509 my $token = $pl->password;
510
511 $token = $token =~ /^!/
512 ? Deliantra::Util::hash_pw pack "H*", substr $token, 1
513 : pack "H*", $token;
514
515 $token = Deliantra::Util::auth_pw $token, $ns->{nonces}[0], $ns->{nonces}[1];
516
517 $token eq $hash
518 or $cf::CFG{ext_login_nocheck}
519 or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc.");
520
521 # player exists and passwords match - we can proceed
522
523 $reply->(1, "Success");
524
525 $pl->connect ($ns);
526 enter_map $pl;
527 login $pl;
528 });
529};
530
531cf::register_command password => sub {
532 my ($pl, $arg) = @_;
533
534 unless ($pl->flag (cf::FLAG_WIZ)) {
535 $pl->message (
536 "The password can currently only changed by a DM.",
537 cf::NDI_UNIQUE | cf::NDI_REPLY);
538 return;
539 }
540
541 $pl->message (#d#
542 "Passwords cannot currently be changed.",#d#
543 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
544 return;#d#
545
546 my (@args) = split /\s+/, $arg;
547 my ($player, $new_pw) = @args;
548
549 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
550 $pl->message (
551 "Usage: password <player> [<new password>]",
552 cf::NDI_UNIQUE | cf::NDI_REPLY);
553 return;
554 }
555
556 if ($new_pw eq '') {
557 $new_pw =
558 join '',
559 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
560 1..9;
561 }
562
563 cf::async {
564 my $plc = cf::player::find $player;
565 if ($plc) {
566 $plc->password (encode_password $new_pw);
567 $pl->message (
568 "Ok, changed password of '$player' to '$new_pw'!",
569 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
570 } else {
571 $pl->message (
572 "Fail! Couldn't set password for '$player', "
573 . "he doesn't seem to exist!",
574 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
575 }
576 };
577};
444 578
445cf::register_command quit => sub { 579cf::register_command quit => sub {
446 my ($ob, $arg) = @_; 580 my ($ob, $arg) = @_;
447 581
448 $ob->send_msg (undef, 582 $ob->send_msg (undef,
… …
459 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 593 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
460 if ($_[0] !~ /^[yY]/) { 594 if ($_[0] !~ /^[yY]/) {
461 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 595 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
462 } else { 596 } else {
463 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 597 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
464 $pl->ns->flush; 598 cf::async {
465 cf::async { $pl->quit_character }; 599 $pl->quit_character;
600 };
466 } 601 }
467 }); 602 });
468}; 603};
469 604
470cf::object->attach ( 605cf::object->attach (
… …
476 611
477 my $pl = $ob->contr; 612 my $pl = $ob->contr;
478 613
479 # update respawn position 614 # update respawn position
480 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 615 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
481 cf::async { $pl->save };
482 616
617 cf::async {
483 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 618 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
484 $ob->check_score; 619 ext::highscore::check $ob;
485 620
621 $pl->save;
622
486 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY); 623 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
487 624
625 my $ns = $pl->ns
626 or return;
627
488 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 628 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
489 if ($_[0] !~ /^[yY]/) { 629 if ($_[0] !~ /^[yY]/) {
490 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 630 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
491 $pl->deactivate; 631 $pl->deactivate;
492 $pl->ns->destroy; 632 $pl->ns->destroy;
493 } else { 633 }
494 cf::async { $pl->save };
495 } 634 });
496 }); 635 };
497 }, 636 },
498); 637);
499 638
500cf::player->attach ( 639cf::player->attach (
501 on_login => sub { 640 on_login => sub {
… …
516 unless safe_spot $pl; 655 unless safe_spot $pl;
517 } 656 }
518 }, 657 },
519); 658);
520 659
521

Diff Legend

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