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.94 by root, Wed Oct 6 00:18:14 2010 UTC vs.
Revision 1.118 by root, Tue Jan 3 11:35:33 2012 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,2012 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.
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 Digest::MD5 (); 48use Compress::LZF ();
49 49
50use AnyEvent;
50use Coro 5.12; 51use Coro 5.12;
52use Coro::EV;
51use Coro::AIO; 53use Coro::AIO;
52use Coro::Util; 54use Coro::Util;
53use Coro::Channel; 55use Coro::Channel;
56use Coro::AnyEvent;
54use Coro::Storable; $Storable::canonical = 1; 57use Coro::Storable; $Storable::canonical = 1;
55 58
56use Deliantra; 59use Deliantra;
57 60
58$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 61$SIG{QUIT} = sub { Carp::cluck "QUIT" };
77my $TMPDIR = "/tmp/cfutil$$~"; 80my $TMPDIR = "/tmp/cfutil$$~";
78my $TMPFILE = "aaaa0"; 81my $TMPFILE = "aaaa0";
79my @COMMIT; 82my @COMMIT;
80 83
81our %COLOR = ( 84our %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
97END { system "rm", "-rf", $TMPDIR } 110END { system "rm", "-rf", $TMPDIR }
98 111
99my $s_INT = EV::signal INT => sub { exit 1 }; 112my $s_INT = AE::signal INT => sub { exit 1 };
100my $s_TERM = EV::signal TERM => sub { exit 1 }; 113my $s_TERM = AE::signal TERM => sub { exit 1 };
101 114
102our %hash; 115our %hash;
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
105sub make_hash($\$\$;$) { 118sub 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 # hash collision, 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 "ERROR: 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
137sub optipng($) {
138 system $OPTIPNG, "-o5", "-i0", "-q", $_[0];
139 die "$_[0] has zero size, aborting." unless -s $_[0];
140}
141
124mkdir $TMPDIR, 0700 142mkdir $TMPDIR, 0700
125 or die "$TMPDIR: $!"; 143 or die "$TMPDIR: $!";
126 144
127sub fork_sub(&) { 145sub 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
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
142sub inst_maps($) { 189sub 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
147 if (!-f "$path/regions") { 194 if (!-f "$path/regions") {
148 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";
149 exit 1 unless $FORCE; 196 exit 1 unless $FORCE;
150 } 197 }
151 198
152 system $RSYNC, "-av", "--chmod=u=rwX,go=rX", 199 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
153 "$path/.", "$DATADIR/maps/.", 200 "$path/.", "$DATADIR/maps/.",
154 "--exclude", "CVS", "--exclude", "/world-precomposed", 201 "--exclude", "CVS", "--exclude", "/world-precomposed",
155 "--delete", "--delete-excluded" 202 "--delete", "--delete-excluded"
156 and die "map installation failed.\n"; 203 and die "map installation failed.\n";
157 204
158 print "maps installed successfully.\n"; 205 print "maps installed successfully.\n";
159}
160
161our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
162
163sub autoglyph {
164 my ($stem, $face) = @_;
165
166 if ($stem =~ /^wall\/|Nimwall/) {
167 return $WALL_SUFFIX[hex $1]
168 if $stem =~ $stem =~ /(_[0-9A-F]).x11/;
169
170 "+"
171
172 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
173 "."
174
175 } elsif ($stem =~ /^player\//) {
176 "\@"
177
178 } else {
179 substr $stem, 0, 1
180 }
181} 206}
182 207
183{ 208{
184 our %ANIMINFO; 209 our %ANIMINFO;
185 our %FACEINFO; 210 our %FACEINFO;
186 our %RESOURCE; 211 our %RESOURCE;
187 our @ARC; 212 our @ARC;
188 our %ARC; 213 our %ARC;
189 our $TRS; 214 our $TRS;
215 our %PNG;
190 our $NFILE; 216 our $NFILE;
191 our $PATH; 217 our $PATH;
192 218
193 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 219 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
194 220
195 our $c_arc = new Coro::Channel; 221 our $c_arc = new Coro::Channel;
196 our $c_trs = new Coro::Channel; 222 our $c_any = new Coro::Channel;
197 our $c_res = new Coro::Channel;
198 223
199 our @c_png; 224 our @c_png;
200 225
201 sub commit_png($$$$) { 226 sub commit_png($$$$) {
202 my ($stem, $name, $data, $T) = @_; 227 my ($stem, $name, $data, $T) = @_;
212 my $png; 237 my $png;
213 aio_lstat $path; 238 aio_lstat $path;
214 my ($size, $mtime) = (stat _)[7,9]; 239 my ($size, $mtime) = (stat _)[7,9];
215 240
216 if (0 > aio_load $path, $png) { 241 if (0 > aio_load $path, $png) {
217 warn "$path: $!, skipping.\n"; 242 warn "ERROR: $path: $!, skipping.\n";
218 next; 243 next;
219 } 244 }
220 245
221 my $stem = $path; 246 my $stem = $path;
222 my $T; 247 my $T;
224 if ($stem =~ s/\.32x32\.png~?$//) { 249 if ($stem =~ s/\.32x32\.png~?$//) {
225 $T = 32; 250 $T = 32;
226 } elsif ($stem =~ s/\.64x64\.png~?$//) { 251 } elsif ($stem =~ s/\.64x64\.png~?$//) {
227 $T = 64; 252 $T = 64;
228 } else { 253 } else {
229 warn "$path: weird filename, skipping.\n"; 254 warn "ERROR: $path: weird filename, skipping.\n";
230 next; 255 next;
231 } 256 }
232 257
233 # quickly extract width and height of the (necessarily PNG) image 258 # quickly extract width and height of the (necessarily PNG) image
234 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 259 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
235 warn "$path: not a recognized png file, skipping.\n"; 260 warn "ERROR: $path: not a recognized png file, skipping.\n";
236 next; 261 next;
237 } 262 }
238 263
239 my ($w, $h) = unpack "NN", $1; 264 my ($w, $h) = unpack "NN", $1;
240 265
241 if ($w < $T || $h < $T) { 266 if ($w < $T || $h < $T) {
242 warn "$path: too small ($w $h), skipping.\n"; 267 warn "ERROR: $path: too small ($w $h), skipping.\n";
243 next; 268 next;
244 } 269 }
245 270
246 if ($w % $T || $h % $T) { 271 if ($w % $T || $h % $T) {
247 warn "$path: weird png size ($w $h), skipping.\n"; 272 warn "ERROR: $path: weird png size ($w $h), skipping.\n";
248 next; 273 next;
249 } 274 }
250 275
251 (my $base = $stem) =~ s/^.*\///; 276 (my $base = $stem) =~ s/^.*\///;
252 277
261 unless ($path =~ /~$/) { 286 unless ($path =~ /~$/) {
262 # possibly enlarge 287 # possibly enlarge
263 if (0 > aio_stat "$stem.64x64.png") { 288 if (0 > aio_stat "$stem.64x64.png") {
264 my $other = "$stem.64x64.png~"; 289 my $other = "$stem.64x64.png~";
265 290
266 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 291 make_file $path, $other, sub {
267 fork_sub { 292 fork_exec {
268 my $CROP; 293 my $CROP;
269 my $SRC = "png:\Q$path\E"; 294 my $SRC = "png:\Q$path\E";
270 295
271 my $is_floor = $arc->{is_floor}; 296 my $is_floor = $arc->{is_floor};
272 my $is_wall = 0; 297 my $is_wall = 0;
326 351
327 system "convert -depth 8 $SRC rgba:-" 352 system "convert -depth 8 $SRC rgba:-"
328 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 353 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
329 . "| 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~"
330 and die "convert/cfhq2xa pipeline error: status $? ($!)"; 355 and die "convert/cfhq2xa pipeline error: status $? ($!)";
331 system $OPTIPNG, "-i0", "-q", "$other~"; 356 optipng "$other~";
332 die "$other~ has zero size, aborting." unless -s "$other~";
333 rename "$other~", $other; 357 rename "$other~", $other;
334 }; 358 };
335 } 359 };
336 360
337 push @c_png, [$other, !$CACHE]; 361 push @c_png, [$other, !$CACHE];
338 } 362 }
339 363
340 # possibly scale down 364 # possibly scale down
341 if (0 > aio_stat "$stem.32x32.png") { 365 if (0 > aio_stat "$stem.32x32.png") {
342 my $other = "$stem.32x32.png~"; 366 my $other = "$stem.32x32.png~";
343 367
344 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 368 make_file $path, $other, sub {
345 fork_sub { 369 fork_exec {
346 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~";
347 system $OPTIPNG, "-i0", "-q", "$other~"; 371 optipng "$other~";
348 372
349 # reduce smoothfaces >10000 bytes 373 # reduce smoothfaces >10000 bytes
350 # obsolete, no longer required 374 # obsolete, no longer required
351 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { 375 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
352 my $ncolor = 256; 376 my $ncolor = 256;
353 while () { 377 while () {
354 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 378 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
355 system $OPTIPNG, "-i0", "-q", "$other~~"; 379 optipng "$other~~";
356 last if 10000 > -s "$other~~"; 380 last if 10000 > -s "$other~~";
357 $ncolor = int $ncolor * 0.9; 381 $ncolor = int $ncolor * 0.9;
358 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; 382 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
359 } 383 }
360 384
365 } 389 }
366 390
367 die "$other~ has zero size, aborting." unless -s "$other~"; 391 die "$other~ has zero size, aborting." unless -s "$other~";
368 rename "$other~", $other; 392 rename "$other~", $other;
369 }; 393 };
370 } 394 };
371 395
372 #warn "scaled down $path to $other\n";#d# 396 #warn "scaled down $path to $other\n";#d#
373 push @c_png, [$other, !$CACHE]; 397 push @c_png, [$other, !$CACHE];
374 } 398 }
375 } 399 }
376 400
377 (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 }
378 452
379 # split all bigfaces, but avoid smoothfaces (*_S) 453 # split all bigfaces, but avoid smoothfaces (*_S)
380 if (($w > $T || $h > $T) && $face !~ /_S\./) { 454 if (($w > $T || $h > $T) && $face !~ /_S\./) {
381 # split 455 # split
382 my @tile; 456 my @tile;
387 push @tile, [$x, $y, $file, (stat _)[9]]; 461 push @tile, [$x, $y, $file, (stat _)[9]];
388 } 462 }
389 } 463 }
390 464
391 my $mtime = (lstat $path)[9]; 465 my $mtime = (lstat $path)[9];
392 my @todo = grep { $_->[3] <= $mtime } @tile; 466 my @todo = grep { $_->[3] < $mtime } @tile;
393 if (@todo) { 467 if (@todo) {
394 fork_sub { 468 fork_exec {
395 open my $convert, "|-", $CONVERT, 469 open my $convert, "|-", $CONVERT,
396 "png:-", 470 "png:-",
397 (map { 471 (map {
398 ( 472 (
399 "(", 473 "(",
412 print $convert $png; 486 print $convert $png;
413 close $convert; 487 close $convert;
414 488
415 # pass 2, optimise, and rename 489 # pass 2, optimise, and rename
416 for (@todo) { 490 for (@todo) {
417 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 491 optipng "$_->[2]~";
418 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
419 rename "$_->[2]~", $_->[2]; 492 rename "$_->[2]~", $_->[2];
420 } 493 }
421 }; 494 };
422 } 495 }
423 496
434 } else { 507 } else {
435 # use as-is (either small, use smooth) 508 # use as-is (either small, use smooth)
436 commit_png $stem, $face, $png, $T; 509 commit_png $stem, $face, $png, $T;
437 } 510 }
438 511
439 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 }
440 } 554 }
441 } 555 }
442 556
443 sub process_arc { 557 sub process_arc {
444 while (my $job = $c_arc->get) { 558 while (my ($dir, $file) = @{ $c_arc->get }) {
445 my ($dir, $file) = @$job;
446
447 my $arc; 559 my $arc;
448 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 :/
449 561
450 my $arc = read_arch "$dir/$file"; 562 my $arc = read_arch "$dir/$file";
451 for my $o (values %$arc) { 563 for my $o (values %$arc) {
453 for (my $m = $o; $m; $m = $m->{more}) { 565 for (my $m = $o; $m; $m = $m->{more}) {
454 $ARC{$m->{_name}} = $m; 566 $ARC{$m->{_name}} = $m;
455 } 567 }
456 568
457 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 569 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
458
459 my $visibility = delete $o->{visibility};
460 my $magicmap = delete $o->{magicmap};
461 my $glyph = delete $o->{glyph};
462 570
463 # find upper left corner :/ 571 # find upper left corner :/
464 # omg, this is sooo broken 572 # omg, this is sooo broken
465 my ($dx, $dy); 573 my ($dx, $dy);
466 for (my $o = $o; $o; $o = $o->{more}) { 574 for (my $o = $o; $o; $o = $o->{more}) {
473 my $y = $o->{y} - $dy; 581 my $y = $o->{y} - $dy;
474 582
475 my $ext = $x|$y ? "+$x+$y" : ""; 583 my $ext = $x|$y ? "+$x+$y" : "";
476 584
477 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 585 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
478
479 $visibility = delete $o->{visibility} if exists $o->{visibility};
480 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
481 $glyph = delete $o->{glyph} if exists $o->{glyph};
482 586
483 my $anim = delete $o->{anim}; 587 my $anim = delete $o->{anim};
484 588
485 if ($anim) { 589 if ($anim) {
486 # possibly add $ext to the animation name to avoid 590 # possibly add $ext to the animation name to avoid
510 next if /^facings\s/; 614 next if /^facings\s/;
511 615
512 my $face = $_; 616 my $face = $_;
513 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates 617 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
514 618
515 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
516 $info->{arc} = $o; 625 $FACEINFO{$face}{arc} = $o;
517 626
518 next if $face =~ /^blank.x11$|^empty.x11$/; 627 next if $face =~ /^blank.x11$|^empty.x11$/;
519
520 $info->{visibility} = $visibility if defined $visibility;
521 $info->{magicmap} = $magicmap if defined $magicmap;
522 $info->{glyph} = $glyph if defined $glyph;
523 } 628 }
524 629
525 if (my $smooth = delete $o->{smoothface}) { 630 if (my $smooth = delete $o->{smoothface}) {
526 my %kv = split /\s+/, $smooth; 631 my %kv = split /\s+/, $smooth;
527 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 632 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
536 } 641 }
537 } 642 }
538 } 643 }
539 644
540 sub process_trs { 645 sub process_trs {
541 while (my $job = $c_trs->get) {
542 my ($dir, $file) = @$job; 646 my ($dir, $file) = @_;
543 my $path = "$dir/$file"; 647 my $path = "$dir/$file";
544 648
545 my $trs; 649 my $trs;
546 if (0 > aio_load $path, $trs) { 650 if (0 > aio_load $path, $trs) {
547 warn "$path: $!, skipping.\n"; 651 warn "ERROR: $path: $!, skipping.\n";
548 next; 652 return;
549 } 653 }
550 654
551 $TRS .= $trs; 655 $TRS .= $trs;
552 }
553 } 656 }
554 657
555 my %FILECACHE; 658 my %FILECACHE;
556 659
557 sub load_cached($;$) { 660 sub load_cached($;$) {
558 unless (exists $FILECACHE{$_[0]}) { 661 unless (exists $FILECACHE{$_[0]}) {
559 my $data; 662 my $data;
560 if (0 < aio_load $_[0], $data) { 663 if (0 < aio_load $_[0], $data) {
561 if ($_[1]) { 664 if ($_[1]) {
562 $data = eval { $_[1]->($data) }; 665 $data = eval { $_[1]->($data) };
563 warn "$_[0]: $@" if $@; 666 warn "ERROR: $_[0]: $@" if $@;
564 } 667 }
565 } 668 }
566 669
567 $FILECACHE{$_[0]} = $data; 670 $FILECACHE{$_[0]} = $data;
568 } 671 }
569 672
570 $FILECACHE{$_[0]} 673 $FILECACHE{$_[0]}
571 } 674 }
572 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
573 sub process_res { 744 sub process_res {
574 while (my $job = $c_res->get) {
575 my ($dir, $file, $type) = @$job; 745 my ($dir, $file, $type) = @_;
576 746
577 my $data;
578 aio_load "$dir/$file", $data; 747 0 <= aio_load "$dir/$file", my $data
748 or die "$dir/$file: $!";
579 749
580 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) };
581 751
582 utf8::decode $dir; 752 utf8::decode $dir;
583 utf8::decode $file; 753 utf8::decode $file;
584 754
585 # a meta file for resources is now mandatory 755 # a meta file for resources is now mandatory
586 unless (exists $meta->{$file}) { 756 unless (exists $meta->{$file}) {
587 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 757 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
588 next; 758 return;
589 } 759 }
590 760
591 $meta = { 761 $meta = {
592 %{ $meta->{"" } || {} }, 762 %{ $meta->{"" } || {} },
593 %{ $meta->{$file} || {} }, 763 %{ $meta->{$file} || {} },
594 }; 764 };
595 765
596 if ($meta->{license} =~ s/^#//) { 766 if ($meta->{license} =~ s/^#//) {
597 $meta->{license} = ({ 767 $meta->{license} = ({
598 "pd" => "Public Domain", 768 "pd" => "Public Domain",
599 "gpl" => "GNU General Public License, version 3.0 or any later", 769 "gpl" => "GNU General Public License, version 3.0 or any later",
600 "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/",
601 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", 771 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
602 "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/",
603 "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/",
604 })->{$meta->{license}} 774 })->{$meta->{license}}
605 || warn "$dir/$file: license tag '$meta->{license}' not found."; 775 || warn "ERROR: $dir/$file: license tag '$meta->{license}' not found.";
606 } 776 }
607 777
608 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { 778 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
609 ($meta->{author} = $1) =~ s/_/ /g; 779 ($meta->{author} = $1) =~ s/_/ /g;
610 } 780 }
611 781
612 $file =~ s/\.res$//; 782 $file =~ s/\.res$//;
613 $file =~ s/\.(ogg|wav|jpg|png)$//; 783 $file =~ s/\.(ogg|wav|jpg|png)$//;
614 784
615 substr $dir, 0, 1 + length $PATH, ""; 785 if ($file =~ s/\.plt$//) {
616 786 $data = process_plt "$dir/$file", $data;
617 if (my $filter = $meta->{cfutil_filter}) { 787 } elsif (my $filter = $meta->{cfutil_filter}) {
618 if ($filter eq "yaml2json") { 788 if ($filter eq "yaml2json") {
619 $data = JSON::XS::encode_json YAML::XS::Load $data; 789 $data = JSON::XS::encode_json YAML::XS::Load $data;
620 } elsif ($filter eq "json2json") { 790 } elsif ($filter eq "json2json") {
621 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 791 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
622 } elsif ($filter eq "perl2json") { 792 } elsif ($filter eq "perl2json") {
623 $data = eval $data; die if $@; 793 $data = eval $data; die if $@;
624 $data = JSON::XS::encode_json $data; 794 $data = JSON::XS::encode_json $data;
625 } else { 795 } else {
626 warn "$dir/$file: unknown filter $filter, skipping\n"; 796 warn "ERROR: $dir/$file: unknown filter $filter, skipping\n";
627 } 797 }
628 } 798 }
629 799
800 substr $dir, 0, 1 + length $PATH, "";
801
630 $RESOURCE{"$dir/$file"} = { 802 $RESOURCE{"$dir/$file"} = {
631 type => (exists $meta->{type} ? delete $meta->{type} : $type), 803 type => (exists $meta->{type} ? delete $meta->{type} : $type),
632 data => $data, 804 data => $data,
633 %$meta ? (meta => $meta) : (), 805 %$meta ? (meta => $meta) : (),
634 }; 806 };
807 }
808
809 sub process_any {
810 while (my ($func, @args) = @{ $c_any->get }) {
811 $func->(@args);
635 } 812 }
636 } 813 }
637 814
638 sub find_files; 815 sub find_files;
639 sub find_files { 816 sub find_files {
640 my ($path) = @_; 817 my ($path) = @_;
641 818
819 my $grp = IO::AIO::aio_group;
820
821 my $scandir; $scandir = sub {
822 my ($path) = @_;
823
642 IO::AIO::aioreq_pri 4; 824 IO::AIO::aioreq_pri 4;
643 IO::AIO::aio_scandir $path, 4, sub { 825 add $grp IO::AIO::aio_scandir $path, 4, sub {
644 my ($dirs, $nondirs) = @_; 826 my ($dirs, $nondirs) = @_;
645 827
646 find_files "$path/$_" 828 $scandir->("$path/$_")
647 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; 829 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
648 830
649 my $dir = $path; 831 my $dir = $path;
650 substr $dir, 0, 1 + length $PATH, ""; 832 substr $dir, 0, 1 + length $PATH, "";
651 833
652 for my $file (@$nondirs) { 834 for my $file (@$nondirs) {
653 if ($dir =~ /^music(?:\/|$)/) { 835 if ($dir =~ /^music(?:\/|$)/) {
654 $c_res->put ([$path, $file, 3]) # FT_MUSIC 836 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
655 if $file =~ /\.(ogg)$/; 837 if $file =~ /\.(ogg)$/;
656 838
657 } elsif ($dir =~ /^sound(?:\/|$)/) { 839 } elsif ($dir =~ /^sound(?:\/|$)/) {
658 $c_res->put ([$path, $file, 5]) # FT_SOUND 840 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
659 if $file =~ /\.(wav|ogg)$/; 841 if $file =~ /\.(wav|ogg)$/;
660 842
661 } elsif ($dir =~ /^res(?:\/|$)/) { 843 } elsif ($dir =~ /^res(?:\/|$)/) {
662 if ($file =~ /\.(jpg|png)$/) { 844 if ($file =~ /\.(jpg|png)$/) {
663 $c_res->put ([$path, $file, 0]) # FT_FACE 845 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
664 } 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$/) {
665 $c_res->put ([$path, $file, 6]) # FT_RSRC 862 $c_arc->put ([$path, $file]);
863
666 } else { 864 } else {
667 $c_res->put ([$path, $file, undef]); 865 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
668 } 866 }
669
670 } elsif ($file =~ /\.png$/) {
671 push @c_png, ["$path/$file", 0];
672
673 } elsif ($file =~ /\.trs$/) {
674 $c_trs->put ([$path, $file]);
675
676 } elsif ($file =~ /\.arc$/) {
677 $c_arc->put ([$path, $file]);
678
679 } else { 867 }
680 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
681 }
682 } 868 };
683 }; 869 };
870
871 $scandir->($path);
872 aio_wait $grp;
684 } 873 }
685 874
686 sub generate_plurals { 875 sub generate_plurals {
687# use Lingua::EN::Inflect (); 876# use Lingua::EN::Inflect ();
688# Lingua::EN::Inflect::classical; 877# Lingua::EN::Inflect::classical;
722 "Unless you run verbosely, all following warning\n", 911 "Unless you run verbosely, all following warning\n",
723 "or error messages indicate serious problems.\n", 912 "or error messages indicate serious problems.\n",
724 "\n"; 913 "\n";
725 914
726 if (!-d "$path/treasures") { 915 if (!-d "$path/treasures") {
727 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";
728 exit 1 unless $FORCE; 917 exit 1 unless $FORCE;
729 } 918 }
730 919
731 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;
732 924
733 find_files $path; 925 find_files $path;
734 926
735 my @a_arc = map +(async \&process_arc), 1..2;
736 my @a_res = map +(async \&process_res), 1..2;
737 my @a_trs = map +(async \&process_trs), 1..2;
738
739 IO::AIO::flush;
740
741 $c_res->shutdown;
742 $c_arc->shutdown; 927 $c_arc->shutdown;
743 $c_trs->shutdown; 928 $c_any->shutdown;
744
745 print "start file scan, arc, res processing...\n" if $VERBOSE;
746 929
747 $_->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 "finished arc processing...\n" if $VERBOSE;
748 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
749 print "end arc, start png processing...\n" if $VERBOSE; 956 print "starting png processing...\n" if $VERBOSE;
750 957
751 # eight png crunchers work fine for my 4x smp machine 958 # eight png crunchers work fine for my 4x smp machine
752 my @a_png = map +(async \&process_png), 1..8; 959 my @a_png = map +(async \&process_png), 1..8;
753 960
754 $_->join for (@a_trs, @a_res, @a_png); 961 $_->join for @a_any;
962 print "finished any processing...\n" if $VERBOSE;
963
964 $_->join for @a_png;
965 print "finished png processing...\n" if $VERBOSE;
755 966
756 print "scanning done, processing results...\n" if $VERBOSE; 967 print "scanning done, processing results...\n" if $VERBOSE;
757 { 968 {
758 # remove path prefix from editor_folder 969 # remove path prefix from editor_folder
759 $_->{editor_folder} =~ /^\x00/ 970 $_->{editor_folder} =~ /^\x00/
777 delete @s{qw(_name more name name_pl)}; 988 delete @s{qw(_name more name name_pl)};
778 %$o = ( %s, %$o ); 989 %$o = ( %s, %$o );
779 ++$progress; 990 ++$progress;
780 } 991 }
781 } else { 992 } else {
782 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";
783 delete $ARC{$o->{_name}}; 994 delete $ARC{$o->{_name}};
784 } 995 }
785 } 996 }
786 } 997 }
787 998
794 } 1005 }
795 1006
796 # 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
797 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 1008 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
798 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
799 print "generating plurals...\n" if $VERBOSE; 1021 #print "generating plurals...\n" if $VERBOSE;
800 generate_plurals; 1022 #generate_plurals;
801 1023
802 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; 1024 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
803 open my $fh, ">:utf8", "$DATADIR/archetypes~" 1025 open my $fh, ">:utf8", "$DATADIR/archetypes~"
804 or die "$DATADIR/archetypes~: $!"; 1026 or die "$DATADIR/archetypes~: $!";
805 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];
813 } 1035 }
814 1036
815 { 1037 {
816 print "processing facedata...\n" if $VERBOSE; 1038 print "processing facedata...\n" if $VERBOSE;
817 while (my ($k, $v) = each %FACEINFO) { 1039 while (my ($k, $v) = each %FACEINFO) {
818 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";
819 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";
820 1042
821 make_hash $k, $v->{data32}, $v->{hash32}; 1043 make_hash $k, $v->{data32}, $v->{hash32};
822 make_hash $k, $v->{data64}, $v->{hash64}; 1044 make_hash $k, $v->{data64}, $v->{hash64};
823 1045
824 #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";
825 #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";
826 1048
827 if (my $magicmap = $v->{magicmap}) { 1049 $v->{glyph} // warn "ERROR: face '$k' has no glyph - missing faceinfo entry?\n";
828 $magicmap =~ y/A-Z_\-/a-z/d; 1050 $v->{visibility} // warn "ERROR: face '$k' has no visibility info - missing faceinfo entry?\n";
829 $v->{magicmap} = $COLOR{$magicmap}; 1051 $v->{magicmap} // warn "ERROR: face '$k' has no foreground colour - missing faceinfo entry?\n";
830 }
831 1052
832 my $stem = delete $v->{stem}; 1053 delete @$v{qw(arc stem derive)}; # not used by the server
833 $v->{glyph} //= autoglyph $stem, $v;
834 utf8::encode $v->{glyph};
835 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
836
837 delete $v->{arc};
838 } 1054 }
839 1055
840 print "processing resources...\n" if $VERBOSE; 1056 print "processing resources...\n" if $VERBOSE;
841 my $enc = JSON::XS->new->utf8->canonical->relaxed; 1057 my $enc = JSON::XS->new->utf8->canonical->relaxed;
842 while (my ($k, $v) = each %RESOURCE) { 1058 while (my ($k, $v) = each %RESOURCE) {
881 version => 2, 1097 version => 2,
882 faceinfo => \%FACEINFO, 1098 faceinfo => \%FACEINFO,
883 animinfo => \%ANIMINFO, 1099 animinfo => \%ANIMINFO,
884 resource => \%RESOURCE, 1100 resource => \%RESOURCE,
885 }; 1101 };
886
887 } 1102 }
888 1103
889 print "committing files...\n" if $VERBOSE; 1104 print "committing files...\n" if $VERBOSE;
890 1105
891 for (qw(archetypes facedata treasures), @COMMIT) { 1106 for (qw(archetypes facedata treasures), @COMMIT) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines