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.76 by root, Fri Dec 28 19:40:22 2007 UTC vs.
Revision 1.96 by pippijn, Tue Dec 23 18:52:57 2008 UTC

… …
13} 13}
14 14
15sub query { 15sub query {
16 my ($ns, $flags, $text) = @_; 16 my ($ns, $flags, $text) = @_;
17 17
18 my $current = $Coro::current; 18 $ns->query ($flags, $text, Coro::rouse_cb);
19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] }); 19 Coro::rouse_wait
20 Coro::schedule while ref $current;
21
22 $current
23} 20}
24 21
25sub can_cleanup { 22sub can_cleanup {
26 my ($pl, $mtime) = @_; 23 my ($pl, $mtime) = @_;
27 24
… …
52 ); 49 );
53 50
54 1 51 1
55} 52}
56 53
57sub safe_spot($$$) { 54sub safe_spot($) {
58 my ($m, $x, $y) = @_; 55 my ($pl) = @_;
56
57 my $ob = $pl->ob;
58
59 my $m = $ob->map
60 or return;
61 my $x = $ob->x;
62 my $y = $ob->y;
63
64# return 0;#d#
65# warn join ":", $m->at ($x, $y);#d#
66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
67# return 0;
59 68
60 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) 69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
61} 70}
62 71
63sub enter_map { 72sub enter_map {
64 my ($pl) = @_; 73 my ($pl) = @_;
65 74
75 warn $pl->ob->name, ": enter map 1\n";#d#
66 my $ob = $pl->ob; 76 my $ob = $pl->ob;
67 77
68 my ($map, $x, $y) 78 my ($map, $x, $y)
69 = $ob->{_link_pos} 79 = $ob->{_link_pos}
70 ? @{delete $ob->{_link_pos}} 80 ? @{delete $ob->{_link_pos}}
71 : ($pl->maplevel, $ob->x, $ob->y); 81 : ($pl->maplevel, $ob->x, $ob->y);
72 82
83 warn $pl->ob->name, ": enter map 2\n";#d#
73 $ob->enter_link; 84 $ob->enter_link;
85 warn $pl->ob->name, ": enter map 3\n";#d#
74 86
87 my $m = cf::map::find $map;
75 if (my $time = delete $pl->{unclean_save}) { 88 my $time = delete $pl->{unclean_save};
76 if (my $m = cf::map::find $map) { 89 warn $pl->ob->name, ": enter map 4\n";#d#
90
91 if ($time && $m) {
77 if ($time < $m->{instantiate_time}) { 92 if ($time < $m->{instantiate_time}) {
78 # the map was reset in the meantime 93 # the map was reset in the meantime
79 my $age = $cf::RUNTIME - $time; 94 my $age = $cf::RUNTIME - $time;
80 95
81 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 96 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
82 97
83 ($map, $x, $y) = $pl->savebed;
84
85 if (safe_spot $m, $x, $y) {
86 # do nothing, this is simply ok without a special scary message
87 } elsif ($age >= $MAX_DISCONNECT_TIME) { 98 if ($age >= $MAX_DISCONNECT_TIME) {
88 $ob->message (
89 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
90 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
91 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
92 . "H<You disconnected too long without having used a savebed.>",
93 cf::NDI_RED
94 );
95 # kill them.
96 # reminds me of the famous badness 10000 syndrome...
97 $ob->stats->hp (-10000); #] if they survive this they deserved to live
98 $pl->killer ("a cave-in");
99 } else {
100 $ob->message (
101 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
102 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
103 . "Better use a savebed next time, much worse things could have happened... "
104 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
105 cf::NDI_RED
106 );
107 }
108 } elsif (safe_spot $m, $x, $y) {
109 # do nothing, this is simply ok without a special scary message
110 } else {
111 $ob->message ( 99 $ob->message (
112 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 100 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
113 . "as lots of things could happen when you leave by other means, such as cave-ins, " 101 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
114 . "or monsters suddenly snapping your body. Better use a savebed next time. " 102 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
115 . "H<Always apply a bed of reality to disconnect from the server.>", 103 . "H<You disconnected too long without having used a savebed.>",
116 cf::NDI_RED 104 cf::NDI_RED
117 ); 105 );
106 # kill them.
107 # reminds me of the famous badness 10000 syndrome...
108 $ob->stats->hp (-10000); #] if they survive this they deserved to live
109 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
110 } else {
111 ($map, $x, $y) = $pl->savebed;
112
113 $ob->message (
114 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
115 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
116 . "Better use a savebed next time, much worse things could have happened... "
117 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
118 cf::NDI_RED
119 );
120 }
121 } else {
122 $ob->message (
123 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
124 . "as lots of things could happen when you leave by other means, such as cave-ins, "
125 . "or monsters suddenly snapping your body. Better use a savebed next time. "
126 . "H<Always apply a bed of reality to disconnect from the server.>",
127 cf::NDI_RED
118 } 128 );
119 } 129 }
120 } 130 }
121 131
132 warn $pl->ob->name, ": enter map 5\n";#d#
122 $ob->goto ($map, $x, $y); 133 #$ob->goto ($map, $x, $y);
134 $ob->goto ($map, $x, $y, sub {
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
123} 142}
124 143
125# delete a player directory, be non-blocking AND synchronous... 144# delete a player directory, be non-blocking AND synchronous...
126# (thats hard, so we crap out and fork). 145# (that's hard, so we crap out and fork).
127sub nuke_playerdir { 146sub nuke_playerdir {
128 my ($user) = @_; 147 my ($user) = @_;
129 148
130 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 149 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
131 150
… …
149*** or it has been disabled. Face caching is mandatory 168*** or it has been disabled. Face caching is mandatory
150*** so please enable it or use a newer client. 169*** so please enable it or use a newer client.
151*** 170***
152*** Look at your client preferences: 171*** Look at your client preferences:
153*** 172***
154*** CFPlus: all known versions automatically enable the facecache. 173*** deliantra: all known versions automatically enable the facecache.
155*** cfclient: use the -cache commandline option. 174*** cfclient: use the -cache commandline option.
156*** cfclient: map will not redraw automatically (bug). 175*** cfclient: map will not redraw automatically (bug).
157*** gcfclient: use -cache commandline option, or enable 176*** gcfclient: use -cache commandline option, or enable
158*** gcfclient: Client => Configure => Map & Image => Cache Images. 177*** gcfclient: Client => Configure => Map & Image => Cache Images.
159*** jcrossclient: your client is broken, use CFPlus or gcfclient. 178*** jcrossclient: your client is broken, use deliantra or gcfclient.
160*** 179***
161*** 180***
162EOF 181EOF
163 if ($ns->version =~ /jcrossclient/) { 182 if ($ns->version =~ /jcrossclient/) {
164 # let them, for now 183 # let them, for now
… …
200 cf::NDI_BLUE 219 cf::NDI_BLUE
201 ); 220 );
202 221
203 # read username 222 # read username
204 while () { 223 while () {
205 $user = query $ns, 0, "What is your name?\n:"; 224 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
206 225
207 if ($cf::LOGIN_LOCK{$user}) { 226 if ($cf::LOGIN_LOCK{$user}) {
208 $ns->send_drawinfo ( 227 $ns->send_drawinfo (
209 "That username is currently used in another login session. " 228 "That username is currently used in another login session. "
210 . "Chose another, or wait till the other session has ended.", 229 . "Chose another, or wait till the other session has ended.",
211 cf::NDI_RED 230 cf::NDI_RED
212 ); 231 );
213 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 232 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
214 last; 233 last;
215 } else { 234 } else {
216 $ns->send_drawinfo ( 235 $ns->send_drawinfo (
217 "Your username contains illegal characters " 236 "Your username contains illegal characters "
218 . "(only a-z, A-Z and 0-9 are allowed), " 237 . "(only a-z, A-Z and 0-9 are allowed), "
219 . "or is not between 3 and 18 characters in length.", 238 . "or is not between 3 and 20 characters in length.",
220 cf::NDI_RED 239 cf::NDI_RED
221 ); 240 );
222 } 241 }
223 Coro::Timer::sleep 0.4; 242 Coro::Timer::sleep 0.4;
224 } 243 }
… …
270 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 289 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
271 nuke_str $pass; 290 nuke_str $pass;
272 # password matches, wonderful 291 # password matches, wonderful
273 my $pl = cf::player::find $user or next; 292 my $pl = cf::player::find $user or next;
274 $pl->connect ($ns); 293 $pl->connect ($ns);
294 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
275 enter_map $pl; 295 enter_map $pl;
276 last; 296 last;
277 } elsif (can_cleanup $pl, $mtime) { 297 } elsif (can_cleanup $pl, $mtime) {
278 Coro::Timer::sleep 1; 298 Coro::Timer::sleep 1;
279 299
… …
368 } 388 }
369 } else { 389 } else {
370 $ob->roll_stats; 390 $ob->roll_stats;
371 } 391 }
372 392
373 Coro::Timer::sleep 0.2; 393 Coro::Timer::sleep 0.05;
374 } 394 }
375 395
376 $ob->set_animation (2); 396 $ob->set_animation (2);
377 $ob->add_statbonus; 397 $ob->add_statbonus;
378 398
… …
389 409
390 $pl->chargen_race_next; 410 $pl->chargen_race_next;
391 Coro::Timer::sleep 0.2; 411 Coro::Timer::sleep 0.2;
392 } 412 }
393 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;
394 $pl->chargen_race_done; 417 $pl->chargen_race_done;
395 418
396 while () { 419 while () {
397 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 420 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
398 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; 421 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
… …
407 Coro::Timer::sleep 0.2; 430 Coro::Timer::sleep 0.2;
408 } 431 }
409 432
410 $ob->reply (undef, "Welcome to Deliantra!"); 433 $ob->reply (undef, "Welcome to Deliantra!");
411 434
435 # XXX: Workaround for delayed client ext protocol handshake
436 $pl->esrv_new_player;
437
412 delete $pl->{deny_save}; 438 delete $pl->{deny_save};
413 439
414 last; 440 last;
415 } 441 }
416 }); 442 });
417}); 443});
418 444
419cf::register_command quit => sub { 445cf::register_command quit => sub {
420 my ($ob, $arg) = @_; 446 my ($ob, $arg) = @_;
421 447
422 $ob->reply (undef, 448 $ob->send_msg (undef,
423 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 449 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
424 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 450 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
425 cf::NDI_UNIQUE | cf::NDI_RED); 451 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
426}; 452};
427 453
428cf::register_command quit_character => sub { 454cf::register_command quit_character => sub {
429 my ($ob, $arg) = @_; 455 my ($ob, $arg) = @_;
430 456
431 my $pl = $ob->contr; 457 my $pl = $ob->contr;
432 458
433 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 459 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
434 if ($_[0] !~ /^[yY]/) { 460 if ($_[0] !~ /^[yY]/) {
435 $ob->reply (undef, 461 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
436 "Ok, not not quitting then.",
437 cf::NDI_UNIQUE | cf::NDI_RED);
438 } else { 462 } else {
439 $ob->reply (undef, 463 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
440 "Ok, quitting, hope to see you again.",
441 cf::NDI_UNIQUE | cf::NDI_RED);
442 $pl->ns->flush; 464 $pl->ns->flush;
443 cf::async { $pl->quit_character }; 465 cf::async { $pl->quit_character };
444 } 466 }
445 }); 467 });
446}; 468};
… …
456 478
457 # update respawn position 479 # update respawn position
458 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 480 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
459 cf::async { $pl->save }; 481 cf::async { $pl->save };
460 482
461 $pl->killer ("left"); 483 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
462 $ob->check_score; 484 $ob->check_score;
463 485
464 $ob->reply (undef, "In the future, you will wake up here when you die."); 486 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
465 487
466 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 488 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
467 if ($_[0] !~ /^[yY]/) { 489 if ($_[0] !~ /^[yY]/) {
468 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 490 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
469 $pl->deactivate; 491 $pl->deactivate;
… …
488 510
489 if ($cleanly) { 511 if ($cleanly) {
490 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 512 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
491 } else { 513 } else {
492 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 514 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
493 $pl->{unclean_save} = $cf::RUNTIME; 515 $pl->{unclean_save} = $cf::RUNTIME
516 unless safe_spot $pl;
494 } 517 }
495 }, 518 },
496); 519);
497 520
498#############################################################################
499 521
500our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
501our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
502
503our $SCHEDULER = cf::async_ext {
504 $Coro::current->{desc} = "player scheduler";
505
506 while () {
507 Coro::EV::timer_once $SCHEDULE_INTERVAL;
508
509 # this weird form of iteration over values is used because
510 # the hash changes underneath us frequently, and for
511 # keeps a direct reference to the value without (in 5.8 perls)
512 # keeping a reference, so this is prone to crashes or worse.
513 my @players = keys %cf::PLAYER;
514 for (@players) {
515 my $pl = $cf::PLAYER{$_}
516 or next;
517 $pl->valid or next;
518
519 eval {
520 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
521 $pl->save;
522
523 unless ($pl->active || $pl->ns) {
524 # check refcounts, this is tricky and needs to be adjusted to fit server internals
525 my $ob = $pl->ob;
526
527 my $pl_ref = $pl->refcnt_cnt;
528 my $ob_ref = $ob->refcnt_cnt;
529
530 ## pl_ref == $pl + ob->contr + %cf::PLAYER
531 ## ob_ref == $ob + pl->observe + simply being an object
532 if ($pl_ref == 3 && $ob_ref == 3) {
533 warn "player-scheduler destroy ", $ob->name;#d#
534
535 # remove from sight and get fresh "copies"
536 $pl = delete $cf::PLAYER{$ob->name};
537 $ob = $pl->ob;
538
539 $pl->destroy; # destroys $ob
540 } else {
541 my $a_ = $pl->refcnt;#d#
542 my $b_ = $ob->refcnt;#d#
543
544 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
545 }
546 }
547 }
548 };
549 warn $@ if $@;
550 Coro::cede;
551 };
552 }
553};
554
555$SCHEDULER->prio (1);
556

Diff Legend

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