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.41 by root, Tue Apr 17 10:06:33 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);
8 7
9my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir; 8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
10 9
11# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
12sub nuke_str { 11sub nuke_str {
13 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
14} 13}
15 14
16sub query { 15sub query {
17 my ($ns, $flags, $text) = @_; 16 my ($ns, $flags, $text) = @_;
18 17
19 my $current = $Coro::current; 18 $ns->query ($flags, $text, Coro::rouse_cb);
20 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] }); 19 Coro::rouse_wait
21 Coro::schedule while ref $current;
22
23 $current
24} 20}
25 21
26sub can_cleanup { 22sub can_cleanup {
27 my ($pl, $mtime) = @_; 23 my ($pl, $mtime) = @_;
28 24
… …
41 return unless cf::player::find_active $user; 37 return unless cf::player::find_active $user;
42 38
43 $ns->send_drawinfo ( 39 $ns->send_drawinfo (
44 "That player is already logged in on this server. " 40 "That player is already logged in on this server. "
45 . "If you want to create a new player, choose another name. " 41 . "If you want to create a new player, choose another name. "
46 . "If you are already a registered player, make sure nobody " 42 . "If you have already a registered, make sure nobody "
47 . "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 "
48 . "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 "
49 . "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 "
50 . "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, "
51 . "this will fix anything.", 47 . "this will fix anything.",
52 cf::NDI_RED 48 cf::NDI_RED
53 ); 49 );
54 50
55 1 51 1
56} 52}
57 53
58sub check_clean_save { 54sub safe_spot($) {
59 my ($pl) = @_; 55 my ($pl) = @_;
56
57 my $ob = $pl->ob;
60 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
72sub enter_map {
73 my ($pl) = @_;
74
75 my $ob = $pl->ob;
76
77 my ($map, $x, $y)
78 = $ob->{_link_pos}
79 ? @{delete $ob->{_link_pos}}
80 : ($pl->maplevel, $ob->x, $ob->y);
81
82 $ob->enter_link;
83
84 my $m = cf::map::find $map;
61 if (my $time = delete $pl->{unclean_save}) { 85 my $time = delete $pl->{unclean_save};
62 $pl->ns->send_drawinfo ( 86
87 if ($time && $m) {
88 if ($time < $m->{instantiate_time}) {
89 # the map was reset in the meantime
90 my $age = $cf::RUNTIME - $time;
91
92 cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
93
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 {
107 ($map, $x, $y) = $pl->savebed;
108
109 $ob->message (
110 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
111 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
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.>",
114 cf::NDI_RED
115 );
116 }
117 } else {
118 $ob->message (
63 "You didn't use a savebed 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, "
64 . "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, "
65 . "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.>",
66 cf::NDI_RED 123 cf::NDI_RED
67 ); 124 );
68 #d#TODO 125 }
69 } 126 }
127
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)]
70} 135}
71 136
72# delete a player directory, be non-blocking AND synchronous... 137# delete a player directory, be non-blocking AND synchronous...
73# (thats hard, so we crap out and fork). 138# (that's hard, so we crap out and fork).
74sub nuke_playerdir { 139sub nuke_playerdir {
75 my ($user) = @_; 140 my ($user) = @_;
76 141
77 aio_stat "$PLAYERDIR/$user"; 142 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
78 system "cd \Q$PLAYERDIR\E "
79 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
80 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
81}
82 143
83sub 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 {
84 my ($ns) = @_; 151 my ($ns) = @_;
85 152
86 return unless $ns->extcmd;
87
88 $ns->ext_event (capabilities =>
89 # id, name, flags (1 == 2d), edge length
90 tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
91 );
92}
93
94sub setup {
95 my ($ns, $args) = @_;
96
97 # run through the cmds of setup
98 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
99 #
100 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
101 # The client then must sort this out
102
103 my %setup = split / +/, $args;
104 while (my ($k, $v) = each %setup) {
105 if ($k eq "sound") {
106 $ns->sound ($v);
107
108 } elsif ($k eq "exp64") {
109 $setup{$k} = 1;
110
111 } elsif ($k eq "spellmon") {
112 $ns->monitor_spells ($v);
113
114 } elsif ($k eq "darkness") {
115 $ns->darkness ($v);
116
117 } elsif ($k eq "map1cmd") {
118 $ns->mapmode (cf::Map1Cmd) if $v > 0;
119
120 } elsif ($k eq "map1acmd") {
121 $ns->mapmode (cf::Map1aCmd) if $v > 0;
122
123 } elsif ($k eq "map2cmd") {
124 # gcfclient bug, map1acmd is sent too late
125 $ns->mapmode (cf::Map1aCmd);
126 $setup{$k} = "FALSE";
127
128 } elsif ($k eq "newmapcmd") {
129 $ns->newmapcmd ($v);
130
131 } elsif ($k eq "mapinfocmd") {
132 $ns->mapinfocmd ($v);
133
134 } elsif ($k eq "extcmd") {
135 $ns->extcmd ($v > 0);
136 send_capabilities $ns;
137
138 } elsif ($k eq "extmap") {
139 $ns->extmap ($v);
140
141 } elsif ($k eq "facecache") {
142 if (!$v) {
143 $v = 1;
144 $setup{$k} = $v;
145 $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
146 }
147
148 $ns->facecache ($v);
149
150 } elsif ($k eq "faceset") {
151 $ns->faceset (0);
152 $setup{$k} = 0;
153 # $ns->image2 (1)
154
155 } elsif ($k eq "tileset") {
156 $setup{$k} = $ns->faceset ($v & 1);
157
158 } elsif ($k eq "itemcmd") {
159 # Version of the item protocol command to use. Currently,
160 # only supported versions are 1 and 2. Using a numeric
161 # value will make it very easy to extend this in the future.
162 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
163
164 $setup{$k} = $ns->itemcmd;
165
166 } elsif ($k eq "mapsize") {
167 my ($x, $y) = split /x/, $v;
168
169 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
170 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
171
172 $setup{$k} = "${x}x${y}";
173
174 } elsif ($k eq "extendedMapInfos") {
175 $ns->ext_mapinfos ($v);
176
177 } elsif ($k eq "extendedTextInfos") {
178 $ns->has_readable_type ($v);
179
180 } elsif ($k eq "smoothing") { # cfplus-style smoothing
181 $ns->smoothing ($v);
182
183 } elsif ($k eq "fxix") {
184 $ns->fxix ($v);
185
186 } else {
187 # other commands:
188 # sexp: no idea, probably for oudated servers
189 # tick: more stupidity, server should sned a tick per tick
190
191 $setup{$k} = "FALSE";
192 }
193 }
194
195 $ns->send_packet (join " ", setup => %setup);
196
197 cf::datalog setup =>
198 request => $args,
199 reply => \%setup,
200 client => $ns->version,
201 ;
202}
203
204sub addme {
205 my ($ns) = @_;
206
207 if (!$ns->facecache)
208 {
209 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
210
211
212***
213*** WARNING:
214*** Your client does not support face/image caching,
215*** or it has been disabled. Face caching is mandatory
216*** so please enable it or use a newer client.
217***
218*** Look at your client preferences:
219***
220*** CFPlus: all known versions automatically enable the facecache.
221*** cfclient: use the -cache commandline option.
222*** cfclient: map will not redraw automatically (bug).
223*** gcfclient: use -cache commandline option, or enable
224*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.
225*** jcrossclient: your client is broken, use CFPlus or gcfclient.
226***
227***
228EOF
229 if ($ns->version =~ /jcrossclient/) {
230 # let them, for now
231 } else {
232 $ns->flush;
233 return $ns->destroy;
234 }
235
236 # $ns->facecache = true;
237 }
238
239 if ($ns->mapmode < cf::Map1aCmd) {
240 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
241
242
243***
244*** WARNING:
245*** Your client is too old. Please upgrade to a newer version.
246EOF
247
248 $ns->flush;
249 return $ns->destroy;
250 }
251
252 $ns->pl and return $ns->destroy; 153 $ns->pl and return $ns->destroy;
253 154
254 $ns->async (sub { 155 $ns->async (sub {
156 $Coro::current->{desc} = "addme init";
157
255 my ($user, $pass); 158 my ($user, $pass);
256 159
257 $ns->send_packet ("addme_success"); 160 $ns->send_packet ("addme_success");
258 161
259 for (;;) { 162 for (;;) {
… …
264 cf::NDI_BLUE 167 cf::NDI_BLUE
265 ); 168 );
266 169
267 # read username 170 # read username
268 while () { 171 while () {
269 $user = query $ns, 0, "What is your name?\n:"; 172 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
270 173
271 if ($cf::LOGIN_LOCK{$user}) { 174 if ($cf::LOGIN_LOCK{$user}) {
272 $ns->send_drawinfo ( 175 $ns->send_drawinfo (
273 "That username is currently used in another login session. " 176 "That username is currently used in another login session. "
274 . "Chose another, or wait till the other session has ended.", 177 . "Chose another, or wait till the other session has ended.",
275 cf::NDI_RED 178 cf::NDI_RED
276 ); 179 );
277 } 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/) {
278 last; 181 last;
279 } else { 182 } else {
280 $ns->send_drawinfo ( 183 $ns->send_drawinfo (
281 "Your username contains illegal characters " 184 "Your username contains illegal characters "
282 . "(only a-z, A-Z and 0-9 are allowed), " 185 . "(only a-z, A-Z and 0-9 are allowed), "
283 . "or is not between 3 and 18 characters in length.", 186 . "or is not between 3 and 20 characters in length.",
284 cf::NDI_RED 187 cf::NDI_RED
285 ); 188 );
286 } 189 }
190 Coro::Timer::sleep 0.4;
287 } 191 }
288 192
289 check_playing $ns, $user and next; 193 check_playing $ns, $user and next;
194
195 $Coro::current->{desc} = "addme($user) pass";
290 196
291 $ns->send_drawinfo ( 197 $ns->send_drawinfo (
292 "Welcome $user, please enter your password now. " 198 "Welcome $user, please enter your password now. "
293 . "New users should now choose a password. " 199 . "New users should now choose a password. "
294 . "Anything your client lets you enter is fine.", 200 . "Anything your client lets you enter is fine.",
… …
302 $ns->send_drawinfo ( 208 $ns->send_drawinfo (
303 "Try to use at least three characters as your password please, " 209 "Try to use at least three characters as your password please, "
304 . "that cannot be too much to ask for :)", 210 . "that cannot be too much to ask for :)",
305 cf::NDI_RED 211 cf::NDI_RED
306 ); 212 );
213 Coro::Timer::sleep 0.4;
307 } 214 }
308 215
309 # lock this username for the remainder of this login session 216 # lock this username for the remainder of this login session
310 if ($cf::LOGIN_LOCK{$user}) { 217 if ($cf::LOGIN_LOCK{$user}) {
311 $ns->send_drawinfo ( 218 $ns->send_drawinfo (
… …
317 } 224 }
318 local $cf::LOGIN_LOCK{$user} = 1; 225 local $cf::LOGIN_LOCK{$user} = 1;
319 226
320 check_playing $ns, $user and next; 227 check_playing $ns, $user and next;
321 228
229 $Coro::current->{desc} = "addme($user) check";
230
322 # try to read the user file and check the password 231 # try to read the user file and check the password
323 if (my $pl = cf::player::find $user) { 232 if (my $pl = cf::player::find $user) {
324 aio_stat $pl->path and next; 233 aio_stat $pl->path and next;
325 my $mtime = (stat _)[9]; 234 my $mtime = (stat _)[9];
326 my $hash = $pl->password; 235 my $hash = $pl->password;
… …
328 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) {
329 nuke_str $pass; 238 nuke_str $pass;
330 # password matches, wonderful 239 # password matches, wonderful
331 my $pl = cf::player::find $user or next; 240 my $pl = cf::player::find $user or next;
332 $pl->connect ($ns); 241 $pl->connect ($ns);
333 check_clean_save $pl; 242 enter_map $pl;
334 last; 243 last;
335 } elsif (can_cleanup $pl, $mtime) { 244 } elsif (can_cleanup $pl, $mtime) {
336 Coro::Timer::sleep 1; 245 Coro::Timer::sleep 1;
337 246
338 $ns->send_drawinfo ( 247 $ns->send_drawinfo (
… …
379 next; 288 next;
380 } 289 }
381 } 290 }
382 291
383 # the rest of this function is character creation 292 # the rest of this function is character creation
293 $Coro::current->{desc} = "addme($user) chargen";
384 294
385 # just to make sure nothing is left over 295 # just to make sure nothing is left over
386 nuke_playerdir $user; 296 nuke_playerdir $user;
387 297
388 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.";
… …
392 nuke_str $pass2; 302 nuke_str $pass2;
393 $ns->send_drawinfo ( 303 $ns->send_drawinfo (
394 "The passwords do not match, please try again.", 304 "The passwords do not match, please try again.",
395 cf::NDI_RED 305 cf::NDI_RED
396 ); 306 );
307 Coro::Timer::sleep 0.5;
397 next; 308 next;
398 } 309 }
399 310
400 nuke_str $pass2; 311 nuke_str $pass2;
401 312
402 my $pl = cf::player::new $user; 313 my $pl = cf::player::new $user;
403 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 314 $pl->password (encode_password $pass);
404 nuke_str $pass; 315 nuke_str $pass;
405 $pl->connect ($ns); 316 $pl->connect ($ns);
406
407 my $ob = $pl->ob; 317 my $ob = $pl->ob;
318
319 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
408 320
409 while () { 321 while () {
410 $ob->update_stats; 322 $ob->update_stats;
411 $pl->save_stats; 323 $pl->save_stats;
412 324
… …
422 $ob->swap_stats ($res - 1, $swap - 1); 334 $ob->swap_stats ($res - 1, $swap - 1);
423 } 335 }
424 } else { 336 } else {
425 $ob->roll_stats; 337 $ob->roll_stats;
426 } 338 }
339
340 Coro::Timer::sleep 0.05;
427 } 341 }
428 342
429 $ob->set_animation (2); 343 $ob->set_animation (2);
430 $ob->add_statbonus; 344 $ob->add_statbonus;
431 345
432 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 346 while () {
433 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 347 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
348 my $msg = $ob->msg;
349 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
350 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
351
352 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
434 "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";
435 354
436 $ns->state (cf::ST_CHANGE_CLASS); 355 last if $res =~ /[dD]/;
356
357 $pl->chargen_race_next;
358 Coro::Timer::sleep 0.05;
359 }
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;
364 $pl->chargen_race_done;
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
437 delete $pl->{deny_save};#d# too early 385 delete $pl->{deny_save};
438 386
439 last; 387 last;
440 } 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 }
441 }); 393 });
442} 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};
443 461
444cf::register_command quit => sub { 462cf::register_command quit => sub {
445 my ($ob, $arg) = @_; 463 my ($ob, $arg) = @_;
446 464
447 $ob->reply (undef, 465 $ob->send_msg (undef,
448 "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. "
449 . "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.",
450 cf::NDI_UNIQUE | cf::NDI_RED); 468 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
451}; 469};
452 470
453cf::register_command quit_character => sub { 471cf::register_command quit_character => sub {
454 my ($ob, $arg) = @_; 472 my ($ob, $arg) = @_;
455 473
456 my $pl = $ob->contr; 474 my $pl = $ob->contr;
457 475
458 $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 {
459 if ($_[0] !~ /^[yY]/) { 477 if ($_[0] !~ /^[yY]/) {
460 $ob->reply (undef, 478 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
461 "Ok, not not quitting then.",
462 cf::NDI_UNIQUE | cf::NDI_RED);
463 } else { 479 } else {
464 $ob->reply (undef, 480 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
465 "Ok, quitting, hope to see you again.",
466 cf::NDI_UNIQUE | cf::NDI_RED);
467 $pl->ns->flush; 481 $pl->ns->flush;
482 cf::async {
483 ext::highscore::check $pl->ob;
468 cf::async { $pl->quit_character }; 484 $pl->quit_character;
485 };
469 } 486 }
470 }); 487 });
471}; 488};
472 489
473cf::object->attach ( 490cf::object->attach (
… …
481 498
482 # update respawn position 499 # update respawn position
483 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 500 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
484 cf::async { $pl->save }; 501 cf::async { $pl->save };
485 502
486 $pl->killer ("left"); 503 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
487 $ob->check_score; 504 ext::highscore::check $ob;
488 505
489 $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);
490 507
491 $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 {
492 if ($_[0] !~ /^[yY]/) { 509 if ($_[0] !~ /^[yY]/) {
493 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 510 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
494 $pl->deactivate; 511 $pl->deactivate;
… …
513 530
514 if ($cleanly) { 531 if ($cleanly) {
515 $_->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;
516 } else { 533 } else {
517 $_->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;
518 $pl->{unclean_save} = $cf::RUNTIME; 535 $pl->{unclean_save} = $cf::RUNTIME
536 unless safe_spot $pl;
519 } 537 }
520 }, 538 },
521); 539);
522 540
523cf::client->attach (
524 on_addme => \&addme,
525 on_setup => \&setup,
526);
527
528#############################################################################
529
530our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
531our $SAVE_TIMEOUT = 20; # save players every n seconds
532
533our $SCHEDULER = cf::async_ext {
534 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
535 while () {
536 $schedule_interval->next;
537
538 # this weird form of iteration over values is used because
539 # the hash changes underneath us frequently, and for
540 # keeps a direct reference to the value without (in 5.8 perls)
541 # keeping a reference, so this is prone to crashes or worse.
542 my @players = keys %cf::PLAYER;
543 for (@players) {
544 my $pl = $cf::PLAYER{$_}
545 or next;
546 $pl->valid or next;
547
548 eval {
549 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
550 cf::wait_for_tick_begin;
551 $pl->save;
552
553 unless ($pl->active) {
554 # check refcounts, this is tricky and needs to be adjusted to fit server internals
555 my $ob = $pl->ob;
556 Scalar::Util::weaken $pl;
557 Scalar::Util::weaken $ob;
558 my $a_ = $pl->refcnt;#d#
559 my $b_ = $ob->refcnt;#d#
560 my $pl_ref = $pl->refcnt_cnt;
561 my $ob_ref = $ob->refcnt_cnt;
562
563 ## pl_ref == one from object + one from cf::PLAYER
564 ## ob_ref == one from simply being an object
565 if ($pl_ref == 2 && $ob_ref == 1) {
566 warn "player-scheduler destroy ", $ob->name;#d#
567
568 # remove from sight and get fresh "copies"
569 $pl = delete $cf::PLAYER{$ob->name};
570 $ob = $pl->ob;
571
572 $ob->destroy;
573 $pl->destroy;
574 } else {
575 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d#
576 }
577 }
578 }
579 };
580 warn $@ if $@;
581 Coro::cede;
582 };
583 }
584};
585
586$SCHEDULER->prio (1);
587

Diff Legend

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