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.50 by root, Sun Jun 10 03:14:04 2007 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;
7use List::Util qw(min max); 7
8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
8 9
9# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
10sub nuke_str { 11sub nuke_str {
11 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
12} 13}
13 14
14sub query { 15sub query {
15 my ($ns, $flags, $text) = @_; 16 my ($ns, $flags, $text) = @_;
16 17
17 my $current = $Coro::current; 18 $ns->query ($flags, $text, Coro::rouse_cb);
18 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] }); 19 Coro::rouse_wait
19 Coro::schedule while ref $current;
20
21 $current
22} 20}
23 21
24sub can_cleanup { 22sub can_cleanup {
25 my ($pl, $mtime) = @_; 23 my ($pl, $mtime) = @_;
26 24
… …
39 return unless cf::player::find_active $user; 37 return unless cf::player::find_active $user;
40 38
41 $ns->send_drawinfo ( 39 $ns->send_drawinfo (
42 "That player is already logged in on this server. " 40 "That player is already logged in on this server. "
43 . "If you want to create a new player, choose another name. " 41 . "If you want to create a new player, choose another name. "
44 . "If you are already a registered player, make sure nobody " 42 . "If you have already a registered, make sure nobody "
45 . "else is using your account at this time. If you lost your conenction " 43 . "else is using your account at this time. If you lost your connection "
46 . "then the server will likely timeout within a minute. If you still " 44 . "then the server will likely timeout within a minute. If you still "
47 . "cannot log-in after a minute, you are still logged in. Make sure " 45 . "cannot log-in after a minute, you are still logged in. Make sure "
48 . "you do not have another client running. If you use windows, reboot, " 46 . "you do not have another client running. If you use windows, reboot, "
49 . "this will fix anything.", 47 . "this will fix anything.",
50 cf::NDI_RED 48 cf::NDI_RED
51 ); 49 );
52 50
53 1 51 1
54} 52}
55 53
54sub safe_spot($) {
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;
68
69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
70}
71
56sub enter_map { 72sub enter_map {
57 my ($pl) = @_; 73 my ($pl) = @_;
58 74
75 my $ob = $pl->ob;
76
59 my ($map, $x, $y) 77 my ($map, $x, $y)
60 = $pl->ob->{_link_pos} 78 = $ob->{_link_pos}
61 ? @{delete $pl->ob->{_link_pos}} 79 ? @{delete $ob->{_link_pos}}
62 : ($pl->maplevel, $pl->ob->x, $pl->ob->y); 80 : ($pl->maplevel, $ob->x, $ob->y);
63 81
64 $pl->ob->enter_link; 82 $ob->enter_link;
65 83
84 my $m = cf::map::find $map;
66 if (my $time = delete $pl->{unclean_save}) { 85 my $time = delete $pl->{unclean_save};
67 if (my $m = cf::map::find $map) { 86
87 if ($time && $m) {
68 if ($time < $m->{instantiate_time}) { 88 if ($time < $m->{instantiate_time}) {
69 # the map was reset in the meantime 89 # the map was reset in the meantime
70 my $age = $cf::RUNTIME - $time; 90 my $age = $cf::RUNTIME - $time;
91
71 warn $pl->ob->name, " map reset after logout, logout age $age\n";#d# 92 cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
72 93
73 # for now, just go back to savebed 94 if ($age >= $MAX_DISCONNECT_TIME) {
95 $ob->message (
96 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
97 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
98 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
99 . "H<You disconnected too long without having used a savebed.>",
100 cf::NDI_RED
101 );
102 # kill them.
103 # reminds me of the famous badness 10000 syndrome...
104 $ob->stats->hp (-10000); #] if they survive this they deserved to live
105 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
106 } else {
74 ($map, $x, $y) = $pl->savebed; 107 ($map, $x, $y) = $pl->savebed;
75 108
76 $pl->ns->send_drawinfo ( 109 $ob->message (
77 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 110 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
78 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. " 111 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
79 . "Better use a savebed next time, much worse things could have happened...", 112 . "Better use a savebed next time, much worse things could have happened... "
113 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
80 cf::NDI_RED 114 cf::NDI_RED
81 ); 115 );
116 }
82 } else { 117 } else {
83 $pl->ns->send_drawinfo ( 118 $ob->message (
84 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 119 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
85 . "as lots of things could happen when you leave by other means, such as cave-ins, " 120 . "as lots of things could happen when you leave by other means, such as cave-ins, "
86 . "or monsters suddenly snapping your body. Better use a savebed next time.", 121 . "or monsters suddenly snapping your body. Better use a savebed next time. "
122 . "H<Always apply a bed of reality to disconnect from the server.>",
87 cf::NDI_RED 123 cf::NDI_RED
88 ); 124 );
89 }
90 } 125 }
91 } 126 }
92 127
93 $pl->ob->goto ($map, $x, $y); 128 $ob->goto ($map, $x, $y);
129}
130
131sub encode_password {
132 crypt $_[0],
133 join '',
134 ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
94} 135}
95 136
96# delete a player directory, be non-blocking AND synchronous... 137# delete a player directory, be non-blocking AND synchronous...
97# (thats hard, so we crap out and fork). 138# (that's hard, so we crap out and fork).
98sub nuke_playerdir { 139sub nuke_playerdir {
99 my ($user) = @_; 140 my ($user) = @_;
100 141
101 aio_stat "$PLAYERDIR/$user"; 142 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
102 system "cd \Q$PLAYERDIR\E "
103 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
104 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
105}
106 143
107sub send_capabilities { 144 cf::fork_call {
145 rename "$PLAYERDIR/$user", $temp;
146 system "rm", "-rf", $temp;
147 };
148}
149
150cf::client->attach (on_addme => sub {
108 my ($ns) = @_; 151 my ($ns) = @_;
109 152
110 return unless $ns->extcmd;
111
112 $ns->ext_event (capabilities =>
113 # id, name, flags (1 == 2d), edge length
114 tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
115 );
116}
117
118sub setup {
119 my ($ns, $args) = @_;
120
121 # run through the cmds of setup
122 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
123 #
124 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
125 # The client then must sort this out
126
127 my %setup = split / +/, $args;
128 while (my ($k, $v) = each %setup) {
129 if ($k eq "sound") {
130 $ns->sound ($v);
131
132 } elsif ($k eq "exp64") {
133 $setup{$k} = 1;
134
135 } elsif ($k eq "spellmon") {
136 $ns->monitor_spells ($v);
137
138 } elsif ($k eq "darkness") {
139 $ns->darkness ($v);
140
141 } elsif ($k eq "map1cmd") {
142 $ns->mapmode (cf::Map1Cmd) if $v > 0;
143
144 } elsif ($k eq "map1acmd") {
145 $ns->mapmode (cf::Map1aCmd) if $v > 0;
146
147 } elsif ($k eq "map2cmd") {
148 # gcfclient bug, map1acmd is sent too late
149 $ns->mapmode (cf::Map1aCmd);
150 $setup{$k} = "FALSE";
151
152 } elsif ($k eq "newmapcmd") {
153 $ns->newmapcmd ($v);
154
155 } elsif ($k eq "mapinfocmd") {
156 $ns->mapinfocmd ($v);
157
158 } elsif ($k eq "extcmd") {
159 $ns->extcmd ($v > 0);
160 send_capabilities $ns;
161
162 } elsif ($k eq "extmap") {
163 $ns->extmap ($v);
164
165 } elsif ($k eq "facecache") {
166 if (!$v) {
167 $v = 1;
168 $setup{$k} = $v;
169 $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
170 }
171
172 $ns->facecache ($v);
173
174 } elsif ($k eq "faceset") {
175 $ns->faceset (0);
176 $setup{$k} = 0;
177 # $ns->image2 (1)
178
179 } elsif ($k eq "tileset") {
180 $setup{$k} = $ns->faceset ($v & 1);
181
182 } elsif ($k eq "itemcmd") {
183 # Version of the item protocol command to use. Currently,
184 # only supported versions are 1 and 2. Using a numeric
185 # value will make it very easy to extend this in the future.
186 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
187
188 $setup{$k} = $ns->itemcmd;
189
190 } elsif ($k eq "mapsize") {
191 my ($x, $y) = split /x/, $v;
192
193 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
194 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
195
196 $setup{$k} = "${x}x${y}";
197
198 } elsif ($k eq "extendedMapInfos") {
199 $ns->ext_mapinfos ($v);
200
201 } elsif ($k eq "extendedTextInfos") {
202 $ns->has_readable_type ($v);
203
204 } elsif ($k eq "smoothing") { # cfplus-style smoothing
205 $ns->smoothing ($v);
206
207 } elsif ($k eq "fxix") {
208 $ns->fxix ($v);
209
210 } elsif ($k eq "msg") {
211 $ns->can_msg ($v);
212
213 } elsif ($k eq "excmd") {
214 # we support it
215
216 } else {
217 # other commands:
218 # sexp: no idea, probably for oudated servers
219 # tick: more stupidity, server should send a tick per tick
220
221 $setup{$k} = "FALSE";
222 }
223 }
224
225 $ns->send_packet (join " ", setup => %setup);
226
227 cf::datalog setup =>
228 request => $args,
229 reply => \%setup,
230 client => $ns->version,
231 ;
232}
233
234sub addme {
235 my ($ns) = @_;
236
237 if (!$ns->facecache)
238 {
239 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
240
241
242***
243*** WARNING:
244*** Your client does not support face/image caching,
245*** or it has been disabled. Face caching is mandatory
246*** so please enable it or use a newer client.
247***
248*** Look at your client preferences:
249***
250*** CFPlus: all known versions automatically enable the facecache.
251*** cfclient: use the -cache commandline option.
252*** cfclient: map will not redraw automatically (bug).
253*** gcfclient: use -cache commandline option, or enable
254*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.
255*** jcrossclient: your client is broken, use CFPlus or gcfclient.
256***
257***
258EOF
259 if ($ns->version =~ /jcrossclient/) {
260 # let them, for now
261 } else {
262 $ns->flush;
263 return $ns->destroy;
264 }
265
266 # $ns->facecache = true;
267 }
268
269 if ($ns->mapmode < cf::Map1aCmd) {
270 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
271
272
273***
274*** WARNING:
275*** Your client is too old. Please upgrade to a newer version.
276EOF
277
278 $ns->flush;
279 return $ns->destroy;
280 }
281
282 $ns->pl and return $ns->destroy; 153 $ns->pl and return $ns->destroy;
283 154
284 $ns->async (sub { 155 $ns->async (sub {
156 $Coro::current->{desc} = "addme init";
157
285 my ($user, $pass); 158 my ($user, $pass);
286 159
287 $ns->send_packet ("addme_success"); 160 $ns->send_packet ("addme_success");
288 161
289 for (;;) { 162 for (;;) {
… …
294 cf::NDI_BLUE 167 cf::NDI_BLUE
295 ); 168 );
296 169
297 # read username 170 # read username
298 while () { 171 while () {
299 $user = query $ns, 0, "What is your name?\n:"; 172 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
300 173
301 if ($cf::LOGIN_LOCK{$user}) { 174 if ($cf::LOGIN_LOCK{$user}) {
302 $ns->send_drawinfo ( 175 $ns->send_drawinfo (
303 "That username is currently used in another login session. " 176 "That username is currently used in another login session. "
304 . "Chose another, or wait till the other session has ended.", 177 . "Chose another, or wait till the other session has ended.",
305 cf::NDI_RED 178 cf::NDI_RED
306 ); 179 );
307 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 180 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
308 last; 181 last;
309 } else { 182 } else {
310 $ns->send_drawinfo ( 183 $ns->send_drawinfo (
311 "Your username contains illegal characters " 184 "Your username contains illegal characters "
312 . "(only a-z, A-Z and 0-9 are allowed), " 185 . "(only a-z, A-Z and 0-9 are allowed), "
313 . "or is not between 3 and 18 characters in length.", 186 . "or is not between 3 and 20 characters in length.",
314 cf::NDI_RED 187 cf::NDI_RED
315 ); 188 );
316 } 189 }
190 Coro::Timer::sleep 0.4;
317 } 191 }
318 192
319 check_playing $ns, $user and next; 193 check_playing $ns, $user and next;
194
195 $Coro::current->{desc} = "addme($user) pass";
320 196
321 $ns->send_drawinfo ( 197 $ns->send_drawinfo (
322 "Welcome $user, please enter your password now. " 198 "Welcome $user, please enter your password now. "
323 . "New users should now choose a password. " 199 . "New users should now choose a password. "
324 . "Anything your client lets you enter is fine.", 200 . "Anything your client lets you enter is fine.",
… …
332 $ns->send_drawinfo ( 208 $ns->send_drawinfo (
333 "Try to use at least three characters as your password please, " 209 "Try to use at least three characters as your password please, "
334 . "that cannot be too much to ask for :)", 210 . "that cannot be too much to ask for :)",
335 cf::NDI_RED 211 cf::NDI_RED
336 ); 212 );
213 Coro::Timer::sleep 0.4;
337 } 214 }
338 215
339 # lock this username for the remainder of this login session 216 # lock this username for the remainder of this login session
340 if ($cf::LOGIN_LOCK{$user}) { 217 if ($cf::LOGIN_LOCK{$user}) {
341 $ns->send_drawinfo ( 218 $ns->send_drawinfo (
… …
346 next; 223 next;
347 } 224 }
348 local $cf::LOGIN_LOCK{$user} = 1; 225 local $cf::LOGIN_LOCK{$user} = 1;
349 226
350 check_playing $ns, $user and next; 227 check_playing $ns, $user and next;
228
229 $Coro::current->{desc} = "addme($user) check";
351 230
352 # try to read the user file and check the password 231 # try to read the user file and check the password
353 if (my $pl = cf::player::find $user) { 232 if (my $pl = cf::player::find $user) {
354 aio_stat $pl->path and next; 233 aio_stat $pl->path and next;
355 my $mtime = (stat _)[9]; 234 my $mtime = (stat _)[9];
… …
409 next; 288 next;
410 } 289 }
411 } 290 }
412 291
413 # the rest of this function is character creation 292 # the rest of this function is character creation
293 $Coro::current->{desc} = "addme($user) chargen";
414 294
415 # just to make sure nothing is left over 295 # just to make sure nothing is left over
416 nuke_playerdir $user; 296 nuke_playerdir $user;
417 297
418 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 298 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
422 nuke_str $pass2; 302 nuke_str $pass2;
423 $ns->send_drawinfo ( 303 $ns->send_drawinfo (
424 "The passwords do not match, please try again.", 304 "The passwords do not match, please try again.",
425 cf::NDI_RED 305 cf::NDI_RED
426 ); 306 );
307 Coro::Timer::sleep 0.5;
427 next; 308 next;
428 } 309 }
429 310
430 nuke_str $pass2; 311 nuke_str $pass2;
431 312
432 my $pl = cf::player::new $user; 313 my $pl = cf::player::new $user;
433 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 314 $pl->password (encode_password $pass);
434 nuke_str $pass; 315 nuke_str $pass;
435 $pl->connect ($ns); 316 $pl->connect ($ns);
436 my $ob = $pl->ob; 317 my $ob = $pl->ob;
437 318
438 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 319 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
… …
453 $ob->swap_stats ($res - 1, $swap - 1); 334 $ob->swap_stats ($res - 1, $swap - 1);
454 } 335 }
455 } else { 336 } else {
456 $ob->roll_stats; 337 $ob->roll_stats;
457 } 338 }
339
340 Coro::Timer::sleep 0.05;
458 } 341 }
459 342
460 $ob->set_animation (2); 343 $ob->set_animation (2);
461 $ob->add_statbonus; 344 $ob->add_statbonus;
462 345
463 while () { 346 while () {
464 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 347 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
465 my $msg = $ob->msg; 348 my $msg = $ob->msg;
466 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 349 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
467 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 350 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
468 351
469 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 352 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
470 "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";
471 354
472 last if $res =~ /[dD]/; 355 last if $res =~ /[dD]/;
473 356
474 $pl->chargen_race_next; 357 $pl->chargen_race_next;
358 Coro::Timer::sleep 0.05;
475 } 359 }
476 360
361 # create the playerdir, if necessary, as chargen_race_done did it before
362 # presumably because of unique maps
363 aio_mkdir playerdir $pl, 0770;
477 $pl->chargen_race_done; 364 $pl->chargen_race_done;
478 365
366 while () {
367 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
368 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
369
370 if ($res =~ /^[fF]/) {
371 $pl->gender (1);
372 last;
373 } elsif ($res =~ /^[mM]/) {
374 $pl->gender (0);
375 last;
376 }
377 Coro::Timer::sleep 0.05;
378 }
379
380 $ob->reply (undef, "Welcome to Deliantra!");
381
382 # XXX: Workaround for delayed client ext protocol handshake
383 $pl->esrv_new_player;
384
479 delete $pl->{deny_save}; 385 delete $pl->{deny_save};
480 386
481 last; 387 last;
482 } 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 }
483 }); 393 });
484} 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};
485 461
486cf::register_command quit => sub { 462cf::register_command quit => sub {
487 my ($ob, $arg) = @_; 463 my ($ob, $arg) = @_;
488 464
489 $ob->reply (undef, 465 $ob->send_msg (undef,
490 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 466 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
491 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 467 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
492 cf::NDI_UNIQUE | cf::NDI_RED); 468 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
493}; 469};
494 470
495cf::register_command quit_character => sub { 471cf::register_command quit_character => sub {
496 my ($ob, $arg) = @_; 472 my ($ob, $arg) = @_;
497 473
498 my $pl = $ob->contr; 474 my $pl = $ob->contr;
499 475
500 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 476 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
501 if ($_[0] !~ /^[yY]/) { 477 if ($_[0] !~ /^[yY]/) {
502 $ob->reply (undef, 478 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
503 "Ok, not not quitting then.",
504 cf::NDI_UNIQUE | cf::NDI_RED);
505 } else { 479 } else {
506 $ob->reply (undef, 480 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
507 "Ok, quitting, hope to see you again.",
508 cf::NDI_UNIQUE | cf::NDI_RED);
509 $pl->ns->flush; 481 $pl->ns->flush;
482 cf::async {
483 ext::highscore::check $pl->ob;
510 cf::async { $pl->quit_character }; 484 $pl->quit_character;
485 };
511 } 486 }
512 }); 487 });
513}; 488};
514 489
515cf::object->attach ( 490cf::object->attach (
… …
523 498
524 # update respawn position 499 # update respawn position
525 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 500 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
526 cf::async { $pl->save }; 501 cf::async { $pl->save };
527 502
528 $pl->killer ("left"); 503 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
529 $ob->check_score; 504 ext::highscore::check $ob;
530 505
531 $ob->reply (undef, "In the future, you will wake up here when you die."); 506 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
532 507
533 $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 {
534 if ($_[0] !~ /^[yY]/) { 509 if ($_[0] !~ /^[yY]/) {
535 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 510 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
536 $pl->deactivate; 511 $pl->deactivate;
… …
555 530
556 if ($cleanly) { 531 if ($cleanly) {
557 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 532 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
558 } else { 533 } else {
559 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 534 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
560 $pl->{unclean_save} = $cf::RUNTIME; 535 $pl->{unclean_save} = $cf::RUNTIME
536 unless safe_spot $pl;
561 } 537 }
562 }, 538 },
563); 539);
564 540
565cf::client->attach (
566 on_addme => \&addme,
567 on_setup => \&setup,
568);
569
570#############################################################################
571
572our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
573our $SAVE_TIMEOUT = 20; # save players every n seconds
574
575our $SCHEDULER = cf::async_ext {
576 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
577 while () {
578 $schedule_interval->next;
579
580 # this weird form of iteration over values is used because
581 # the hash changes underneath us frequently, and for
582 # keeps a direct reference to the value without (in 5.8 perls)
583 # keeping a reference, so this is prone to crashes or worse.
584 my @players = keys %cf::PLAYER;
585 for (@players) {
586 my $pl = $cf::PLAYER{$_}
587 or next;
588 $pl->valid or next;
589
590 eval {
591 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
592 cf::wait_for_tick_begin;
593 $pl->save;
594
595 unless ($pl->active || $pl->ns) {
596 # check refcounts, this is tricky and needs to be adjusted to fit server internals
597 my $ob = $pl->ob;
598
599 my $pl_ref = $pl->refcnt_cnt;
600 my $ob_ref = $ob->refcnt_cnt;
601
602 ## pl_ref == object + cf::PLAYER + $pl
603 ## ob_ref == being an object + pl->observe + $ob
604 if ($pl_ref == 3 && $ob_ref == 3) {
605 warn "player-scheduler destroy ", $ob->name;#d#
606
607 # remove from sight and get fresh "copies"
608 $pl = delete $cf::PLAYER{$ob->name};
609 $ob = $pl->ob;
610
611 $ob->destroy;
612 $pl->destroy;
613 } else {
614 my $a_ = $pl->refcnt;#d#
615 my $b_ = $ob->refcnt;#d#
616
617 warn "player-scheduler refcnt ", $ob->name, " pp$pl_ref,pc$a_ op$ob_ref,oc$b_\n";#d#
618 }
619 }
620 }
621 };
622 warn $@ if $@;
623 Coro::cede;
624 };
625 }
626};
627
628$SCHEDULER->prio (1);
629

Diff Legend

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