ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.75 by root, Mon Nov 2 11:50:20 2009 UTC vs.
Revision 1.107 by root, Wed Oct 20 06:36:48 2010 UTC

1#!@PERL@ 1#!@PERL@
2 2
3use strict; 3#
4# This file is part of Deliantra, the Roguelike Realtime MMORPG.
5#
6# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
7#
8# Deliantra is free software: you can redistribute it and/or modify it under
9# the terms of the Affero GNU General Public License as published by the
10# Free Software Foundation, either version 3 of the License, or (at your
11# option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU General Public License for more details.
17#
18# You should have received a copy of the Affero GNU General Public License
19# and the GNU General Public License along with this program. If not, see
20# <http://www.gnu.org/licenses/>.
21#
22# The authors can be reached via e-mail to <support@deliantra.net>
23#
24
25use common::sense;
4 26
5my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
6my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
7my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
… …
21use Coro::EV; 43use Coro::EV;
22use AnyEvent; 44use AnyEvent;
23use YAML::XS (); 45use YAML::XS ();
24use JSON::XS (); 46use JSON::XS ();
25use IO::AIO (); 47use IO::AIO ();
48use Digest::MD5 ();
26 49
27use Coro 5.12; 50use Coro 5.12;
28use Coro::AIO; 51use Coro::AIO;
29use Coro::Util; 52use Coro::Util;
30use Coro::Channel; 53use Coro::Channel;
… …
51my $VERBOSE = 1; 74my $VERBOSE = 1;
52my $CACHE = 0; 75my $CACHE = 0;
53my $FORCE; 76my $FORCE;
54my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
55my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
56 80
57our %COLOR = ( 81our %COLOR = (
82 # original cf colours
58 black => 0, 83 black => 0,
59 white => 1, 84 white => 1,
60 navy => 2, 85 navy => 2, # "dark blue"
61 red => 3, 86 red => 3,
62 orange => 4, 87 orange => 4,
63 blue => 5, 88 blue => 5, # "light blue"
64 darkorange => 6, 89 darkorange => 6,
65 green => 7, 90 green => 7,
66 lightgreen => 8, 91 lightgreen => 8,
67 grey => 9, 92 grey => 9,
93 brown => 10, # "yellow"
94 gold => 11, # "light yellow"
95 tan => 12, # yellowish gray
96
97 # new for deliantra
68 brown => 10, 98 none => 13,
99
100 # compatibility to existing archetypes
101 lightblue => 5,
69 gold => 11, 102 gray => 9,
103 yellow => 11,
70 tan => 12, 104 khaki => 12,
71); 105);
72 106
73END { system "rm", "-rf", $TMPDIR } 107END { system "rm", "-rf", $TMPDIR }
74 108
75my $s_INT = EV::signal INT => sub { exit 1 }; 109my $s_INT = EV::signal INT => sub { exit 1 };
76my $s_TERM = EV::signal TERM => sub { exit 1 }; 110my $s_TERM = EV::signal TERM => sub { exit 1 };
111
112our %hash;
113
114# here we could try to avoid collisions and reduce chksum size further
115sub make_hash($\$\$;$) {
116 my ($id, $dataref, $hashref, $clen) = @_;
117
118 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
119
120 if (exists $hash{$hash}) {
121 # hash collision, but some files are simply identical
122 if (${$hash{$hash}[1]} ne $$dataref) {
123 warn "hash collision $hash{$hash}[0] vs. $id\n";
124 exit 1;
125 } else {
126 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
127 }
128 }
129 $hash{$hash} = [$id, $dataref, $hashref];
130
131 $$hashref = $hash;
132}
77 133
78mkdir $TMPDIR, 0700 134mkdir $TMPDIR, 0700
79 or die "$TMPDIR: $!"; 135 or die "$TMPDIR: $!";
80 136
81sub fork_sub(&) { 137sub fork_sub(&) {
… …
123 our $PATH; 179 our $PATH;
124 180
125 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 181 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
126 182
127 our $c_arc = new Coro::Channel; 183 our $c_arc = new Coro::Channel;
128 our $c_trs = new Coro::Channel; 184 our $c_any = new Coro::Channel;
129 our $c_res = new Coro::Channel;
130 185
131 our @c_png; 186 our @c_png;
132 187
133 sub commit_png($$$) { 188 sub commit_png($$$$) {
134 my ($name, $data, $T) = @_; 189 my ($stem, $name, $data, $T) = @_;
135 190
191 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
136 $FACEINFO{$name}{"data$T"} = $data; 192 $FACEINFO{$name}{"data$T"} = $data;
137 } 193 }
138 194
139 sub process_png { 195 sub process_png {
140 while (@c_png) { 196 while (@c_png) {
… …
358 414
359 if (0 > aio_load $file, $tile) { 415 if (0 > aio_load $file, $tile) {
360 die "$path: unable to read tile +$x+$y, aborting.\n"; 416 die "$path: unable to read tile +$x+$y, aborting.\n";
361 } 417 }
362 IO::AIO::aio_unlink $file unless $CACHE; 418 IO::AIO::aio_unlink $file unless $CACHE;
363 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 419 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
364 } 420 }
365 } else { 421 } else {
366 # use as-is (either small, use smooth) 422 # use as-is (either small, use smooth)
367 commit_png $face, $png, $T; 423 commit_png $stem, $face, $png, $T;
368 } 424 }
369 425
370 aio_unlink $path if $delete; 426 aio_unlink $path if $delete;
371 } 427 }
372 } 428 }
373 429
430 sub process_faceinfo {
431 my ($dir, $file) = @_;
432 my $path = "$dir/$file";
433
434 my $data;
435 if (0 > aio_load $path, $data) {
436 warn "$path: $!, skipping.\n";
437 return;
438 }
439
440 for (split /\n/, $data) {
441 chomp;
442 my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/;
443 # bg not used except for text clients
444
445 utf8::decode $glyph;
446 $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag
447
448 $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
449
450 (my $fgi = $COLOR{$fg})
451 // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n";
452 (my $bgi = $COLOR{$bg})
453 // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n";
454
455 my $fi = $FACEINFO{$face} ||= { };
456 $fi->{visibility} = $visibility * 1;
457 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap
458
459 $glyph .= " " if 2 > length $glyph; # TODO kanji
460 die "glyph $face too long" if 2 < length $glyph;
461
462 $fi->{glyph} = "";
463 for (split //, $glyph) {
464 utf8::encode $_;
465 $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_;
466 }
467 }
468 }
469
374 sub process_arc { 470 sub process_arc {
375 while (my $job = $c_arc->get) { 471 while (my ($dir, $file) = @{ $c_arc->get }) {
376 my ($dir, $file) = @$job;
377
378 my $arc; 472 my $arc;
379 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 473 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
380 474
381 my $arc = read_arch "$dir/$file"; 475 my $arc = read_arch "$dir/$file";
382 for my $o (values %$arc) { 476 for my $o (values %$arc) {
383 push @ARC, $o; 477 push @ARC, $o;
384 for (my $m = $o; $m; $m = $m->{more}) { 478 for (my $m = $o; $m; $m = $m->{more}) {
385 $ARC{$m->{_name}} = $m; 479 $ARC{$m->{_name}} = $m;
386 } 480 }
387 481
388 $o->{editor_folder} ||= $dir; 482 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
389
390 my $visibility = delete $o->{visibility};
391 my $magicmap = delete $o->{magicmap};
392 483
393 # find upper left corner :/ 484 # find upper left corner :/
394 # omg, this is sooo broken 485 # omg, this is sooo broken
395 my ($dx, $dy); 486 my ($dx, $dy);
396 for (my $o = $o; $o; $o = $o->{more}) { 487 for (my $o = $o; $o; $o = $o->{more}) {
… …
403 my $y = $o->{y} - $dy; 494 my $y = $o->{y} - $dy;
404 495
405 my $ext = $x|$y ? "+$x+$y" : ""; 496 my $ext = $x|$y ? "+$x+$y" : "";
406 497
407 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 498 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
408
409 $visibility = delete $o->{visibility} if exists $o->{visibility};
410 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
411 499
412 my $anim = delete $o->{anim}; 500 my $anim = delete $o->{anim};
413 501
414 if ($anim) { 502 if ($anim) {
415 # possibly add $ext to the animation name to avoid 503 # possibly add $ext to the animation name to avoid
… …
443 531
444 my $info = $FACEINFO{$face} ||= { }; 532 my $info = $FACEINFO{$face} ||= { };
445 $info->{arc} = $o; 533 $info->{arc} = $o;
446 534
447 next if $face =~ /^blank.x11$|^empty.x11$/; 535 next if $face =~ /^blank.x11$|^empty.x11$/;
448
449 $info->{visibility} = $visibility if defined $visibility;
450 $info->{magicmap} = $magicmap if defined $magicmap;
451 } 536 }
452 537
453 if (my $smooth = delete $o->{smoothface}) { 538 if (my $smooth = delete $o->{smoothface}) {
454 my %kv = split /\s+/, $smooth; 539 my %kv = split /\s+/, $smooth;
455 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 540 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
464 } 549 }
465 } 550 }
466 } 551 }
467 552
468 sub process_trs { 553 sub process_trs {
469 while (my $job = $c_trs->get) {
470 my ($dir, $file) = @$job; 554 my ($dir, $file) = @_;
471 my $path = "$dir/$file"; 555 my $path = "$dir/$file";
472 556
473 my $trs; 557 my $trs;
474 if (0 > aio_load $path, $trs) { 558 if (0 > aio_load $path, $trs) {
475 warn "$path: $!, skipping.\n"; 559 warn "$path: $!, skipping.\n";
476 next; 560 return;
477 } 561 }
478 562
479 $TRS .= $trs; 563 $TRS .= $trs;
480 }
481 } 564 }
482 565
483 my %FILECACHE; 566 my %FILECACHE;
484 567
485 sub load_cached($;$) { 568 sub load_cached($;$) {
… …
497 580
498 $FILECACHE{$_[0]} 581 $FILECACHE{$_[0]}
499 } 582 }
500 583
501 sub process_res { 584 sub process_res {
502 while (my $job = $c_res->get) {
503 my ($dir, $file, $type) = @$job; 585 my ($dir, $file, $type) = @_;
504 586
505 my $data; 587 my $data;
506 aio_load "$dir/$file", $data; 588 aio_load "$dir/$file", $data;
507 589
508 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 590 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
509 591
510 utf8::decode $dir; 592 utf8::decode $dir;
511 utf8::decode $file; 593 utf8::decode $file;
512 594
513 # a meta file for resources is now mandatory 595 # a meta file for resources is now mandatory
514 unless (exists $meta->{$file}) { 596 unless (exists $meta->{$file}) {
515 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 597 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
516 next; 598 return;
517 } 599 }
518 600
519 $meta = { 601 $meta = {
520 %{ $meta->{"" } || {} }, 602 %{ $meta->{"" } || {} },
521 %{ $meta->{$file} || {} }, 603 %{ $meta->{$file} || {} },
522 }; 604 };
523 605
524 if ($meta->{license} =~ s/^#//) { 606 if ($meta->{license} =~ s/^#//) {
525 $meta->{license} = ({ 607 $meta->{license} = ({
526 "pd" => "Public Domain", 608 "pd" => "Public Domain",
527 "gpl" => "GNU General Public License, version 3.0 or any later", 609 "gpl" => "GNU General Public License, version 3.0 or any later",
528 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 610 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
611 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
529 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 612 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
530 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 613 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
531 })->{$meta->{license}} 614 })->{$meta->{license}}
532 || warn "$dir/$file: license tag '$meta->{license}' not found."; 615 || warn "$dir/$file: license tag '$meta->{license}' not found.";
533 } 616 }
534 617
618 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
619 ($meta->{author} = $1) =~ s/_/ /g;
620 }
621
535 $file =~ s/\.res$//; 622 $file =~ s/\.res$//;
536 $file =~ s/\.(ogg|wav|jpg|png)$//; 623 $file =~ s/\.(ogg|wav|jpg|png)$//;
537 624
538 substr $dir, 0, 1 + length $PATH, ""; 625 substr $dir, 0, 1 + length $PATH, "";
539 626
540 if (my $filter = $meta->{cfutil_filter}) { 627 if (my $filter = $meta->{cfutil_filter}) {
541 if ($filter eq "yaml2json") { 628 if ($filter eq "yaml2json") {
542 $data = JSON::XS::encode_json YAML::XS::Load $data; 629 $data = JSON::XS::encode_json YAML::XS::Load $data;
543 } elsif ($filter eq "json2json") { 630 } elsif ($filter eq "json2json") {
544 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 631 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
545 } elsif ($filter eq "perl2json") { 632 } elsif ($filter eq "perl2json") {
546 $data = eval $data; die if $@; 633 $data = eval $data; die if $@;
547 $data = JSON::XS::encode_json $data; 634 $data = JSON::XS::encode_json $data;
548 } else { 635 } else {
549 warn "$dir/$file: unknown filter $filter, skipping\n"; 636 warn "$dir/$file: unknown filter $filter, skipping\n";
550 } 637 }
551 } 638 }
552 639
553 $RESOURCE{"$dir/$file"} = { 640 $RESOURCE{"$dir/$file"} = {
554 type => (exists $meta->{type} ? delete $meta->{type} : $type), 641 type => (exists $meta->{type} ? delete $meta->{type} : $type),
555 data => $data, 642 data => $data,
556 %$meta ? (meta => $meta) : (), 643 %$meta ? (meta => $meta) : (),
557 }; 644 };
645 }
646
647 sub process_any {
648 while (my ($func, @args) = @{ $c_any->get }) {
649 $func->(@args);
558 } 650 }
559 } 651 }
560 652
561 sub find_files; 653 sub find_files;
562 sub find_files { 654 sub find_files {
563 my ($path) = @_; 655 my ($path) = @_;
564 656
657 my $grp = IO::AIO::aio_group;
658
659 my $scandir; $scandir = sub {
660 my ($path) = @_;
661
565 IO::AIO::aioreq_pri 4; 662 IO::AIO::aioreq_pri 4;
566 IO::AIO::aio_scandir $path, 4, sub { 663 add $grp IO::AIO::aio_scandir $path, 4, sub {
567 my ($dirs, $nondirs) = @_; 664 my ($dirs, $nondirs) = @_;
568 665
569 find_files "$path/$_" 666 $scandir->("$path/$_")
570 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 667 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
571 668
572 my $dir = $path; 669 my $dir = $path;
573 substr $dir, 0, 1 + length $PATH, ""; 670 substr $dir, 0, 1 + length $PATH, "";
574 671
575 for my $file (@$nondirs) { 672 for my $file (@$nondirs) {
576 if ($dir =~ /^music(?:\/|$)/) { 673 if ($dir =~ /^music(?:\/|$)/) {
577 $c_res->put ([$path, $file, 3]) # FT_MUSIC 674 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
578 if $file =~ /\.(ogg)$/; 675 if $file =~ /\.(ogg)$/;
579 676
580 } elsif ($dir =~ /^sound(?:\/|$)/) { 677 } elsif ($dir =~ /^sound(?:\/|$)/) {
581 $c_res->put ([$path, $file, 5]) # FT_SOUND 678 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
582 if $file =~ /\.(wav|ogg)$/; 679 if $file =~ /\.(wav|ogg)$/;
583 680
584 } elsif ($dir =~ /^res(?:\/|$)/) { 681 } elsif ($dir =~ /^res(?:\/|$)/) {
585 if ($file =~ /\.(jpg|png)$/) { 682 if ($file =~ /\.(jpg|png)$/) {
586 $c_res->put ([$path, $file, 0]) # FT_FACE 683 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
587 } elsif ($file =~ /\.(res)$/) { 684 } elsif ($file =~ /\.(res)$/) {
685 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
686 } else {
687 $c_any->put ([\&process_res, $path, $file, undef]);
688 }
689
690 } elsif ($file =~ /\.png$/) {
691 push @c_png, ["$path/$file", 0];
692
693 } elsif ($file =~ /\.faceinfo$/) {
694 $c_any->put ([\&process_faceinfo, $path, $file]);
695
696 } elsif ($file =~ /\.trs$/) {
697 $c_any->put ([\&process_trs, $path, $file]);
698
699 } elsif ($file =~ /\.arc$/) {
588 $c_res->put ([$path, $file, 6]) # FT_RSRC 700 $c_arc->put ([$path, $file]);
701
589 } else { 702 } else {
590 $c_res->put ([$path, $file, undef]);
591 }
592
593 } elsif ($file =~ /\.png$/) {
594 push @c_png, ["$path/$file", 0];
595
596 } elsif ($file =~ /\.trs$/) {
597 $c_trs->put ([$path, $file]);
598
599 } elsif ($file =~ /\.arc$/) {
600 $c_arc->put ([$path, $file]);
601
602 } else {
603 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 703 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
604 } 704 }
705 }
605 } 706 };
606 }; 707 };
708
709 $scandir->($path);
710 aio_wait $grp;
607 } 711 }
608 712
609 sub generate_plurals { 713 sub generate_plurals {
610# use Lingua::EN::Inflect (); 714# use Lingua::EN::Inflect ();
611# Lingua::EN::Inflect::classical; 715# Lingua::EN::Inflect::classical;
… …
649 if (!-d "$path/treasures") { 753 if (!-d "$path/treasures") {
650 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 754 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
651 exit 1 unless $FORCE; 755 exit 1 unless $FORCE;
652 } 756 }
653 757
654 print "scanning files...\n" if $VERBOSE; 758 print "start file scan, arc, any processing...\n" if $VERBOSE;
759
760 my @a_arc = map +(async \&process_arc), 1..2;
761 my @a_any = map +(async \&process_any), 1..4;
655 762
656 find_files $path; 763 find_files $path;
657 764
658 my @a_arc = map +(async \&process_arc), 1..2;
659 my @a_res = map +(async \&process_res), 1..2;
660 my @a_trs = map +(async \&process_trs), 1..2;
661
662 IO::AIO::flush;
663
664 $c_res->shutdown;
665 $c_arc->shutdown; 765 $c_arc->shutdown;
666 $c_trs->shutdown; 766 $c_any->shutdown;
667
668 print "start file scan, arc, res processing...\n" if $VERBOSE;
669 767
670 $_->join for @a_arc; # need to parse all archetypes before png processing 768 $_->join for @a_arc; # need to parse all archetypes before png processing
671 769
672 print "end arc, start png processing...\n" if $VERBOSE; 770 print "end arc, start png processing...\n" if $VERBOSE;
673 771
674 # eight png crunchers work fine for my 4x smp machine 772 # eight png crunchers work fine for my 4x smp machine
675 my @a_png = map +(async \&process_png), 1..8; 773 my @a_png = map +(async \&process_png), 1..8;
676 774
677 $_->join for (@a_trs, @a_res, @a_png); 775 print "end any processing...\n" if $VERBOSE;
776 $_->join for @a_any;
777
778 print "end png processing...\n" if $VERBOSE;
779 $_->join for @a_png;
678 780
679 print "scanning done, processing results...\n" if $VERBOSE; 781 print "scanning done, processing results...\n" if $VERBOSE;
680 { 782 {
681 # remove path prefix from editor_folder 783 # remove path prefix from editor_folder
784 $_->{editor_folder} =~ /^\x00/
682 substr $_->{editor_folder}, 0, 1 + length $path, "" 785 and substr $_->{editor_folder}, 0, 2 + length $path, ""
683 for values %ARC; 786 for values %ARC;
684 787
685 print "resolving inheritance tree...\n" if $VERBOSE; 788 print "resolving inheritance tree...\n" if $VERBOSE;
686 # resolve inherit 789 # resolve inherit
687 while () { 790 while () {
688 my $progress; 791 my $progress;
689 my $loop; 792 my $loop;
690 793
691 for my $o (values %ARC) { 794 for my $o (values %ARC) {
692 if (my $other = $o->{inherit}) { 795 for my $other (split /,/, $o->{inherit}) {
693 if (my $s = $ARC{$other}) { 796 if (my $s = $ARC{$other}) {
694 if ($s->{inherit}) { 797 if ($s->{inherit}) {
695 $loop = $s; 798 $loop = $s;
696 } else { 799 } else {
697 delete $o->{inherit}; 800 delete $o->{inherit};
… …
699 delete @s{qw(_name more name name_pl)}; 802 delete @s{qw(_name more name name_pl)};
700 %$o = ( %s, %$o ); 803 %$o = ( %s, %$o );
701 ++$progress; 804 ++$progress;
702 } 805 }
703 } else { 806 } else {
704 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 807 warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
705 delete $ARC{$o->{_name}}; 808 delete $ARC{$o->{_name}};
706 } 809 }
707 } 810 }
708 } 811 }
709 812
… …
716 } 819 }
717 820
718 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 821 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
719 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 822 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
720 823
824 # fix up archetypes without names, where the archanme doesn't work at all
825 for (@ARC) {
826 if (!exists $_->{name} and $_->{_name} =~ /_/) {
827 for ($_->{name} = $_->{_name}) {
828 s/(?:_\d+)+$//;
829 s/_[nesw]+$//;
830 y/_/ /;
831 }
832 }
833 }
834
721 print "generating plurals...\n" if $VERBOSE; 835 #print "generating plurals...\n" if $VERBOSE;
722 generate_plurals; 836 #generate_plurals;
723 837
724 print "writing archetypes...\n" if $VERBOSE; 838 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
725 open my $fh, ">:utf8", "$DATADIR/archetypes~" 839 open my $fh, ">:utf8", "$DATADIR/archetypes~"
726 or die "$DATADIR/archetypes~: $!"; 840 or die "$DATADIR/archetypes~: $!";
727 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 841 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
728 } 842 }
729 843
730 { 844 {
731 print "writing treasures...\n" if $VERBOSE; 845 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
732 open my $fh, ">:utf8", "$DATADIR/treasures~" 846 open my $fh, ">:utf8", "$DATADIR/treasures~"
733 or die "$DATADIR/treasures~: $!"; 847 or die "$DATADIR/treasures~: $!";
734 print $fh $TRS; 848 print $fh $TRS;
735 } 849 }
736 850
737 { 851 {
738 print "processing facedata...\n" if $VERBOSE; 852 print "processing facedata...\n" if $VERBOSE;
739 while (my ($k, $v) = each %FACEINFO) { 853 while (my ($k, $v) = each %FACEINFO) {
740 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 854 length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n";
741 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 855 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
742 856
857 make_hash $k, $v->{data32}, $v->{hash32};
858 make_hash $k, $v->{data64}, $v->{hash64};
859
743 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 860 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
744 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 861 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
745 862
746 if (my $magicmap = $v->{magicmap}) { 863 $v->{glyph} // warn "WARNING: face '$k' has glyph.";
747 $magicmap =~ y/A-Z_\-/a-z/d; 864 $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
748 $v->{magicmap} = $COLOR{$magicmap}; 865 $v->{magicmap} // warn "WARNING: face '$k' has foreground colour.";
866
867 delete @$v{qw(arc stem)}; # not used by the server
868 }
869
870 print "processing resources...\n" if $VERBOSE;
871 my $enc = JSON::XS->new->utf8->canonical->relaxed;
872 while (my ($k, $v) = each %RESOURCE) {
873
874 if ($v->{meta} && $v->{meta}{datadir}) {
875 delete $RESOURCE{$k};
876
877 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
878
879 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
880 open my $fh, ">:raw", "$DATADIR/$k~"
881 or die "$DATADIR/$k~: $!";
882 syswrite $fh, $v->{data};
883 push @COMMIT, $k;
884
885 } else {
886 if ($v->{type} & 1) {
887 # prepend meta info
888
889 my $meta = $enc->encode ({
890 name => $k,
891 %{ $v->{meta} || {} },
892 });
893
894 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
749 } 895 }
750 896
751 delete $v->{arc}; 897 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
752 } 898 }
899 }
753 900
754 print "writing facedata...\n" if $VERBOSE; 901 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
902 scalar keys %FACEINFO,
903 scalar keys %ANIMINFO,
904 scalar keys %RESOURCE
905 if $VERBOSE;
906
755 open my $fh, ">:perlio", "$DATADIR/facedata~" 907 open my $fh, ">:perlio", "$DATADIR/facedata~"
756 or die "$DATADIR/facedata~: $!"; 908 or die "$DATADIR/facedata~: $!";
757 909
758 print $fh freeze { 910 print $fh nfreeze {
759 version => 2, 911 version => 2,
760 faceinfo => \%FACEINFO, 912 faceinfo => \%FACEINFO,
761 animinfo => \%ANIMINFO, 913 animinfo => \%ANIMINFO,
762 resource => \%RESOURCE, 914 resource => \%RESOURCE,
763 }; 915 };
916
764 } 917 }
765 918
766 print "committing files...\n" if $VERBOSE; 919 print "committing files...\n" if $VERBOSE;
767 920
768 for (qw(archetypes facedata treasures)) { 921 for (qw(archetypes facedata treasures), @COMMIT) {
769 chmod 0644, "$DATADIR/$_~"; 922 chmod 0644, "$DATADIR/$_~";
770 rename "$DATADIR/$_~", "$DATADIR/$_" 923 rename "$DATADIR/$_~", "$DATADIR/$_"
771 or die "$DATADIR/$_: $!"; 924 or die "$DATADIR/$_: $!";
772 } 925 }
773 926

Diff Legend

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