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.78 by root, Wed Nov 4 13:46:37 2009 UTC vs.
Revision 1.116 by root, Sun May 15 20:14:30 2011 UTC

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
25use strict; 25use common::sense;
26 26
27my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
28my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
29my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
30my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
31 31
32my $CONVERT = "@CONVERT@"; 32my $CONVERT = "@CONVERT@";
33#my $IDENTIFY = "@IDENTIFY@"; 33my $IDENTIFY = "@IDENTIFY@";
34my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
35my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
36my $PNGNQ = "@PNGNQ@"; 36my $PNGNQ = "@PNGNQ@";
37 37
38use Getopt::Long; 38use Getopt::Long;
39use File::Temp; 39use File::Temp;
40use POSIX (); 40use POSIX ();
41use Carp; 41use Carp;
42 42
43use Coro::EV;
44use AnyEvent;
45use YAML::XS (); 43use YAML::XS ();
44use Digest::MD5 ();
45use Storable ();
46use JSON::XS (); 46use JSON::XS ();
47use IO::AIO (); 47use IO::AIO ();
48use Compress::LZF ();
48 49
50use AnyEvent;
49use Coro 5.12; 51use Coro 5.12;
52use Coro::EV;
50use Coro::AIO; 53use Coro::AIO;
51use Coro::Util; 54use Coro::Util;
52use Coro::Channel; 55use Coro::Channel;
56use Coro::AnyEvent;
53use Coro::Storable; $Storable::canonical = 1; 57use Coro::Storable; $Storable::canonical = 1;
54 58
55use Deliantra; 59use Deliantra;
56 60
57$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 61$SIG{QUIT} = sub { Carp::cluck "QUIT" };
73my $VERBOSE = 1; 77my $VERBOSE = 1;
74my $CACHE = 0; 78my $CACHE = 0;
75my $FORCE; 79my $FORCE;
76my $TMPDIR = "/tmp/cfutil$$~"; 80my $TMPDIR = "/tmp/cfutil$$~";
77my $TMPFILE = "aaaa0"; 81my $TMPFILE = "aaaa0";
82my @COMMIT;
78 83
79our %COLOR = ( 84our %COLOR = (
85 # original cf colours
80 black => 0, 86 black => 0,
81 white => 1, 87 white => 1,
82 navy => 2, 88 navy => 2, # "dark blue"
83 red => 3, 89 red => 3,
84 orange => 4, 90 orange => 4,
85 blue => 5, 91 blue => 5, # "light blue"
86 darkorange => 6, 92 darkorange => 6,
87 green => 7, 93 green => 7,
88 lightgreen => 8, 94 lightgreen => 8,
89 grey => 9, 95 grey => 9,
96 brown => 10, # "yellow"
97 gold => 11, # "light yellow"
98 tan => 12, # yellowish gray
99
100 # new for deliantra
90 brown => 10, 101 none => 13,
102
103 # compatibility to existing archetypes
104 lightblue => 5,
91 gold => 11, 105 gray => 9,
106 yellow => 11,
92 tan => 12, 107 khaki => 12,
93); 108);
94 109
95END { system "rm", "-rf", $TMPDIR } 110END { system "rm", "-rf", $TMPDIR }
96 111
97my $s_INT = EV::signal INT => sub { exit 1 }; 112my $s_INT = AE::signal INT => sub { exit 1 };
98my $s_TERM = EV::signal TERM => sub { exit 1 }; 113my $s_TERM = AE::signal TERM => sub { exit 1 };
114
115our %hash;
116
117# here we could try to avoid collisions and reduce chksum size further
118sub make_hash($\$\$;$) {
119 my ($id, $dataref, $hashref, $clen) = @_;
120
121 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 5;
122
123 if (exists $hash{$hash}) {
124 # hash collision, but some files are simply identical
125 if (${$hash{$hash}[1]} ne $$dataref) {
126 warn "ERROR: hash collision $hash{$hash}[0] vs. $id (increase the default \$clen in make_hash?)\n";
127 exit 1;
128 } else {
129 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
130 }
131 }
132 $hash{$hash} = [$id, $dataref, $hashref];
133
134 $$hashref = $hash;
135}
136
137sub optipng($) {
138 system $OPTIPNG, "-o5", "-i0", "-q", $_[0];
139 die "$_[0] has zero size, aborting." unless -s $_[0];
140}
99 141
100mkdir $TMPDIR, 0700 142mkdir $TMPDIR, 0700
101 or die "$TMPDIR: $!"; 143 or die "$TMPDIR: $!";
102 144
103sub fork_sub(&) { 145sub fork_exec(&) {
104 my ($cb) = @_; 146 my ($cb) = @_;
105 147
106 if (my $pid = fork) { 148 if (my $pid = fork) {
107 my $current = $Coro::current; 149 my $current = $Coro::current;
108 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); 150 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready });
113 warn $@; 155 warn $@;
114 POSIX::_exit 1; 156 POSIX::_exit 1;
115 } 157 }
116} 158}
117 159
160sub 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
172sub 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
118sub inst_maps($) { 189sub inst_maps($) {
119 my (undef, $path) = @_; 190 my (undef, $path) = @_;
120 191
121 print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; 192 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
122 193
123 if (!-f "$path/regions") { 194 if (!-f "$path/regions") {
124 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 195 warn "ERROR: '$path' does not look like a maps directory ('regions' file is missing).\n";
125 exit 1 unless $FORCE; 196 exit 1 unless $FORCE;
126 } 197 }
127 198
128 system $RSYNC, "-av", "--chmod=u=rwX,go=rX", 199 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
129 "$path/.", "$DATADIR/maps/.", 200 "$path/.", "$DATADIR/maps/.",
139 our %FACEINFO; 210 our %FACEINFO;
140 our %RESOURCE; 211 our %RESOURCE;
141 our @ARC; 212 our @ARC;
142 our %ARC; 213 our %ARC;
143 our $TRS; 214 our $TRS;
215 our %PNG;
144 our $NFILE; 216 our $NFILE;
145 our $PATH; 217 our $PATH;
146 218
147 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 219 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
148 220
149 our $c_arc = new Coro::Channel; 221 our $c_arc = new Coro::Channel;
150 our $c_trs = new Coro::Channel; 222 our $c_any = new Coro::Channel;
151 our $c_res = new Coro::Channel;
152 223
153 our @c_png; 224 our @c_png;
154 225
155 sub commit_png($$$) { 226 sub commit_png($$$$) {
156 my ($name, $data, $T) = @_; 227 my ($stem, $name, $data, $T) = @_;
157 228
229 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
158 $FACEINFO{$name}{"data$T"} = $data; 230 $FACEINFO{$name}{"data$T"} = $data;
159 } 231 }
160 232
161 sub process_png { 233 sub process_png {
162 while (@c_png) { 234 while (@c_png) {
165 my $png; 237 my $png;
166 aio_lstat $path; 238 aio_lstat $path;
167 my ($size, $mtime) = (stat _)[7,9]; 239 my ($size, $mtime) = (stat _)[7,9];
168 240
169 if (0 > aio_load $path, $png) { 241 if (0 > aio_load $path, $png) {
170 warn "$path: $!, skipping.\n"; 242 warn "ERROR: $path: $!, skipping.\n";
171 next; 243 next;
172 } 244 }
173 245
174 my $stem = $path; 246 my $stem = $path;
175 my $T; 247 my $T;
177 if ($stem =~ s/\.32x32\.png~?$//) { 249 if ($stem =~ s/\.32x32\.png~?$//) {
178 $T = 32; 250 $T = 32;
179 } elsif ($stem =~ s/\.64x64\.png~?$//) { 251 } elsif ($stem =~ s/\.64x64\.png~?$//) {
180 $T = 64; 252 $T = 64;
181 } else { 253 } else {
182 warn "$path: weird filename, skipping.\n"; 254 warn "ERROR: $path: weird filename, skipping.\n";
183 next; 255 next;
184 } 256 }
185 257
186 # quickly extract width and height of the (necessarily PNG) image 258 # quickly extract width and height of the (necessarily PNG) image
187 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 259 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
188 warn "$path: not a recognized png file, skipping.\n"; 260 warn "ERROR: $path: not a recognized png file, skipping.\n";
189 next; 261 next;
190 } 262 }
191 263
192 my ($w, $h) = unpack "NN", $1; 264 my ($w, $h) = unpack "NN", $1;
193 265
194 if ($w < $T || $h < $T) { 266 if ($w < $T || $h < $T) {
195 warn "$path: too small ($w $h), skipping.\n"; 267 warn "ERROR: $path: too small ($w $h), skipping.\n";
196 next; 268 next;
197 } 269 }
198 270
199 if ($w % $T || $h % $T) { 271 if ($w % $T || $h % $T) {
200 warn "$path: weird png size ($w $h), skipping.\n"; 272 warn "ERROR: $path: weird png size ($w $h), skipping.\n";
201 next; 273 next;
202 } 274 }
203 275
204 (my $base = $stem) =~ s/^.*\///; 276 (my $base = $stem) =~ s/^.*\///;
205 277
214 unless ($path =~ /~$/) { 286 unless ($path =~ /~$/) {
215 # possibly enlarge 287 # possibly enlarge
216 if (0 > aio_stat "$stem.64x64.png") { 288 if (0 > aio_stat "$stem.64x64.png") {
217 my $other = "$stem.64x64.png~"; 289 my $other = "$stem.64x64.png~";
218 290
219 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 291 make_file $path, $other, sub {
220 fork_sub { 292 fork_exec {
221 my $CROP; 293 my $CROP;
222 my $SRC = "png:\Q$path\E"; 294 my $SRC = "png:\Q$path\E";
223 295
224 my $is_floor = $arc->{is_floor}; 296 my $is_floor = $arc->{is_floor};
225 my $is_wall = 0; 297 my $is_wall = 0;
279 351
280 system "convert -depth 8 $SRC rgba:-" 352 system "convert -depth 8 $SRC rgba:-"
281 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 353 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
282 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" 354 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
283 and die "convert/cfhq2xa pipeline error: status $? ($!)"; 355 and die "convert/cfhq2xa pipeline error: status $? ($!)";
284 system $OPTIPNG, "-i0", "-q", "$other~"; 356 optipng "$other~";
285 die "$other~ has zero size, aborting." unless -s "$other~";
286 rename "$other~", $other; 357 rename "$other~", $other;
287 }; 358 };
288 } 359 };
289 360
290 push @c_png, [$other, !$CACHE]; 361 push @c_png, [$other, !$CACHE];
291 } 362 }
292 363
293 # possibly scale down 364 # possibly scale down
294 if (0 > aio_stat "$stem.32x32.png") { 365 if (0 > aio_stat "$stem.32x32.png") {
295 my $other = "$stem.32x32.png~"; 366 my $other = "$stem.32x32.png~";
296 367
297 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 368 make_file $path, $other, sub {
298 fork_sub { 369 fork_exec {
299 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 370 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
300 system $OPTIPNG, "-i0", "-q", "$other~"; 371 optipng "$other~";
301 372
302 # reduce smoothfaces >10000 bytes 373 # reduce smoothfaces >10000 bytes
303 # obsolete, no longer required 374 # obsolete, no longer required
304 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { 375 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
305 my $ncolor = 256; 376 my $ncolor = 256;
306 while () { 377 while () {
307 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 378 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
308 system $OPTIPNG, "-i0", "-q", "$other~~"; 379 optipng "$other~~";
309 last if 10000 > -s "$other~~"; 380 last if 10000 > -s "$other~~";
310 $ncolor = int $ncolor * 0.9; 381 $ncolor = int $ncolor * 0.9;
311 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; 382 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
312 } 383 }
313 384
318 } 389 }
319 390
320 die "$other~ has zero size, aborting." unless -s "$other~"; 391 die "$other~ has zero size, aborting." unless -s "$other~";
321 rename "$other~", $other; 392 rename "$other~", $other;
322 }; 393 };
323 } 394 };
324 395
325 #warn "scaled down $path to $other\n";#d# 396 #warn "scaled down $path to $other\n";#d#
326 push @c_png, [$other, !$CACHE]; 397 push @c_png, [$other, !$CACHE];
327 } 398 }
328 } 399 }
329 400
330 (my $face = $stem) =~ s/^.*\///; 401 (my $face = $stem) =~ s/^.*\///;
402
403 for (@{ $fi->{derive} }) {
404 my ($dir, $type) = @$_;
405
406 my $geom = "${T}x${T}";
407 my $dpath = "$dir/$type:$face.$geom.png~";
408
409 if ($type eq "buildmaterial") {
410 my $ov = "$PATH/mapbuilding/buildmaterial.png";
411 make_file [$path, $ov], $dpath, sub {
412 fork_exec {
413 system "$CONVERT -size 64x64 xc:transparent \\( \Q$path\E -geometry 52x52+6+6 \\) -composite \Q$ov\E -composite -geometry $geom png:\Q$dpath\E~";
414 optipng "$dpath~";
415 rename "$dpath~", $dpath;
416 };
417 };
418 } elsif ($type eq "buildmaterial-box") {
419 my $ov = "$PATH/mapbuilding/buildmaterial-box.png";
420 make_file [$path, $ov], $dpath, sub {
421 fork_exec {
422 system "$CONVERT \Q$ov\E "
423 . "\\( \Q$path\E -trim -geometry 34x31\\> "
424 . "-gravity center -background transparent -extent 37x34 +gravity "
425 . "-geometry +22+6 \\) -composite "
426 . "-geometry $geom png:\Q$dpath\E~";
427 optipng "$dpath~";
428 rename "$dpath~", $dpath;
429 };
430 };
431 } elsif ($type eq "buildmaterial-sbox") {
432 my $ov = "$PATH/mapbuilding/buildmaterial-sbox.png";
433 make_file [$path, $ov], $dpath, sub {
434 fork_exec {
435 system "$CONVERT \Q$ov\E "
436 . "\\( \Q$path\E -trim -geometry 16x24\\> "
437 . "-gravity center -background transparent -extent 18x26 +gravity "
438 . "-geometry +26+16 \\) -composite "
439 . "-geometry $geom png:\Q$dpath\E~";
440 optipng "$dpath~";
441 rename "$dpath~", $dpath;
442 };
443 };
444 } else {
445 warn "ERROR: facename $type:$face contains unsupported derivation type.\n";
446 }
447
448 aio_load $dpath, my $png;
449 IO::AIO::aio_unlink $dpath unless $CACHE;
450 commit_png "$dir/$type:$face", "$type:$face", $png, $T;
451 }
331 452
332 # split all bigfaces, but avoid smoothfaces (*_S) 453 # split all bigfaces, but avoid smoothfaces (*_S)
333 if (($w > $T || $h > $T) && $face !~ /_S\./) { 454 if (($w > $T || $h > $T) && $face !~ /_S\./) {
334 # split 455 # split
335 my @tile; 456 my @tile;
340 push @tile, [$x, $y, $file, (stat _)[9]]; 461 push @tile, [$x, $y, $file, (stat _)[9]];
341 } 462 }
342 } 463 }
343 464
344 my $mtime = (lstat $path)[9]; 465 my $mtime = (lstat $path)[9];
345 my @todo = grep { $_->[3] <= $mtime } @tile; 466 my @todo = grep { $_->[3] < $mtime } @tile;
346 if (@todo) { 467 if (@todo) {
347 fork_sub { 468 fork_exec {
348 open my $convert, "|-", $CONVERT, 469 open my $convert, "|-", $CONVERT,
349 "png:-", 470 "png:-",
350 (map { 471 (map {
351 ( 472 (
352 "(", 473 "(",
365 print $convert $png; 486 print $convert $png;
366 close $convert; 487 close $convert;
367 488
368 # pass 2, optimise, and rename 489 # pass 2, optimise, and rename
369 for (@todo) { 490 for (@todo) {
370 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 491 optipng "$_->[2]~";
371 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
372 rename "$_->[2]~", $_->[2]; 492 rename "$_->[2]~", $_->[2];
373 } 493 }
374 }; 494 };
375 } 495 }
376 496
380 500
381 if (0 > aio_load $file, $tile) { 501 if (0 > aio_load $file, $tile) {
382 die "$path: unable to read tile +$x+$y, aborting.\n"; 502 die "$path: unable to read tile +$x+$y, aborting.\n";
383 } 503 }
384 IO::AIO::aio_unlink $file unless $CACHE; 504 IO::AIO::aio_unlink $file unless $CACHE;
385 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 505 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
386 } 506 }
387 } else { 507 } else {
388 # use as-is (either small, use smooth) 508 # use as-is (either small, use smooth)
389 commit_png $face, $png, $T; 509 commit_png $stem, $face, $png, $T;
390 } 510 }
391 511
392 aio_unlink $path if $delete; 512 IO::AIO::aio_unlink $path if $delete;
513 }
514 }
515
516 sub process_faceinfo {
517 my ($dir, $file) = @_;
518 my $path = "$dir/$file";
519
520 my $data;
521 if (0 > aio_load $path, $data) {
522 warn "ERROR: $path: $!, skipping.\n";
523 return;
524 }
525
526 for (split /\n/, $data) {
527 chomp;
528 my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/, $_, 5;
529 # bg not used except for text clients
530
531 utf8::decode $glyph;
532 $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag
533 $glyph =~ s/^"(.+)"$/$1/; # allow for ""-style quoting
534
535 $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
536
537 (my $fgi = $COLOR{$fg})
538 // warn "ERROR: $path: $face specifies unknown foreground colour '$fg'.\n";
539 (my $bgi = $COLOR{$bg})
540 // warn "ERROR: $path: $face specifies unknown background colour '$bg'.\n";
541
542 my $fi = $FACEINFO{$face} ||= { };
543 $fi->{visibility} = $visibility * 1;
544 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap
545
546 $glyph .= " " if 2 > length $glyph; # TODO kanji
547 die "glyph $face too long" if 2 < length $glyph;
548
549 $fi->{glyph} = "";
550 for (split //, $glyph) {
551 utf8::encode $_;
552 $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_;
553 }
393 } 554 }
394 } 555 }
395 556
396 sub process_arc { 557 sub process_arc {
397 while (my $job = $c_arc->get) { 558 while (my ($dir, $file) = @{ $c_arc->get }) {
398 my ($dir, $file) = @$job;
399
400 my $arc; 559 my $arc;
401 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 560 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
402 561
403 my $arc = read_arch "$dir/$file"; 562 my $arc = read_arch "$dir/$file";
404 for my $o (values %$arc) { 563 for my $o (values %$arc) {
406 for (my $m = $o; $m; $m = $m->{more}) { 565 for (my $m = $o; $m; $m = $m->{more}) {
407 $ARC{$m->{_name}} = $m; 566 $ARC{$m->{_name}} = $m;
408 } 567 }
409 568
410 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 569 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
411
412 my $visibility = delete $o->{visibility};
413 my $magicmap = delete $o->{magicmap};
414 570
415 # find upper left corner :/ 571 # find upper left corner :/
416 # omg, this is sooo broken 572 # omg, this is sooo broken
417 my ($dx, $dy); 573 my ($dx, $dy);
418 for (my $o = $o; $o; $o = $o->{more}) { 574 for (my $o = $o; $o; $o = $o->{more}) {
425 my $y = $o->{y} - $dy; 581 my $y = $o->{y} - $dy;
426 582
427 my $ext = $x|$y ? "+$x+$y" : ""; 583 my $ext = $x|$y ? "+$x+$y" : "";
428 584
429 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 585 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
430
431 $visibility = delete $o->{visibility} if exists $o->{visibility};
432 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
433 586
434 my $anim = delete $o->{anim}; 587 my $anim = delete $o->{anim};
435 588
436 if ($anim) { 589 if ($anim) {
437 # possibly add $ext to the animation name to avoid 590 # possibly add $ext to the animation name to avoid
461 next if /^facings\s/; 614 next if /^facings\s/;
462 615
463 my $face = $_; 616 my $face = $_;
464 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates 617 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
465 618
466 my $info = $FACEINFO{$face} ||= { }; 619 # handle derived faces
620 if ($face =~ /^([^:]+):(.*)/) {
621 my ($type, $base) = ($1, $2);
622 push @{ $FACEINFO{$base}{derive} }, [$dir, $type];
623 }
624
467 $info->{arc} = $o; 625 $FACEINFO{$face}{arc} = $o;
468 626
469 next if $face =~ /^blank.x11$|^empty.x11$/; 627 next if $face =~ /^blank.x11$|^empty.x11$/;
470
471 $info->{visibility} = $visibility if defined $visibility;
472 $info->{magicmap} = $magicmap if defined $magicmap;
473 } 628 }
474 629
475 if (my $smooth = delete $o->{smoothface}) { 630 if (my $smooth = delete $o->{smoothface}) {
476 my %kv = split /\s+/, $smooth; 631 my %kv = split /\s+/, $smooth;
477 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 632 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
486 } 641 }
487 } 642 }
488 } 643 }
489 644
490 sub process_trs { 645 sub process_trs {
491 while (my $job = $c_trs->get) {
492 my ($dir, $file) = @$job; 646 my ($dir, $file) = @_;
493 my $path = "$dir/$file"; 647 my $path = "$dir/$file";
494 648
495 my $trs; 649 my $trs;
496 if (0 > aio_load $path, $trs) { 650 if (0 > aio_load $path, $trs) {
497 warn "$path: $!, skipping.\n"; 651 warn "ERROR: $path: $!, skipping.\n";
498 next; 652 return;
499 } 653 }
500 654
501 $TRS .= $trs; 655 $TRS .= $trs;
502 }
503 } 656 }
504 657
505 my %FILECACHE; 658 my %FILECACHE;
506 659
507 sub load_cached($;$) { 660 sub load_cached($;$) {
508 unless (exists $FILECACHE{$_[0]}) { 661 unless (exists $FILECACHE{$_[0]}) {
509 my $data; 662 my $data;
510 if (0 < aio_load $_[0], $data) { 663 if (0 < aio_load $_[0], $data) {
511 if ($_[1]) { 664 if ($_[1]) {
512 $data = eval { $_[1]->($data) }; 665 $data = eval { $_[1]->($data) };
513 warn "$_[0]: $@" if $@; 666 warn "ERROR: $_[0]: $@" if $@;
514 } 667 }
515 } 668 }
516 669
517 $FILECACHE{$_[0]} = $data; 670 $FILECACHE{$_[0]} = $data;
518 } 671 }
519 672
520 $FILECACHE{$_[0]} 673 $FILECACHE{$_[0]}
521 } 674 }
522 675
676 # convert an image and a palette to some indexed 2d-matrix structure
677 sub process_plt {
678 my ($base, $plt) = @_;
679
680 my ($w, $h) = imgsize "$base.png";
681
682 $w * $h
683 or die "$base.png: unable to identify correct size\n";
684
685 my @plt;
686 my %map;
687
688 for (split /\n/, $plt) {
689 next unless /\S/;
690 next if /^\s*#/;
691
692 /^([0-9a-fA-F]{3,6})\s*(.*?)\s*$/
693 or die "unparseable palette entry for $base.plt: $_";
694
695 my ($rgb, $name) = ($1, $2);
696
697 $rgb =~ s/^(.)(.)(.)$/$1$1$2$2$3$3/;
698
699 $map{pack "H*", $rgb} = chr @plt;
700 push @plt, $name;
701 }
702
703 make_file ["$base.plt", "$base.png"], "$base.tbl~", sub {
704 warn "building $base\n" if $VERBOSE >= 3;
705
706 fork_exec {
707 open my $png, "-|", $CONVERT, qw(-depth 8 --), "$base.png", "rgb:"
708 or die "$base.png: $!";
709
710 local $/;
711 $png = <$png>;
712
713 $w * $h * 3 == length $png
714 or die "$base.png: failed to read enough data from file\n";
715
716 $png =~ s/(...)/$map{$1}/ge;
717
718 $w * $h == length $png
719 or die "$base.png: failed to map all data - wrong palette?\n";
720
721 {
722 open my $fh, ">:raw", "$base.tbl~~"
723 or die "$base.tbl~~: $!";
724 syswrite $fh, $png;
725 }
726
727 rename "$base.tbl~~", "$base.tbl~";
728 };
729 };
730
731 0 <= aio_load "$base.tbl~", my $tbl
732 or die "$base.tbl~: $!";
733
734 IO::AIO::aio_unlink "$base.tbl~" unless $CACHE;
735
736 Compress::LZF::compress nfreeze {
737 w => $w,
738 h => $h,
739 plt => \@plt,
740 tbl => $tbl,
741 }
742 }
743
523 sub process_res { 744 sub process_res {
524 while (my $job = $c_res->get) {
525 my ($dir, $file, $type) = @$job; 745 my ($dir, $file, $type) = @_;
526 746
527 my $data;
528 aio_load "$dir/$file", $data; 747 0 <= aio_load "$dir/$file", my $data
748 or die "$dir/$file: $!";
529 749
530 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 750 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
531 751
532 utf8::decode $dir; 752 utf8::decode $dir;
533 utf8::decode $file; 753 utf8::decode $file;
534 754
535 # a meta file for resources is now mandatory 755 # a meta file for resources is now mandatory
536 unless (exists $meta->{$file}) { 756 unless (exists $meta->{$file}) {
537 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 757 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
538 next; 758 return;
539 } 759 }
540 760
541 $meta = { 761 $meta = {
542 %{ $meta->{"" } || {} }, 762 %{ $meta->{"" } || {} },
543 %{ $meta->{$file} || {} }, 763 %{ $meta->{$file} || {} },
544 }; 764 };
545 765
546 if ($meta->{license} =~ s/^#//) { 766 if ($meta->{license} =~ s/^#//) {
547 $meta->{license} = ({ 767 $meta->{license} = ({
548 "pd" => "Public Domain", 768 "pd" => "Public Domain",
549 "gpl" => "GNU General Public License, version 3.0 or any later", 769 "gpl" => "GNU General Public License, version 3.0 or any later",
550 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 770 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
771 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
551 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 772 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
552 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 773 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
553 })->{$meta->{license}} 774 })->{$meta->{license}}
554 || warn "$dir/$file: license tag '$meta->{license}' not found."; 775 || warn "ERROR: $dir/$file: license tag '$meta->{license}' not found.";
555 } 776 }
556 777
778 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
779 ($meta->{author} = $1) =~ s/_/ /g;
780 }
781
557 $file =~ s/\.res$//; 782 $file =~ s/\.res$//;
558 $file =~ s/\.(ogg|wav|jpg|png)$//; 783 $file =~ s/\.(ogg|wav|jpg|png)$//;
559 784
560 substr $dir, 0, 1 + length $PATH, ""; 785 if ($file =~ s/\.plt$//) {
561 786 $data = process_plt "$dir/$file", $data;
562 if (my $filter = $meta->{cfutil_filter}) { 787 } elsif (my $filter = $meta->{cfutil_filter}) {
563 if ($filter eq "yaml2json") { 788 if ($filter eq "yaml2json") {
564 $data = JSON::XS::encode_json YAML::XS::Load $data; 789 $data = JSON::XS::encode_json YAML::XS::Load $data;
565 } elsif ($filter eq "json2json") { 790 } elsif ($filter eq "json2json") {
566 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 791 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
567 } elsif ($filter eq "perl2json") { 792 } elsif ($filter eq "perl2json") {
568 $data = eval $data; die if $@; 793 $data = eval $data; die if $@;
569 $data = JSON::XS::encode_json $data; 794 $data = JSON::XS::encode_json $data;
570 } else { 795 } else {
571 warn "$dir/$file: unknown filter $filter, skipping\n"; 796 warn "ERROR: $dir/$file: unknown filter $filter, skipping\n";
572 } 797 }
573 } 798 }
574 799
800 substr $dir, 0, 1 + length $PATH, "";
801
575 $RESOURCE{"$dir/$file"} = { 802 $RESOURCE{"$dir/$file"} = {
576 type => (exists $meta->{type} ? delete $meta->{type} : $type), 803 type => (exists $meta->{type} ? delete $meta->{type} : $type),
577 data => $data, 804 data => $data,
578 %$meta ? (meta => $meta) : (), 805 %$meta ? (meta => $meta) : (),
579 }; 806 };
807 }
808
809 sub process_any {
810 while (my ($func, @args) = @{ $c_any->get }) {
811 $func->(@args);
580 } 812 }
581 } 813 }
582 814
583 sub find_files; 815 sub find_files;
584 sub find_files { 816 sub find_files {
585 my ($path) = @_; 817 my ($path) = @_;
586 818
819 my $grp = IO::AIO::aio_group;
820
821 my $scandir; $scandir = sub {
822 my ($path) = @_;
823
587 IO::AIO::aioreq_pri 4; 824 IO::AIO::aioreq_pri 4;
588 IO::AIO::aio_scandir $path, 4, sub { 825 add $grp IO::AIO::aio_scandir $path, 4, sub {
589 my ($dirs, $nondirs) = @_; 826 my ($dirs, $nondirs) = @_;
590 827
591 find_files "$path/$_" 828 $scandir->("$path/$_")
592 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 829 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
593 830
594 my $dir = $path; 831 my $dir = $path;
595 substr $dir, 0, 1 + length $PATH, ""; 832 substr $dir, 0, 1 + length $PATH, "";
596 833
597 for my $file (@$nondirs) { 834 for my $file (@$nondirs) {
598 if ($dir =~ /^music(?:\/|$)/) { 835 if ($dir =~ /^music(?:\/|$)/) {
599 $c_res->put ([$path, $file, 3]) # FT_MUSIC 836 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
600 if $file =~ /\.(ogg)$/; 837 if $file =~ /\.(ogg)$/;
601 838
602 } elsif ($dir =~ /^sound(?:\/|$)/) { 839 } elsif ($dir =~ /^sound(?:\/|$)/) {
603 $c_res->put ([$path, $file, 5]) # FT_SOUND 840 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
604 if $file =~ /\.(wav|ogg)$/; 841 if $file =~ /\.(wav|ogg)$/;
605 842
606 } elsif ($dir =~ /^res(?:\/|$)/) { 843 } elsif ($dir =~ /^res(?:\/|$)/) {
607 if ($file =~ /\.(jpg|png)$/) { 844 if ($file =~ /\.(jpg|png)$/) {
608 $c_res->put ([$path, $file, 0]) # FT_FACE 845 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
609 } elsif ($file =~ /\.(res)$/) { 846 } elsif ($file =~ /\.(res)$/) {
847 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
848 } else {
849 $c_any->put ([\&process_res, $path, $file, undef]);
850 }
851
852 } elsif ($file =~ /\.png$/) {
853 $PNG{$file} = $path;
854
855 } elsif ($file =~ /\.faceinfo$/) {
856 $c_any->put ([\&process_faceinfo, $path, $file]);
857
858 } elsif ($file =~ /\.trs$/) {
859 $c_any->put ([\&process_trs, $path, $file]);
860
861 } elsif ($file =~ /\.arc$/) {
610 $c_res->put ([$path, $file, 6]) # FT_RSRC 862 $c_arc->put ([$path, $file]);
863
611 } else { 864 } else {
612 $c_res->put ([$path, $file, undef]); 865 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
613 } 866 }
614
615 } elsif ($file =~ /\.png$/) {
616 push @c_png, ["$path/$file", 0];
617
618 } elsif ($file =~ /\.trs$/) {
619 $c_trs->put ([$path, $file]);
620
621 } elsif ($file =~ /\.arc$/) {
622 $c_arc->put ([$path, $file]);
623
624 } else { 867 }
625 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
626 }
627 } 868 };
628 }; 869 };
870
871 $scandir->($path);
872 aio_wait $grp;
629 } 873 }
630 874
631 sub generate_plurals { 875 sub generate_plurals {
632# use Lingua::EN::Inflect (); 876# use Lingua::EN::Inflect ();
633# Lingua::EN::Inflect::classical; 877# Lingua::EN::Inflect::classical;
667 "Unless you run verbosely, all following warning\n", 911 "Unless you run verbosely, all following warning\n",
668 "or error messages indicate serious problems.\n", 912 "or error messages indicate serious problems.\n",
669 "\n"; 913 "\n";
670 914
671 if (!-d "$path/treasures") { 915 if (!-d "$path/treasures") {
672 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 916 warn "FATAL: '$path' does not look like an arch directory ('treasures' directory is missing).\n";
673 exit 1 unless $FORCE; 917 exit 1 unless $FORCE;
674 } 918 }
675 919
676 print "scanning files...\n" if $VERBOSE; 920 print "starting file scan, arc, any processing...\n" if $VERBOSE;
921
922 my @a_arc = map +(async \&process_arc), 1..2;
923 my @a_any = map +(async \&process_any), 1..4;
677 924
678 find_files $path; 925 find_files $path;
679 926
680 my @a_arc = map +(async \&process_arc), 1..2;
681 my @a_res = map +(async \&process_res), 1..2;
682 my @a_trs = map +(async \&process_trs), 1..2;
683
684 IO::AIO::flush;
685
686 $c_res->shutdown;
687 $c_arc->shutdown; 927 $c_arc->shutdown;
688 $c_trs->shutdown; 928 $c_any->shutdown;
689
690 print "start file scan, arc, res processing...\n" if $VERBOSE;
691 929
692 $_->join for @a_arc; # need to parse all archetypes before png processing 930 $_->join for @a_arc; # need to parse all archetypes before png processing
931 print "ended arc processing...\n" if $VERBOSE;
693 932
933 # fill png queue
934 for (keys %FACEINFO) {
935 # we only expect source pngs to exist for non-derived
936 # faces, i.e. no split tiles (+x+x) and no face derivates
937 # (xxx:)
938 /^[^:]+\....$/
939 or next;
940
941 my $seen;
942
943 if (exists $PNG{"$_.32x32.png"}) {
944 push @c_png, ["$PNG{\"$_.32x32.png\"}/$_.32x32.png"];
945 $seen = 1;
946 }
947 if (exists $PNG{"$_.64x64.png"}) {
948 push @c_png, ["$PNG{\"$_.64x64.png\"}/$_.64x64.png"];
949 $seen = 1;
950 }
951
952 warn "ERROR: $_: face not found, expect problems.\n"
953 unless $seen;
954 }
955
694 print "end arc, start png processing...\n" if $VERBOSE; 956 print "starting png processing...\n" if $VERBOSE;
695 957
696 # eight png crunchers work fine for my 4x smp machine 958 # eight png crunchers work fine for my 4x smp machine
697 my @a_png = map +(async \&process_png), 1..8; 959 my @a_png = map +(async \&process_png), 1..8;
698 960
699 $_->join for (@a_trs, @a_res, @a_png); 961 $_->join for @a_any;
962 print "ended any processing...\n" if $VERBOSE;
963
964 $_->join for @a_png;
965 print "ended png processing...\n" if $VERBOSE;
700 966
701 print "scanning done, processing results...\n" if $VERBOSE; 967 print "scanning done, processing results...\n" if $VERBOSE;
702 { 968 {
703 # remove path prefix from editor_folder 969 # remove path prefix from editor_folder
704 $_->{editor_folder} =~ /^\x00/ 970 $_->{editor_folder} =~ /^\x00/
710 while () { 976 while () {
711 my $progress; 977 my $progress;
712 my $loop; 978 my $loop;
713 979
714 for my $o (values %ARC) { 980 for my $o (values %ARC) {
715 if (my $other = $o->{inherit}) { 981 for my $other (split /,/, $o->{inherit}) {
716 if (my $s = $ARC{$other}) { 982 if (my $s = $ARC{$other}) {
717 if ($s->{inherit}) { 983 if ($s->{inherit}) {
718 $loop = $s; 984 $loop = $s;
719 } else { 985 } else {
720 delete $o->{inherit}; 986 delete $o->{inherit};
722 delete @s{qw(_name more name name_pl)}; 988 delete @s{qw(_name more name name_pl)};
723 %$o = ( %s, %$o ); 989 %$o = ( %s, %$o );
724 ++$progress; 990 ++$progress;
725 } 991 }
726 } else { 992 } else {
727 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 993 warn "ERROR: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
728 delete $ARC{$o->{_name}}; 994 delete $ARC{$o->{_name}};
729 } 995 }
730 } 996 }
731 } 997 }
732 998
739 } 1005 }
740 1006
741 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 1007 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
742 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 1008 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
743 1009
1010 # fix up archetypes without names, where the archanme doesn't work at all
1011 for (@ARC) {
1012 if (!exists $_->{name} and $_->{_name} =~ /_/) {
1013 for ($_->{name} = $_->{_name}) {
1014 s/(?:_\d+)+$//;
1015 s/_[nesw]+$//;
1016 y/_/ /;
1017 }
1018 }
1019 }
1020
744 print "generating plurals...\n" if $VERBOSE; 1021 #print "generating plurals...\n" if $VERBOSE;
745 generate_plurals; 1022 #generate_plurals;
746 1023
747 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; 1024 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
748 open my $fh, ">:utf8", "$DATADIR/archetypes~" 1025 open my $fh, ">:utf8", "$DATADIR/archetypes~"
749 or die "$DATADIR/archetypes~: $!"; 1026 or die "$DATADIR/archetypes~: $!";
750 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 1027 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
758 } 1035 }
759 1036
760 { 1037 {
761 print "processing facedata...\n" if $VERBOSE; 1038 print "processing facedata...\n" if $VERBOSE;
762 while (my ($k, $v) = each %FACEINFO) { 1039 while (my ($k, $v) = each %FACEINFO) {
763 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 1040 length $v->{data32} or warn "ERROR: face '$k' has no png32 - this will not work.\n";
764 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 1041 length $v->{data64} or warn "ERROR: face '$k' has no png64 - this will not work.\n";
765 1042
1043 make_hash $k, $v->{data32}, $v->{hash32};
1044 make_hash $k, $v->{data64}, $v->{hash64};
1045
766 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 1046 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
767 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 1047 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
768 1048
769 if (my $magicmap = $v->{magicmap}) { 1049 $v->{glyph} // warn "ERROR: face '$k' has no glyph - missing faceinfo entry?\n";
770 $magicmap =~ y/A-Z_\-/a-z/d; 1050 $v->{visibility} // warn "ERROR: face '$k' has no visibility info - missing faceinfo entry?\n";
771 $v->{magicmap} = $COLOR{$magicmap}; 1051 $v->{magicmap} // warn "ERROR: face '$k' has no foreground colour - missing faceinfo entry?\n";
1052
1053 delete @$v{qw(arc stem derive)}; # not used by the server
1054 }
1055
1056 print "processing resources...\n" if $VERBOSE;
1057 my $enc = JSON::XS->new->utf8->canonical->relaxed;
1058 while (my ($k, $v) = each %RESOURCE) {
1059
1060 if ($v->{meta} && $v->{meta}{datadir}) {
1061 delete $RESOURCE{$k};
1062
1063 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
1064
1065 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
1066 open my $fh, ">:raw", "$DATADIR/$k~"
1067 or die "$DATADIR/$k~: $!";
1068 syswrite $fh, $v->{data};
1069 push @COMMIT, $k;
1070
1071 } else {
1072 if ($v->{type} & 1) {
1073 # prepend meta info
1074
1075 my $meta = $enc->encode ({
1076 name => $k,
1077 %{ $v->{meta} || {} },
1078 });
1079
1080 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
772 } 1081 }
773 1082
774 delete $v->{arc}; 1083 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
1084 }
775 } 1085 }
776 1086
777 printf "writing facedata (%d faces, %d anims, %d resources)...\n", 1087 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
778 scalar keys %FACEINFO, 1088 scalar keys %FACEINFO,
779 scalar keys %ANIMINFO, 1089 scalar keys %ANIMINFO,
781 if $VERBOSE; 1091 if $VERBOSE;
782 1092
783 open my $fh, ">:perlio", "$DATADIR/facedata~" 1093 open my $fh, ">:perlio", "$DATADIR/facedata~"
784 or die "$DATADIR/facedata~: $!"; 1094 or die "$DATADIR/facedata~: $!";
785 1095
786 print $fh freeze { 1096 print $fh nfreeze {
787 version => 2, 1097 version => 2,
788 faceinfo => \%FACEINFO, 1098 faceinfo => \%FACEINFO,
789 animinfo => \%ANIMINFO, 1099 animinfo => \%ANIMINFO,
790 resource => \%RESOURCE, 1100 resource => \%RESOURCE,
791 }; 1101 };
792
793 } 1102 }
794 1103
795 print "committing files...\n" if $VERBOSE; 1104 print "committing files...\n" if $VERBOSE;
796 1105
797 for (qw(archetypes facedata treasures)) { 1106 for (qw(archetypes facedata treasures), @COMMIT) {
798 chmod 0644, "$DATADIR/$_~"; 1107 chmod 0644, "$DATADIR/$_~";
799 rename "$DATADIR/$_~", "$DATADIR/$_" 1108 rename "$DATADIR/$_~", "$DATADIR/$_"
800 or die "$DATADIR/$_: $!"; 1109 or die "$DATADIR/$_: $!";
801 } 1110 }
802 1111

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines