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

Diff Legend

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