1 | #!@PERL@ |
1 | #!@PERL@ |
2 | |
2 | |
3 | use 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 | |
|
|
25 | use common::sense; |
4 | |
26 | |
5 | my $prefix = "@prefix@"; |
27 | my $prefix = "@prefix@"; |
6 | my $exec_prefix = "@exec_prefix@"; |
28 | my $exec_prefix = "@exec_prefix@"; |
7 | my $datarootdir = "@datarootdir@"; |
29 | my $datarootdir = "@datarootdir@"; |
8 | my $DATADIR = "@datadir@/@PACKAGE@"; |
30 | my $DATADIR = "@datadir@/@PACKAGE@"; |
… | |
… | |
12 | my $OPTIPNG = "@OPTIPNG@"; |
34 | my $OPTIPNG = "@OPTIPNG@"; |
13 | my $RSYNC = "@RSYNC@"; |
35 | my $RSYNC = "@RSYNC@"; |
14 | my $PNGNQ = "@PNGNQ@"; |
36 | my $PNGNQ = "@PNGNQ@"; |
15 | |
37 | |
16 | use Getopt::Long; |
38 | use Getopt::Long; |
|
|
39 | use File::Temp; |
|
|
40 | use POSIX (); |
|
|
41 | use Carp; |
|
|
42 | |
17 | use Coro::Event; |
43 | use Coro::EV; |
18 | use AnyEvent; |
44 | use AnyEvent; |
|
|
45 | use YAML::XS (); |
|
|
46 | use JSON::XS (); |
19 | use IO::AIO (); |
47 | use IO::AIO (); |
20 | use File::Temp; |
48 | use Digest::MD5 (); |
21 | use Crossfire; |
49 | |
22 | use Coro; |
50 | use Coro 5.12; |
23 | use Coro::AIO; |
51 | use Coro::AIO; |
24 | use POSIX (); |
52 | use Coro::Util; |
25 | use Digest::MD5; |
53 | use Coro::Channel; |
26 | use Carp; |
|
|
27 | use Coro::Storable; $Storable::canonical = 1; |
54 | use Coro::Storable; $Storable::canonical = 1; |
|
|
55 | |
|
|
56 | use Deliantra; |
28 | |
57 | |
29 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
58 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
30 | |
59 | |
31 | sub usage { |
60 | sub usage { |
32 | warn <<EOF; |
61 | warn <<EOF; |
… | |
… | |
45 | my $VERBOSE = 1; |
74 | my $VERBOSE = 1; |
46 | my $CACHE = 0; |
75 | my $CACHE = 0; |
47 | my $FORCE; |
76 | my $FORCE; |
48 | my $TMPDIR = "/tmp/cfutil$$~"; |
77 | my $TMPDIR = "/tmp/cfutil$$~"; |
49 | my $TMPFILE = "aaaa0"; |
78 | my $TMPFILE = "aaaa0"; |
|
|
79 | my @COMMIT; |
50 | |
80 | |
51 | our %COLOR = ( |
81 | our %COLOR = ( |
|
|
82 | # original cf colours |
52 | black => 0, |
83 | black => 0, |
53 | white => 1, |
84 | white => 1, |
54 | navy => 2, |
85 | navy => 2, # "dark blue" |
55 | red => 3, |
86 | red => 3, |
56 | orange => 4, |
87 | orange => 4, |
57 | blue => 5, |
88 | blue => 5, # "light blue" |
58 | darkorange => 6, |
89 | darkorange => 6, |
59 | green => 7, |
90 | green => 7, |
60 | lightgreen => 8, |
91 | lightgreen => 8, |
61 | grey => 9, |
92 | grey => 9, |
|
|
93 | brown => 10, # "yellow" |
|
|
94 | gold => 11, # "light yellow" |
|
|
95 | tan => 12, # yellowish gray |
|
|
96 | |
|
|
97 | # new for deliantra |
62 | brown => 10, |
98 | none => 13, |
|
|
99 | |
|
|
100 | # compatibility to existing archetypes |
|
|
101 | lightblue => 5, |
63 | gold => 11, |
102 | gray => 9, |
|
|
103 | yellow => 11, |
64 | tan => 12, |
104 | khaki => 12, |
65 | ); |
105 | ); |
66 | |
106 | |
67 | END { system "rm", "-rf", $TMPDIR } |
107 | END { system "rm", "-rf", $TMPDIR } |
68 | |
108 | |
69 | Event->signal (signal => "INT", cb => sub { exit 1 }); |
109 | my $s_INT = EV::signal INT => sub { exit 1 }; |
70 | Event->signal (signal => "TERM", cb => sub { exit 1 }); |
110 | my $s_TERM = EV::signal TERM => sub { exit 1 }; |
|
|
111 | |
|
|
112 | our %hash; |
|
|
113 | |
|
|
114 | # here we could try to avoid collisions and reduce chksum size further |
|
|
115 | sub 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 | } |
71 | |
133 | |
72 | mkdir $TMPDIR, 0700 |
134 | mkdir $TMPDIR, 0700 |
73 | or die "$TMPDIR: $!"; |
135 | or die "$TMPDIR: $!"; |
74 | |
136 | |
75 | sub fork_sub(&) { |
137 | sub fork_sub(&) { |
… | |
… | |
95 | if (!-f "$path/regions") { |
157 | if (!-f "$path/regions") { |
96 | warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; |
158 | warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; |
97 | exit 1 unless $FORCE; |
159 | exit 1 unless $FORCE; |
98 | } |
160 | } |
99 | |
161 | |
100 | system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" |
162 | system $RSYNC, "-av", "--chmod=u=rwX,go=rX", |
|
|
163 | "$path/.", "$DATADIR/maps/.", |
|
|
164 | "--exclude", "CVS", "--exclude", "/world-precomposed", |
|
|
165 | "--delete", "--delete-excluded" |
101 | and die "map installation failed.\n"; |
166 | and die "map installation failed.\n"; |
102 | |
167 | |
103 | print "maps installed successfully.\n"; |
168 | print "maps installed successfully.\n"; |
104 | } |
169 | } |
105 | |
170 | |
… | |
… | |
113 | our $NFILE; |
178 | our $NFILE; |
114 | our $PATH; |
179 | our $PATH; |
115 | |
180 | |
116 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
181 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
117 | |
182 | |
118 | our (@png, @trs, @arc, @res); # files we are interested in |
183 | our $c_arc = new Coro::Channel; |
|
|
184 | our $c_any = new Coro::Channel; |
119 | |
185 | |
|
|
186 | our @c_png; |
|
|
187 | |
120 | sub commit_png($$$) { |
188 | sub commit_png($$$$) { |
121 | my ($name, $data, $T) = @_; |
189 | my ($stem, $name, $data, $T) = @_; |
122 | |
190 | |
|
|
191 | $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH; |
123 | $FACEINFO{$name}{"data$T"} = $data; |
192 | $FACEINFO{$name}{"data$T"} = $data; |
124 | } |
193 | } |
125 | |
194 | |
126 | sub process_png { |
195 | sub process_png { |
127 | while (@png) { |
196 | while (@c_png) { |
128 | my ($path, $delete) = @{pop @png}; |
197 | my ($path, $delete) = @{pop @c_png}; |
129 | |
198 | |
130 | my $png; |
199 | my $png; |
131 | aio_lstat $path; |
200 | aio_lstat $path; |
132 | my ($size, $mtime) = (stat _)[7,9]; |
201 | my ($size, $mtime) = (stat _)[7,9]; |
133 | |
202 | |
… | |
… | |
164 | if ($w % $T || $h % $T) { |
233 | if ($w % $T || $h % $T) { |
165 | warn "$path: weird png size ($w $h), skipping.\n"; |
234 | warn "$path: weird png size ($w $h), skipping.\n"; |
166 | next; |
235 | next; |
167 | } |
236 | } |
168 | |
237 | |
|
|
238 | (my $base = $stem) =~ s/^.*\///; |
|
|
239 | |
|
|
240 | my $fi = $FACEINFO{$base}; |
|
|
241 | unless ($fi) { |
|
|
242 | #warn "$path: <$base> not referenced by any archetype, skipping.\n"; |
|
|
243 | #next; |
|
|
244 | } |
|
|
245 | |
|
|
246 | my $arc = $fi->{arc} || { }; |
|
|
247 | |
169 | unless ($path =~ /~$/) { |
248 | unless ($path =~ /~$/) { |
170 | # possibly enlarge |
249 | # possibly enlarge |
171 | if (0 > aio_stat "$stem.64x64.png") { |
250 | if (0 > aio_stat "$stem.64x64.png") { |
172 | my $other = "$stem.64x64.png~"; |
251 | my $other = "$stem.64x64.png~"; |
173 | |
252 | |
174 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
253 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
175 | my $wrap = 0; # for the time being |
|
|
176 | fork_sub { |
254 | fork_sub { |
|
|
255 | my $CROP; |
|
|
256 | my $SRC = "png:\Q$path\E"; |
|
|
257 | |
|
|
258 | my $is_floor = $arc->{is_floor}; |
|
|
259 | my $is_wall = 0; |
|
|
260 | |
|
|
261 | my ($wall_pfx, $wall_dir, $wall_sfx); |
|
|
262 | |
|
|
263 | if ( |
|
|
264 | !$is_floor |
|
|
265 | && !$arc->{alive} |
|
|
266 | && $arc->{move_block} eq "all" |
|
|
267 | && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/ |
|
|
268 | ) { |
|
|
269 | ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3); |
|
|
270 | |
|
|
271 | unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) { |
|
|
272 | $is_wall = 1; |
|
|
273 | } |
|
|
274 | } |
|
|
275 | |
|
|
276 | if ($is_wall || $is_floor) { |
|
|
277 | # add a 4px border and add other images around it |
|
|
278 | $CROP = "-shave 8x8 +repage"; |
|
|
279 | |
|
|
280 | $w += 8; |
|
|
281 | $h += 8; |
|
|
282 | |
|
|
283 | $SRC = "-size ${w}x${h} xc:transparent"; |
|
|
284 | $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; |
|
|
285 | |
|
|
286 | # 8 surrounding images |
|
|
287 | for ( |
|
|
288 | # x y b r0 r1 |
|
|
289 | [-1, -1, 0, 6], |
|
|
290 | [ 0, -1, 1, 10, 14], |
|
|
291 | [+1, -1, 0, 12], |
|
|
292 | |
|
|
293 | [-1, 0, 8, 5, 7], |
|
|
294 | # |
|
|
295 | [+1, 0, 2, 5, 13], |
|
|
296 | |
|
|
297 | [-1, +1, 0, 3], |
|
|
298 | [ 0, +1, 4, 10, 11], |
|
|
299 | [+1, +1, 0, 9], |
|
|
300 | ) { |
|
|
301 | my ($x, $y, $d, $r0, $r1) = @$_; |
|
|
302 | |
|
|
303 | my $tile = $is_floor ? $path |
|
|
304 | : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx |
|
|
305 | : die; |
|
|
306 | |
|
|
307 | $SRC .= sprintf " png:%s -geometry %+d%+d -composite", |
|
|
308 | "\Q$tile", |
|
|
309 | $x * ($w - 8) + 4, |
|
|
310 | $y * ($h - 8) + 4; |
|
|
311 | } |
|
|
312 | } |
|
|
313 | |
177 | system "convert png:\Q$path\E -depth 8 rgba:-" |
314 | system "convert -depth 8 $SRC rgba:-" |
178 | . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" |
315 | . "| $exec_prefix/bin/cfhq2xa $w $h 0" |
179 | . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" |
316 | . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" |
180 | and die "convert/hq2xa pipeline error: status $? ($!)"; |
317 | and die "convert/cfhq2xa pipeline error: status $? ($!)"; |
181 | system $OPTIPNG, "-i0", "-q", "$other~"; |
318 | system $OPTIPNG, "-i0", "-q", "$other~"; |
182 | die "$other~ has zero size, aborting." unless -s "$other~"; |
319 | die "$other~ has zero size, aborting." unless -s "$other~"; |
183 | rename "$other~", $other; |
320 | rename "$other~", $other; |
184 | }; |
321 | }; |
185 | } |
322 | } |
186 | |
323 | |
187 | push @png, [$other, !$CACHE]; |
324 | push @c_png, [$other, !$CACHE]; |
188 | } |
325 | } |
189 | |
326 | |
190 | # possibly scale down |
327 | # possibly scale down |
191 | if (0 > aio_stat "$stem.32x32.png") { |
328 | if (0 > aio_stat "$stem.32x32.png") { |
192 | my $other = "$stem.32x32.png~"; |
329 | my $other = "$stem.32x32.png~"; |
… | |
… | |
195 | fork_sub { |
332 | fork_sub { |
196 | system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; |
333 | system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; |
197 | system $OPTIPNG, "-i0", "-q", "$other~"; |
334 | system $OPTIPNG, "-i0", "-q", "$other~"; |
198 | |
335 | |
199 | # reduce smoothfaces >10000 bytes |
336 | # reduce smoothfaces >10000 bytes |
|
|
337 | # obsolete, no longer required |
200 | if ($stem =~ /_S\./ && (-s "$other~") > 10000) { |
338 | if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { |
201 | my $ncolor = 256; |
339 | my $ncolor = 256; |
202 | while () { |
340 | while () { |
203 | system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; |
341 | system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; |
204 | system $OPTIPNG, "-i0", "-q", "$other~~"; |
342 | system $OPTIPNG, "-i0", "-q", "$other~~"; |
205 | last if 10000 > -s "$other~~"; |
343 | last if 10000 > -s "$other~~"; |
… | |
… | |
217 | rename "$other~", $other; |
355 | rename "$other~", $other; |
218 | }; |
356 | }; |
219 | } |
357 | } |
220 | |
358 | |
221 | #warn "scaled down $path to $other\n";#d# |
359 | #warn "scaled down $path to $other\n";#d# |
222 | push @png, [$other, !$CACHE]; |
360 | push @c_png, [$other, !$CACHE]; |
223 | } |
361 | } |
224 | } |
362 | } |
225 | |
363 | |
226 | (my $face = $stem) =~ s/^.*\///; |
364 | (my $face = $stem) =~ s/^.*\///; |
227 | |
365 | |
… | |
… | |
276 | |
414 | |
277 | if (0 > aio_load $file, $tile) { |
415 | if (0 > aio_load $file, $tile) { |
278 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
416 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
279 | } |
417 | } |
280 | IO::AIO::aio_unlink $file unless $CACHE; |
418 | IO::AIO::aio_unlink $file unless $CACHE; |
281 | commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; |
419 | commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T; |
282 | } |
420 | } |
283 | } else { |
421 | } else { |
284 | # use as-is (either small, use smooth) |
422 | # use as-is (either small, use smooth) |
285 | commit_png $face, $png, $T; |
423 | commit_png $stem, $face, $png, $T; |
286 | } |
424 | } |
287 | |
425 | |
288 | aio_unlink $path if $delete; |
426 | aio_unlink $path if $delete; |
289 | } |
427 | } |
290 | } |
428 | } |
291 | |
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 | |
|
|
461 | $fi->{glyph} = ""; |
|
|
462 | for (split //, $glyph, -1) { |
|
|
463 | utf8::encode $_; |
|
|
464 | $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_; |
|
|
465 | } |
|
|
466 | } |
|
|
467 | } |
|
|
468 | |
292 | sub process_arc { |
469 | sub process_arc { |
293 | while (@arc) { |
470 | while (my ($dir, $file) = @{ $c_arc->get }) { |
294 | my ($dir, $file) = @{pop @arc}; |
|
|
295 | |
|
|
296 | my $arc; |
471 | my $arc; |
297 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
472 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
298 | |
473 | |
299 | my $arc = read_arch "$dir/$file"; |
474 | my $arc = read_arch "$dir/$file"; |
300 | for my $o (values %$arc) { |
475 | for my $o (values %$arc) { |
301 | push @ARC, $o; |
476 | push @ARC, $o; |
302 | for (my $m = $o; $m; $m = $m->{more}) { |
477 | for (my $m = $o; $m; $m = $m->{more}) { |
303 | $ARC{$m->{_name}} = $m; |
478 | $ARC{$m->{_name}} = $m; |
304 | } |
479 | } |
305 | |
480 | |
306 | $o->{editor_folder} = $dir; |
481 | $o->{editor_folder} ||= "\x00$dir"; # horrible kludge |
307 | |
|
|
308 | my $visibility = delete $o->{visibility}; |
|
|
309 | my $magicmap = delete $o->{magicmap}; |
|
|
310 | |
482 | |
311 | # find upper left corner :/ |
483 | # find upper left corner :/ |
312 | # omg, this is sooo broken |
484 | # omg, this is sooo broken |
313 | my ($dx, $dy); |
485 | my ($dx, $dy); |
314 | for (my $o = $o; $o; $o = $o->{more}) { |
486 | for (my $o = $o; $o; $o = $o->{more}) { |
… | |
… | |
321 | my $y = $o->{y} - $dy; |
493 | my $y = $o->{y} - $dy; |
322 | |
494 | |
323 | my $ext = $x|$y ? "+$x+$y" : ""; |
495 | my $ext = $x|$y ? "+$x+$y" : ""; |
324 | |
496 | |
325 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
497 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
326 | |
|
|
327 | $visibility = delete $o->{visibility} if exists $o->{visibility}; |
|
|
328 | $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
|
|
329 | |
498 | |
330 | my $anim = delete $o->{anim}; |
499 | my $anim = delete $o->{anim}; |
331 | |
500 | |
332 | if ($anim) { |
501 | if ($anim) { |
333 | # possibly add $ext to the animation name to avoid |
502 | # possibly add $ext to the animation name to avoid |
… | |
… | |
351 | facings => $facings, |
520 | facings => $facings, |
352 | frames => \@frames, |
521 | frames => \@frames, |
353 | }; |
522 | }; |
354 | } |
523 | } |
355 | |
524 | |
356 | for my $face ($o->{face} || (), @{$anim || []}) { |
525 | for ($o->{face} || (), @{$anim || []}) { |
357 | next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; |
526 | next if /^facings\s/; |
358 | |
527 | |
|
|
528 | my $face = $_; |
|
|
529 | $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates |
|
|
530 | |
359 | my $info = $FACEINFO{$face} ||= {}; |
531 | my $info = $FACEINFO{$face} ||= { }; |
|
|
532 | $info->{arc} = $o; |
360 | |
533 | |
361 | $info->{visibility} = $visibility if defined $visibility; |
534 | next if $face =~ /^blank.x11$|^empty.x11$/; |
362 | $info->{magicmap} = $magicmap if defined $magicmap; |
|
|
363 | } |
535 | } |
364 | |
536 | |
365 | if (my $smooth = delete $o->{smoothface}) { |
537 | if (my $smooth = delete $o->{smoothface}) { |
366 | my %kv =split /\s+/, $smooth; |
538 | my %kv = split /\s+/, $smooth; |
367 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
539 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
368 | while (my ($face, $smooth) = each %kv) { |
540 | while (my ($face, $smooth) = each %kv) { |
|
|
541 | $FACEINFO{$smooth}{arc} = $o; |
|
|
542 | |
369 | $FACEINFO{$face}{smooth} = $smooth; |
543 | $FACEINFO{$face}{smooth} = $smooth; |
370 | $FACEINFO{$face}{smoothlevel} = $level; |
544 | $FACEINFO{$face}{smoothlevel} = $level; |
371 | } |
545 | } |
372 | } |
546 | } |
373 | } |
547 | } |
374 | } |
548 | } |
375 | } |
549 | } |
376 | } |
550 | } |
377 | |
551 | |
378 | sub process_trs { |
552 | sub process_trs { |
379 | while (@trs) { |
|
|
380 | my ($dir, $file) = @{pop @trs}; |
553 | my ($dir, $file) = @_; |
381 | my $path = "$dir/$file"; |
554 | my $path = "$dir/$file"; |
382 | |
555 | |
383 | my $trs; |
556 | my $trs; |
384 | if (0 > aio_load $path, $trs) { |
557 | if (0 > aio_load $path, $trs) { |
385 | warn "$path: $!, skipping.\n"; |
558 | warn "$path: $!, skipping.\n"; |
386 | next; |
559 | return; |
387 | } |
560 | } |
388 | |
561 | |
389 | $TRS .= $trs; |
562 | $TRS .= $trs; |
390 | } |
|
|
391 | } |
563 | } |
392 | |
564 | |
393 | my %FILECACHE; |
565 | my %FILECACHE; |
394 | |
566 | |
395 | sub load_cached($;$) { |
567 | sub load_cached($;$) { |
396 | unless (exists $FILECACHE{$_[0]}) { |
568 | unless (exists $FILECACHE{$_[0]}) { |
397 | my $data; |
569 | my $data; |
398 | if (0 < aio_load $_[0], $data) { |
570 | if (0 < aio_load $_[0], $data) { |
|
|
571 | if ($_[1]) { |
399 | $data = $_[1]->($data) |
572 | $data = eval { $_[1]->($data) }; |
400 | if $_[1]; |
573 | warn "$_[0]: $@" if $@; |
|
|
574 | } |
401 | } |
575 | } |
402 | |
576 | |
403 | $FILECACHE{$_[0]} = $data; |
577 | $FILECACHE{$_[0]} = $data; |
404 | } |
578 | } |
405 | |
579 | |
406 | $FILECACHE{$_[0]} |
580 | $FILECACHE{$_[0]} |
407 | } |
581 | } |
408 | |
582 | |
409 | sub process_res { |
583 | sub process_res { |
410 | while (@res) { |
|
|
411 | my ($dir, $file, $type) = @{pop @res}; |
584 | my ($dir, $file, $type) = @_; |
412 | |
585 | |
413 | my $data; |
586 | my $data; |
414 | aio_load "$dir/$file", $data; |
587 | aio_load "$dir/$file", $data; |
415 | |
588 | |
416 | my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; |
589 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
417 | |
590 | |
|
|
591 | utf8::decode $dir; |
|
|
592 | utf8::decode $file; |
|
|
593 | |
|
|
594 | # a meta file for resources is now mandatory |
|
|
595 | unless (exists $meta->{$file}) { |
|
|
596 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
|
|
597 | return; |
|
|
598 | } |
|
|
599 | |
418 | $meta = { |
600 | $meta = { |
419 | %{ $meta->{"" } || {} }, |
601 | %{ $meta->{"" } || {} }, |
420 | %{ $meta->{$file} || {} }, |
602 | %{ $meta->{$file} || {} }, |
421 | }; |
603 | }; |
422 | |
604 | |
|
|
605 | if ($meta->{license} =~ s/^#//) { |
|
|
606 | $meta->{license} = ({ |
|
|
607 | "pd" => "Public Domain", |
|
|
608 | "gpl" => "GNU General Public License, version 3.0 or any later", |
|
|
609 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
|
|
610 | "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", |
|
|
611 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
|
|
612 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
|
|
613 | })->{$meta->{license}} |
|
|
614 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
|
|
615 | } |
|
|
616 | |
|
|
617 | if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { |
|
|
618 | ($meta->{author} = $1) =~ s/_/ /g; |
|
|
619 | } |
|
|
620 | |
423 | $file =~ s/\.res$//; |
621 | $file =~ s/\.res$//; |
424 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
622 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
425 | |
623 | |
426 | substr $dir, 0, 1 + length $PATH, ""; |
624 | substr $dir, 0, 1 + length $PATH, ""; |
427 | |
625 | |
|
|
626 | if (my $filter = $meta->{cfutil_filter}) { |
|
|
627 | if ($filter eq "yaml2json") { |
|
|
628 | $data = JSON::XS::encode_json YAML::XS::Load $data; |
|
|
629 | } elsif ($filter eq "json2json") { |
|
|
630 | $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); |
|
|
631 | } elsif ($filter eq "perl2json") { |
|
|
632 | $data = eval $data; die if $@; |
|
|
633 | $data = JSON::XS::encode_json $data; |
|
|
634 | } else { |
|
|
635 | warn "$dir/$file: unknown filter $filter, skipping\n"; |
|
|
636 | } |
|
|
637 | } |
|
|
638 | |
428 | $RESOURCE{"$dir/$file"} = { |
639 | $RESOURCE{"$dir/$file"} = { |
429 | type => (delete $meta->{type}) || $type, |
640 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
430 | data => $data, |
641 | data => $data, |
431 | chksum => (Digest::MD5::md5 $data), |
|
|
432 | %$meta ? (meta => $meta) : (), |
642 | %$meta ? (meta => $meta) : (), |
433 | }; |
643 | }; |
|
|
644 | } |
|
|
645 | |
|
|
646 | sub process_any { |
|
|
647 | while (my ($func, @args) = @{ $c_any->get }) { |
|
|
648 | $func->(@args); |
434 | } |
649 | } |
435 | } |
650 | } |
436 | |
651 | |
437 | sub find_files; |
652 | sub find_files; |
438 | sub find_files { |
653 | sub find_files { |
439 | my ($path) = @_; |
654 | my ($path) = @_; |
440 | |
655 | |
|
|
656 | my $grp = IO::AIO::aio_group; |
|
|
657 | |
|
|
658 | my $scandir; $scandir = sub { |
|
|
659 | my ($path) = @_; |
|
|
660 | |
441 | IO::AIO::aioreq_pri 4; |
661 | IO::AIO::aioreq_pri 4; |
442 | IO::AIO::aio_scandir $path, 4, sub { |
662 | add $grp IO::AIO::aio_scandir $path, 4, sub { |
443 | my ($dirs, $nondirs) = @_; |
663 | my ($dirs, $nondirs) = @_; |
444 | |
664 | |
445 | find_files "$path/$_" |
665 | $scandir->("$path/$_") |
446 | for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; |
666 | for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; |
447 | |
667 | |
448 | my $dir = $path; |
668 | my $dir = $path; |
449 | substr $dir, 0, 1 + length $PATH, ""; |
669 | substr $dir, 0, 1 + length $PATH, ""; |
450 | |
670 | |
451 | for my $file (@$nondirs) { |
671 | for my $file (@$nondirs) { |
452 | if ($dir =~ /^music(?:\/|$)/) { |
672 | if ($dir =~ /^music(?:\/|$)/) { |
453 | push @res, [$path, $file, 3] # FT_MUSIC |
673 | $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC |
454 | if $file =~ /\.(ogg)$/; |
674 | if $file =~ /\.(ogg)$/; |
455 | |
675 | |
456 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
676 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
457 | push @res, [$path, $file, 5] # FT_SOUND |
677 | $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND |
458 | if $file =~ /\.(wav|ogg)$/; |
678 | if $file =~ /\.(wav|ogg)$/; |
459 | |
679 | |
460 | } elsif ($dir =~ /^res(?:\/|$)/) { |
680 | } elsif ($dir =~ /^res(?:\/|$)/) { |
461 | push @res, [$path, $file, 0] # FT_FACE |
|
|
462 | if $file =~ /\.(jpg|png)$/; |
681 | if ($file =~ /\.(jpg|png)$/) { |
463 | push @res, [$path, $file, 7] # FT_RSRC |
682 | $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE |
464 | if $file =~ /\.(res)$/; |
683 | } elsif ($file =~ /\.(res)$/) { |
|
|
684 | $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC |
|
|
685 | } else { |
|
|
686 | $c_any->put ([\&process_res, $path, $file, undef]); |
|
|
687 | } |
465 | |
688 | |
466 | } elsif ($file =~ /\.png$/) { |
689 | } elsif ($file =~ /\.png$/) { |
467 | push @png, ["$path/$file", 0]; |
690 | push @c_png, ["$path/$file", 0]; |
468 | |
691 | |
|
|
692 | } elsif ($file =~ /\.faceinfo$/) { |
|
|
693 | $c_any->put ([\&process_faceinfo, $path, $file]); |
|
|
694 | |
469 | } elsif ($file =~ /\.trs$/) { |
695 | } elsif ($file =~ /\.trs$/) { |
470 | push @trs, [$path, $file]; |
696 | $c_any->put ([\&process_trs, $path, $file]); |
471 | |
697 | |
472 | } elsif ($file =~ /\.arc$/) { |
698 | } elsif ($file =~ /\.arc$/) { |
473 | push @arc, [$path, $file]; |
699 | $c_arc->put ([$path, $file]); |
474 | |
700 | |
475 | } else { |
701 | } else { |
476 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
702 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
477 | } |
703 | } |
|
|
704 | } |
478 | } |
705 | }; |
479 | }; |
706 | }; |
|
|
707 | |
|
|
708 | $scandir->($path); |
|
|
709 | aio_wait $grp; |
|
|
710 | } |
|
|
711 | |
|
|
712 | sub generate_plurals { |
|
|
713 | # use Lingua::EN::Inflect (); |
|
|
714 | # Lingua::EN::Inflect::classical; |
|
|
715 | # Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy |
|
|
716 | # Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack |
|
|
717 | # |
|
|
718 | # for my $a (@ARC) { |
|
|
719 | # my $name = $a->{name} || $a->{_name}; |
|
|
720 | # |
|
|
721 | # next unless $a->{name_pl}; |
|
|
722 | # next if $a->{invisible}; |
|
|
723 | # next if $a->{is_floor}; |
|
|
724 | # next if $a->{no_pick}; |
|
|
725 | # |
|
|
726 | # my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name; |
|
|
727 | # my $pl = $test =~ /^(?:eq|p:.)$/ |
|
|
728 | # ? $name |
|
|
729 | # : Lingua::EN::Inflect::PL $name; |
|
|
730 | # |
|
|
731 | # if ($pl ne $a->{name_pl}) { |
|
|
732 | # warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n"; |
|
|
733 | # } |
|
|
734 | # } |
480 | } |
735 | } |
481 | |
736 | |
482 | sub inst_arch($) { |
737 | sub inst_arch($) { |
483 | my (undef, $path) = @_; |
738 | my (undef, $path) = @_; |
484 | |
739 | |
… | |
… | |
497 | if (!-d "$path/treasures") { |
752 | if (!-d "$path/treasures") { |
498 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
753 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
499 | exit 1 unless $FORCE; |
754 | exit 1 unless $FORCE; |
500 | } |
755 | } |
501 | |
756 | |
|
|
757 | print "start file scan, arc, any processing...\n" if $VERBOSE; |
|
|
758 | |
|
|
759 | my @a_arc = map +(async \&process_arc), 1..2; |
|
|
760 | my @a_any = map +(async \&process_any), 1..4; |
|
|
761 | |
502 | find_files $path; |
762 | find_files $path; |
503 | IO::AIO::flush; |
|
|
504 | |
763 | |
505 | $_->join for ( |
764 | $c_arc->shutdown; |
|
|
765 | $c_any->shutdown; |
|
|
766 | |
|
|
767 | $_->join for @a_arc; # need to parse all archetypes before png processing |
|
|
768 | |
|
|
769 | print "end arc, start png processing...\n" if $VERBOSE; |
|
|
770 | |
506 | # four png crunchers work fine for my 2x smp machine |
771 | # eight png crunchers work fine for my 4x smp machine |
507 | (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), |
772 | my @a_png = map +(async \&process_png), 1..8; |
508 | (async \&process_trs), (async \&process_trs), |
|
|
509 | (async \&process_arc), (async \&process_arc), |
|
|
510 | (async \&process_res), (async \&process_res), |
|
|
511 | ); |
|
|
512 | |
773 | |
|
|
774 | print "end any processing...\n" if $VERBOSE; |
|
|
775 | $_->join for @a_any; |
|
|
776 | |
|
|
777 | print "end png processing...\n" if $VERBOSE; |
|
|
778 | $_->join for @a_png; |
|
|
779 | |
|
|
780 | print "scanning done, processing results...\n" if $VERBOSE; |
513 | { |
781 | { |
514 | # remove path prefix from editor_folder |
782 | # remove path prefix from editor_folder |
|
|
783 | $_->{editor_folder} =~ /^\x00/ |
515 | substr $_->{editor_folder}, 0, 1 + length $path, "" |
784 | and substr $_->{editor_folder}, 0, 2 + length $path, "" |
516 | for values %ARC; |
785 | for values %ARC; |
517 | |
786 | |
|
|
787 | print "resolving inheritance tree...\n" if $VERBOSE; |
518 | # resolve inherit |
788 | # resolve inherit |
519 | while () { |
789 | while () { |
520 | my $progress; |
790 | my $progress; |
521 | my $loop; |
791 | my $loop; |
522 | |
792 | |
523 | for my $o (values %ARC) { |
793 | for my $o (values %ARC) { |
524 | if (my $other = $o->{inherit}) { |
794 | for my $other (split /,/, $o->{inherit}) { |
525 | if (my $s = $ARC{$other}) { |
795 | if (my $s = $ARC{$other}) { |
526 | if ($s->{inherit}) { |
796 | if ($s->{inherit}) { |
527 | $loop = $s; |
797 | $loop = $s; |
528 | } else { |
798 | } else { |
529 | delete $o->{inherit}; |
799 | delete $o->{inherit}; |
… | |
… | |
531 | delete @s{qw(_name more name name_pl)}; |
801 | delete @s{qw(_name more name name_pl)}; |
532 | %$o = ( %s, %$o ); |
802 | %$o = ( %s, %$o ); |
533 | ++$progress; |
803 | ++$progress; |
534 | } |
804 | } |
535 | } else { |
805 | } else { |
536 | warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
806 | warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
537 | delete $ARC{$o->{_name}}; |
807 | delete $ARC{$o->{_name}}; |
538 | } |
808 | } |
539 | } |
809 | } |
540 | } |
810 | } |
541 | |
811 | |
… | |
… | |
548 | } |
818 | } |
549 | |
819 | |
550 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
820 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
551 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
821 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
552 | |
822 | |
|
|
823 | # fix up archetypes without names, where the archanme doesn't work at all |
|
|
824 | for (@ARC) { |
|
|
825 | if (!exists $_->{name} and $_->{_name} =~ /_/) { |
|
|
826 | for ($_->{name} = $_->{_name}) { |
|
|
827 | s/(?:_\d+)+$//; |
|
|
828 | s/_[nesw]+$//; |
|
|
829 | y/_/ /; |
|
|
830 | } |
|
|
831 | } |
|
|
832 | } |
|
|
833 | |
|
|
834 | #print "generating plurals...\n" if $VERBOSE; |
|
|
835 | #generate_plurals; |
|
|
836 | |
|
|
837 | printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; |
553 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
838 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
554 | or die "$DATADIR/archetypes~: $!"; |
839 | or die "$DATADIR/archetypes~: $!"; |
555 | print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
840 | print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
556 | } |
841 | } |
557 | |
842 | |
558 | { |
843 | { |
|
|
844 | printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE; |
559 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
845 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
560 | or die "$DATADIR/treasures~: $!"; |
846 | or die "$DATADIR/treasures~: $!"; |
561 | print $fh $TRS; |
847 | print $fh $TRS; |
562 | } |
848 | } |
563 | |
849 | |
564 | { |
850 | { |
|
|
851 | print "processing facedata...\n" if $VERBOSE; |
565 | while (my ($k, $v) = each %FACEINFO) { |
852 | while (my ($k, $v) = each %FACEINFO) { |
566 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
853 | length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
567 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
854 | length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n"; |
568 | |
855 | |
|
|
856 | make_hash $k, $v->{data32}, $v->{hash32}; |
|
|
857 | make_hash $k, $v->{data64}, $v->{hash64}; |
|
|
858 | |
569 | length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
859 | #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
570 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
860 | #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n"; |
571 | |
861 | |
572 | $v->{chksum32} = Digest::MD5::md5 $v->{data32}; |
862 | $v->{glyph} // warn "WARNING: face '$k' has glyph."; |
573 | $v->{chksum64} = Digest::MD5::md5 $v->{data64}; |
863 | $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n"; |
|
|
864 | $v->{magicmap} // warn "WARNING: face '$k' has foreground colour."; |
574 | |
865 | |
575 | if (my $magicmap = $v->{magicmap}) { |
866 | delete @$v{qw(arc stem)}; # not used by the server |
576 | $magicmap =~ y/A-Z_\-/a-z/d; |
867 | } |
577 | $v->{magicmap} = $COLOR{$magicmap}; |
868 | |
|
|
869 | print "processing resources...\n" if $VERBOSE; |
|
|
870 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
|
|
871 | while (my ($k, $v) = each %RESOURCE) { |
|
|
872 | |
|
|
873 | if ($v->{meta} && $v->{meta}{datadir}) { |
|
|
874 | delete $RESOURCE{$k}; |
|
|
875 | |
|
|
876 | $k =~ s/^res\/// or die "$k: datadir files must be in res/"; |
|
|
877 | |
|
|
878 | printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE; |
|
|
879 | open my $fh, ">:raw", "$DATADIR/$k~" |
|
|
880 | or die "$DATADIR/$k~: $!"; |
|
|
881 | syswrite $fh, $v->{data}; |
|
|
882 | push @COMMIT, $k; |
|
|
883 | |
|
|
884 | } else { |
|
|
885 | if ($v->{type} & 1) { |
|
|
886 | # prepend meta info |
|
|
887 | |
|
|
888 | my $meta = $enc->encode ({ |
|
|
889 | name => $k, |
|
|
890 | %{ $v->{meta} || {} }, |
|
|
891 | }); |
|
|
892 | |
|
|
893 | $v->{data} = pack "(w/a*)*", $meta, $v->{data}; |
578 | } |
894 | } |
|
|
895 | |
|
|
896 | make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients |
579 | } |
897 | } |
|
|
898 | } |
|
|
899 | |
|
|
900 | printf "writing facedata (%d faces, %d anims, %d resources)...\n", |
|
|
901 | scalar keys %FACEINFO, |
|
|
902 | scalar keys %ANIMINFO, |
|
|
903 | scalar keys %RESOURCE |
|
|
904 | if $VERBOSE; |
580 | |
905 | |
581 | open my $fh, ">:perlio", "$DATADIR/facedata~" |
906 | open my $fh, ">:perlio", "$DATADIR/facedata~" |
582 | or die "$DATADIR/facedata~: $!"; |
907 | or die "$DATADIR/facedata~: $!"; |
583 | |
908 | |
584 | print $fh freeze { |
909 | print $fh nfreeze { |
585 | version => 2, |
910 | version => 2, |
586 | faceinfo => \%FACEINFO, |
911 | faceinfo => \%FACEINFO, |
587 | animinfo => \%ANIMINFO, |
912 | animinfo => \%ANIMINFO, |
588 | resource => \%RESOURCE, |
913 | resource => \%RESOURCE, |
589 | }; |
914 | }; |
590 | } |
|
|
591 | |
915 | |
|
|
916 | } |
|
|
917 | |
|
|
918 | print "committing files...\n" if $VERBOSE; |
|
|
919 | |
592 | for (qw(archetypes facedata treasures)) { |
920 | for (qw(archetypes facedata treasures), @COMMIT) { |
593 | chmod 0644, "$DATADIR/$_~"; |
921 | chmod 0644, "$DATADIR/$_~"; |
594 | rename "$DATADIR/$_~", "$DATADIR/$_" |
922 | rename "$DATADIR/$_~", "$DATADIR/$_" |
595 | or die "$DATADIR/$_: $!"; |
923 | or die "$DATADIR/$_: $!"; |
596 | } |
924 | } |
597 | |
925 | |