1 | #!@PERL@ |
1 | #!@PERL@ |
2 | |
2 | |
3 | # |
3 | # |
4 | # This file is part of Deliantra, the Roguelike Realtime MMORPG. |
4 | # This file is part of Deliantra, the Roguelike Realtime MMORPG. |
5 | # |
5 | # |
6 | # Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
6 | # Copyright (©) 2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
7 | # |
7 | # |
8 | # Deliantra is free software: you can redistribute it and/or modify it under |
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 |
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 |
10 | # Free Software Foundation, either version 3 of the License, or (at your |
11 | # option) any later version. |
11 | # option) any later version. |
… | |
… | |
20 | # <http://www.gnu.org/licenses/>. |
20 | # <http://www.gnu.org/licenses/>. |
21 | # |
21 | # |
22 | # The authors can be reached via e-mail to <support@deliantra.net> |
22 | # The authors can be reached via e-mail to <support@deliantra.net> |
23 | # |
23 | # |
24 | |
24 | |
25 | use strict; |
25 | use common::sense; |
26 | |
26 | |
27 | my $prefix = "@prefix@"; |
27 | my $prefix = "@prefix@"; |
28 | my $exec_prefix = "@exec_prefix@"; |
28 | my $exec_prefix = "@exec_prefix@"; |
29 | my $datarootdir = "@datarootdir@"; |
29 | my $datarootdir = "@datarootdir@"; |
30 | my $DATADIR = "@datadir@/@PACKAGE@"; |
30 | my $DATADIR = "@datadir@/@PACKAGE@"; |
31 | |
31 | |
32 | my $CONVERT = "@CONVERT@"; |
32 | my $CONVERT = "@CONVERT@"; |
33 | #my $IDENTIFY = "@IDENTIFY@"; |
33 | my $IDENTIFY = "@IDENTIFY@"; |
34 | my $OPTIPNG = "@OPTIPNG@"; |
34 | my $OPTIPNG = "@OPTIPNG@"; |
35 | my $RSYNC = "@RSYNC@"; |
35 | my $RSYNC = "@RSYNC@"; |
36 | my $PNGNQ = "@PNGNQ@"; |
36 | my $PNGNQ = "@PNGNQ@"; |
37 | |
37 | |
38 | use Getopt::Long; |
38 | use Getopt::Long; |
39 | use File::Temp; |
39 | use File::Temp; |
40 | use POSIX (); |
40 | use POSIX (); |
41 | use Carp; |
41 | use Carp; |
42 | |
42 | |
43 | use Coro::EV; |
|
|
44 | use AnyEvent; |
|
|
45 | use YAML::XS (); |
43 | use YAML::XS (); |
|
|
44 | use Digest::MD5 (); |
|
|
45 | use Storable (); |
46 | use JSON::XS (); |
46 | use JSON::XS (); |
47 | use IO::AIO (); |
47 | use IO::AIO (); |
48 | use Digest::MD5 (); |
48 | use Compress::LZF (); |
49 | |
49 | |
|
|
50 | use AnyEvent; |
50 | use Coro 5.12; |
51 | use Coro 5.12; |
|
|
52 | use Coro::EV; |
51 | use Coro::AIO; |
53 | use Coro::AIO; |
52 | use Coro::Util; |
54 | use Coro::Util; |
53 | use Coro::Channel; |
55 | use Coro::Channel; |
|
|
56 | use Coro::AnyEvent; |
54 | use Coro::Storable; $Storable::canonical = 1; |
57 | use Coro::Storable; $Storable::canonical = 1; |
55 | |
58 | |
56 | use Deliantra; |
59 | use Deliantra; |
57 | |
60 | |
58 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
61 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
… | |
… | |
77 | my $TMPDIR = "/tmp/cfutil$$~"; |
80 | my $TMPDIR = "/tmp/cfutil$$~"; |
78 | my $TMPFILE = "aaaa0"; |
81 | my $TMPFILE = "aaaa0"; |
79 | my @COMMIT; |
82 | my @COMMIT; |
80 | |
83 | |
81 | our %COLOR = ( |
84 | our %COLOR = ( |
|
|
85 | # original cf colours |
82 | black => 0, |
86 | black => 0, |
83 | white => 1, |
87 | white => 1, |
84 | navy => 2, |
88 | navy => 2, # "dark blue" |
85 | red => 3, |
89 | red => 3, |
86 | orange => 4, |
90 | orange => 4, |
87 | blue => 5, |
91 | blue => 5, # "light blue" |
88 | darkorange => 6, |
92 | darkorange => 6, |
89 | green => 7, |
93 | green => 7, |
90 | lightgreen => 8, |
94 | lightgreen => 8, |
91 | grey => 9, |
95 | grey => 9, |
|
|
96 | brown => 10, # "yellow" |
|
|
97 | gold => 11, # "light yellow" |
|
|
98 | tan => 12, # yellowish gray |
|
|
99 | |
|
|
100 | # new for deliantra |
92 | brown => 10, |
101 | none => 13, |
|
|
102 | |
|
|
103 | # compatibility to existing archetypes |
|
|
104 | lightblue => 5, |
93 | gold => 11, |
105 | gray => 9, |
|
|
106 | yellow => 11, |
94 | tan => 12, |
107 | khaki => 12, |
95 | ); |
108 | ); |
96 | |
109 | |
97 | END { system "rm", "-rf", $TMPDIR } |
110 | END { system "rm", "-rf", $TMPDIR } |
98 | |
111 | |
99 | my $s_INT = EV::signal INT => sub { exit 1 }; |
112 | my $s_INT = EV::signal INT => sub { exit 1 }; |
… | |
… | |
103 | |
116 | |
104 | # here we could try to avoid collisions and reduce chksum size further |
117 | # here we could try to avoid collisions and reduce chksum size further |
105 | sub make_hash($\$\$;$) { |
118 | sub make_hash($\$\$;$) { |
106 | my ($id, $dataref, $hashref, $clen) = @_; |
119 | my ($id, $dataref, $hashref, $clen) = @_; |
107 | |
120 | |
108 | my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; |
121 | my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 5; |
109 | |
122 | |
110 | if (exists $hash{$hash}) { |
123 | if (exists $hash{$hash}) { |
111 | # hahs collinion, but some files are simply identical |
124 | # hash collision, but some files are simply identical |
112 | if (${$hash{$hash}[1]} ne $$dataref) { |
125 | if (${$hash{$hash}[1]} ne $$dataref) { |
113 | warn "hash collision $hash{$hash}[0] vs. $id\n"; |
126 | warn "hash collision $hash{$hash}[0] vs. $id (increase the default \$clen in make_hash?)\n"; |
114 | exit 1; |
127 | exit 1; |
115 | } else { |
128 | } else { |
116 | print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; |
129 | print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; |
117 | } |
130 | } |
118 | } |
131 | } |
119 | $hash{$hash} = [$id, $dataref, $hashref]; |
132 | $hash{$hash} = [$id, $dataref, $hashref]; |
120 | |
133 | |
121 | $$hashref = $hash; |
134 | $$hashref = $hash; |
122 | } |
135 | } |
123 | |
136 | |
|
|
137 | sub optipng($) { |
|
|
138 | system $OPTIPNG, "-o5", "-i0", "-q", $_[0]; |
|
|
139 | die "$_[0] has zero size, aborting." unless -s $_[0]; |
|
|
140 | } |
|
|
141 | |
124 | mkdir $TMPDIR, 0700 |
142 | mkdir $TMPDIR, 0700 |
125 | or die "$TMPDIR: $!"; |
143 | or die "$TMPDIR: $!"; |
126 | |
144 | |
127 | sub fork_sub(&) { |
145 | sub fork_exec(&) { |
128 | my ($cb) = @_; |
146 | my ($cb) = @_; |
129 | |
147 | |
130 | if (my $pid = fork) { |
148 | if (my $pid = fork) { |
131 | my $current = $Coro::current; |
149 | my $current = $Coro::current; |
132 | my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); |
150 | my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); |
… | |
… | |
137 | warn $@; |
155 | warn $@; |
138 | POSIX::_exit 1; |
156 | POSIX::_exit 1; |
139 | } |
157 | } |
140 | } |
158 | } |
141 | |
159 | |
|
|
160 | sub imgsize($) { |
|
|
161 | open my $fh, "-|", $IDENTIFY, qw(-ping -format %w,%h --), $_[0] |
|
|
162 | or die "$IDENTIFY: $!"; |
|
|
163 | |
|
|
164 | Coro::AnyEvent::readable $fh; |
|
|
165 | |
|
|
166 | my ($w, $h) = split /,/, <$fh>; |
|
|
167 | |
|
|
168 | ($w+0, $h+0) |
|
|
169 | } |
|
|
170 | |
|
|
171 | # make $dst from $src, if not uptodate, by calling $how |
|
|
172 | sub make_file($$$) { |
|
|
173 | my ($src, $dst, $how) = @_; |
|
|
174 | |
|
|
175 | my $t = (aio_stat $dst) ? -1 : (stat _)[9]; |
|
|
176 | |
|
|
177 | for (ref $src ? @$src : $src) { |
|
|
178 | aio_stat $_ |
|
|
179 | and die "$_: $!"; |
|
|
180 | |
|
|
181 | if ((stat _)[9] > $t) { |
|
|
182 | # outdated, redo |
|
|
183 | $how->(); |
|
|
184 | last; |
|
|
185 | } |
|
|
186 | } |
|
|
187 | } |
|
|
188 | |
142 | sub inst_maps($) { |
189 | sub inst_maps($) { |
143 | my (undef, $path) = @_; |
190 | my (undef, $path) = @_; |
144 | |
191 | |
145 | print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; |
192 | print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; |
146 | |
193 | |
… | |
… | |
169 | our $PATH; |
216 | our $PATH; |
170 | |
217 | |
171 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
218 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
172 | |
219 | |
173 | our $c_arc = new Coro::Channel; |
220 | our $c_arc = new Coro::Channel; |
174 | our $c_trs = new Coro::Channel; |
221 | our $c_any = new Coro::Channel; |
175 | our $c_res = new Coro::Channel; |
|
|
176 | |
222 | |
177 | our @c_png; |
223 | our @c_png; |
178 | |
224 | |
179 | sub commit_png($$$) { |
225 | sub commit_png($$$$) { |
180 | my ($name, $data, $T) = @_; |
226 | my ($stem, $name, $data, $T) = @_; |
181 | |
227 | |
|
|
228 | $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH; |
182 | $FACEINFO{$name}{"data$T"} = $data; |
229 | $FACEINFO{$name}{"data$T"} = $data; |
183 | } |
230 | } |
184 | |
231 | |
185 | sub process_png { |
232 | sub process_png { |
186 | while (@c_png) { |
233 | while (@c_png) { |
… | |
… | |
238 | unless ($path =~ /~$/) { |
285 | unless ($path =~ /~$/) { |
239 | # possibly enlarge |
286 | # possibly enlarge |
240 | if (0 > aio_stat "$stem.64x64.png") { |
287 | if (0 > aio_stat "$stem.64x64.png") { |
241 | my $other = "$stem.64x64.png~"; |
288 | my $other = "$stem.64x64.png~"; |
242 | |
289 | |
243 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
290 | make_file $path, $other, sub { |
244 | fork_sub { |
291 | fork_exec { |
245 | my $CROP; |
292 | my $CROP; |
246 | my $SRC = "png:\Q$path\E"; |
293 | my $SRC = "png:\Q$path\E"; |
247 | |
294 | |
248 | my $is_floor = $arc->{is_floor}; |
295 | my $is_floor = $arc->{is_floor}; |
249 | my $is_wall = 0; |
296 | my $is_wall = 0; |
… | |
… | |
303 | |
350 | |
304 | system "convert -depth 8 $SRC rgba:-" |
351 | system "convert -depth 8 $SRC rgba:-" |
305 | . "| $exec_prefix/bin/cfhq2xa $w $h 0" |
352 | . "| $exec_prefix/bin/cfhq2xa $w $h 0" |
306 | . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" |
353 | . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" |
307 | and die "convert/cfhq2xa pipeline error: status $? ($!)"; |
354 | and die "convert/cfhq2xa pipeline error: status $? ($!)"; |
308 | system $OPTIPNG, "-i0", "-q", "$other~"; |
355 | optipng "$other~"; |
309 | die "$other~ has zero size, aborting." unless -s "$other~"; |
|
|
310 | rename "$other~", $other; |
356 | rename "$other~", $other; |
311 | }; |
357 | }; |
312 | } |
358 | }; |
313 | |
359 | |
314 | push @c_png, [$other, !$CACHE]; |
360 | push @c_png, [$other, !$CACHE]; |
315 | } |
361 | } |
316 | |
362 | |
317 | # possibly scale down |
363 | # possibly scale down |
318 | if (0 > aio_stat "$stem.32x32.png") { |
364 | if (0 > aio_stat "$stem.32x32.png") { |
319 | my $other = "$stem.32x32.png~"; |
365 | my $other = "$stem.32x32.png~"; |
320 | |
366 | |
321 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
367 | make_file $path, $other, sub { |
322 | fork_sub { |
368 | fork_exec { |
323 | system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; |
369 | system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; |
324 | system $OPTIPNG, "-i0", "-q", "$other~"; |
370 | optipng "$other~"; |
325 | |
371 | |
326 | # reduce smoothfaces >10000 bytes |
372 | # reduce smoothfaces >10000 bytes |
327 | # obsolete, no longer required |
373 | # obsolete, no longer required |
328 | if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { |
374 | if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { |
329 | my $ncolor = 256; |
375 | my $ncolor = 256; |
330 | while () { |
376 | while () { |
331 | system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; |
377 | system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; |
332 | system $OPTIPNG, "-i0", "-q", "$other~~"; |
378 | optipng "$other~~"; |
333 | last if 10000 > -s "$other~~"; |
379 | last if 10000 > -s "$other~~"; |
334 | $ncolor = int $ncolor * 0.9; |
380 | $ncolor = int $ncolor * 0.9; |
335 | $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; |
381 | $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; |
336 | } |
382 | } |
337 | |
383 | |
… | |
… | |
342 | } |
388 | } |
343 | |
389 | |
344 | die "$other~ has zero size, aborting." unless -s "$other~"; |
390 | die "$other~ has zero size, aborting." unless -s "$other~"; |
345 | rename "$other~", $other; |
391 | rename "$other~", $other; |
346 | }; |
392 | }; |
347 | } |
393 | }; |
348 | |
394 | |
349 | #warn "scaled down $path to $other\n";#d# |
395 | #warn "scaled down $path to $other\n";#d# |
350 | push @c_png, [$other, !$CACHE]; |
396 | push @c_png, [$other, !$CACHE]; |
351 | } |
397 | } |
352 | } |
398 | } |
… | |
… | |
366 | } |
412 | } |
367 | |
413 | |
368 | my $mtime = (lstat $path)[9]; |
414 | my $mtime = (lstat $path)[9]; |
369 | my @todo = grep { $_->[3] <= $mtime } @tile; |
415 | my @todo = grep { $_->[3] <= $mtime } @tile; |
370 | if (@todo) { |
416 | if (@todo) { |
371 | fork_sub { |
417 | fork_exec { |
372 | open my $convert, "|-", $CONVERT, |
418 | open my $convert, "|-", $CONVERT, |
373 | "png:-", |
419 | "png:-", |
374 | (map { |
420 | (map { |
375 | ( |
421 | ( |
376 | "(", |
422 | "(", |
… | |
… | |
389 | print $convert $png; |
435 | print $convert $png; |
390 | close $convert; |
436 | close $convert; |
391 | |
437 | |
392 | # pass 2, optimise, and rename |
438 | # pass 2, optimise, and rename |
393 | for (@todo) { |
439 | for (@todo) { |
394 | system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; |
440 | optipng "$_->[2]~"; |
395 | die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~"; |
|
|
396 | rename "$_->[2]~", $_->[2]; |
441 | rename "$_->[2]~", $_->[2]; |
397 | } |
442 | } |
398 | }; |
443 | }; |
399 | } |
444 | } |
400 | |
445 | |
… | |
… | |
404 | |
449 | |
405 | if (0 > aio_load $file, $tile) { |
450 | if (0 > aio_load $file, $tile) { |
406 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
451 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
407 | } |
452 | } |
408 | IO::AIO::aio_unlink $file unless $CACHE; |
453 | IO::AIO::aio_unlink $file unless $CACHE; |
409 | commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; |
454 | commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T; |
410 | } |
455 | } |
411 | } else { |
456 | } else { |
412 | # use as-is (either small, use smooth) |
457 | # use as-is (either small, use smooth) |
413 | commit_png $face, $png, $T; |
458 | commit_png $stem, $face, $png, $T; |
414 | } |
459 | } |
415 | |
460 | |
416 | aio_unlink $path if $delete; |
461 | aio_unlink $path if $delete; |
417 | } |
462 | } |
418 | } |
463 | } |
419 | |
464 | |
|
|
465 | sub process_faceinfo { |
|
|
466 | my ($dir, $file) = @_; |
|
|
467 | my $path = "$dir/$file"; |
|
|
468 | |
|
|
469 | my $data; |
|
|
470 | if (0 > aio_load $path, $data) { |
|
|
471 | warn "$path: $!, skipping.\n"; |
|
|
472 | return; |
|
|
473 | } |
|
|
474 | |
|
|
475 | for (split /\n/, $data) { |
|
|
476 | chomp; |
|
|
477 | my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/, $_, 5; |
|
|
478 | # bg not used except for text clients |
|
|
479 | |
|
|
480 | utf8::decode $glyph; |
|
|
481 | $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag |
|
|
482 | $glyph =~ s/^"(.+)"$/$1/; # allow for ""-style quoting |
|
|
483 | |
|
|
484 | $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet |
|
|
485 | |
|
|
486 | (my $fgi = $COLOR{$fg}) |
|
|
487 | // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n"; |
|
|
488 | (my $bgi = $COLOR{$bg}) |
|
|
489 | // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n"; |
|
|
490 | |
|
|
491 | my $fi = $FACEINFO{$face} ||= { }; |
|
|
492 | $fi->{visibility} = $visibility * 1; |
|
|
493 | $fi->{magicmap} = $fgi; # foreground colour becomes magicmap |
|
|
494 | |
|
|
495 | $glyph .= " " if 2 > length $glyph; # TODO kanji |
|
|
496 | die "glyph $face too long" if 2 < length $glyph; |
|
|
497 | |
|
|
498 | $fi->{glyph} = ""; |
|
|
499 | for (split //, $glyph) { |
|
|
500 | utf8::encode $_; |
|
|
501 | $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_; |
|
|
502 | } |
|
|
503 | } |
|
|
504 | } |
|
|
505 | |
420 | sub process_arc { |
506 | sub process_arc { |
421 | while (my $job = $c_arc->get) { |
507 | while (my ($dir, $file) = @{ $c_arc->get }) { |
422 | my ($dir, $file) = @$job; |
|
|
423 | |
|
|
424 | my $arc; |
508 | my $arc; |
425 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
509 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
426 | |
510 | |
427 | my $arc = read_arch "$dir/$file"; |
511 | my $arc = read_arch "$dir/$file"; |
428 | for my $o (values %$arc) { |
512 | for my $o (values %$arc) { |
… | |
… | |
430 | for (my $m = $o; $m; $m = $m->{more}) { |
514 | for (my $m = $o; $m; $m = $m->{more}) { |
431 | $ARC{$m->{_name}} = $m; |
515 | $ARC{$m->{_name}} = $m; |
432 | } |
516 | } |
433 | |
517 | |
434 | $o->{editor_folder} ||= "\x00$dir"; # horrible kludge |
518 | $o->{editor_folder} ||= "\x00$dir"; # horrible kludge |
435 | |
|
|
436 | my $visibility = delete $o->{visibility}; |
|
|
437 | my $magicmap = delete $o->{magicmap}; |
|
|
438 | |
519 | |
439 | # find upper left corner :/ |
520 | # find upper left corner :/ |
440 | # omg, this is sooo broken |
521 | # omg, this is sooo broken |
441 | my ($dx, $dy); |
522 | my ($dx, $dy); |
442 | for (my $o = $o; $o; $o = $o->{more}) { |
523 | for (my $o = $o; $o; $o = $o->{more}) { |
… | |
… | |
449 | my $y = $o->{y} - $dy; |
530 | my $y = $o->{y} - $dy; |
450 | |
531 | |
451 | my $ext = $x|$y ? "+$x+$y" : ""; |
532 | my $ext = $x|$y ? "+$x+$y" : ""; |
452 | |
533 | |
453 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
534 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
454 | |
|
|
455 | $visibility = delete $o->{visibility} if exists $o->{visibility}; |
|
|
456 | $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
|
|
457 | |
535 | |
458 | my $anim = delete $o->{anim}; |
536 | my $anim = delete $o->{anim}; |
459 | |
537 | |
460 | if ($anim) { |
538 | if ($anim) { |
461 | # possibly add $ext to the animation name to avoid |
539 | # possibly add $ext to the animation name to avoid |
… | |
… | |
489 | |
567 | |
490 | my $info = $FACEINFO{$face} ||= { }; |
568 | my $info = $FACEINFO{$face} ||= { }; |
491 | $info->{arc} = $o; |
569 | $info->{arc} = $o; |
492 | |
570 | |
493 | next if $face =~ /^blank.x11$|^empty.x11$/; |
571 | next if $face =~ /^blank.x11$|^empty.x11$/; |
494 | |
|
|
495 | $info->{visibility} = $visibility if defined $visibility; |
|
|
496 | $info->{magicmap} = $magicmap if defined $magicmap; |
|
|
497 | } |
572 | } |
498 | |
573 | |
499 | if (my $smooth = delete $o->{smoothface}) { |
574 | if (my $smooth = delete $o->{smoothface}) { |
500 | my %kv = split /\s+/, $smooth; |
575 | my %kv = split /\s+/, $smooth; |
501 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
576 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
… | |
… | |
510 | } |
585 | } |
511 | } |
586 | } |
512 | } |
587 | } |
513 | |
588 | |
514 | sub process_trs { |
589 | sub process_trs { |
515 | while (my $job = $c_trs->get) { |
|
|
516 | my ($dir, $file) = @$job; |
590 | my ($dir, $file) = @_; |
517 | my $path = "$dir/$file"; |
591 | my $path = "$dir/$file"; |
518 | |
592 | |
519 | my $trs; |
593 | my $trs; |
520 | if (0 > aio_load $path, $trs) { |
594 | if (0 > aio_load $path, $trs) { |
521 | warn "$path: $!, skipping.\n"; |
595 | warn "$path: $!, skipping.\n"; |
522 | next; |
596 | return; |
523 | } |
597 | } |
524 | |
598 | |
525 | $TRS .= $trs; |
599 | $TRS .= $trs; |
526 | } |
|
|
527 | } |
600 | } |
528 | |
601 | |
529 | my %FILECACHE; |
602 | my %FILECACHE; |
530 | |
603 | |
531 | sub load_cached($;$) { |
604 | sub load_cached($;$) { |
… | |
… | |
542 | } |
615 | } |
543 | |
616 | |
544 | $FILECACHE{$_[0]} |
617 | $FILECACHE{$_[0]} |
545 | } |
618 | } |
546 | |
619 | |
|
|
620 | # convert an image and a palette to some indexed 2d-matrix structure |
|
|
621 | sub process_plt { |
|
|
622 | my ($base, $plt) = @_; |
|
|
623 | |
|
|
624 | my ($w, $h) = imgsize "$base.png"; |
|
|
625 | |
|
|
626 | $w * $h |
|
|
627 | or die "$base.png: unable to identify correct size\n"; |
|
|
628 | |
|
|
629 | my @plt; |
|
|
630 | my %map; |
|
|
631 | |
|
|
632 | for (split /\n/, $plt) { |
|
|
633 | next unless /\S/; |
|
|
634 | next if /^\s*#/; |
|
|
635 | |
|
|
636 | /^([0-9a-fA-F]{3,6})\s*(.*?)\s*$/ |
|
|
637 | or die "unparseable palette entry for $base.plt: $_"; |
|
|
638 | |
|
|
639 | my ($rgb, $name) = ($1, $2); |
|
|
640 | |
|
|
641 | $rgb =~ s/^(.)(.)(.)$/$1$1$2$2$3$3/; |
|
|
642 | |
|
|
643 | $map{pack "H*", $rgb} = chr @plt; |
|
|
644 | push @plt, $name; |
|
|
645 | } |
|
|
646 | |
|
|
647 | make_file ["$base.plt", "$base.png"], "$base.tbl~", sub { |
|
|
648 | warn "building $base\n" if $VERBOSE >= 3; |
|
|
649 | |
|
|
650 | fork_exec { |
|
|
651 | open my $png, "-|", $CONVERT, qw(-depth 8 --), "$base.png", "rgb:" |
|
|
652 | or die "$base.png: $!"; |
|
|
653 | |
|
|
654 | local $/; |
|
|
655 | $png = <$png>; |
|
|
656 | |
|
|
657 | $w * $h * 3 == length $png |
|
|
658 | or die "$base.png: failed to read enough data from file\n"; |
|
|
659 | |
|
|
660 | $png =~ s/(...)/$map{$1}/ge; |
|
|
661 | |
|
|
662 | $w * $h == length $png |
|
|
663 | or die "$base.png: failed to map all data - wrong palette?\n"; |
|
|
664 | |
|
|
665 | { |
|
|
666 | open my $fh, ">:raw", "$base.tbl~~" |
|
|
667 | or die "$base.tbl~~: $!"; |
|
|
668 | syswrite $fh, $png; |
|
|
669 | } |
|
|
670 | |
|
|
671 | rename "$base.tbl~~", "$base.tbl~"; |
|
|
672 | }; |
|
|
673 | }; |
|
|
674 | |
|
|
675 | 0 <= aio_load "$base.tbl~", my $tbl |
|
|
676 | or die "$base.tbl~: $!"; |
|
|
677 | |
|
|
678 | IO::AIO::aio_unlink "$base.tbl~" unless $CACHE; |
|
|
679 | |
|
|
680 | Compress::LZF::compress nfreeze { |
|
|
681 | w => $w, |
|
|
682 | h => $h, |
|
|
683 | plt => \@plt, |
|
|
684 | tbl => $tbl, |
|
|
685 | } |
|
|
686 | } |
|
|
687 | |
547 | sub process_res { |
688 | sub process_res { |
548 | while (my $job = $c_res->get) { |
|
|
549 | my ($dir, $file, $type) = @$job; |
689 | my ($dir, $file, $type) = @_; |
550 | |
690 | |
551 | my $data; |
|
|
552 | aio_load "$dir/$file", $data; |
691 | 0 <= aio_load "$dir/$file", my $data |
|
|
692 | or die "$dir/$file: $!"; |
553 | |
693 | |
554 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
694 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
555 | |
695 | |
556 | utf8::decode $dir; |
696 | utf8::decode $dir; |
557 | utf8::decode $file; |
697 | utf8::decode $file; |
558 | |
698 | |
559 | # a meta file for resources is now mandatory |
699 | # a meta file for resources is now mandatory |
560 | unless (exists $meta->{$file}) { |
700 | unless (exists $meta->{$file}) { |
561 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
701 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
562 | next; |
702 | return; |
563 | } |
703 | } |
564 | |
704 | |
565 | $meta = { |
705 | $meta = { |
566 | %{ $meta->{"" } || {} }, |
706 | %{ $meta->{"" } || {} }, |
567 | %{ $meta->{$file} || {} }, |
707 | %{ $meta->{$file} || {} }, |
568 | }; |
708 | }; |
569 | |
709 | |
570 | if ($meta->{license} =~ s/^#//) { |
710 | if ($meta->{license} =~ s/^#//) { |
571 | $meta->{license} = ({ |
711 | $meta->{license} = ({ |
572 | "pd" => "Public Domain", |
712 | "pd" => "Public Domain", |
573 | "gpl" => "GNU General Public License, version 3.0 or any later", |
713 | "gpl" => "GNU General Public License, version 3.0 or any later", |
574 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
714 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
|
|
715 | "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", |
575 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
716 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
576 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
717 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
577 | })->{$meta->{license}} |
718 | })->{$meta->{license}} |
578 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
719 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
579 | } |
720 | } |
580 | |
721 | |
|
|
722 | if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { |
|
|
723 | ($meta->{author} = $1) =~ s/_/ /g; |
|
|
724 | } |
|
|
725 | |
581 | $file =~ s/\.res$//; |
726 | $file =~ s/\.res$//; |
582 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
727 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
583 | |
728 | |
584 | substr $dir, 0, 1 + length $PATH, ""; |
729 | if ($file =~ s/\.plt$//) { |
585 | |
730 | $data = process_plt "$dir/$file", $data; |
586 | if (my $filter = $meta->{cfutil_filter}) { |
731 | } elsif (my $filter = $meta->{cfutil_filter}) { |
587 | if ($filter eq "yaml2json") { |
732 | if ($filter eq "yaml2json") { |
588 | $data = JSON::XS::encode_json YAML::XS::Load $data; |
733 | $data = JSON::XS::encode_json YAML::XS::Load $data; |
589 | } elsif ($filter eq "json2json") { |
734 | } elsif ($filter eq "json2json") { |
590 | $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); |
735 | $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); |
591 | } elsif ($filter eq "perl2json") { |
736 | } elsif ($filter eq "perl2json") { |
592 | $data = eval $data; die if $@; |
737 | $data = eval $data; die if $@; |
593 | $data = JSON::XS::encode_json $data; |
738 | $data = JSON::XS::encode_json $data; |
594 | } else { |
739 | } else { |
595 | warn "$dir/$file: unknown filter $filter, skipping\n"; |
740 | warn "$dir/$file: unknown filter $filter, skipping\n"; |
596 | } |
741 | } |
597 | } |
742 | } |
598 | |
743 | |
|
|
744 | substr $dir, 0, 1 + length $PATH, ""; |
|
|
745 | |
599 | $RESOURCE{"$dir/$file"} = { |
746 | $RESOURCE{"$dir/$file"} = { |
600 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
747 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
601 | data => $data, |
748 | data => $data, |
602 | %$meta ? (meta => $meta) : (), |
749 | %$meta ? (meta => $meta) : (), |
603 | }; |
750 | }; |
|
|
751 | } |
|
|
752 | |
|
|
753 | sub process_any { |
|
|
754 | while (my ($func, @args) = @{ $c_any->get }) { |
|
|
755 | $func->(@args); |
604 | } |
756 | } |
605 | } |
757 | } |
606 | |
758 | |
607 | sub find_files; |
759 | sub find_files; |
608 | sub find_files { |
760 | sub find_files { |
609 | my ($path) = @_; |
761 | my ($path) = @_; |
610 | |
762 | |
|
|
763 | my $grp = IO::AIO::aio_group; |
|
|
764 | |
|
|
765 | my $scandir; $scandir = sub { |
|
|
766 | my ($path) = @_; |
|
|
767 | |
611 | IO::AIO::aioreq_pri 4; |
768 | IO::AIO::aioreq_pri 4; |
612 | IO::AIO::aio_scandir $path, 4, sub { |
769 | add $grp IO::AIO::aio_scandir $path, 4, sub { |
613 | my ($dirs, $nondirs) = @_; |
770 | my ($dirs, $nondirs) = @_; |
614 | |
771 | |
615 | find_files "$path/$_" |
772 | $scandir->("$path/$_") |
616 | for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; |
773 | for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; |
617 | |
774 | |
618 | my $dir = $path; |
775 | my $dir = $path; |
619 | substr $dir, 0, 1 + length $PATH, ""; |
776 | substr $dir, 0, 1 + length $PATH, ""; |
620 | |
777 | |
621 | for my $file (@$nondirs) { |
778 | for my $file (@$nondirs) { |
622 | if ($dir =~ /^music(?:\/|$)/) { |
779 | if ($dir =~ /^music(?:\/|$)/) { |
623 | $c_res->put ([$path, $file, 3]) # FT_MUSIC |
780 | $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC |
624 | if $file =~ /\.(ogg)$/; |
781 | if $file =~ /\.(ogg)$/; |
625 | |
782 | |
626 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
783 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
627 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
784 | $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND |
628 | if $file =~ /\.(wav|ogg)$/; |
785 | if $file =~ /\.(wav|ogg)$/; |
629 | |
786 | |
630 | } elsif ($dir =~ /^res(?:\/|$)/) { |
787 | } elsif ($dir =~ /^res(?:\/|$)/) { |
631 | if ($file =~ /\.(jpg|png)$/) { |
788 | if ($file =~ /\.(jpg|png)$/) { |
632 | $c_res->put ([$path, $file, 0]) # FT_FACE |
789 | $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE |
633 | } elsif ($file =~ /\.(res)$/) { |
790 | } elsif ($file =~ /\.(res)$/) { |
|
|
791 | $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC |
|
|
792 | } else { |
|
|
793 | $c_any->put ([\&process_res, $path, $file, undef]); |
|
|
794 | } |
|
|
795 | |
|
|
796 | } elsif ($file =~ /\.png$/) { |
|
|
797 | push @c_png, ["$path/$file", 0]; |
|
|
798 | |
|
|
799 | } elsif ($file =~ /\.faceinfo$/) { |
|
|
800 | $c_any->put ([\&process_faceinfo, $path, $file]); |
|
|
801 | |
|
|
802 | } elsif ($file =~ /\.trs$/) { |
|
|
803 | $c_any->put ([\&process_trs, $path, $file]); |
|
|
804 | |
|
|
805 | } elsif ($file =~ /\.arc$/) { |
634 | $c_res->put ([$path, $file, 6]) # FT_RSRC |
806 | $c_arc->put ([$path, $file]); |
|
|
807 | |
635 | } else { |
808 | } else { |
636 | $c_res->put ([$path, $file, undef]); |
809 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
637 | } |
810 | } |
638 | |
|
|
639 | } elsif ($file =~ /\.png$/) { |
|
|
640 | push @c_png, ["$path/$file", 0]; |
|
|
641 | |
|
|
642 | } elsif ($file =~ /\.trs$/) { |
|
|
643 | $c_trs->put ([$path, $file]); |
|
|
644 | |
|
|
645 | } elsif ($file =~ /\.arc$/) { |
|
|
646 | $c_arc->put ([$path, $file]); |
|
|
647 | |
|
|
648 | } else { |
811 | } |
649 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
|
|
650 | } |
|
|
651 | } |
812 | }; |
652 | }; |
813 | }; |
|
|
814 | |
|
|
815 | $scandir->($path); |
|
|
816 | aio_wait $grp; |
653 | } |
817 | } |
654 | |
818 | |
655 | sub generate_plurals { |
819 | sub generate_plurals { |
656 | # use Lingua::EN::Inflect (); |
820 | # use Lingua::EN::Inflect (); |
657 | # Lingua::EN::Inflect::classical; |
821 | # Lingua::EN::Inflect::classical; |
… | |
… | |
695 | if (!-d "$path/treasures") { |
859 | if (!-d "$path/treasures") { |
696 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
860 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
697 | exit 1 unless $FORCE; |
861 | exit 1 unless $FORCE; |
698 | } |
862 | } |
699 | |
863 | |
700 | print "scanning files...\n" if $VERBOSE; |
864 | print "starting file scan, arc, any processing...\n" if $VERBOSE; |
|
|
865 | |
|
|
866 | my @a_arc = map +(async \&process_arc), 1..2; |
|
|
867 | my @a_any = map +(async \&process_any), 1..4; |
701 | |
868 | |
702 | find_files $path; |
869 | find_files $path; |
703 | |
870 | |
704 | my @a_arc = map +(async \&process_arc), 1..2; |
|
|
705 | my @a_res = map +(async \&process_res), 1..2; |
|
|
706 | my @a_trs = map +(async \&process_trs), 1..2; |
|
|
707 | |
|
|
708 | IO::AIO::flush; |
|
|
709 | |
|
|
710 | $c_res->shutdown; |
|
|
711 | $c_arc->shutdown; |
871 | $c_arc->shutdown; |
712 | $c_trs->shutdown; |
872 | $c_any->shutdown; |
713 | |
|
|
714 | print "start file scan, arc, res processing...\n" if $VERBOSE; |
|
|
715 | |
873 | |
716 | $_->join for @a_arc; # need to parse all archetypes before png processing |
874 | $_->join for @a_arc; # need to parse all archetypes before png processing |
|
|
875 | print "ended arc processing...\n" if $VERBOSE; |
717 | |
876 | |
718 | print "end arc, start png processing...\n" if $VERBOSE; |
877 | print "starting png processing...\n" if $VERBOSE; |
719 | |
878 | |
720 | # eight png crunchers work fine for my 4x smp machine |
879 | # eight png crunchers work fine for my 4x smp machine |
721 | my @a_png = map +(async \&process_png), 1..8; |
880 | my @a_png = map +(async \&process_png), 1..8; |
722 | |
881 | |
723 | $_->join for (@a_trs, @a_res, @a_png); |
882 | $_->join for @a_any; |
|
|
883 | print "ended any processing...\n" if $VERBOSE; |
|
|
884 | |
|
|
885 | $_->join for @a_png; |
|
|
886 | print "ended png processing...\n" if $VERBOSE; |
724 | |
887 | |
725 | print "scanning done, processing results...\n" if $VERBOSE; |
888 | print "scanning done, processing results...\n" if $VERBOSE; |
726 | { |
889 | { |
727 | # remove path prefix from editor_folder |
890 | # remove path prefix from editor_folder |
728 | $_->{editor_folder} =~ /^\x00/ |
891 | $_->{editor_folder} =~ /^\x00/ |
… | |
… | |
746 | delete @s{qw(_name more name name_pl)}; |
909 | delete @s{qw(_name more name name_pl)}; |
747 | %$o = ( %s, %$o ); |
910 | %$o = ( %s, %$o ); |
748 | ++$progress; |
911 | ++$progress; |
749 | } |
912 | } |
750 | } else { |
913 | } else { |
751 | warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
914 | warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
752 | delete $ARC{$o->{_name}}; |
915 | delete $ARC{$o->{_name}}; |
753 | } |
916 | } |
754 | } |
917 | } |
755 | } |
918 | } |
756 | |
919 | |
… | |
… | |
763 | } |
926 | } |
764 | |
927 | |
765 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
928 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
766 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
929 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
767 | |
930 | |
|
|
931 | # fix up archetypes without names, where the archanme doesn't work at all |
|
|
932 | for (@ARC) { |
|
|
933 | if (!exists $_->{name} and $_->{_name} =~ /_/) { |
|
|
934 | for ($_->{name} = $_->{_name}) { |
|
|
935 | s/(?:_\d+)+$//; |
|
|
936 | s/_[nesw]+$//; |
|
|
937 | y/_/ /; |
|
|
938 | } |
|
|
939 | } |
|
|
940 | } |
|
|
941 | |
768 | print "generating plurals...\n" if $VERBOSE; |
942 | #print "generating plurals...\n" if $VERBOSE; |
769 | generate_plurals; |
943 | #generate_plurals; |
770 | |
944 | |
771 | printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; |
945 | printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; |
772 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
946 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
773 | or die "$DATADIR/archetypes~: $!"; |
947 | or die "$DATADIR/archetypes~: $!"; |
774 | print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
948 | print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
… | |
… | |
782 | } |
956 | } |
783 | |
957 | |
784 | { |
958 | { |
785 | print "processing facedata...\n" if $VERBOSE; |
959 | print "processing facedata...\n" if $VERBOSE; |
786 | while (my ($k, $v) = each %FACEINFO) { |
960 | while (my ($k, $v) = each %FACEINFO) { |
787 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
961 | length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
788 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
962 | length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n"; |
789 | |
963 | |
790 | make_hash $k, $v->{data32}, $v->{hash32}; |
964 | make_hash $k, $v->{data32}, $v->{hash32}; |
791 | make_hash $k, $v->{data64}, $v->{hash64}; |
965 | make_hash $k, $v->{data64}, $v->{hash64}; |
792 | |
966 | |
793 | #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
967 | #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
794 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
968 | #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n"; |
795 | |
969 | |
796 | if (my $magicmap = $v->{magicmap}) { |
970 | $v->{glyph} // warn "WARNING: face '$k' has glyph."; |
797 | $magicmap =~ y/A-Z_\-/a-z/d; |
971 | $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n"; |
798 | $v->{magicmap} = $COLOR{$magicmap}; |
972 | $v->{magicmap} // warn "WARNING: face '$k' has foreground colour."; |
799 | } |
|
|
800 | |
973 | |
801 | delete $v->{arc}; |
974 | delete @$v{qw(arc stem)}; # not used by the server |
802 | } |
975 | } |
803 | |
976 | |
804 | print "processing resources...\n" if $VERBOSE; |
977 | print "processing resources...\n" if $VERBOSE; |
805 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
978 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
806 | while (my ($k, $v) = each %RESOURCE) { |
979 | while (my ($k, $v) = each %RESOURCE) { |
… | |
… | |
845 | version => 2, |
1018 | version => 2, |
846 | faceinfo => \%FACEINFO, |
1019 | faceinfo => \%FACEINFO, |
847 | animinfo => \%ANIMINFO, |
1020 | animinfo => \%ANIMINFO, |
848 | resource => \%RESOURCE, |
1021 | resource => \%RESOURCE, |
849 | }; |
1022 | }; |
850 | |
|
|
851 | } |
1023 | } |
852 | |
1024 | |
853 | print "committing files...\n" if $VERBOSE; |
1025 | print "committing files...\n" if $VERBOSE; |
854 | |
1026 | |
855 | for (qw(archetypes facedata treasures), @COMMIT) { |
1027 | for (qw(archetypes facedata treasures), @COMMIT) { |