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

Diff Legend

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