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.38 by root, Tue Apr 10 09:35:23 2007 UTC vs.
Revision 1.110 by root, Sat May 8 10:49:44 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)]
135 "!" . unpack "H*", $_[0]
136}
137
138sub compare_password($$) {
139 my ($pass, $token) = @_;
140
141 if ($token =~ /\!(.*)/) {
142 return $pass eq pack "H*", $1;
143 } else {
144 return $token eq crypt $pass, $token;
145 }
70} 146}
71 147
72# delete a player directory, be non-blocking AND synchronous... 148# delete a player directory, be non-blocking AND synchronous...
73# (thats hard, so we crap out and fork). 149# (that's hard, so we crap out and fork).
74sub nuke_playerdir { 150sub nuke_playerdir {
75 my ($user) = @_; 151 my ($user) = @_;
76 152
77 aio_stat "$PLAYERDIR/$user"; 153 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 154
83sub send_capabilities { 155 cf::fork_call {
156 rename "$PLAYERDIR/$user", $temp;
157 system "rm", "-rf", $temp;
158 };
159}
160
161cf::client->attach (on_addme => sub {
84 my ($ns) = @_; 162 my ($ns) = @_;
85 163
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 $ns->facecache ($v);
143
144 } elsif ($k eq "faceset") {
145 $ns->faceset (0);
146 $setup{$k} = 0;
147 # $ns->image2 (1)
148
149 } elsif ($k eq "tileset") {
150 $setup{$k} = $ns->faceset ($v & 1);
151
152 } elsif ($k eq "itemcmd") {
153 # Version of the item protocol command to use. Currently,
154 # only supported versions are 1 and 2. Using a numeric
155 # value will make it very easy to extend this in the future.
156 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
157
158 $setup{$k} = $ns->itemcmd;
159
160 } elsif ($k eq "mapsize") {
161 my ($x, $y) = split /x/, $v;
162
163 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
164 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
165
166 $setup{$k} = "${x}x${y}";
167
168 } elsif ($k eq "extendedMapInfos") {
169 $ns->ext_mapinfos ($v);
170
171 } elsif ($k eq "extendedTextInfos") {
172 $ns->has_readable_type ($v);
173
174 } elsif ($k eq "smoothing") { # cfplus-style smoothing
175 $ns->smoothing ($v);
176
177 } elsif ($k eq "fxix") {
178 $ns->fxix ($v);
179
180 } else {
181 # other commands:
182 # sexp: no idea, probably for oudated servers
183 # tick: more stupidity, server should sned a tick per tick
184
185 $setup{$k} = "FALSE";
186 }
187 }
188
189 $ns->send_packet (join " ", setup => %setup);
190
191 cf::datalog setup =>
192 request => $args,
193 reply => \%setup,
194 client => $ns->version,
195 ;
196}
197
198sub addme {
199 my ($ns) = @_;
200
201 if (!$ns->facecache)
202 {
203 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
204
205
206***
207*** WARNING:
208*** Your client does not support face/image caching,
209*** or it has been disabled. Face caching is mandatory
210*** so please enable it or use a newer client.
211***
212*** Look at your client preferences:
213***
214*** CFPlus: all known versions automatically enable the facecache.
215*** cfclient: use the -cache commandline option.
216*** cfclient: map will not redraw automatically (bug).
217*** gcfclient: use -cache commandline option, or enable
218*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.
219*** jcrossclient: your client is broken, use CFPlus or gcfclient.
220***
221***
222EOF
223 if ($ns->version =~ /jcrossclient/) {
224 # let them, for now
225 } else {
226 $ns->flush;
227 return $ns->destroy;
228 }
229
230 # $ns->facecache = true;
231 }
232
233 if ($ns->mapmode < cf::Map1aCmd) {
234 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
235
236
237***
238*** WARNING:
239*** Your client is too old. Please upgrade to a newer version.
240EOF
241
242 $ns->flush;
243 return $ns->destroy;
244 }
245
246 $ns->pl and return $ns->destroy; 164 $ns->pl and return $ns->destroy;
247 165
248 $ns->async (sub { 166 $ns->async (sub {
167 $Coro::current->{desc} = "addme init";
168
249 my ($user, $pass); 169 my ($user, $pass);
250 170
251 $ns->send_packet ("addme_success"); 171 $ns->send_packet ("addme_success");
252 172
253 for (;;) { 173 for (;;) {
… …
258 cf::NDI_BLUE 178 cf::NDI_BLUE
259 ); 179 );
260 180
261 # read username 181 # read username
262 while () { 182 while () {
263 $user = query $ns, 0, "What is your name?\n:"; 183 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
264 184
265 if ($cf::LOGIN_LOCK{$user}) { 185 if ($cf::LOGIN_LOCK{$user}) {
266 $ns->send_drawinfo ( 186 $ns->send_drawinfo (
267 "That username is currently used in another login session. " 187 "That username is currently used in another login session. "
268 . "Chose another, or wait till the other session has ended.", 188 . "Chose another, or wait till the other session has ended.",
269 cf::NDI_RED 189 cf::NDI_RED
270 ); 190 );
271 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 191 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
272 last; 192 last;
273 } else { 193 } else {
274 $ns->send_drawinfo ( 194 $ns->send_drawinfo (
275 "Your username contains illegal characters " 195 "Your username contains illegal characters "
276 . "(only a-z, A-Z and 0-9 are allowed), " 196 . "(only a-z, A-Z and 0-9 are allowed), "
277 . "or is not between 3 and 18 characters in length.", 197 . "or is not between 3 and 20 characters in length.",
278 cf::NDI_RED 198 cf::NDI_RED
279 ); 199 );
280 } 200 }
201 Coro::Timer::sleep 0.4;
281 } 202 }
282 203
283 check_playing $ns, $user and next; 204 check_playing $ns, $user and next;
205
206 $Coro::current->{desc} = "addme($user) pass";
284 207
285 $ns->send_drawinfo ( 208 $ns->send_drawinfo (
286 "Welcome $user, please enter your password now. " 209 "Welcome $user, please enter your password now. "
287 . "New users should now choose a password. " 210 . "New users should now choose a password. "
288 . "Anything your client lets you enter is fine.", 211 . "Anything your client lets you enter is fine.",
… …
296 $ns->send_drawinfo ( 219 $ns->send_drawinfo (
297 "Try to use at least three characters as your password please, " 220 "Try to use at least three characters as your password please, "
298 . "that cannot be too much to ask for :)", 221 . "that cannot be too much to ask for :)",
299 cf::NDI_RED 222 cf::NDI_RED
300 ); 223 );
224 Coro::Timer::sleep 0.4;
301 } 225 }
302 226
303 # lock this username for the remainder of this login session 227 # lock this username for the remainder of this login session
304 if ($cf::LOGIN_LOCK{$user}) { 228 if ($cf::LOGIN_LOCK{$user}) {
305 $ns->send_drawinfo ( 229 $ns->send_drawinfo (
… …
311 } 235 }
312 local $cf::LOGIN_LOCK{$user} = 1; 236 local $cf::LOGIN_LOCK{$user} = 1;
313 237
314 check_playing $ns, $user and next; 238 check_playing $ns, $user and next;
315 239
240 $Coro::current->{desc} = "addme($user) check";
241
316 # try to read the user file and check the password 242 # try to read the user file and check the password
317 if (my $pl = cf::player::find $user) { 243 if (my $pl = cf::player::find $user) {
318 aio_stat $pl->path and next; 244 aio_stat $pl->path and next;
319 my $mtime = (stat _)[9]; 245 my $mtime = (stat _)[9];
320 my $hash = $pl->password; 246 my $token = $pl->password;
321 247
322 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 248 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
249 $pl->password (encode_password $pass); # make sure we store the new encoding #d#
323 nuke_str $pass; 250 nuke_str $pass;
324 # password matches, wonderful 251 # password matches, wonderful
325 my $pl = cf::player::find $user or next; 252 my $pl = cf::player::find $user or next;
326 $pl->connect ($ns); 253 $pl->connect ($ns);
327 check_clean_save $pl; 254 enter_map $pl;
328 last; 255 last;
329 } elsif (can_cleanup $pl, $mtime) { 256 } elsif (can_cleanup $pl, $mtime) {
330 Coro::Timer::sleep 1; 257 Coro::Timer::sleep 1;
331 258
332 $ns->send_drawinfo ( 259 $ns->send_drawinfo (
… …
373 next; 300 next;
374 } 301 }
375 } 302 }
376 303
377 # the rest of this function is character creation 304 # the rest of this function is character creation
305 $Coro::current->{desc} = "addme($user) chargen";
378 306
379 # just to make sure nothing is left over 307 # just to make sure nothing is left over
380 nuke_playerdir $user; 308 nuke_playerdir $user;
381 309
382 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 310 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
386 nuke_str $pass2; 314 nuke_str $pass2;
387 $ns->send_drawinfo ( 315 $ns->send_drawinfo (
388 "The passwords do not match, please try again.", 316 "The passwords do not match, please try again.",
389 cf::NDI_RED 317 cf::NDI_RED
390 ); 318 );
319 Coro::Timer::sleep 0.5;
391 next; 320 next;
392 } 321 }
393 322
394 nuke_str $pass2; 323 nuke_str $pass2;
395 324
396 my $pl = cf::player::new $user; 325 my $pl = cf::player::new $user;
397 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 326 $pl->password (encode_password $pass);
398 nuke_str $pass; 327 nuke_str $pass;
399 $pl->connect ($ns); 328 $pl->connect ($ns);
400
401 my $ob = $pl->ob; 329 my $ob = $pl->ob;
330
331 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
402 332
403 while () { 333 while () {
404 $ob->update_stats; 334 $ob->update_stats;
405 $pl->save_stats; 335 $pl->save_stats;
406 336
… …
416 $ob->swap_stats ($res - 1, $swap - 1); 346 $ob->swap_stats ($res - 1, $swap - 1);
417 } 347 }
418 } else { 348 } else {
419 $ob->roll_stats; 349 $ob->roll_stats;
420 } 350 }
351
352 Coro::Timer::sleep 0.05;
421 } 353 }
422 354
423 $ob->set_animation (2); 355 $ob->set_animation (2);
424 $ob->add_statbonus; 356 $ob->add_statbonus;
425 357
426 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 358 while () {
427 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 359 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
360 my $msg = $ob->msg;
361 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
362 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
363
364 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
428 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 365 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
429 366
430 $ns->state (cf::ST_CHANGE_CLASS); 367 last if $res =~ /[dD]/;
368
369 $pl->chargen_race_next;
370 Coro::Timer::sleep 0.05;
371 }
372
373 # create the playerdir, if necessary, as chargen_race_done did it before
374 # presumably because of unique maps
375 aio_mkdir playerdir $pl, 0770;
376 $pl->chargen_race_done;
377
378 while () {
379 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
380 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
381
382 if ($res =~ /^[fF]/) {
383 $pl->gender (1);
384 last;
385 } elsif ($res =~ /^[mM]/) {
386 $pl->gender (0);
387 last;
388 }
389 Coro::Timer::sleep 0.05;
390 }
391
392 $ob->reply (undef, "Welcome to Deliantra!");
393
394 # XXX: Workaround for delayed client ext protocol handshake
395 $pl->esrv_new_player;
396
431 delete $pl->{deny_save};#d# too early 397 delete $pl->{deny_save};
432 398
433 last; 399 last;
434 } 400 }
401
402 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
403 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
404 }
435 }); 405 });
436} 406});
407
408cf::register_command password => sub {
409 my ($pl, $arg) = @_;
410
411 my (@args) = split /\s+/, $arg;
412
413 my ($new_pw, $player);
414
415 if ($pl->flag (cf::FLAG_WIZ)) {
416 ($player, $new_pw) = @args;
417 } else {
418 $new_pw = $args[0];
419 }
420
421 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
422 $pl->message (
423 "Usage: password <player> [<new password>]",
424 cf::NDI_UNIQUE | cf::NDI_REPLY);
425 return;
426 } elsif (!$pl->flag (cf::FLAG_WIZ) && $new_pw eq '') {
427 $pl->message (
428 "Usage: password <new password>",
429 cf::NDI_UNIQUE | cf::NDI_REPLY);
430 return;
431 }
432
433 if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
434 unless ($new_pw ne '') {
435 $new_pw =
436 join '',
437 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
438 1..9;
439 }
440
441 cf::async {
442 my $plc = cf::player::find $player;
443 if ($plc) {
444 $plc->password (encode_password $new_pw);
445 $pl->message (
446 "Ok, changed password of '$player' to '$new_pw'!",
447 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
448 } else {
449 $pl->message (
450 "Fail! Couldn't set password for '$player', "
451 . "he doesn't seem to exist!",
452 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
453 }
454 };
455 } else {
456 my $change = delete $pl->{password_change};
457
458 if ($change && (time - $change->[0]) < 60) {
459 $pl->message (
460 "Ok, changed your password!",
461 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
462 $pl->contr->password (encode_password $new_pw);
463
464 } else {
465 $pl->message (
466 "Ok, please confirm your new password by sending "
467 . "the command again within one minute!",
468 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
469 $pl->{password_change} = [time, $new_pw];
470 }
471 }
472};
437 473
438cf::register_command quit => sub { 474cf::register_command quit => sub {
439 my ($ob, $arg) = @_; 475 my ($ob, $arg) = @_;
440 476
441 $ob->reply (undef, 477 $ob->send_msg (undef,
442 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 478 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
443 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 479 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
444 cf::NDI_UNIQUE | cf::NDI_RED); 480 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
445}; 481};
446 482
447cf::register_command quit_character => sub { 483cf::register_command quit_character => sub {
448 my ($ob, $arg) = @_; 484 my ($ob, $arg) = @_;
449 485
450 my $pl = $ob->contr; 486 my $pl = $ob->contr;
451 487
452 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 488 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
453 if ($_[0] !~ /^[yY]/) { 489 if ($_[0] !~ /^[yY]/) {
454 $ob->reply (undef, 490 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
455 "Ok, not not quitting then.",
456 cf::NDI_UNIQUE | cf::NDI_RED);
457 } else { 491 } else {
458 $ob->reply (undef, 492 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
459 "Ok, quitting, hope to see you again.",
460 cf::NDI_UNIQUE | cf::NDI_RED);
461 $pl->ns->flush; 493 $pl->ns->flush;
494 cf::async {
495 ext::highscore::check $pl->ob;
462 cf::async { $pl->quit_character }; 496 $pl->quit_character;
497 };
463 } 498 }
464 }); 499 });
465}; 500};
466 501
467cf::object->attach ( 502cf::object->attach (
… …
475 510
476 # update respawn position 511 # update respawn position
477 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 512 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
478 cf::async { $pl->save }; 513 cf::async { $pl->save };
479 514
480 $pl->killer ("left"); 515 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
481 $ob->check_score; 516 ext::highscore::check $ob;
482 517
483 $ob->reply (undef, "In the future, you will wake up here when you die."); 518 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
484 519
485 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 520 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
486 if ($_[0] !~ /^[yY]/) { 521 if ($_[0] !~ /^[yY]/) {
487 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 522 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
488 $pl->deactivate; 523 $pl->deactivate;
… …
507 542
508 if ($cleanly) { 543 if ($cleanly) {
509 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 544 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
510 } else { 545 } else {
511 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 546 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
512 $pl->{unclean_save} = $cf::RUNTIME; 547 $pl->{unclean_save} = $cf::RUNTIME
548 unless safe_spot $pl;
513 } 549 }
514 }, 550 },
515); 551);
516 552
517cf::client->attach (
518 on_addme => \&addme,
519 on_setup => \&setup,
520);
521
522#############################################################################
523
524our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
525our $SAVE_TIMEOUT = 20; # save players every n seconds
526
527our $SCHEDULER = cf::async_ext {
528 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
529 while () {
530 $schedule_interval->next;
531
532 # this weird form of iteration over values is used because
533 # the hash changes underneath us frequently, and for
534 # keeps a direct reference to the value without (in 5.8 perls)
535 # keeping a reference, so this is prone to crashes or worse.
536 my @players = keys %cf::PLAYER;
537 for (@players) {
538 my $pl = $cf::PLAYER{$_}
539 or next;
540 $pl->valid or next;
541
542 eval {
543 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
544 $cf::WAIT_FOR_TICK_ONE->wait;
545 $pl->save;
546
547 unless ($pl->active) {
548 # check refcounts, this is tricky and needs to be adjusted to fit server internals
549 my $ob = $pl->ob;
550 Scalar::Util::weaken $pl;
551 Scalar::Util::weaken $ob;
552 my $a_ = $pl->refcnt;#d#
553 my $b_ = $ob->refcnt;#d#
554 my $pl_ref = $pl->refcnt_cnt;
555 my $ob_ref = $ob->refcnt_cnt;
556
557 ## pl_ref == one from object + one from cf::PLAYER
558 ## ob_ref == one from simply being an object
559 if ($pl_ref == 2 && $ob_ref == 1) {
560 warn "player-scheduler destroy ", $ob->name;#d#
561
562 # remove from sight and get fresh "copies"
563 $pl = delete $cf::PLAYER{$ob->name};
564 $ob = $pl->ob;
565
566 $ob->destroy;
567 $pl->destroy;
568 } else {
569 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d#
570 }
571 }
572 }
573 };
574 warn $@ if $@;
575 Coro::cede;
576 };
577 }
578};
579
580$SCHEDULER->prio (1);
581

Diff Legend

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