| … | |
… | |
| 10 | use Event; |
10 | use Event; |
| 11 | use Opcode; |
11 | use Opcode; |
| 12 | use Safe; |
12 | use Safe; |
| 13 | use Safe::Hole; |
13 | use Safe::Hole; |
| 14 | |
14 | |
| 15 | use Coro 3.61 (); |
15 | use Coro 3.64 (); |
| 16 | use Coro::State; |
16 | use Coro::State; |
| 17 | use Coro::Handle; |
17 | use Coro::Handle; |
| 18 | use Coro::Event; |
18 | use Coro::Event; |
| 19 | use Coro::Timer; |
19 | use Coro::Timer; |
| 20 | use Coro::Signal; |
20 | use Coro::Signal; |
| 21 | use Coro::Semaphore; |
21 | use Coro::Semaphore; |
| 22 | use Coro::AIO; |
22 | use Coro::AIO; |
| 23 | use Coro::Storable; |
23 | use Coro::Storable; |
|
|
24 | use Coro::Util (); |
| 24 | |
25 | |
| 25 | use JSON::XS 1.4 (); |
26 | use JSON::XS 1.4 (); |
| 26 | use BDB (); |
27 | use BDB (); |
| 27 | use Data::Dumper; |
28 | use Data::Dumper; |
| 28 | use Digest::MD5; |
29 | use Digest::MD5; |
| 29 | use Fcntl; |
30 | use Fcntl; |
| 30 | use YAML::Syck (); |
31 | use YAML::Syck (); |
| 31 | use IO::AIO 2.32 (); |
32 | use IO::AIO 2.32 (); |
| 32 | use Time::HiRes; |
33 | use Time::HiRes; |
| 33 | use Compress::LZF; |
34 | use Compress::LZF; |
|
|
35 | use Digest::MD5 (); |
| 34 | |
36 | |
| 35 | # configure various modules to our taste |
37 | # configure various modules to our taste |
| 36 | # |
38 | # |
| 37 | $Storable::canonical = 1; # reduce rsync transfers |
39 | $Storable::canonical = 1; # reduce rsync transfers |
| 38 | Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator |
40 | Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator |
| … | |
… | |
| 165 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
167 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
| 166 | |
168 | |
| 167 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
169 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
| 168 | returns directly I<after> the tick processing (and consequently, can only wake one process |
170 | returns directly I<after> the tick processing (and consequently, can only wake one process |
| 169 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
171 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
|
|
172 | |
|
|
173 | =item @cf::INVOKE_RESULTS |
|
|
174 | |
|
|
175 | This array contains the results of the last C<invoke ()> call. When |
|
|
176 | C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of |
|
|
177 | that call. |
| 170 | |
178 | |
| 171 | =back |
179 | =back |
| 172 | |
180 | |
| 173 | =cut |
181 | =cut |
| 174 | |
182 | |
| … | |
… | |
| 248 | |
256 | |
| 249 | Converts a perl data structure into its JSON representation. |
257 | Converts a perl data structure into its JSON representation. |
| 250 | |
258 | |
| 251 | =cut |
259 | =cut |
| 252 | |
260 | |
| 253 | our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max |
261 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
| 254 | |
262 | |
| 255 | sub to_json ($) { $json_coder->encode ($_[0]) } |
263 | sub to_json ($) { $json_coder->encode ($_[0]) } |
| 256 | sub from_json ($) { $json_coder->decode ($_[0]) } |
264 | sub from_json ($) { $json_coder->decode ($_[0]) } |
| 257 | |
265 | |
| 258 | =item cf::lock_wait $string |
266 | =item cf::lock_wait $string |
| … | |
… | |
| 313 | my $guard = Coro::guard { |
321 | my $guard = Coro::guard { |
| 314 | $TICK_WATCHER->start; |
322 | $TICK_WATCHER->start; |
| 315 | }; |
323 | }; |
| 316 | $TICK_WATCHER->stop; |
324 | $TICK_WATCHER->stop; |
| 317 | $guard |
325 | $guard |
|
|
326 | } |
|
|
327 | |
|
|
328 | =item cf::get_slot $time[, $priority[, $name]] |
|
|
329 | |
|
|
330 | Allocate $time seconds of blocking CPU time at priority C<$priority>: |
|
|
331 | This call blocks and returns only when you have at least C<$time> seconds |
|
|
332 | of cpu time till the next tick. The slot is only valid till the next cede. |
|
|
333 | |
|
|
334 | The optional C<$name> can be used to identify the job to run. It might be |
|
|
335 | used for statistical purposes and should identify the same time-class. |
|
|
336 | |
|
|
337 | Useful for short background jobs. |
|
|
338 | |
|
|
339 | =cut |
|
|
340 | |
|
|
341 | our @SLOT_QUEUE; |
|
|
342 | our $SLOT_QUEUE; |
|
|
343 | |
|
|
344 | $SLOT_QUEUE->cancel if $SLOT_QUEUE; |
|
|
345 | $SLOT_QUEUE = Coro::async { |
|
|
346 | my $signal = new Coro::Signal; |
|
|
347 | |
|
|
348 | while () { |
|
|
349 | next_job: |
|
|
350 | my $avail = cf::till_tick; |
|
|
351 | if ($avail > 0.01) { |
|
|
352 | for (0 .. $#SLOT_QUEUE) { |
|
|
353 | if ($SLOT_QUEUE[$_][0] < $avail) { |
|
|
354 | my $job = splice @SLOT_QUEUE, $_, 1, (); |
|
|
355 | $job->[2]->send; |
|
|
356 | Coro::cede; |
|
|
357 | goto next_job; |
|
|
358 | } |
|
|
359 | } |
|
|
360 | } |
|
|
361 | |
|
|
362 | if (@SLOT_QUEUE) { |
|
|
363 | # we do not use wait_For_tick() as it returns immediately when tick is inactive |
|
|
364 | push @cf::WAIT_FOR_TICK, $signal; |
|
|
365 | $signal->wait; |
|
|
366 | } else { |
|
|
367 | Coro::schedule; |
|
|
368 | } |
|
|
369 | } |
|
|
370 | }; |
|
|
371 | |
|
|
372 | sub get_slot($;$$) { |
|
|
373 | my ($time, $pri, $name) = @_; |
|
|
374 | |
|
|
375 | $time = $TICK * .6 if $time > $TICK * .6; |
|
|
376 | my $sig = new Coro::Signal; |
|
|
377 | |
|
|
378 | push @SLOT_QUEUE, [$time, $pri, $sig, $name]; |
|
|
379 | @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; |
|
|
380 | $SLOT_QUEUE->ready; |
|
|
381 | $sig->wait; |
| 318 | } |
382 | } |
| 319 | |
383 | |
| 320 | =item cf::async { BLOCK } |
384 | =item cf::async { BLOCK } |
| 321 | |
385 | |
| 322 | Currently the same as Coro::async_pool, meaning you cannot use |
386 | Currently the same as Coro::async_pool, meaning you cannot use |
| … | |
… | |
| 412 | =cut |
476 | =cut |
| 413 | |
477 | |
| 414 | sub fork_call(&@) { |
478 | sub fork_call(&@) { |
| 415 | my ($cb, @args) = @_; |
479 | my ($cb, @args) = @_; |
| 416 | |
480 | |
| 417 | # socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC |
481 | # we seemingly have to make a local copy of the whole thing, |
| 418 | # or die "socketpair: $!"; |
482 | # otherwise perl prematurely frees the stuff :/ |
| 419 | pipe my $fh1, my $fh2 |
483 | # TODO: investigate and fix (liekly this will be rather laborious) |
| 420 | or die "pipe: $!"; |
|
|
| 421 | |
484 | |
| 422 | if (my $pid = fork) { |
485 | my @res = Coro::Util::fork_eval { |
| 423 | close $fh2; |
|
|
| 424 | |
|
|
| 425 | my $res = (Coro::Handle::unblock $fh1)->readline (undef); |
|
|
| 426 | $res = Coro::Storable::thaw $res; |
|
|
| 427 | |
|
|
| 428 | waitpid $pid, 0; # should not block anymore, we expect the child to simply behave |
|
|
| 429 | |
|
|
| 430 | die $$res unless "ARRAY" eq ref $res; |
|
|
| 431 | |
|
|
| 432 | return wantarray ? @$res : $res->[-1]; |
|
|
| 433 | } else { |
|
|
| 434 | reset_signals; |
486 | reset_signals; |
| 435 | local $SIG{__WARN__}; |
487 | &$cb |
| 436 | local $SIG{__DIE__}; |
488 | }, @args; |
| 437 | eval { |
|
|
| 438 | close $fh1; |
|
|
| 439 | |
489 | |
| 440 | my @res = eval { $cb->(@args) }; |
490 | wantarray ? @res : $res[-1] |
| 441 | syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); |
|
|
| 442 | }; |
|
|
| 443 | |
|
|
| 444 | warn $@ if $@; |
|
|
| 445 | _exit 0; |
|
|
| 446 | } |
|
|
| 447 | } |
491 | } |
| 448 | |
492 | |
| 449 | =item $value = cf::db_get $family => $key |
493 | =item $value = cf::db_get $family => $key |
| 450 | |
494 | |
| 451 | Returns a single value from the environment database. |
495 | Returns a single value from the environment database. |
| … | |
… | |
| 847 | "; |
891 | "; |
| 848 | die if $@; |
892 | die if $@; |
| 849 | } |
893 | } |
| 850 | |
894 | |
| 851 | our $override; |
895 | our $override; |
| 852 | our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? |
896 | our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals? |
| 853 | |
897 | |
| 854 | sub override { |
898 | sub override { |
| 855 | $override = 1; |
899 | $override = 1; |
| 856 | @invoke_results = (); |
900 | @INVOKE_RESULTS = (@_); |
| 857 | } |
901 | } |
| 858 | |
902 | |
| 859 | sub do_invoke { |
903 | sub do_invoke { |
| 860 | my $event = shift; |
904 | my $event = shift; |
| 861 | my $callbacks = shift; |
905 | my $callbacks = shift; |
| 862 | |
906 | |
| 863 | @invoke_results = (); |
907 | @INVOKE_RESULTS = (); |
| 864 | |
908 | |
| 865 | local $override; |
909 | local $override; |
| 866 | |
910 | |
| 867 | for (@$callbacks) { |
911 | for (@$callbacks) { |
| 868 | eval { &{$_->[1]} }; |
912 | eval { &{$_->[1]} }; |
| … | |
… | |
| 885 | |
929 | |
| 886 | Generate an object-specific event with the given arguments. |
930 | Generate an object-specific event with the given arguments. |
| 887 | |
931 | |
| 888 | This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be |
932 | This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be |
| 889 | removed in future versions), and there is no public API to access override |
933 | removed in future versions), and there is no public API to access override |
| 890 | results (if you must, access C<@cf::invoke_results> directly). |
934 | results (if you must, access C<@cf::INVOKE_RESULTS> directly). |
| 891 | |
935 | |
| 892 | =back |
936 | =back |
| 893 | |
937 | |
| 894 | =cut |
938 | =cut |
| 895 | |
939 | |
| 896 | ############################################################################# |
940 | ############################################################################# |
| 897 | # object support |
941 | # object support |
|
|
942 | # |
|
|
943 | |
|
|
944 | sub _can_merge { |
|
|
945 | my ($ob1, $ob2) = @_; |
|
|
946 | |
|
|
947 | local $Storable::canonical = 1; |
|
|
948 | my $fob1 = Storable::freeze $ob1; |
|
|
949 | my $fob2 = Storable::freeze $ob2; |
|
|
950 | |
|
|
951 | $fob1 eq $fob2 |
|
|
952 | } |
| 898 | |
953 | |
| 899 | sub reattach { |
954 | sub reattach { |
| 900 | # basically do the same as instantiate, without calling instantiate |
955 | # basically do the same as instantiate, without calling instantiate |
| 901 | my ($obj) = @_; |
956 | my ($obj) = @_; |
| 902 | |
957 | |
| … | |
… | |
| 1086 | cf::override; |
1141 | cf::override; |
| 1087 | }, |
1142 | }, |
| 1088 | on_extcmd => sub { |
1143 | on_extcmd => sub { |
| 1089 | my ($pl, $buf) = @_; |
1144 | my ($pl, $buf) = @_; |
| 1090 | |
1145 | |
| 1091 | my $msg = eval { from_json $buf }; |
1146 | my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; |
| 1092 | |
1147 | |
| 1093 | if (ref $msg) { |
1148 | if (ref $msg) { |
|
|
1149 | my ($type, $reply, @payload) = |
|
|
1150 | "ARRAY" eq ref $msg |
|
|
1151 | ? @$msg |
|
|
1152 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
|
|
1153 | |
| 1094 | if (my $cb = $EXTCMD{$msg->{msgtype}}) { |
1154 | if (my $cb = $EXTCMD{$type}) { |
| 1095 | if (my %reply = $cb->($pl, $msg)) { |
1155 | my @reply = $cb->($pl, @payload); |
|
|
1156 | |
| 1096 | $pl->ext_reply ($msg->{msgid}, %reply); |
1157 | $pl->ext_reply ($reply, @reply) |
| 1097 | } |
1158 | if $reply; |
| 1098 | } |
1159 | } |
| 1099 | } else { |
1160 | } else { |
| 1100 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1161 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
| 1101 | } |
1162 | } |
| 1102 | |
1163 | |
| … | |
… | |
| 1272 | $self->{deny_save} = 1; |
1333 | $self->{deny_save} = 1; |
| 1273 | |
1334 | |
| 1274 | $cf::PLAYER{$login} = $self; |
1335 | $cf::PLAYER{$login} = $self; |
| 1275 | |
1336 | |
| 1276 | $self |
1337 | $self |
|
|
1338 | } |
|
|
1339 | |
|
|
1340 | =item $player->send_msg ($channel, $msg, $color, [extra...]) |
|
|
1341 | |
|
|
1342 | =cut |
|
|
1343 | |
|
|
1344 | sub send_msg { |
|
|
1345 | my $ns = shift->ns |
|
|
1346 | or return; |
|
|
1347 | $ns->send_msg (@_); |
| 1277 | } |
1348 | } |
| 1278 | |
1349 | |
| 1279 | =item $pl->quit_character |
1350 | =item $pl->quit_character |
| 1280 | |
1351 | |
| 1281 | Nukes the player without looking back. If logged in, the connection will |
1352 | Nukes the player without looking back. If logged in, the connection will |
| … | |
… | |
| 1400 | # replace G<male|female> tags |
1471 | # replace G<male|female> tags |
| 1401 | || s{G<([^>|]*)\|([^>]*)>}{ |
1472 | || s{G<([^>|]*)\|([^>]*)>}{ |
| 1402 | $self->gender ? $2 : $1 |
1473 | $self->gender ? $2 : $1 |
| 1403 | }ge |
1474 | }ge |
| 1404 | # replace H<hint text> |
1475 | # replace H<hint text> |
| 1405 | || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; |
1476 | || s{H<([^\>]*)>} |
|
|
1477 | { |
|
|
1478 | ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", |
|
|
1479 | "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", |
|
|
1480 | "") |
|
|
1481 | [$self->{hintmode}] |
|
|
1482 | }ge; |
| 1406 | |
1483 | |
| 1407 | # create single paragraphs (very hackish) |
1484 | # create single paragraphs (very hackish) |
| 1408 | s/(?<=\S)\n(?=\w)/ /g; |
1485 | s/(?<=\S)\n(?=\w)/ /g; |
| 1409 | |
1486 | |
|
|
1487 | # compress some whitespace |
|
|
1488 | s/\s+\n/\n/g; # ws line-ends |
|
|
1489 | s/\n\n+/\n/g; # double lines |
|
|
1490 | s/^\n+//; # beginning lines |
|
|
1491 | s/\n+$//; # ending lines |
|
|
1492 | |
| 1410 | $_ |
1493 | $_ |
| 1411 | } |
1494 | } |
| 1412 | |
1495 | |
|
|
1496 | sub hintmode { |
|
|
1497 | $_[0]{hintmode} = $_[1] if @_ > 1; |
|
|
1498 | $_[0]{hintmode} |
|
|
1499 | } |
|
|
1500 | |
| 1413 | =item $player->ext_reply ($msgid, %msg) |
1501 | =item $player->ext_reply ($msgid, @msg) |
| 1414 | |
1502 | |
| 1415 | Sends an ext reply to the player. |
1503 | Sends an ext reply to the player. |
| 1416 | |
1504 | |
| 1417 | =cut |
1505 | =cut |
| 1418 | |
1506 | |
| 1419 | sub ext_reply($$%) { |
1507 | sub ext_reply($$@) { |
| 1420 | my ($self, $id, %msg) = @_; |
1508 | my ($self, $id, @msg) = @_; |
| 1421 | |
1509 | |
| 1422 | $msg{msgid} = $id; |
1510 | if ($self->ns->extcmd == 2) { |
| 1423 | $self->send ("ext " . cf::to_json \%msg); |
1511 | $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg])); |
|
|
1512 | } elsif ($self->ns->extcmd == 1) { |
|
|
1513 | #TODO: version 1, remove |
|
|
1514 | unshift @msg, msgtype => "reply", msgid => $id; |
|
|
1515 | $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg})); |
|
|
1516 | } |
| 1424 | } |
1517 | } |
| 1425 | |
1518 | |
| 1426 | =item $player->ext_event ($type, %msg) |
1519 | =item $player->ext_msg ($type, @msg) |
| 1427 | |
1520 | |
| 1428 | Sends an ext event to the client. |
1521 | Sends an ext event to the client. |
| 1429 | |
1522 | |
| 1430 | =cut |
1523 | =cut |
| 1431 | |
1524 | |
| 1432 | sub ext_event($$%) { |
1525 | sub ext_msg($$@) { |
| 1433 | my ($self, $type, %msg) = @_; |
1526 | my ($self, $type, @msg) = @_; |
| 1434 | |
1527 | |
| 1435 | $self->ns->ext_event ($type, %msg); |
1528 | $self->ns->ext_msg ($type, @msg); |
| 1436 | } |
1529 | } |
| 1437 | |
1530 | |
| 1438 | =head3 cf::region |
1531 | =head3 cf::region |
| 1439 | |
1532 | |
| 1440 | =over 4 |
1533 | =over 4 |
| … | |
… | |
| 1453 | my ($path) = @_; |
1546 | my ($path) = @_; |
| 1454 | |
1547 | |
| 1455 | my ($match, $specificity); |
1548 | my ($match, $specificity); |
| 1456 | |
1549 | |
| 1457 | for my $region (list) { |
1550 | for my $region (list) { |
| 1458 | if ($region->match && $path =~ $region->match) { |
1551 | if ($region->{match} && $path =~ $region->{match}) { |
| 1459 | ($match, $specificity) = ($region, $region->specificity) |
1552 | ($match, $specificity) = ($region, $region->specificity) |
| 1460 | if $region->specificity > $specificity; |
1553 | if $region->specificity > $specificity; |
| 1461 | } |
1554 | } |
| 1462 | } |
1555 | } |
| 1463 | |
1556 | |
| … | |
… | |
| 1583 | $self->init; # pass $1 etc. |
1676 | $self->init; # pass $1 etc. |
| 1584 | return $self; |
1677 | return $self; |
| 1585 | } |
1678 | } |
| 1586 | } |
1679 | } |
| 1587 | |
1680 | |
| 1588 | Carp::carp "unable to resolve path '$path' (base '$base')."; |
1681 | Carp::cluck "unable to resolve path '$path' (base '$base')."; |
| 1589 | () |
1682 | () |
| 1590 | } |
1683 | } |
| 1591 | |
1684 | |
| 1592 | sub init { |
1685 | sub init { |
| 1593 | my ($self) = @_; |
1686 | my ($self) = @_; |
| … | |
… | |
| 1801 | $self->set_darkness_map; |
1894 | $self->set_darkness_map; |
| 1802 | Coro::cede; |
1895 | Coro::cede; |
| 1803 | $self->activate; |
1896 | $self->activate; |
| 1804 | } |
1897 | } |
| 1805 | |
1898 | |
|
|
1899 | $self->{last_save} = $cf::RUNTIME; |
|
|
1900 | $self->last_access ($cf::RUNTIME); |
|
|
1901 | |
| 1806 | $self->in_memory (cf::MAP_IN_MEMORY); |
1902 | $self->in_memory (cf::MAP_IN_MEMORY); |
| 1807 | } |
1903 | } |
| 1808 | |
1904 | |
| 1809 | $self->post_load; |
1905 | $self->post_load; |
| 1810 | } |
1906 | } |
| … | |
… | |
| 1871 | |
1967 | |
| 1872 | undef $MAP_PREFETCH{$path}; |
1968 | undef $MAP_PREFETCH{$path}; |
| 1873 | $MAP_PREFETCHER ||= cf::async { |
1969 | $MAP_PREFETCHER ||= cf::async { |
| 1874 | while (%MAP_PREFETCH) { |
1970 | while (%MAP_PREFETCH) { |
| 1875 | for my $path (keys %MAP_PREFETCH) { |
1971 | for my $path (keys %MAP_PREFETCH) { |
| 1876 | my $map = find $path |
1972 | if (my $map = find $path) { |
| 1877 | or next; |
|
|
| 1878 | $map->load; |
1973 | $map->load; |
|
|
1974 | } |
| 1879 | |
1975 | |
| 1880 | delete $MAP_PREFETCH{$path}; |
1976 | delete $MAP_PREFETCH{$path}; |
| 1881 | } |
1977 | } |
| 1882 | } |
1978 | } |
| 1883 | undef $MAP_PREFETCHER; |
1979 | undef $MAP_PREFETCHER; |
| … | |
… | |
| 2110 | |
2206 | |
| 2111 | } else { |
2207 | } else { |
| 2112 | my $pl = $self->contr; |
2208 | my $pl = $self->contr; |
| 2113 | |
2209 | |
| 2114 | if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { |
2210 | if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { |
| 2115 | my $diag = $pl->{npc_dialog}; |
2211 | my $dialog = $pl->{npc_dialog}; |
| 2116 | $diag->{pl}->ext_reply ( |
2212 | $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); |
| 2117 | $diag->{id}, |
|
|
| 2118 | msgtype => "reply", |
|
|
| 2119 | msg => $diag->{pl}->expand_cfpod ($msg), |
|
|
| 2120 | add_topics => [] |
|
|
| 2121 | ); |
|
|
| 2122 | |
2213 | |
| 2123 | } else { |
2214 | } else { |
| 2124 | $msg = $npc->name . " says: $msg" if $npc; |
2215 | $msg = $npc->name . " says: $msg" if $npc; |
| 2125 | $self->message ($msg, $flags); |
2216 | $self->message ($msg, $flags); |
| 2126 | } |
2217 | } |
| 2127 | } |
2218 | } |
|
|
2219 | } |
|
|
2220 | |
|
|
2221 | =item $object->send_msg ($channel, $msg, $color, [extra...]) |
|
|
2222 | |
|
|
2223 | =cut |
|
|
2224 | |
|
|
2225 | sub cf::object::send_msg { |
|
|
2226 | my $pl = shift->contr |
|
|
2227 | or return; |
|
|
2228 | $pl->send_msg (@_); |
| 2128 | } |
2229 | } |
| 2129 | |
2230 | |
| 2130 | =item $player_object->may ("access") |
2231 | =item $player_object->may ("access") |
| 2131 | |
2232 | |
| 2132 | Returns wether the given player is authorized to access resource "access" |
2233 | Returns wether the given player is authorized to access resource "access" |
| … | |
… | |
| 2220 | |
2321 | |
| 2221 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2322 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
| 2222 | $self->enter_map ($map, $x, $y); |
2323 | $self->enter_map ($map, $x, $y); |
| 2223 | } |
2324 | } |
| 2224 | |
2325 | |
| 2225 | =item $player_object->goto ($path, $x, $y[, $check->($map)]) |
2326 | =item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) |
| 2226 | |
2327 | |
| 2227 | Moves the player to the given map-path and coordinates by first freezing |
2328 | Moves the player to the given map-path and coordinates by first freezing |
| 2228 | her, loading and preparing them map, calling the provided $check callback |
2329 | her, loading and preparing them map, calling the provided $check callback |
| 2229 | that has to return the map if sucecssful, and then unfreezes the player on |
2330 | that has to return the map if sucecssful, and then unfreezes the player on |
| 2230 | the new (success) or old (failed) map position. |
2331 | the new (success) or old (failed) map position. In either case, $done will |
|
|
2332 | be called at the end of this process. |
| 2231 | |
2333 | |
| 2232 | =cut |
2334 | =cut |
| 2233 | |
2335 | |
| 2234 | our $GOTOGEN; |
2336 | our $GOTOGEN; |
| 2235 | |
2337 | |
| 2236 | sub cf::object::player::goto { |
2338 | sub cf::object::player::goto { |
| 2237 | my ($self, $path, $x, $y, $check) = @_; |
2339 | my ($self, $path, $x, $y, $check, $done) = @_; |
| 2238 | |
2340 | |
| 2239 | # do generation counting so two concurrent goto's will be executed in-order |
2341 | # do generation counting so two concurrent goto's will be executed in-order |
| 2240 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2342 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
| 2241 | |
2343 | |
| 2242 | $self->enter_link; |
2344 | $self->enter_link; |
| … | |
… | |
| 2262 | |
2364 | |
| 2263 | if ($gen == $self->{_goto_generation}) { |
2365 | if ($gen == $self->{_goto_generation}) { |
| 2264 | delete $self->{_goto_generation}; |
2366 | delete $self->{_goto_generation}; |
| 2265 | $self->leave_link ($map, $x, $y); |
2367 | $self->leave_link ($map, $x, $y); |
| 2266 | } |
2368 | } |
|
|
2369 | |
|
|
2370 | $done->() if $done; |
| 2267 | })->prio (1); |
2371 | })->prio (1); |
| 2268 | } |
2372 | } |
| 2269 | |
2373 | |
| 2270 | =item $player_object->enter_exit ($exit_object) |
2374 | =item $player_object->enter_exit ($exit_object) |
| 2271 | |
2375 | |
| … | |
… | |
| 2340 | my $hp = $exit->stats->hp; |
2444 | my $hp = $exit->stats->hp; |
| 2341 | my $sp = $exit->stats->sp; |
2445 | my $sp = $exit->stats->sp; |
| 2342 | |
2446 | |
| 2343 | $self->enter_link; |
2447 | $self->enter_link; |
| 2344 | |
2448 | |
|
|
2449 | # if exit is damned, update players death & WoR home-position |
|
|
2450 | $self->contr->savebed ($slaying, $hp, $sp) |
|
|
2451 | if $exit->flag (FLAG_DAMNED); |
|
|
2452 | |
| 2345 | (async { |
2453 | (async { |
| 2346 | $self->deactivate_recursive; # just to be sure |
2454 | $self->deactivate_recursive; # just to be sure |
| 2347 | unless (eval { |
2455 | unless (eval { |
| 2348 | $self->goto ($slaying, $hp, $sp); |
2456 | $self->goto ($slaying, $hp, $sp); |
| 2349 | |
2457 | |
| … | |
… | |
| 2376 | |
2484 | |
| 2377 | utf8::encode $text; |
2485 | utf8::encode $text; |
| 2378 | $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); |
2486 | $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); |
| 2379 | } |
2487 | } |
| 2380 | |
2488 | |
| 2381 | =item $client->send_msg ($color, $type, $msg, [extra...]) |
2489 | =item $client->send_msg ($channel, $msg, $color, [extra...]) |
| 2382 | |
2490 | |
| 2383 | Send a drawinfo or msg packet to the client, formatting the msg for the |
2491 | Send a drawinfo or msg packet to the client, formatting the msg for the |
| 2384 | client if neccessary. C<$type> should be a string identifying the type of |
2492 | client if neccessary. C<$type> should be a string identifying the type of |
| 2385 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2493 | the message, with C<log> being the default. If C<$color> is negative, suppress |
| 2386 | the message unless the client supports the msg packet. |
2494 | the message unless the client supports the msg packet. |
| 2387 | |
2495 | |
| 2388 | =cut |
2496 | =cut |
| 2389 | |
2497 | |
| 2390 | sub cf::client::send_msg { |
2498 | sub cf::client::send_msg { |
| 2391 | my ($self, $color, $type, $msg, @extra) = @_; |
2499 | my ($self, $channel, $msg, $color, @extra) = @_; |
| 2392 | |
2500 | |
| 2393 | $msg = $self->pl->expand_cfpod ($msg); |
2501 | $msg = $self->pl->expand_cfpod ($msg); |
| 2394 | |
2502 | |
|
|
2503 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
|
|
2504 | |
|
|
2505 | if (ref $channel) { |
|
|
2506 | # send meta info to client, if not yet sent |
|
|
2507 | unless (exists $self->{channel}{$channel->{id}}) { |
|
|
2508 | $self->{channel}{$channel->{id}} = $channel; |
|
|
2509 | $self->ext_msg (channel_info => $channel); |
|
|
2510 | } |
|
|
2511 | |
|
|
2512 | $channel = $channel->{id}; |
|
|
2513 | } |
|
|
2514 | |
|
|
2515 | return unless @extra || length $msg; |
|
|
2516 | |
| 2395 | if ($self->can_msg) { |
2517 | if ($self->can_msg) { |
| 2396 | $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); |
2518 | # default colour, mask it out |
|
|
2519 | $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) |
|
|
2520 | if $color & cf::NDI_DEF; |
|
|
2521 | |
|
|
2522 | $self->send_packet ("msg " . $self->{json_coder}->encode ( |
|
|
2523 | [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); |
| 2397 | } else { |
2524 | } else { |
| 2398 | # replace some tags by gcfclient-compatible ones |
|
|
| 2399 | for ($msg) { |
|
|
| 2400 | 1 while |
|
|
| 2401 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
|
|
| 2402 | || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ |
|
|
| 2403 | || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ |
|
|
| 2404 | || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ |
|
|
| 2405 | || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; |
|
|
| 2406 | } |
|
|
| 2407 | |
|
|
| 2408 | if ($color >= 0) { |
2525 | if ($color >= 0) { |
|
|
2526 | # replace some tags by gcfclient-compatible ones |
|
|
2527 | for ($msg) { |
|
|
2528 | 1 while |
|
|
2529 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
|
|
2530 | || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ |
|
|
2531 | || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ |
|
|
2532 | || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ |
|
|
2533 | || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; |
|
|
2534 | } |
|
|
2535 | |
|
|
2536 | $color &= cf::NDI_COLOR_MASK; |
|
|
2537 | |
|
|
2538 | utf8::encode $msg; |
|
|
2539 | |
| 2409 | if (0 && $msg =~ /\[/) { |
2540 | if (0 && $msg =~ /\[/) { |
|
|
2541 | # COMMAND/INFO |
| 2410 | $self->send_packet ("drawextinfo $color 4 0 $msg") |
2542 | $self->send_packet ("drawextinfo $color 10 8 $msg") |
| 2411 | } else { |
2543 | } else { |
| 2412 | $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
2544 | $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
| 2413 | $self->send_packet ("drawinfo $color $msg") |
2545 | $self->send_packet ("drawinfo $color $msg") |
| 2414 | } |
2546 | } |
| 2415 | } |
2547 | } |
| 2416 | } |
2548 | } |
| 2417 | } |
2549 | } |
| 2418 | |
2550 | |
| 2419 | =item $client->ext_event ($type, %msg) |
2551 | =item $client->ext_msg ($type, @msg) |
| 2420 | |
2552 | |
| 2421 | Sends an ext event to the client. |
2553 | Sends an ext event to the client. |
| 2422 | |
2554 | |
| 2423 | =cut |
2555 | =cut |
| 2424 | |
2556 | |
| 2425 | sub cf::client::ext_event($$%) { |
2557 | sub cf::client::ext_msg($$@) { |
| 2426 | my ($self, $type, %msg) = @_; |
2558 | my ($self, $type, @msg) = @_; |
| 2427 | |
2559 | |
|
|
2560 | my $extcmd = $self->extcmd; |
|
|
2561 | |
|
|
2562 | if ($extcmd == 2) { |
|
|
2563 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
|
|
2564 | } elsif ($extcmd == 1) { # TODO: remove |
| 2428 | $msg{msgtype} = "event_$type"; |
2565 | push @msg, msgtype => "event_$type"; |
| 2429 | $self->send_packet ("ext " . cf::to_json \%msg); |
2566 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2567 | } |
| 2430 | } |
2568 | } |
| 2431 | |
2569 | |
| 2432 | =item $success = $client->query ($flags, "text", \&cb) |
2570 | =item $success = $client->query ($flags, "text", \&cb) |
| 2433 | |
2571 | |
| 2434 | Queues a query to the client, calling the given callback with |
2572 | Queues a query to the client, calling the given callback with |
| … | |
… | |
| 2457 | |
2595 | |
| 2458 | 1 |
2596 | 1 |
| 2459 | } |
2597 | } |
| 2460 | |
2598 | |
| 2461 | cf::client->attach ( |
2599 | cf::client->attach ( |
|
|
2600 | on_connect => sub { |
|
|
2601 | my ($ns) = @_; |
|
|
2602 | |
|
|
2603 | $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed; |
|
|
2604 | }, |
| 2462 | on_reply => sub { |
2605 | on_reply => sub { |
| 2463 | my ($ns, $msg) = @_; |
2606 | my ($ns, $msg) = @_; |
| 2464 | |
2607 | |
| 2465 | # this weird shuffling is so that direct followup queries |
2608 | # this weird shuffling is so that direct followup queries |
| 2466 | # get handled first |
2609 | # get handled first |
| … | |
… | |
| 2481 | } |
2624 | } |
| 2482 | }, |
2625 | }, |
| 2483 | on_exticmd => sub { |
2626 | on_exticmd => sub { |
| 2484 | my ($ns, $buf) = @_; |
2627 | my ($ns, $buf) = @_; |
| 2485 | |
2628 | |
| 2486 | my $msg = eval { from_json $buf }; |
2629 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
| 2487 | |
2630 | |
| 2488 | if (ref $msg) { |
2631 | if (ref $msg) { |
|
|
2632 | my ($type, $reply, @payload) = |
|
|
2633 | "ARRAY" eq ref $msg |
|
|
2634 | ? @$msg |
|
|
2635 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
|
|
2636 | |
| 2489 | if (my $cb = $EXTICMD{$msg->{msgtype}}) { |
2637 | if (my $cb = $EXTICMD{$type}) { |
| 2490 | if (my %reply = $cb->($ns, $msg)) { |
2638 | my @reply = $cb->($ns, @payload); |
| 2491 | $reply{msgid} = $msg->{msgid}; |
2639 | |
| 2492 | $ns->send ("ext " . cf::to_json \%reply); |
2640 | $ns->ext_reply ($reply, @reply) |
| 2493 | } |
2641 | if $reply; |
| 2494 | } |
2642 | } |
| 2495 | } else { |
2643 | } else { |
| 2496 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2644 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
| 2497 | } |
2645 | } |
| 2498 | |
2646 | |
| … | |
… | |
| 2546 | our $safe = new Safe "safe"; |
2694 | our $safe = new Safe "safe"; |
| 2547 | our $safe_hole = new Safe::Hole; |
2695 | our $safe_hole = new Safe::Hole; |
| 2548 | |
2696 | |
| 2549 | $SIG{FPE} = 'IGNORE'; |
2697 | $SIG{FPE} = 'IGNORE'; |
| 2550 | |
2698 | |
| 2551 | $safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); |
2699 | $safe->permit_only (Opcode::opset qw( |
|
|
2700 | :base_core :base_mem :base_orig :base_math |
|
|
2701 | grepstart grepwhile mapstart mapwhile |
|
|
2702 | sort time |
|
|
2703 | )); |
| 2552 | |
2704 | |
| 2553 | # here we export the classes and methods available to script code |
2705 | # here we export the classes and methods available to script code |
| 2554 | |
2706 | |
| 2555 | =pod |
2707 | =pod |
| 2556 | |
2708 | |
| 2557 | The following functions and methods are available within a safe environment: |
2709 | The following functions and methods are available within a safe environment: |
| 2558 | |
2710 | |
| 2559 | cf::object contr pay_amount pay_player map |
2711 | cf::object |
|
|
2712 | contr pay_amount pay_player map x y force_find force_add |
|
|
2713 | insert remove name archname title slaying race |
|
|
2714 | |
| 2560 | cf::object::player player |
2715 | cf::object::player |
| 2561 | cf::player peaceful |
2716 | player |
| 2562 | cf::map trigger |
2717 | |
|
|
2718 | cf::player |
|
|
2719 | peaceful |
|
|
2720 | |
|
|
2721 | cf::map |
|
|
2722 | trigger |
| 2563 | |
2723 | |
| 2564 | =cut |
2724 | =cut |
| 2565 | |
2725 | |
| 2566 | for ( |
2726 | for ( |
| 2567 | ["cf::object" => qw(contr pay_amount pay_player map)], |
2727 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
|
|
2728 | insert remove inv name archname title slaying race)], |
| 2568 | ["cf::object::player" => qw(player)], |
2729 | ["cf::object::player" => qw(player)], |
| 2569 | ["cf::player" => qw(peaceful)], |
2730 | ["cf::player" => qw(peaceful)], |
| 2570 | ["cf::map" => qw(trigger)], |
2731 | ["cf::map" => qw(trigger)], |
| 2571 | ) { |
2732 | ) { |
| 2572 | no strict 'refs'; |
2733 | no strict 'refs'; |
| … | |
… | |
| 2664 | { |
2825 | { |
| 2665 | my $faces = $facedata->{faceinfo}; |
2826 | my $faces = $facedata->{faceinfo}; |
| 2666 | |
2827 | |
| 2667 | while (my ($face, $info) = each %$faces) { |
2828 | while (my ($face, $info) = each %$faces) { |
| 2668 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2829 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
| 2669 | cf::face::set $idx, $info->{visibility}, $info->{magicmap}; |
2830 | cf::face::set_visibility $idx, $info->{visibility}; |
|
|
2831 | cf::face::set_magicmap $idx, $info->{magicmap}; |
| 2670 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
2832 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
| 2671 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
2833 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
| 2672 | Coro::cede; |
2834 | |
|
|
2835 | cf::cede_to_tick; |
| 2673 | } |
2836 | } |
| 2674 | |
2837 | |
| 2675 | while (my ($face, $info) = each %$faces) { |
2838 | while (my ($face, $info) = each %$faces) { |
| 2676 | next unless $info->{smooth}; |
2839 | next unless $info->{smooth}; |
| 2677 | my $idx = cf::face::find $face |
2840 | my $idx = cf::face::find $face |
| 2678 | or next; |
2841 | or next; |
| 2679 | if (my $smooth = cf::face::find $info->{smooth}) { |
2842 | if (my $smooth = cf::face::find $info->{smooth}) { |
|
|
2843 | cf::face::set_smooth $idx, $smooth; |
| 2680 | cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; |
2844 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
| 2681 | } else { |
2845 | } else { |
| 2682 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
2846 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
| 2683 | } |
2847 | } |
| 2684 | Coro::cede; |
2848 | |
|
|
2849 | cf::cede_to_tick; |
| 2685 | } |
2850 | } |
| 2686 | } |
2851 | } |
| 2687 | |
2852 | |
| 2688 | { |
2853 | { |
| 2689 | my $anims = $facedata->{animinfo}; |
2854 | my $anims = $facedata->{animinfo}; |
| 2690 | |
2855 | |
| 2691 | while (my ($anim, $info) = each %$anims) { |
2856 | while (my ($anim, $info) = each %$anims) { |
| 2692 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
2857 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
| 2693 | Coro::cede; |
2858 | cf::cede_to_tick; |
| 2694 | } |
2859 | } |
| 2695 | |
2860 | |
| 2696 | cf::anim::invalidate_all; # d'oh |
2861 | cf::anim::invalidate_all; # d'oh |
| 2697 | } |
2862 | } |
| 2698 | |
2863 | |
|
|
2864 | { |
|
|
2865 | # TODO: for gcfclient pleasure, we should give resources |
|
|
2866 | # that gcfclient doesn't grok a >10000 face index. |
|
|
2867 | my $res = $facedata->{resource}; |
|
|
2868 | my $enc = JSON::XS->new->utf8->canonical; |
|
|
2869 | |
|
|
2870 | my $soundconf = delete $res->{"res/sound.conf"}; |
|
|
2871 | |
|
|
2872 | while (my ($name, $info) = each %$res) { |
|
|
2873 | my $meta = $enc->encode ({ |
|
|
2874 | name => $name, |
|
|
2875 | %{ $info->{meta} || {} }, |
|
|
2876 | }); |
|
|
2877 | |
|
|
2878 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
|
|
2879 | |
|
|
2880 | if ($info->{type} & 1) { |
|
|
2881 | # prepend meta info |
|
|
2882 | |
|
|
2883 | my $data = pack "(w/a*)*", $meta, $info->{data}; |
|
|
2884 | my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata |
|
|
2885 | |
|
|
2886 | cf::face::set_data $idx, 0, $data, $chk; |
|
|
2887 | } else { |
|
|
2888 | cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; |
|
|
2889 | } |
|
|
2890 | |
|
|
2891 | cf::face::set_type $idx, $info->{type}; |
|
|
2892 | |
|
|
2893 | cf::cede_to_tick; |
|
|
2894 | } |
|
|
2895 | |
|
|
2896 | if ($soundconf) { |
|
|
2897 | $soundconf = $enc->decode (delete $soundconf->{data}); |
|
|
2898 | |
|
|
2899 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
|
|
2900 | my $sound = $soundconf->{compat}[$_] |
|
|
2901 | or next; |
|
|
2902 | |
|
|
2903 | my $face = cf::face::find "sound/$sound->[1]"; |
|
|
2904 | cf::sound::set $sound->[0] => $face; |
|
|
2905 | cf::sound::old_sound_index $_, $face; # gcfclient-compat |
|
|
2906 | } |
|
|
2907 | |
|
|
2908 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
|
|
2909 | my $face = cf::face::find "sound/$v"; |
|
|
2910 | cf::sound::set $k => $face; |
|
|
2911 | } |
|
|
2912 | } |
|
|
2913 | } |
|
|
2914 | |
| 2699 | 1 |
2915 | 1 |
| 2700 | } |
2916 | } |
|
|
2917 | |
|
|
2918 | register_exticmd fx_want => sub { |
|
|
2919 | my ($ns, $want) = @_; |
|
|
2920 | |
|
|
2921 | while (my ($k, $v) = each %$want) { |
|
|
2922 | $ns->fx_want ($k, $v); |
|
|
2923 | } |
|
|
2924 | }; |
| 2701 | |
2925 | |
| 2702 | sub reload_regions { |
2926 | sub reload_regions { |
| 2703 | load_resource_file "$MAPDIR/regions" |
2927 | load_resource_file "$MAPDIR/regions" |
| 2704 | or die "unable to load regions file\n"; |
2928 | or die "unable to load regions file\n"; |
|
|
2929 | |
|
|
2930 | for (cf::region::list) { |
|
|
2931 | $_->{match} = qr/$_->{match}/ |
|
|
2932 | if exists $_->{match}; |
|
|
2933 | } |
| 2705 | } |
2934 | } |
| 2706 | |
2935 | |
| 2707 | sub reload_facedata { |
2936 | sub reload_facedata { |
| 2708 | load_facedata "$DATADIR/facedata" |
2937 | load_facedata "$DATADIR/facedata" |
| 2709 | or die "unable to load facedata\n"; |
2938 | or die "unable to load facedata\n"; |
| 2710 | } |
2939 | } |
| 2711 | |
2940 | |
| 2712 | sub reload_archetypes { |
2941 | sub reload_archetypes { |
|
|
2942 | load_resource_file "$DATADIR/archetypes" |
|
|
2943 | or die "unable to load archetypes\n"; |
|
|
2944 | #d# NEED to laod twice to resolve forward references |
|
|
2945 | # this really needs to be done in an extra post-pass |
|
|
2946 | # (which needs to be synchronous, so solve it differently) |
| 2713 | load_resource_file "$DATADIR/archetypes" |
2947 | load_resource_file "$DATADIR/archetypes" |
| 2714 | or die "unable to load archetypes\n"; |
2948 | or die "unable to load archetypes\n"; |
| 2715 | } |
2949 | } |
| 2716 | |
2950 | |
| 2717 | sub reload_treasures { |
2951 | sub reload_treasures { |
