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.60 by root, Mon Aug 27 02:43:38 2007 UTC vs.
Revision 1.102 by root, Wed Oct 6 18:23:52 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@";
… …
12my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@"; 36my $PNGNQ = "@PNGNQ@";
15 37
16use Getopt::Long; 38use Getopt::Long;
39use File::Temp;
40use POSIX ();
41use Carp;
42
17use Coro::Event; 43use Coro::EV;
18use AnyEvent; 44use AnyEvent;
45use YAML::XS ();
46use JSON::XS ();
19use IO::AIO (); 47use IO::AIO ();
20use File::Temp; 48use Digest::MD5 ();
21use Crossfire; 49
22use Coro; 50use Coro 5.12;
23use Coro::AIO; 51use Coro::AIO;
24use Coro::Util; 52use Coro::Util;
25use POSIX ();
26use Carp;
27use Coro::Channel; 53use Coro::Channel;
28use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
29 57
30$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
31 59
32sub usage { 60sub usage {
33 warn <<EOF; 61 warn <<EOF;
… …
46my $VERBOSE = 1; 74my $VERBOSE = 1;
47my $CACHE = 0; 75my $CACHE = 0;
48my $FORCE; 76my $FORCE;
49my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
50my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
51 80
52our %COLOR = ( 81our %COLOR = (
53 black => 0, 82 black => 0,
54 white => 1, 83 white => 1,
55 navy => 2, 84 navy => 2,
… …
65 tan => 12, 94 tan => 12,
66); 95);
67 96
68END { system "rm", "-rf", $TMPDIR } 97END { system "rm", "-rf", $TMPDIR }
69 98
70Event->signal (signal => "INT", cb => sub { exit 1 }); 99my $s_INT = EV::signal INT => sub { exit 1 };
71Event->signal (signal => "TERM", cb => sub { exit 1 }); 100my $s_TERM = EV::signal TERM => sub { exit 1 };
101
102our %hash;
103
104# here we could try to avoid collisions and reduce chksum size further
105sub make_hash($\$\$;$) {
106 my ($id, $dataref, $hashref, $clen) = @_;
107
108 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
109
110 if (exists $hash{$hash}) {
111 # hash collision, but some files are simply identical
112 if (${$hash{$hash}[1]} ne $$dataref) {
113 warn "hash collision $hash{$hash}[0] vs. $id\n";
114 exit 1;
115 } else {
116 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
117 }
118 }
119 $hash{$hash} = [$id, $dataref, $hashref];
120
121 $$hashref = $hash;
122}
72 123
73mkdir $TMPDIR, 0700 124mkdir $TMPDIR, 0700
74 or die "$TMPDIR: $!"; 125 or die "$TMPDIR: $!";
75 126
76sub fork_sub(&) { 127sub fork_sub(&) {
… …
96 if (!-f "$path/regions") { 147 if (!-f "$path/regions") {
97 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 148 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
98 exit 1 unless $FORCE; 149 exit 1 unless $FORCE;
99 } 150 }
100 151
101 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 152 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
153 "$path/.", "$DATADIR/maps/.",
154 "--exclude", "CVS", "--exclude", "/world-precomposed",
155 "--delete", "--delete-excluded"
102 and die "map installation failed.\n"; 156 and die "map installation failed.\n";
103 157
104 print "maps installed successfully.\n"; 158 print "maps installed successfully.\n";
159}
160
161our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
162
163# used to create crude text glyphs for text-based clients
164sub autoglyph {
165 my ($stem, $face) = @_;
166
167 if ($stem =~ /^wall\/|Nimwall/) {
168 return $WALL_SUFFIX[hex $1]
169 if $stem =~ /(_[0-9A-F]).x11/;
170
171 "█"
172
173 } elsif ($stem =~ /^traps\//) {
174 "☠"
175
176 } elsif ($stem =~ /^armour\/shield/) {
177 "Ø"
178
179 } elsif ($stem =~ /^armour\//) {
180 "A"
181
182 } elsif ($stem =~ /^weapon\//) {
183 "†"
184
185 } elsif ($stem =~ /^readable\//) {
186 "✉"
187
188 } elsif ($stem =~ /^river\//) {
189 "~"
190
191 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
192 "·"
193
194 } elsif ($stem =~ /^spells\//) {
195 "!"
196
197 } elsif ($stem =~ /^exit\//) {
198 "⎆"
199
200 } elsif ($stem =~ /^construct\//) {
201 "⌂"
202
203 } elsif ($stem =~ /^player\//) {
204 "\@"
205
206 } elsif ($stem =~ /^(?:monster|misc|class|connect|gods|indoor|inorganic|mining|music|skills).*\/(.)/) {
207 $1
208
209 } else {
210 substr $stem, 0, 1
211 }
105} 212}
106 213
107{ 214{
108 our %ANIMINFO; 215 our %ANIMINFO;
109 our %FACEINFO; 216 our %FACEINFO;
… …
120 our $c_trs = new Coro::Channel; 227 our $c_trs = new Coro::Channel;
121 our $c_res = new Coro::Channel; 228 our $c_res = new Coro::Channel;
122 229
123 our @c_png; 230 our @c_png;
124 231
125 sub commit_png($$$) { 232 sub commit_png($$$$) {
126 my ($name, $data, $T) = @_; 233 my ($stem, $name, $data, $T) = @_;
127 234
235 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
128 $FACEINFO{$name}{"data$T"} = $data; 236 $FACEINFO{$name}{"data$T"} = $data;
129 } 237 }
130 238
131 sub process_png { 239 sub process_png {
132 while (@c_png) { 240 while (@c_png) {
… …
268 fork_sub { 376 fork_sub {
269 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 377 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
270 system $OPTIPNG, "-i0", "-q", "$other~"; 378 system $OPTIPNG, "-i0", "-q", "$other~";
271 379
272 # reduce smoothfaces >10000 bytes 380 # reduce smoothfaces >10000 bytes
381 # obsolete, no longer required
273 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 382 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
274 my $ncolor = 256; 383 my $ncolor = 256;
275 while () { 384 while () {
276 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 385 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
277 system $OPTIPNG, "-i0", "-q", "$other~~"; 386 system $OPTIPNG, "-i0", "-q", "$other~~";
278 last if 10000 > -s "$other~~"; 387 last if 10000 > -s "$other~~";
… …
349 458
350 if (0 > aio_load $file, $tile) { 459 if (0 > aio_load $file, $tile) {
351 die "$path: unable to read tile +$x+$y, aborting.\n"; 460 die "$path: unable to read tile +$x+$y, aborting.\n";
352 } 461 }
353 IO::AIO::aio_unlink $file unless $CACHE; 462 IO::AIO::aio_unlink $file unless $CACHE;
354 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 463 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
355 } 464 }
356 } else { 465 } else {
357 # use as-is (either small, use smooth) 466 # use as-is (either small, use smooth)
358 commit_png $face, $png, $T; 467 commit_png $stem, $face, $png, $T;
359 } 468 }
360 469
361 aio_unlink $path if $delete; 470 aio_unlink $path if $delete;
362 } 471 }
363 } 472 }
… …
374 push @ARC, $o; 483 push @ARC, $o;
375 for (my $m = $o; $m; $m = $m->{more}) { 484 for (my $m = $o; $m; $m = $m->{more}) {
376 $ARC{$m->{_name}} = $m; 485 $ARC{$m->{_name}} = $m;
377 } 486 }
378 487
379 $o->{editor_folder} = $dir; 488 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
380 489
381 my $visibility = delete $o->{visibility}; 490 my $visibility = delete $o->{visibility};
382 my $magicmap = delete $o->{magicmap}; 491 my $magicmap = delete $o->{magicmap};
492 my $glyph = delete $o->{glyph};
383 493
384 # find upper left corner :/ 494 # find upper left corner :/
385 # omg, this is sooo broken 495 # omg, this is sooo broken
386 my ($dx, $dy); 496 my ($dx, $dy);
387 for (my $o = $o; $o; $o = $o->{more}) { 497 for (my $o = $o; $o; $o = $o->{more}) {
… …
397 507
398 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 508 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
399 509
400 $visibility = delete $o->{visibility} if exists $o->{visibility}; 510 $visibility = delete $o->{visibility} if exists $o->{visibility};
401 $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 511 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
512 $glyph = delete $o->{glyph} if exists $o->{glyph};
402 513
403 my $anim = delete $o->{anim}; 514 my $anim = delete $o->{anim};
404 515
405 if ($anim) { 516 if ($anim) {
406 # possibly add $ext to the animation name to avoid 517 # possibly add $ext to the animation name to avoid
… …
437 548
438 next if $face =~ /^blank.x11$|^empty.x11$/; 549 next if $face =~ /^blank.x11$|^empty.x11$/;
439 550
440 $info->{visibility} = $visibility if defined $visibility; 551 $info->{visibility} = $visibility if defined $visibility;
441 $info->{magicmap} = $magicmap if defined $magicmap; 552 $info->{magicmap} = $magicmap if defined $magicmap;
553 $info->{glyph} = $glyph if defined $glyph;
442 } 554 }
443 555
444 if (my $smooth = delete $o->{smoothface}) { 556 if (my $smooth = delete $o->{smoothface}) {
445 my %kv = split /\s+/, $smooth; 557 my %kv = split /\s+/, $smooth;
446 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 558 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
496 my $data; 608 my $data;
497 aio_load "$dir/$file", $data; 609 aio_load "$dir/$file", $data;
498 610
499 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 611 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
500 612
501 next if $meta && !exists $meta->{$file}; 613 utf8::decode $dir;
614 utf8::decode $file;
615
616 # a meta file for resources is now mandatory
617 unless (exists $meta->{$file}) {
618 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
619 next;
620 }
502 621
503 $meta = { 622 $meta = {
504 %{ $meta->{"" } || {} }, 623 %{ $meta->{"" } || {} },
505 %{ $meta->{$file} || {} }, 624 %{ $meta->{$file} || {} },
506 }; 625 };
… …
508 if ($meta->{license} =~ s/^#//) { 627 if ($meta->{license} =~ s/^#//) {
509 $meta->{license} = ({ 628 $meta->{license} = ({
510 "pd" => "Public Domain", 629 "pd" => "Public Domain",
511 "gpl" => "GNU General Public License, version 3.0 or any later", 630 "gpl" => "GNU General Public License, version 3.0 or any later",
512 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 631 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
632 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
513 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 633 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
514 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 634 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
515 })->{$meta->{license}} 635 })->{$meta->{license}}
516 || warn "$dir/$file: license tag '$meta->{license}' not found."; 636 || warn "$dir/$file: license tag '$meta->{license}' not found.";
517 } 637 }
518 638
639 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
640 ($meta->{author} = $1) =~ s/_/ /g;
641 }
642
519 $file =~ s/\.res$//; 643 $file =~ s/\.res$//;
520 $file =~ s/\.(ogg|wav|jpg|png)$//; 644 $file =~ s/\.(ogg|wav|jpg|png)$//;
521 645
522 substr $dir, 0, 1 + length $PATH, ""; 646 substr $dir, 0, 1 + length $PATH, "";
523 647
648 if (my $filter = $meta->{cfutil_filter}) {
649 if ($filter eq "yaml2json") {
650 $data = JSON::XS::encode_json YAML::XS::Load $data;
651 } elsif ($filter eq "json2json") {
652 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
653 } elsif ($filter eq "perl2json") {
654 $data = eval $data; die if $@;
655 $data = JSON::XS::encode_json $data;
656 } else {
657 warn "$dir/$file: unknown filter $filter, skipping\n";
658 }
659 }
660
524 $RESOURCE{"$dir/$file"} = { 661 $RESOURCE{"$dir/$file"} = {
525 type => (delete $meta->{type}) || $type, 662 type => (exists $meta->{type} ? delete $meta->{type} : $type),
526 data => $data, 663 data => $data,
527 %$meta ? (meta => $meta) : (), 664 %$meta ? (meta => $meta) : (),
528 }; 665 };
529 } 666 }
530 } 667 }
… …
536 IO::AIO::aioreq_pri 4; 673 IO::AIO::aioreq_pri 4;
537 IO::AIO::aio_scandir $path, 4, sub { 674 IO::AIO::aio_scandir $path, 4, sub {
538 my ($dirs, $nondirs) = @_; 675 my ($dirs, $nondirs) = @_;
539 676
540 find_files "$path/$_" 677 find_files "$path/$_"
541 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 678 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
542 679
543 my $dir = $path; 680 my $dir = $path;
544 substr $dir, 0, 1 + length $PATH, ""; 681 substr $dir, 0, 1 + length $PATH, "";
545 682
546 for my $file (@$nondirs) { 683 for my $file (@$nondirs) {
… …
551 } elsif ($dir =~ /^sound(?:\/|$)/) { 688 } elsif ($dir =~ /^sound(?:\/|$)/) {
552 $c_res->put ([$path, $file, 5]) # FT_SOUND 689 $c_res->put ([$path, $file, 5]) # FT_SOUND
553 if $file =~ /\.(wav|ogg)$/; 690 if $file =~ /\.(wav|ogg)$/;
554 691
555 } elsif ($dir =~ /^res(?:\/|$)/) { 692 } elsif ($dir =~ /^res(?:\/|$)/) {
693 if ($file =~ /\.(jpg|png)$/) {
556 $c_res->put ([$path, $file, 0]) # FT_FACE 694 $c_res->put ([$path, $file, 0]) # FT_FACE
557 if $file =~ /\.(jpg|png)$/; 695 } elsif ($file =~ /\.(res)$/) {
558 $c_res->put ([$path, $file, 7]) # FT_RSRC 696 $c_res->put ([$path, $file, 6]) # FT_RSRC
559 if $file =~ /\.(res)$/; 697 } else {
698 $c_res->put ([$path, $file, undef]);
699 }
560 700
561 } elsif ($file =~ /\.png$/) { 701 } elsif ($file =~ /\.png$/) {
562 push @c_png, ["$path/$file", 0]; 702 push @c_png, ["$path/$file", 0];
563 703
564 } elsif ($file =~ /\.trs$/) { 704 } elsif ($file =~ /\.trs$/) {
… …
570 } else { 710 } else {
571 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 711 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
572 } 712 }
573 } 713 }
574 }; 714 };
715 }
716
717 sub generate_plurals {
718# use Lingua::EN::Inflect ();
719# Lingua::EN::Inflect::classical;
720# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
721# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
722#
723# for my $a (@ARC) {
724# my $name = $a->{name} || $a->{_name};
725#
726# next unless $a->{name_pl};
727# next if $a->{invisible};
728# next if $a->{is_floor};
729# next if $a->{no_pick};
730#
731# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
732# my $pl = $test =~ /^(?:eq|p:.)$/
733# ? $name
734# : Lingua::EN::Inflect::PL $name;
735#
736# if ($pl ne $a->{name_pl}) {
737# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
738# }
739# }
575 } 740 }
576 741
577 sub inst_arch($) { 742 sub inst_arch($) {
578 my (undef, $path) = @_; 743 my (undef, $path) = @_;
579 744
… …
602 my @a_res = map +(async \&process_res), 1..2; 767 my @a_res = map +(async \&process_res), 1..2;
603 my @a_trs = map +(async \&process_trs), 1..2; 768 my @a_trs = map +(async \&process_trs), 1..2;
604 769
605 IO::AIO::flush; 770 IO::AIO::flush;
606 771
607 $c_res->put (undef) for @a_res; 772 $c_res->shutdown;
608 $c_arc->put (undef) for @a_arc; 773 $c_arc->shutdown;
609 $c_trs->put (undef) for @a_trs; 774 $c_trs->shutdown;
610 775
611 print "start file scan, arc, res processing...\n" if $VERBOSE; 776 print "start file scan, arc, res processing...\n" if $VERBOSE;
612 777
613 $_->join for @a_arc; # need to parse all archetypes before png processing 778 $_->join for @a_arc; # need to parse all archetypes before png processing
614 779
615 print "end arc, start png processing...\n" if $VERBOSE; 780 print "end arc, start png processing...\n" if $VERBOSE;
616 781
617 # four png crunchers work fine for my 2x smp machine 782 # eight png crunchers work fine for my 4x smp machine
618 my @a_png = map +(async \&process_png), 1..4; 783 my @a_png = map +(async \&process_png), 1..8;
619 784
620 $_->join for (@a_trs, @a_res, @a_png); 785 $_->join for (@a_trs, @a_res, @a_png);
621 786
622 print "scanning done, processing results...\n" if $VERBOSE; 787 print "scanning done, processing results...\n" if $VERBOSE;
623 { 788 {
624 # remove path prefix from editor_folder 789 # remove path prefix from editor_folder
790 $_->{editor_folder} =~ /^\x00/
625 substr $_->{editor_folder}, 0, 1 + length $path, "" 791 and substr $_->{editor_folder}, 0, 2 + length $path, ""
626 for values %ARC; 792 for values %ARC;
627 793
628 print "resolving inheritance tree...\n" if $VERBOSE; 794 print "resolving inheritance tree...\n" if $VERBOSE;
629 # resolve inherit 795 # resolve inherit
630 while () { 796 while () {
631 my $progress; 797 my $progress;
632 my $loop; 798 my $loop;
633 799
634 for my $o (values %ARC) { 800 for my $o (values %ARC) {
635 if (my $other = $o->{inherit}) { 801 for my $other (split /,/, $o->{inherit}) {
636 if (my $s = $ARC{$other}) { 802 if (my $s = $ARC{$other}) {
637 if ($s->{inherit}) { 803 if ($s->{inherit}) {
638 $loop = $s; 804 $loop = $s;
639 } else { 805 } else {
640 delete $o->{inherit}; 806 delete $o->{inherit};
… …
659 } 825 }
660 826
661 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 827 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
662 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 828 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
663 829
830 print "generating plurals...\n" if $VERBOSE;
831 generate_plurals;
832
664 print "writing archetypes...\n" if $VERBOSE; 833 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
665 open my $fh, ">:utf8", "$DATADIR/archetypes~" 834 open my $fh, ">:utf8", "$DATADIR/archetypes~"
666 or die "$DATADIR/archetypes~: $!"; 835 or die "$DATADIR/archetypes~: $!";
667 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 836 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
668 } 837 }
669 838
670 { 839 {
671 print "writing treasures...\n" if $VERBOSE; 840 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
672 open my $fh, ">:utf8", "$DATADIR/treasures~" 841 open my $fh, ">:utf8", "$DATADIR/treasures~"
673 or die "$DATADIR/treasures~: $!"; 842 or die "$DATADIR/treasures~: $!";
674 print $fh $TRS; 843 print $fh $TRS;
675 } 844 }
676 845
… …
678 print "processing facedata...\n" if $VERBOSE; 847 print "processing facedata...\n" if $VERBOSE;
679 while (my ($k, $v) = each %FACEINFO) { 848 while (my ($k, $v) = each %FACEINFO) {
680 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 849 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
681 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 850 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
682 851
852 make_hash $k, $v->{data32}, $v->{hash32};
853 make_hash $k, $v->{data64}, $v->{hash64};
854
683 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 855 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
684 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 856 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
685 857
686 if (my $magicmap = $v->{magicmap}) { 858 if (my $magicmap = $v->{magicmap}) {
687 $magicmap =~ y/A-Z_\-/a-z/d; 859 $magicmap =~ y/A-Z_\-/a-z/d;
688 $v->{magicmap} = $COLOR{$magicmap}; 860 $v->{magicmap} = $COLOR{$magicmap};
689 } 861 }
690 862
863 my $stem = delete $v->{stem};
864 $v->{glyph} //= autoglyph $stem, $v;
865 utf8::encode $v->{glyph};
866 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
867
691 delete $v->{arc}; 868 delete $v->{arc};
692 } 869 }
693 870
694 print "writing facedata...\n" if $VERBOSE; 871 print "processing resources...\n" if $VERBOSE;
872 my $enc = JSON::XS->new->utf8->canonical->relaxed;
873 while (my ($k, $v) = each %RESOURCE) {
874
875 if ($v->{meta} && $v->{meta}{datadir}) {
876 delete $RESOURCE{$k};
877
878 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
879
880 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
881 open my $fh, ">:raw", "$DATADIR/$k~"
882 or die "$DATADIR/$k~: $!";
883 syswrite $fh, $v->{data};
884 push @COMMIT, $k;
885
886 } else {
887 if ($v->{type} & 1) {
888 # prepend meta info
889
890 my $meta = $enc->encode ({
891 name => $k,
892 %{ $v->{meta} || {} },
893 });
894
895 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
896 }
897
898 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
899 }
900 }
901
902 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
903 scalar keys %FACEINFO,
904 scalar keys %ANIMINFO,
905 scalar keys %RESOURCE
906 if $VERBOSE;
907
695 open my $fh, ">:perlio", "$DATADIR/facedata~" 908 open my $fh, ">:perlio", "$DATADIR/facedata~"
696 or die "$DATADIR/facedata~: $!"; 909 or die "$DATADIR/facedata~: $!";
697 910
698 print $fh freeze { 911 print $fh nfreeze {
699 version => 2, 912 version => 2,
700 faceinfo => \%FACEINFO, 913 faceinfo => \%FACEINFO,
701 animinfo => \%ANIMINFO, 914 animinfo => \%ANIMINFO,
702 resource => \%RESOURCE, 915 resource => \%RESOURCE,
703 }; 916 };
917
704 } 918 }
705 919
706 print "committing files...\n" if $VERBOSE; 920 print "committing files...\n" if $VERBOSE;
707 921
708 for (qw(archetypes facedata treasures)) { 922 for (qw(archetypes facedata treasures), @COMMIT) {
709 chmod 0644, "$DATADIR/$_~"; 923 chmod 0644, "$DATADIR/$_~";
710 rename "$DATADIR/$_~", "$DATADIR/$_" 924 rename "$DATADIR/$_~", "$DATADIR/$_"
711 or die "$DATADIR/$_: $!"; 925 or die "$DATADIR/$_: $!";
712 } 926 }
713 927

Diff Legend

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