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.1 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.124 by root, Sat Nov 17 06:41:16 2012 UTC

1#! perl 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
8my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir; 9CONF MAX_DISCONNECT_TIME = 3600;
9
10# testbed for coroutines in crossfire :
11 10
12sub query { 11sub query {
13 my ($ns, $flags, $text) = @_; 12 my ($ns, $flags, $text) = @_;
14 13
15 my $current = $Coro::current; 14 $ns->query ($flags, $text, Coro::rouse_cb);
16 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0]; }); 15 Coro::rouse_wait
17 Coro::schedule while ref $current;
18
19 $current
20} 16}
21 17
22sub can_cleanup { 18sub can_cleanup {
23 my ($playerfile, $mtime) = @_; 19 my ($pl, $mtime) = @_;
24 20
25 my $age = time - $mtime; 21 my $age = time - $mtime;
26 my $level = $playerfile =~ /^level (\d+)$/m ? $1 : return; 22 my $level = $pl->ob->level;
27 23
28 ($level <= 3 && $age > 7 * 86400) # 7 days for level 0..3 24 ($level <= 3 && $age > 7 * 86400) # 7 days for level 0..3
29 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9 25 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9
30 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20 26 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20
31 || $age > 700 * 86400 # 2 years for everybody else 27 || $age > 700 * 86400 # 2 years for everybody else
32} 28}
33 29
34sub check_playing { 30sub check_playing {
35 my ($ns, $user) = @_; 31 my ($ns, $user) = @_;
36 32
37 return unless cf::player::find $user; 33 return unless cf::player::find_active $user;
38 34
39 $ns->send_drawinfo ( 35 $ns->send_drawinfo (
40 "That player is already logged in on this server. " 36 "That player is already logged in on this server. "
41 . "If you want to create a new player, choose another name. " 37 . "If you want to create a new player, choose another name. "
42 . "If you are already a registered player, make sure nobody " 38 . "If you have already a registered, make sure nobody "
43 . "else is using your account at this time. If you lost your conenction " 39 . "else is using your account at this time. If you lost your connection "
44 . "then the server will likely timeout within a minute. If you still " 40 . "then the server will likely timeout within a minute. If you still "
45 . "cannot log-in after a minute, you are still logged in. Make sure " 41 . "cannot log-in after a minute, you are still logged in. Make sure "
46 . "you do not have another client running. If you use windows, reboot, " 42 . "you do not have another client running. If you use windows, reboot, "
47 . "this will fix anything.", 43 . "this will fix anything.",
48 cf::NDI_RED 44 cf::NDI_RED
49 ); 45 );
50 46
51 1 47 1
52} 48}
53 49
54# delete a player directory, be non-blocking AND synchronous... 50sub safe_spot($) {
55# (thats hard, so we crap out and fork). 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
67sub enter_map {
68 my ($pl) = @_;
69
70 my $ob = $pl->ob;
71
72 my ($map, $x, $y)
73 = $ob->{_link_pos}
74 ? @{delete $ob->{_link_pos}}
75 : ($pl->maplevel, $ob->x, $ob->y);
76
77 $ob->enter_link;
78
79 my $m = cf::map::find $map;
80 my $time = delete $pl->{unclean_save};
81
82 if ($time && $m) {
83 if ($time < $m->{instantiate_time}) {
84 # the map was reset in the meantime
85 my $age = $cf::RUNTIME - $time;
86
87 cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
88
89 if ($age >= $MAX_DISCONNECT_TIME) {
90 $ob->message (
91 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
92 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
93 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
94 . "H<You disconnected too long without having used a savebed.>",
95 cf::NDI_RED
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
119 );
120 }
121 }
122
123 $ob->goto ($map, $x, $y);
124}
125
126sub encode_password($) {
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
56sub nuke_playerdir { 143sub nuke_playerdir {
57 my ($user) = @_; 144 my ($user) = @_;
58 145
146 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
147
148 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
59 aio_stat "$PLAYERDIR/$user"; 149 aio_rename "$PLAYERDIR/$user", $temp;
60 system "cd \Q$PLAYERDIR\E " 150 IO::AIO::aio_rmtree $temp;
61 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
62 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
63} 151}
64 152
65sub on_addme { 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};
243}
244
245cf::client->attach (on_addme => sub {
66 my ($ns) = @_; 246 my ($ns) = @_;
67 247
68 $ns->destroy if $ns->pl; 248 $ns->{addme}++ and return $ns->destroy;
69 249
70 $ns->coro (sub { 250 $ns->async (sub {
251 $Coro::current->{desc} = "addme init";
252
71 my ($user, $pass); 253 my ($user, $pass);
72 254
73 $ns->send_packet ("addme_success"); 255 $ns->send_packet ("addme_success");
74 256
75 for (;;) { 257 for (;;) {
80 cf::NDI_BLUE 262 cf::NDI_BLUE
81 ); 263 );
82 264
83 # read username 265 # read username
84 while () { 266 while () {
85 $user = query $ns, 0, "What is your name?\n:"; 267 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
86 last if $user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}$/; 268
269 if ($cf::LOGIN_LOCK{$user}) {
87 $ns->send_drawinfo ( 270 $ns->send_drawinfo (
271 "That username is currently used in another login session. "
272 . "Chose another, or wait till the other session has ended.",
273 cf::NDI_RED
274 );
275 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
276 last;
277 } else {
278 $ns->send_drawinfo (
88 "Your username contains illegal characters " 279 "Your username contains illegal characters "
89 . "(only a-z, A-Z and 0-9 are allowed), " 280 . "(only a-z, A-Z and 0-9 are allowed), "
90 . "or is not between 3 and 18 characters in length.", 281 . "or is not between 3 and 20 characters in length.",
91 cf::NDI_RED 282 cf::NDI_RED
92 ); 283 );
284 }
285 Coro::Timer::sleep 0.4;
93 } 286 }
94 287
95 check_playing $ns, $user and next; 288 check_playing $ns, $user and next;
289
290 $Coro::current->{desc} = "addme($user) pass";
96 291
97 $ns->send_drawinfo ( 292 $ns->send_drawinfo (
98 "Welcome $user, please enter your password now. " 293 "Welcome $user, please enter your password now. "
99 . "New users should now choose a password. " 294 . "New users should now choose a password. "
100 . "Anything your client lets you enter is fine.", 295 . "Anything your client lets you enter is fine.",
108 $ns->send_drawinfo ( 303 $ns->send_drawinfo (
109 "Try to use at least three characters as your password please, " 304 "Try to use at least three characters as your password please, "
110 . "that cannot be too much to ask for :)", 305 . "that cannot be too much to ask for :)",
111 cf::NDI_RED 306 cf::NDI_RED
112 ); 307 );
308 Coro::Timer::sleep 0.4;
113 } 309 }
114 310
311 # lock this username for the remainder of this login session
312 if ($cf::LOGIN_LOCK{$user}) {
313 $ns->send_drawinfo (
314 "That username is currently used in another login session. "
315 . "Chose another, or wait till the other session has ended.",
316 cf::NDI_RED
317 );
318 next;
319 }
320 local $cf::LOGIN_LOCK{$user} = 1;
321
115 check_playing $ns, $user and next; 322 check_playing $ns, $user and next;
116 323
117 my $dir = "$PLAYERDIR/$user"; 324 $Coro::current->{desc} = "addme($user) check";
118 my $plfile = "$dir/$user.pl";
119 325
120 # try to read the user file and check the password 326 # try to read the user file and check the password
121 if (my $fh = aio_open $plfile, O_RDONLY, 0) { 327 if (my $pl = cf::player::find $user) {
328 aio_stat $pl->path and next;
122 my $mtime = (stat $fh)[9]; 329 my $mtime = (stat _)[9];
330 my $token = $pl->password;
123 331
124 0 < aio_read $fh, 0, 16384, my $buf, 0 or next; 332 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
125 $buf =~ /^password (\S+)$/m or next; 333 # player exists and passwords match - we can proceed
126 my $hash = $1;
127 334
128 check_playing $ns, $user and next;
129
130 if ($hash eq crypt $pass, $hash) {
131 # password matches, wonderful 335 # password matches, wonderful
132 my $pl = cf::player::load $plfile or next; 336 my $pl = cf::player::find $user or next;
133 $pl->enable_save (1);
134 $pl->connect ($ns); 337 $pl->connect ($ns);
338 enter_map $pl;
339 login_done $pl;
135 last; 340 return;
136 }
137
138 if (can_cleanup $buf, $mtime) { 341 } elsif (can_cleanup $pl, $mtime) {
139 Coro::Timer::sleep 1; 342 Coro::Timer::sleep 1;
140 343
141 $ns->send_drawinfo ( 344 $ns->send_drawinfo (
142 "Player exists, but password does not match. If this is you account, " 345 "Player exists, but password does not match. If this is your account, "
143 . "please try again. If not, you can now opt to take over this account " 346 . "please try again. If not, you can now decide to take over this account "
144 . "because it has not been in-use for some time.", 347 . "because it has not been in-use for some time.",
145 cf::NDI_RED 348 cf::NDI_RED
146 ); 349 );
147 350
148 (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]/
149 or next; 352 or next;
150 353
151 # check if the file hasn't changed 354 # check if the file hasn't changed
152 aio_stat $plfile or next; 355 aio_stat cf::player::path $user and next;
153 $mtime == (stat _)[9] or next; 356 $mtime == (stat _)[9] or next;
154 357
155 # nuke playerdir, this might block, but it needs to be atomic 358 $pl->quit_character;
156 nuke_playerdir $user;
157 359
158 # fall through to creation 360 # fall through to creation
159 } else { 361 } else {
160 Coro::Timer::sleep 1; 362 Coro::Timer::sleep 1;
161 363
164 . "(check for Numlock and other semi-obvious error sources).", 366 . "(check for Numlock and other semi-obvious error sources).",
165 cf::NDI_RED 367 cf::NDI_RED
166 ); 368 );
167 next; 369 next;
168 } 370 }
169 }
170
171 # the rest of this function is character creation
172 check_playing $ns, $user and next;
173
174 nuke_playerdir $user;
175
176 my $pl = cf::player::create;
177 $pl->ob->name ($user);
178 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
179 $pl->connect ($ns);
180 my $ob = $pl->ob;
181
182 while () {
183 $ob->update_stats;
184 $pl->save_stats;
185
186 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
187 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)?";
188
189 if ($res =~ /^[Nn]/) {
190 last;
191 } elsif ($res > 0 && $res <= 7) {
192 my $swap = query $ns, cf::CS_QUERY_SINGLECHAR, "Swap stat with (will not roll new stats) [1-7]?";
193
194 if ($swap > 0 && $swap <= 7) {
195 $ob->swap_stats ($res - 1, $swap - 1);
196 }
197 } else { 371 } else {
198 $ob->roll_stats; 372 # unable to load the playerfile:
373 # check whether the player dir exists, which means the file is corrupted or
374 # something very similar.
375 if (!aio_stat cf::player::playerdir $user) {
376 $ns->send_drawinfo (
377 "Unable to retrieve this player. It might be a locked or broken account. "
378 . "If this is your account, ask a dungeon master for assistance. "
379 . "Otherwise choose a different login name.",
380 cf::NDI_RED
381 );
382 next;
199 } 383 }
200 } 384 }
201 385
202 $ob->set_animation (2); 386 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
203 $ob->add_statbonus;
204 387
205 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 388 if ($pass2 ne $pass) {
206 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 389 $ns->send_drawinfo (
207 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 390 "The passwords do not match, please try again.",
208 391 cf::NDI_RED
209 $ns->state (cf::ST_CHANGE_CLASS); 392 );
393 Coro::Timer::sleep 0.5;
394 next;
395 }
210 396
211 last; 397 last;
212 } 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;
213 }); 405 });
214} 406});
407
408cf::client->attach (
409 on_version => sub {
410 my ($ns, $arg) = @_;
411
412 $ns->{nonces} = [map { join "", map { chr rand 256 } 0..63 } 1..2];
413 $ns->ext_msg (nonces => @{ $ns->{nonces} });
414 },
415);
416
417#cf::register_async_exticmd create_login => sub {
418# my ($ns, $reply, $user, $pass) = @_;
419#
420# $ns->{addme}++ and return $ns->destroy;
421#};
422
423cf::register_async_exticmd login => sub {
424 my ($ns, $reply, $user, $hash) = @_;
425
426 $ns->{addme}++ and return $ns->destroy;
427
428 $ns->async (sub {
429 local $cf::LOGIN_LOCK{$user} = 1;
430
431 $Coro::current->{desc} = "login($user) check";
432
433 my $fail = sub {
434 $reply->(0, $_[0]);
435 $ns->flush; # does not ensure that the data reaches the client - TODO
436 # need to do this in another thread, as this one gets canceled
437 Coro::async_pool {
438 Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
439 $ns->destroy;
440 };
441 Coro::schedule; # do the destroy, should not return
442 };
443
444 # try to read the user file and check the password
445 my $pl = cf::player::find $user
446 or return $fail->("User '$user' does not exist - wrong spelling?");
447
448 aio_stat $pl->path
449 and return $ns->destroy;
450
451 my $mtime = (stat _)[9];
452 my $token = $pl->password;
453
454 $token = $token =~ /^!/
455 ? Deliantra::Util::hash_pw pack "H*", substr $token, 1
456 : pack "H*", $token;
457
458 $token = Deliantra::Util::auth_pw $token, $ns->{nonces}[0], $ns->{nonces}[1];
459
460 $token eq $hash
461 or $cf::CFG{ext_login_nocheck}
462 or return $fail->("User exists, but the password doesn't match - check your spelling, NumLock/CapsLock etc.");
463
464 # player exists and passwords match - we can proceed
465
466 $pl->connect ($ns);
467 enter_map $pl;
468 login_done $pl;
469
470 $reply->(1, "Success");
471 });
472};
473
474cf::register_command password => sub {
475 my ($pl, $arg) = @_;
476
477 unless ($pl->flag (cf::FLAG_WIZ)) {
478 $pl->message (
479 "The password can currently only changed by a DM.",
480 cf::NDI_UNIQUE | cf::NDI_REPLY);
481 return;
482 }
483
484 $pl->message (#d#
485 "Passwords cannot currently be changed.",#d#
486 cf::NDI_UNIQUE | cf::NDI_REPLY);#d#
487 return;#d#
488
489 my (@args) = split /\s+/, $arg;
490 my ($player, $new_pw) = @args;
491
492 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
493 $pl->message (
494 "Usage: password <player> [<new password>]",
495 cf::NDI_UNIQUE | cf::NDI_REPLY);
496 return;
497 }
498
499 if ($new_pw eq '') {
500 $new_pw =
501 join '',
502 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
503 1..9;
504 }
505
506 cf::async {
507 my $plc = cf::player::find $player;
508 if ($plc) {
509 $plc->password (encode_password $new_pw);
510 $pl->message (
511 "Ok, changed password of '$player' to '$new_pw'!",
512 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
513 } else {
514 $pl->message (
515 "Fail! Couldn't set password for '$player', "
516 . "he doesn't seem to exist!",
517 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
518 }
519 };
520};
521
522cf::register_command quit => sub {
523 my ($ob, $arg) = @_;
524
525 $ob->send_msg (undef,
526 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
527 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
528 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
529};
530
531cf::register_command quit_character => sub {
532 my ($ob, $arg) = @_;
533
534 my $pl = $ob->contr;
535
536 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
537 if ($_[0] !~ /^[yY]/) {
538 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
539 } else {
540 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
541 cf::async {
542 $pl->quit_character;
543 };
544 }
545 });
546};
215 547
216cf::object->attach ( 548cf::object->attach (
217 type => cf::SAVEBED, 549 type => cf::SAVEBED,
218 on_apply => sub { 550 on_apply => sub {
219 my ($bed, $ob) = @_; 551 my ($bed, $ob) = @_;
220 552
221 return cf::override 0 unless $ob->type == cf::PLAYER; 553 return cf::override 0 unless $ob->type == cf::PLAYER;
222 554
223 my $ns = $ob->contr->ns; 555 my $pl = $ob->contr;
224 556
225 # update respawn position 557 # update respawn position
226 $ob->contr->savebed ($bed->map->path, $bed->x, $bed->y); 558 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
227 559
228 #TODO? 560 cf::async {
229 #strcpy (pl->contr->killer, "left"); 561 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
230 #check_score (pl); /* Always check score */ 562 ext::highscore::check $ob;
231 563
232 $ob->reply (undef, "In the future, you will wake up here when you die."); 564 $pl->save;
233 $ob->contr->save ();
234 565
566 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
567
568 my $ns = $pl->ns
569 or return;
570
235 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 571 $ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
236 if ($_[0] !~ /^[yY]/) { 572 if ($_[0] !~ /^[yY]/) {
237 $ob->contr->save (1); 573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
574 $pl->deactivate;
238 $ns->destroy (); 575 $pl->ns->destroy;
239 } 576 }
577 });
240 }); 578 };
241 }, 579 },
242); 580);
243 581
244cf::client->attach (package => __PACKAGE__); 582cf::player->attach (
583 on_login => sub {
584 my ($pl) = @_;
585 my $name = $pl->ob->name;
245 586
587 $_->ob->message ("$name has entered the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
588 },
589 on_logout => sub {
590 my ($pl, $cleanly) = @_;
591 my $name = $pl->ob->name;
592
593 if ($cleanly) {
594 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
595 } else {
596 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
597 $pl->{unclean_save} = $cf::RUNTIME
598 unless safe_spot $pl;
599 }
600 },
601);
602

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines