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.98 by root, Sun Jun 28 16:46:50 2009 UTC vs.
Revision 1.109 by root, Tue May 4 21:45:42 2010 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;
… …
70} 70}
71 71
72sub enter_map { 72sub enter_map {
73 my ($pl) = @_; 73 my ($pl) = @_;
74 74
75 warn $pl->ob->name, ": enter map 1\n";#d#
76 my $ob = $pl->ob; 75 my $ob = $pl->ob;
77 76
78 my ($map, $x, $y) 77 my ($map, $x, $y)
79 = $ob->{_link_pos} 78 = $ob->{_link_pos}
80 ? @{delete $ob->{_link_pos}} 79 ? @{delete $ob->{_link_pos}}
81 : ($pl->maplevel, $ob->x, $ob->y); 80 : ($pl->maplevel, $ob->x, $ob->y);
82 81
83 warn $pl->ob->name, ": enter map 2\n";#d#
84 $ob->enter_link; 82 $ob->enter_link;
85 warn $pl->ob->name, ": enter map 3\n";#d#
86 83
87 my $m = cf::map::find $map; 84 my $m = cf::map::find $map;
88 my $time = delete $pl->{unclean_save}; 85 my $time = delete $pl->{unclean_save};
89 warn $pl->ob->name, ": enter map 4\n";#d#
90 86
91 if ($time && $m) { 87 if ($time && $m) {
92 if ($time < $m->{instantiate_time}) { 88 if ($time < $m->{instantiate_time}) {
93 # the map was reset in the meantime 89 # the map was reset in the meantime
94 my $age = $cf::RUNTIME - $time; 90 my $age = $cf::RUNTIME - $time;
95 91
96 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 92 cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
97 93
98 if ($age >= $MAX_DISCONNECT_TIME) { 94 if ($age >= $MAX_DISCONNECT_TIME) {
99 $ob->message ( 95 $ob->message (
100 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 96 "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. " 97 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
… …
127 cf::NDI_RED 123 cf::NDI_RED
128 ); 124 );
129 } 125 }
130 } 126 }
131 127
132 warn $pl->ob->name, ": enter map 5\n";#d#
133 #$ob->goto ($map, $x, $y); 128 $ob->goto ($map, $x, $y);
134 $ob->goto ($map, $x, $y, sub { 129}
135 warn $pl->ob->name, ": enter map check\n";#d#
136 $_[0]
137 }, sub {
138 warn $pl->ob->name, ": enter map done\n";#d#
139 });
140 warn $pl->ob->name, ": enter map 6\n";#d#
141 130
131sub encode_password {
132 crypt $_[0],
133 join '',
134 ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
142} 135}
143 136
144# delete a player directory, be non-blocking AND synchronous... 137# delete a player directory, be non-blocking AND synchronous...
145# (that's hard, so we crap out and fork). 138# (that's hard, so we crap out and fork).
146sub nuke_playerdir { 139sub nuke_playerdir {
… …
244 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 237 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
245 nuke_str $pass; 238 nuke_str $pass;
246 # password matches, wonderful 239 # password matches, wonderful
247 my $pl = cf::player::find $user or next; 240 my $pl = cf::player::find $user or next;
248 $pl->connect ($ns); 241 $pl->connect ($ns);
249 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
250 #d# Coro::Timer::sleep 60;#d# log out here to trigger DEBUG bug
251 enter_map $pl; 242 enter_map $pl;
252 last; 243 last;
253 } elsif (can_cleanup $pl, $mtime) { 244 } elsif (can_cleanup $pl, $mtime) {
254 Coro::Timer::sleep 1; 245 Coro::Timer::sleep 1;
255 246
… …
318 } 309 }
319 310
320 nuke_str $pass2; 311 nuke_str $pass2;
321 312
322 my $pl = cf::player::new $user; 313 my $pl = cf::player::new $user;
323 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 314 $pl->password (encode_password $pass);
324 nuke_str $pass; 315 nuke_str $pass;
325 $pl->connect ($ns); 316 $pl->connect ($ns);
326 my $ob = $pl->ob; 317 my $ob = $pl->ob;
327 318
328 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 319 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
… …
362 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 353 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
363 354
364 last if $res =~ /[dD]/; 355 last if $res =~ /[dD]/;
365 356
366 $pl->chargen_race_next; 357 $pl->chargen_race_next;
367 Coro::Timer::sleep 0.2; 358 Coro::Timer::sleep 0.05;
368 } 359 }
369 360
370 # create the playerdir, if necessary, as chargen_race_done did it before 361 # create the playerdir, if necessary, as chargen_race_done did it before
371 # presumably because of unique maps 362 # presumably because of unique maps
372 aio_mkdir playerdir $pl, 0770; 363 aio_mkdir playerdir $pl, 0770;
… …
381 last; 372 last;
382 } elsif ($res =~ /^[mM]/) { 373 } elsif ($res =~ /^[mM]/) {
383 $pl->gender (0); 374 $pl->gender (0);
384 last; 375 last;
385 } 376 }
386 Coro::Timer::sleep 0.2; 377 Coro::Timer::sleep 0.05;
387 } 378 }
388 379
389 $ob->reply (undef, "Welcome to Deliantra!"); 380 $ob->reply (undef, "Welcome to Deliantra!");
390 381
391 # XXX: Workaround for delayed client ext protocol handshake 382 # XXX: Workaround for delayed client ext protocol handshake
… …
393 384
394 delete $pl->{deny_save}; 385 delete $pl->{deny_save};
395 386
396 last; 387 last;
397 } 388 }
389
390 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
391 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
392 }
398 }); 393 });
399}); 394});
395
396cf::register_command password => sub {
397 my ($pl, $arg) = @_;
398
399 my (@args) = split /\s+/, $arg;
400
401 my ($new_pw, $player);
402
403 if ($pl->flag (cf::FLAG_WIZ)) {
404 ($player, $new_pw) = @args;
405 } else {
406 $new_pw = $args[0];
407 }
408
409 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
410 $pl->message (
411 "Usage: password <player> [<new password>]",
412 cf::NDI_UNIQUE | cf::NDI_REPLY);
413 return;
414 } elsif (!$pl->flag (cf::FLAG_WIZ) && $new_pw eq '') {
415 $pl->message (
416 "Usage: password <new password>",
417 cf::NDI_UNIQUE | cf::NDI_REPLY);
418 return;
419 }
420
421 if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
422 unless ($new_pw ne '') {
423 $new_pw =
424 join '',
425 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
426 1..9;
427 }
428
429 cf::async {
430 my $plc = cf::player::find $player;
431 if ($plc) {
432 $plc->password (encode_password $new_pw);
433 $pl->message (
434 "Ok, changed password of '$player' to '$new_pw'!",
435 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
436 } else {
437 $pl->message (
438 "Fail! Couldn't set password for '$player', "
439 . "he doesn't seem to exist!",
440 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
441 }
442 };
443 } else {
444 my $change = delete $pl->{password_change};
445
446 if ($change && (time - $change->[0]) < 60) {
447 $pl->message (
448 "Ok, changed your password!",
449 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
450 $pl->contr->password (encode_password $new_pw);
451
452 } else {
453 $pl->message (
454 "Ok, please confirm your new password by sending "
455 . "the command again within one minute!",
456 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
457 $pl->{password_change} = [time, $new_pw];
458 }
459 }
460};
400 461
401cf::register_command quit => sub { 462cf::register_command quit => sub {
402 my ($ob, $arg) = @_; 463 my ($ob, $arg) = @_;
403 464
404 $ob->send_msg (undef, 465 $ob->send_msg (undef,
… …
416 if ($_[0] !~ /^[yY]/) { 477 if ($_[0] !~ /^[yY]/) {
417 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 478 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
418 } else { 479 } else {
419 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY); 480 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
420 $pl->ns->flush; 481 $pl->ns->flush;
482 cf::async {
483 ext::highscore::check $pl->ob;
421 cf::async { $pl->quit_character }; 484 $pl->quit_character;
485 };
422 } 486 }
423 }); 487 });
424}; 488};
425 489
426cf::object->attach ( 490cf::object->attach (
… …
435 # update respawn position 499 # update respawn position
436 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 500 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
437 cf::async { $pl->save }; 501 cf::async { $pl->save };
438 502
439 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 503 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
440 $ob->check_score; 504 ext::highscore::check $ob;
441 505
442 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY); 506 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
443 507
444 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 508 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
445 if ($_[0] !~ /^[yY]/) { 509 if ($_[0] !~ /^[yY]/) {
… …
472 unless safe_spot $pl; 536 unless safe_spot $pl;
473 } 537 }
474 }, 538 },
475); 539);
476 540
477

Diff Legend

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