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