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.53 by root, Sun Aug 19 09:27:08 2007 UTC vs.
Revision 1.120 by root, Wed Jan 4 03:22:28 2012 UTC

1#!@PERL@ 1#!@PERL@
2 2
3use strict; 3#
4# This file is part of Deliantra, the Roguelike Realtime MMORPG.
5#
6# Copyright (©) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
7#
8# Deliantra is free software: you can redistribute it and/or modify it under
9# the terms of the Affero GNU General Public License as published by the
10# Free Software Foundation, either version 3 of the License, or (at your
11# option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU General Public License for more details.
17#
18# You should have received a copy of the Affero GNU General Public License
19# and the GNU General Public License along with this program. If not, see
20# <http://www.gnu.org/licenses/>.
21#
22# The authors can be reached via e-mail to <support@deliantra.net>
23#
24
25use common::sense;
4 26
5my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
6my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
7my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
9 31
10my $CONVERT = "@CONVERT@"; 32my $CONVERT = "@CONVERT@";
11#my $IDENTIFY = "@IDENTIFY@"; 33my $IDENTIFY = "@IDENTIFY@";
12my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@"; 36my $PNGNQ = "@PNGNQ@";
15 37
16use Getopt::Long; 38use Getopt::Long;
17use Coro::Event; 39use File::Temp;
40use POSIX ();
41use Carp;
42
43use YAML::XS ();
44use Digest::MD5 ();
45use Storable ();
46use JSON::XS ();
47use IO::AIO ();
48use Compress::LZF ();
49
18use AnyEvent; 50use AnyEvent;
19use IO::AIO (); 51use Coro 5.12;
20use File::Temp;
21use Crossfire;
22use Coro; 52use Coro::EV;
23use Coro::AIO; 53use Coro::AIO;
24use Coro::Util; 54use Coro::Util;
25use POSIX ();
26use Digest::MD5;
27use Carp;
28use Coro::Channel; 55use Coro::Channel;
56use Coro::AnyEvent;
29use Coro::Storable; $Storable::canonical = 1; 57use Coro::Storable; $Storable::canonical = 1;
58
59use Deliantra;
30 60
31$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 61$SIG{QUIT} = sub { Carp::cluck "QUIT" };
32 62
33sub usage { 63sub usage {
34 warn <<EOF; 64 warn <<EOF;
… …
47my $VERBOSE = 1; 77my $VERBOSE = 1;
48my $CACHE = 0; 78my $CACHE = 0;
49my $FORCE; 79my $FORCE;
50my $TMPDIR = "/tmp/cfutil$$~"; 80my $TMPDIR = "/tmp/cfutil$$~";
51my $TMPFILE = "aaaa0"; 81my $TMPFILE = "aaaa0";
82my @COMMIT;
52 83
53our %COLOR = ( 84our %COLOR = (
85 # original cf colours
54 black => 0, 86 black => 0,
55 white => 1, 87 white => 1,
56 navy => 2, 88 navy => 2, # "dark blue"
57 red => 3, 89 red => 3,
58 orange => 4, 90 orange => 4,
59 blue => 5, 91 blue => 5, # "light blue"
60 darkorange => 6, 92 darkorange => 6,
61 green => 7, 93 green => 7,
62 lightgreen => 8, 94 lightgreen => 8,
63 grey => 9, 95 grey => 9,
96 brown => 10, # "yellow"
97 gold => 11, # "light yellow"
98 tan => 12, # yellowish gray
99
100 # new for deliantra
64 brown => 10, 101 none => 13,
102
103 # compatibility to existing archetypes
104 lightblue => 5,
65 gold => 11, 105 gray => 9,
106 yellow => 11,
66 tan => 12, 107 khaki => 12,
67); 108);
68 109
69END { system "rm", "-rf", $TMPDIR } 110END { system "rm", "-rf", $TMPDIR }
70 111
71Event->signal (signal => "INT", cb => sub { exit 1 }); 112my $s_INT = AE::signal INT => sub { exit 1 };
72Event->signal (signal => "TERM", cb => 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}
73 141
74mkdir $TMPDIR, 0700 142mkdir $TMPDIR, 0700
75 or die "$TMPDIR: $!"; 143 or die "$TMPDIR: $!";
76 144
77sub fork_sub(&) { 145sub fork_exec(&) {
78 my ($cb) = @_; 146 my ($cb) = @_;
79 147
80 if (my $pid = fork) { 148 if (my $pid = fork) {
81 my $current = $Coro::current; 149 my $current = $Coro::current;
82 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); 150 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready });
… …
87 warn $@; 155 warn $@;
88 POSIX::_exit 1; 156 POSIX::_exit 1;
89 } 157 }
90} 158}
91 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
92sub inst_maps($) { 189sub inst_maps($) {
93 my (undef, $path) = @_; 190 my (undef, $path) = @_;
94 191
95 print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; 192 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
96 193
97 if (!-f "$path/regions") { 194 if (!-f "$path/regions") {
98 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";
99 exit 1 unless $FORCE; 196 exit 1 unless $FORCE;
100 } 197 }
101 198
102 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 199 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
200 "$path/.", "$DATADIR/maps/.",
201 "--exclude", "CVS", "--exclude", "/world-precomposed",
202 "--delete", "--delete-excluded"
103 and die "map installation failed.\n"; 203 and die "map installation failed.\n";
104 204
105 print "maps installed successfully.\n"; 205 print "maps installed successfully.\n";
106} 206}
107 207
… …
110 our %FACEINFO; 210 our %FACEINFO;
111 our %RESOURCE; 211 our %RESOURCE;
112 our @ARC; 212 our @ARC;
113 our %ARC; 213 our %ARC;
114 our $TRS; 214 our $TRS;
215 our %PNG;
115 our $NFILE; 216 our $NFILE;
116 our $PATH; 217 our $PATH;
117 218
118 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 219 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
119 220
120 our $c_arc = new Coro::Channel; 221 our $c_arc = new Coro::Channel;
121 our $c_trs = new Coro::Channel; 222 our $c_any = new Coro::Channel;
122 our $c_res = new Coro::Channel;
123 223
124 our @c_png; 224 our @c_png;
125 225
126 sub commit_png($$$) { 226 sub commit_png($$$$) {
127 my ($name, $data, $T) = @_; 227 my ($stem, $name, $data, $T) = @_;
128 228
229 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
129 $FACEINFO{$name}{"data$T"} = $data; 230 $FACEINFO{$name}{"data$T"} = $data;
130 } 231 }
131 232
132 sub process_png { 233 sub process_png {
133 while (@c_png) { 234 while (@c_png) {
… …
136 my $png; 237 my $png;
137 aio_lstat $path; 238 aio_lstat $path;
138 my ($size, $mtime) = (stat _)[7,9]; 239 my ($size, $mtime) = (stat _)[7,9];
139 240
140 if (0 > aio_load $path, $png) { 241 if (0 > aio_load $path, $png) {
141 warn "$path: $!, skipping.\n"; 242 warn "ERROR: $path: $!, skipping.\n";
142 next; 243 next;
143 } 244 }
144 245
145 my $stem = $path; 246 my $stem = $path;
146 my $T; 247 my $T;
… …
148 if ($stem =~ s/\.32x32\.png~?$//) { 249 if ($stem =~ s/\.32x32\.png~?$//) {
149 $T = 32; 250 $T = 32;
150 } elsif ($stem =~ s/\.64x64\.png~?$//) { 251 } elsif ($stem =~ s/\.64x64\.png~?$//) {
151 $T = 64; 252 $T = 64;
152 } else { 253 } else {
153 warn "$path: weird filename, skipping.\n"; 254 warn "ERROR: $path: weird filename, skipping.\n";
154 next; 255 next;
155 } 256 }
156 257
157 # quickly extract width and height of the (necessarily PNG) image 258 # quickly extract width and height of the (necessarily PNG) image
158 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 259 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
159 warn "$path: not a recognized png file, skipping.\n"; 260 warn "ERROR: $path: not a recognized png file, skipping.\n";
160 next; 261 next;
161 } 262 }
162 263
163 my ($w, $h) = unpack "NN", $1; 264 my ($w, $h) = unpack "NN", $1;
164 265
165 if ($w < $T || $h < $T) { 266 if ($w < $T || $h < $T) {
166 warn "$path: too small ($w $h), skipping.\n"; 267 warn "ERROR: $path: too small ($w $h), skipping.\n";
167 next; 268 next;
168 } 269 }
169 270
170 if ($w % $T || $h % $T) { 271 if ($w % $T || $h % $T) {
171 warn "$path: weird png size ($w $h), skipping.\n"; 272 warn "ERROR: $path: weird png size ($w $h), skipping.\n";
172 next; 273 next;
173 } 274 }
275
276 (my $base = $stem) =~ s/^.*\///;
277
278 my $fi = $FACEINFO{$base};
279 unless ($fi) {
280 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
281 #next;
282 }
283
284 my $arc = $fi->{arc} || { };
174 285
175 unless ($path =~ /~$/) { 286 unless ($path =~ /~$/) {
176 # possibly enlarge 287 # possibly enlarge
177 if (0 > aio_stat "$stem.64x64.png") { 288 if (0 > aio_stat "$stem.64x64.png") {
178 my $other = "$stem.64x64.png~"; 289 my $other = "$stem.64x64.png~";
179 290
180 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 291 make_file $path, $other, sub {
181 fork_sub { 292 fork_exec {
182 my $CROP; 293 my $CROP;
183 my $SRC = "png:\Q$path\E"; 294 my $SRC = "png:\Q$path\E";
184 295
185 # check if this is a wall. ultra-ugly. ultra-ultra-ugly. 296 my $is_floor = $arc->{is_floor};
297 my $is_wall = 0;
298
299 my ($wall_pfx, $wall_dir, $wall_sfx);
300
301 if (
302 !$is_floor
303 && !$arc->{alive}
304 && $arc->{move_block} eq "all"
186 if ($path =~ /^(.*\/wall\/.*_)([0-9A-F])(\.x11.*\.png)$/) { 305 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
306 ) {
187 my ($pfx, $dir, $sfx) = ($1, hex $2, $3); 307 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
188 #check for 0..F images to be sure(?) this is a wall 308
189 unless (grep { !-e sprintf "%s%X%s", $pfx, $_, $sfx } 0..15) { 309 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
310 $is_wall = 1;
311 }
312 }
313
314 if ($is_wall || $is_floor) {
190 # add a 4px border and add other images around it 315 # add a 4px border and add other images around it
191 $CROP = "-shave 8x8 +repage"; 316 $CROP = "-shave 8x8 +repage";
192 317
193 $w += 8; 318 $w += 8;
194 $h += 8; 319 $h += 8;
195 320
196 $SRC = "-size ${w}x${h} xc:transparent"; 321 $SRC = "-size ${w}x${h} xc:transparent";
197 $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; 322 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
198 323
199 # 8 surrounding images 324 # 8 surrounding images
200 for ( 325 for (
201 # x y b r0 r1 326 # x y b r0 r1
202 [-1, -1, 0, 6], 327 [-1, -1, 0, 6],
203 [ 0, -1, 1, 10, 14], 328 [ 0, -1, 1, 10, 14],
204 [+1, -1, 0, 12], 329 [+1, -1, 0, 12],
205 330
206 [-1, 0, 8, 5, 7], 331 [-1, 0, 8, 5, 7],
207 # 332 #
208 [+1, 0, 2, 5, 13], 333 [+1, 0, 2, 5, 13],
209 334
210 [-1, +1, 0, 3], 335 [-1, +1, 0, 3],
211 [ 0, +1, 4, 10, 11], 336 [ 0, +1, 4, 10, 11],
212 [+1, +1, 0, 9], 337 [+1, +1, 0, 9],
213 ) { 338 ) {
214 my ($x, $y, $d, $r0, $r1) = @$_; 339 my ($x, $y, $d, $r0, $r1) = @$_;
340
341 my $tile = $is_floor ? $path
342 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
343 : die;
344
215 $SRC .= sprintf " png:%s%X%s -geometry %+d%+d -composite", 345 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
216 "\Q$pfx", 346 "\Q$tile",
217 ($dir & $d) ? $r1 : $r0,
218 "\Q$sfx",
219 $x * ($w - 8) + 4, 347 $x * ($w - 8) + 4,
220 $y * ($h - 8) + 4; 348 $y * ($h - 8) + 4;
221 }
222 } 349 }
223 } 350 }
224 351
225 system "convert -depth 8 $SRC rgba:-" 352 system "convert -depth 8 $SRC rgba:-"
226 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 353 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
227 . "| 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~"
228 and die "convert/cfhq2xa pipeline error: status $? ($!)"; 355 and die "convert/cfhq2xa pipeline error: status $? ($!)";
229 system $OPTIPNG, "-i0", "-q", "$other~"; 356 optipng "$other~";
230 die "$other~ has zero size, aborting." unless -s "$other~";
231 rename "$other~", $other; 357 rename "$other~", $other;
232 }; 358 };
233 } 359 };
234 360
235 push @c_png, [$other, !$CACHE]; 361 push @c_png, [$other, !$CACHE];
236 } 362 }
237 363
238 # possibly scale down 364 # possibly scale down
239 if (0 > aio_stat "$stem.32x32.png") { 365 if (0 > aio_stat "$stem.32x32.png") {
240 my $other = "$stem.32x32.png~"; 366 my $other = "$stem.32x32.png~";
241 367
242 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 368 make_file $path, $other, sub {
243 fork_sub { 369 fork_exec {
244 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~";
245 system $OPTIPNG, "-i0", "-q", "$other~"; 371 optipng "$other~";
246 372
247 # reduce smoothfaces >10000 bytes 373 # reduce smoothfaces >10000 bytes
374 # obsolete, no longer required
248 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 375 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
249 my $ncolor = 256; 376 my $ncolor = 256;
250 while () { 377 while () {
251 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 378 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
252 system $OPTIPNG, "-i0", "-q", "$other~~"; 379 optipng "$other~~";
253 last if 10000 > -s "$other~~"; 380 last if 10000 > -s "$other~~";
254 $ncolor = int $ncolor * 0.9; 381 $ncolor = int $ncolor * 0.9;
255 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; 382 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
256 } 383 }
257 384
… …
262 } 389 }
263 390
264 die "$other~ has zero size, aborting." unless -s "$other~"; 391 die "$other~ has zero size, aborting." unless -s "$other~";
265 rename "$other~", $other; 392 rename "$other~", $other;
266 }; 393 };
267 } 394 };
268 395
269 #warn "scaled down $path to $other\n";#d# 396 #warn "scaled down $path to $other\n";#d#
270 push @c_png, [$other, !$CACHE]; 397 push @c_png, [$other, !$CACHE];
271 } 398 }
272 } 399 }
273 400
274 (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 }
275 452
276 # split all bigfaces, but avoid smoothfaces (*_S) 453 # split all bigfaces, but avoid smoothfaces (*_S)
277 if (($w > $T || $h > $T) && $face !~ /_S\./) { 454 if (($w > $T || $h > $T) && $face !~ /_S\./) {
278 # split 455 # split
279 my @tile; 456 my @tile;
… …
284 push @tile, [$x, $y, $file, (stat _)[9]]; 461 push @tile, [$x, $y, $file, (stat _)[9]];
285 } 462 }
286 } 463 }
287 464
288 my $mtime = (lstat $path)[9]; 465 my $mtime = (lstat $path)[9];
289 my @todo = grep { $_->[3] <= $mtime } @tile; 466 my @todo = grep { $_->[3] < $mtime } @tile;
290 if (@todo) { 467 if (@todo) {
291 fork_sub { 468 fork_exec {
292 open my $convert, "|-", $CONVERT, 469 open my $convert, "|-", $CONVERT,
293 "png:-", 470 "png:-",
294 (map { 471 (map {
295 ( 472 (
296 "(", 473 "(",
… …
309 print $convert $png; 486 print $convert $png;
310 close $convert; 487 close $convert;
311 488
312 # pass 2, optimise, and rename 489 # pass 2, optimise, and rename
313 for (@todo) { 490 for (@todo) {
314 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 491 optipng "$_->[2]~";
315 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
316 rename "$_->[2]~", $_->[2]; 492 rename "$_->[2]~", $_->[2];
317 } 493 }
318 }; 494 };
319 } 495 }
320 496
… …
324 500
325 if (0 > aio_load $file, $tile) { 501 if (0 > aio_load $file, $tile) {
326 die "$path: unable to read tile +$x+$y, aborting.\n"; 502 die "$path: unable to read tile +$x+$y, aborting.\n";
327 } 503 }
328 IO::AIO::aio_unlink $file unless $CACHE; 504 IO::AIO::aio_unlink $file unless $CACHE;
329 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 505 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
330 } 506 }
331 } else { 507 } else {
332 # use as-is (either small, use smooth) 508 # use as-is (either small, use smooth)
333 commit_png $face, $png, $T; 509 commit_png $stem, $face, $png, $T;
334 } 510 }
335 511
336 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 }
337 } 554 }
338 } 555 }
339 556
340 sub process_arc { 557 sub process_arc {
341 while (my $job = $c_arc->get) { 558 while (my ($dir, $file) = @{ $c_arc->get }) {
342 my ($dir, $file) = @$job;
343
344 my $arc; 559 my $arc;
345 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 :/
346 561
347 my $arc = read_arch "$dir/$file"; 562 my $arc = read_arch "$dir/$file";
348 for my $o (values %$arc) { 563 for my $o (values %$arc) {
349 push @ARC, $o; 564 push @ARC, $o;
350 for (my $m = $o; $m; $m = $m->{more}) { 565 for (my $m = $o; $m; $m = $m->{more}) {
351 $ARC{$m->{_name}} = $m; 566 $ARC{$m->{_name}} = $m;
352 } 567 }
353 568
354 $o->{editor_folder} = $dir; 569 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
355
356 my $visibility = delete $o->{visibility};
357 my $magicmap = delete $o->{magicmap};
358 570
359 # find upper left corner :/ 571 # find upper left corner :/
360 # omg, this is sooo broken 572 # omg, this is sooo broken
361 my ($dx, $dy); 573 my ($dx, $dy);
362 for (my $o = $o; $o; $o = $o->{more}) { 574 for (my $o = $o; $o; $o = $o->{more}) {
… …
369 my $y = $o->{y} - $dy; 581 my $y = $o->{y} - $dy;
370 582
371 my $ext = $x|$y ? "+$x+$y" : ""; 583 my $ext = $x|$y ? "+$x+$y" : "";
372 584
373 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 585 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
374
375 $visibility = delete $o->{visibility} if exists $o->{visibility};
376 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
377 586
378 my $anim = delete $o->{anim}; 587 my $anim = delete $o->{anim};
379 588
380 if ($anim) { 589 if ($anim) {
381 # possibly add $ext to the animation name to avoid 590 # possibly add $ext to the animation name to avoid
… …
399 facings => $facings, 608 facings => $facings,
400 frames => \@frames, 609 frames => \@frames,
401 }; 610 };
402 } 611 }
403 612
404 for my $face ($o->{face} || (), @{$anim || []}) { 613 for ($o->{face} || (), @{$anim || []}) {
614 next if /^facings\s/;
615
616 my $face = $_;
617 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
618
619 # handle derived faces
620 if ($face =~ /^([^:]+):(.*)/) {
621 my ($type, $base) = ($1, $2);
622 push @{ $FACEINFO{$base}{derive} }, [$dir, $type];
623 }
624
625 $FACEINFO{$face}{arc} = $o;
626
405 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 627 next if $face =~ /^blank.x11$|^empty.x11$/;
406
407 my $info = $FACEINFO{$face} ||= {};
408
409 $info->{arc} = $o;
410 $info->{visibility} = $visibility if defined $visibility;
411 $info->{magicmap} = $magicmap if defined $magicmap;
412 } 628 }
413 629
414 if (my $smooth = delete $o->{smoothface}) { 630 if (my $smooth = delete $o->{smoothface}) {
415 my %kv =split /\s+/, $smooth; 631 my %kv = split /\s+/, $smooth;
416 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 632 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
417 while (my ($face, $smooth) = each %kv) { 633 while (my ($face, $smooth) = each %kv) {
634 $FACEINFO{$smooth}{arc} = $o;
635
418 $FACEINFO{$face}{smooth} = $smooth; 636 $FACEINFO{$face}{smooth} = $smooth;
419 $FACEINFO{$face}{smoothlevel} = $level; 637 $FACEINFO{$face}{smoothlevel} = $level;
420 } 638 }
421 } 639 }
422 } 640 }
423 } 641 }
424 } 642 }
425 } 643 }
426 644
427 sub process_trs { 645 sub process_trs {
428 while (my $job = $c_trs->get) {
429 my ($dir, $file) = @$job; 646 my ($dir, $file) = @_;
430 my $path = "$dir/$file"; 647 my $path = "$dir/$file";
431 648
432 my $trs; 649 my $trs;
433 if (0 > aio_load $path, $trs) { 650 if (0 > aio_load $path, $trs) {
434 warn "$path: $!, skipping.\n"; 651 warn "ERROR: $path: $!, skipping.\n";
435 next; 652 return;
436 } 653 }
437 654
438 $TRS .= $trs; 655 $TRS .= $trs;
439 }
440 } 656 }
441 657
442 my %FILECACHE; 658 my %FILECACHE;
443 659
444 sub load_cached($;$) { 660 sub load_cached($;$) {
445 unless (exists $FILECACHE{$_[0]}) { 661 unless (exists $FILECACHE{$_[0]}) {
446 my $data; 662 my $data;
447 if (0 < aio_load $_[0], $data) { 663 if (0 < aio_load $_[0], $data) {
448 if ($_[1]) { 664 if ($_[1]) {
449 $data = eval { $_[1]->($data) }; 665 $data = eval { $_[1]->($data) };
450 warn "$_[0]: $@" if $@; 666 warn "ERROR: $_[0]: $@" if $@;
451 } 667 }
452 } 668 }
453 669
454 $FILECACHE{$_[0]} = $data; 670 $FILECACHE{$_[0]} = $data;
455 } 671 }
456 672
457 $FILECACHE{$_[0]} 673 $FILECACHE{$_[0]}
458 } 674 }
459 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
460 sub process_res { 744 sub process_res {
461 while (my $job = $c_res->get) {
462 my ($dir, $file, $type) = @$job; 745 my ($dir, $file, $type) = @_;
463 746
464 my $data;
465 aio_load "$dir/$file", $data; 747 0 <= aio_load "$dir/$file", my $data
748 or die "$dir/$file: $!";
466 749
467 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 750 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
468 751
469 next if $meta && !exists $meta->{$file}; 752 utf8::decode $dir;
753 utf8::decode $file;
470 754
755 # a meta file for resources is now mandatory
756 unless (exists $meta->{$file}) {
757 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
758 return;
759 }
760
471 $meta = { 761 $meta = {
472 %{ $meta->{"" } || {} }, 762 %{ $meta->{"" } || {} },
473 %{ $meta->{$file} || {} }, 763 %{ $meta->{$file} || {} },
474 }; 764 };
475 765
476 if ($meta->{license} =~ s/^#//) { 766 if (exists $meta->{license} && $meta->{license} =~ s/^#//) { # exists == avoid autovivification
477 $meta->{license} = ({ 767 $meta->{license} = ({
478 "pd" => "Public Domain", 768 "pd" => "Public Domain",
479 "gpl" => "GNU General Public License, version 3.0 or any later", 769 "gpl" => "GNU General Public License, version 3.0 or any later",
480 "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/",
481 "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/",
482 "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/",
483 })->{$meta->{license}} 774 })->{$meta->{license}}
484 || warn "$dir/$file: license tag '$meta->{license}' not found."; 775 || warn "ERROR: $dir/$file: license tag '$meta->{license}' not found.";
485 } 776 }
486 777
778 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
779 ($meta->{author} = $1) =~ s/_/ /g;
780 }
781
487 $file =~ s/\.res$//; 782 $file =~ s/\.res$//;
488 $file =~ s/\.(ogg|wav|jpg|png)$//; 783 $file =~ s/\.(ogg|wav|jpg|png)$//;
489 784
785 if ($file =~ s/\.plt$//) {
786 $data = process_plt "$dir/$file", $data;
787 } elsif (my $filter = delete $meta->{cfutil_filter}) {
788 if ($filter eq "yaml2json") {
789 $data = JSON::XS::encode_json YAML::XS::Load $data;
790 } elsif ($filter eq "json2json") {
791 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
792 } elsif ($filter eq "perl2json") {
793 $data = eval $data; die if $@;
794 $data = JSON::XS::encode_json $data;
795 } else {
796 warn "ERROR: $dir/$file: unknown filter $filter, skipping\n";
797 }
798 }
799
490 substr $dir, 0, 1 + length $PATH, ""; 800 substr $dir, 0, 1 + length $PATH, "";
491 801
492 $RESOURCE{"$dir/$file"} = { 802 $RESOURCE{"$dir/$file"} = {
493 type => (delete $meta->{type}) || $type, 803 type => (exists $meta->{type} ? delete $meta->{type} : $type),
494 data => $data, 804 data => $data,
495 chksum => (Digest::MD5::md5 $data),
496 %$meta ? (meta => $meta) : (), 805 %$meta ? (meta => $meta) : (),
497 }; 806 };
807 }
808
809 sub process_any {
810 while (my ($func, @args) = @{ $c_any->get }) {
811 $func->(@args);
498 } 812 }
499 } 813 }
500 814
501 sub find_files; 815 sub find_files;
502 sub find_files { 816 sub find_files {
503 my ($path) = @_; 817 my ($path) = @_;
504 818
819 my $grp = IO::AIO::aio_group;
820
821 my $scandir; $scandir = sub {
822 my ($path) = @_;
823
505 IO::AIO::aioreq_pri 4; 824 IO::AIO::aioreq_pri 4;
506 IO::AIO::aio_scandir $path, 4, sub { 825 add $grp IO::AIO::aio_scandir $path, 4, sub {
507 my ($dirs, $nondirs) = @_; 826 my ($dirs, $nondirs) = @_;
508 827
509 find_files "$path/$_" 828 $scandir->("$path/$_")
510 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 829 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
511 830
512 my $dir = $path; 831 my $dir = $path;
513 substr $dir, 0, 1 + length $PATH, ""; 832 substr $dir, 0, 1 + length $PATH, "";
514 833
515 for my $file (@$nondirs) { 834 for my $file (@$nondirs) {
516 if ($dir =~ /^music(?:\/|$)/) { 835 if ($dir =~ /^music(?:\/|$)/) {
517 $c_res->put ([$path, $file, 3]) # FT_MUSIC 836 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
518 if $file =~ /\.(ogg)$/; 837 if $file =~ /\.(ogg)$/;
519 838
520 } elsif ($dir =~ /^sound(?:\/|$)/) { 839 } elsif ($dir =~ /^sound(?:\/|$)/) {
521 $c_res->put ([$path, $file, 5]) # FT_SOUND 840 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
522 if $file =~ /\.(wav|ogg)$/; 841 if $file =~ /\.(wav|ogg)$/;
523 842
524 } elsif ($dir =~ /^res(?:\/|$)/) { 843 } elsif ($dir =~ /^res(?:\/|$)/) {
525 $c_res->put ([$path, $file, 0]) # FT_FACE
526 if $file =~ /\.(jpg|png)$/; 844 if ($file =~ /\.(jpg|png)$/) {
527 $c_res->put ([$path, $file, 7]) # FT_RSRC 845 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
528 if $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, 6]); # was type undef, but now meta files are mandatory, so any mentioned file surely has a purpose
850 }
529 851
530 } elsif ($file =~ /\.png$/) { 852 } elsif ($file =~ /\.png$/) {
531 push @c_png, ["$path/$file", 0]; 853 $PNG{$file} = $path;
532 854
855 } elsif ($file =~ /\.faceinfo$/) {
856 $c_any->put ([\&process_faceinfo, $path, $file]);
857
533 } elsif ($file =~ /\.trs$/) { 858 } elsif ($file =~ /\.trs$/) {
534 $c_trs->put ([$path, $file]); 859 $c_any->put ([\&process_trs, $path, $file]);
535 860
536 } elsif ($file =~ /\.arc$/) { 861 } elsif ($file =~ /\.arc$/) {
537 $c_arc->put ([$path, $file]); 862 $c_arc->put ([$path, $file]);
538 863
539 } else { 864 } else {
540 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 865 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
541 } 866 }
867 }
542 } 868 };
543 }; 869 };
870
871 $scandir->($path);
872 aio_wait $grp;
873 }
874
875 sub generate_plurals {
876# use Lingua::EN::Inflect ();
877# Lingua::EN::Inflect::classical;
878# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
879# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
880#
881# for my $a (@ARC) {
882# my $name = $a->{name} || $a->{_name};
883#
884# next unless $a->{name_pl};
885# next if $a->{invisible};
886# next if $a->{is_floor};
887# next if $a->{no_pick};
888#
889# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
890# my $pl = $test =~ /^(?:eq|p:.)$/
891# ? $name
892# : Lingua::EN::Inflect::PL $name;
893#
894# if ($pl ne $a->{name_pl}) {
895# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
896# }
897# }
544 } 898 }
545 899
546 sub inst_arch($) { 900 sub inst_arch($) {
547 my (undef, $path) = @_; 901 my (undef, $path) = @_;
548 902
… …
557 "Unless you run verbosely, all following warning\n", 911 "Unless you run verbosely, all following warning\n",
558 "or error messages indicate serious problems.\n", 912 "or error messages indicate serious problems.\n",
559 "\n"; 913 "\n";
560 914
561 if (!-d "$path/treasures") { 915 if (!-d "$path/treasures") {
562 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";
563 exit 1 unless $FORCE; 917 exit 1 unless $FORCE;
564 } 918 }
565 919
566 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;
567 924
568 find_files $path; 925 find_files $path;
569 926
570 my @a_arc = map +(async \&process_arc), 1..2; 927 $c_arc->shutdown;
571 my @a_res = map +(async \&process_res), 1..2; 928 $c_any->shutdown;
572 my @a_trs = map +(async \&process_trs), 1..2;
573
574 IO::AIO::flush;
575
576 $c_res->put (undef) for @a_res;
577 $c_arc->put (undef) for @a_arc;
578 $c_trs->put (undef) for @a_trs;
579
580 print "start file scan, arc, res processing...\n" if $VERBOSE;
581 929
582 $_->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;
583 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
584 print "end arc, start png processing...\n" if $VERBOSE; 956 print "starting png processing...\n" if $VERBOSE;
585 957
586 # four png crunchers work fine for my 2x smp machine 958 # eight png crunchers work fine for my 4x smp machine
587 my @a_png = map +(async \&process_png), 1..4; 959 my @a_png = map +(async \&process_png), 1..8;
588 960
589 $_->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;
590 966
591 print "scanning done, processing results...\n" if $VERBOSE; 967 print "scanning done, processing results...\n" if $VERBOSE;
592 { 968 {
593 # remove path prefix from editor_folder 969 # remove path prefix from editor_folder
970 $_->{editor_folder} =~ /^\x00/
594 substr $_->{editor_folder}, 0, 1 + length $path, "" 971 and substr $_->{editor_folder}, 0, 2 + length $path, ""
595 for values %ARC; 972 for values %ARC;
596 973
597 print "resolving inheritance tree...\n" if $VERBOSE; 974 print "resolving inheritance tree...\n" if $VERBOSE;
598 # resolve inherit 975 # resolve inherit
599 while () { 976 while () {
600 my $progress; 977 my $progress;
601 my $loop; 978 my $loop;
602 979
603 for my $o (values %ARC) { 980 for my $o (values %ARC) {
604 if (my $other = $o->{inherit}) { 981 for my $other (split /,/, $o->{inherit}) {
605 if (my $s = $ARC{$other}) { 982 if (my $s = $ARC{$other}) {
606 if ($s->{inherit}) { 983 if ($s->{inherit}) {
607 $loop = $s; 984 $loop = $s;
608 } else { 985 } else {
609 delete $o->{inherit}; 986 delete $o->{inherit};
… …
611 delete @s{qw(_name more name name_pl)}; 988 delete @s{qw(_name more name name_pl)};
612 %$o = ( %s, %$o ); 989 %$o = ( %s, %$o );
613 ++$progress; 990 ++$progress;
614 } 991 }
615 } else { 992 } else {
616 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";
617 delete $ARC{$o->{_name}}; 994 delete $ARC{$o->{_name}};
618 } 995 }
619 } 996 }
620 } 997 }
621 998
… …
628 } 1005 }
629 1006
630 # 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
631 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 1008 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
632 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
1021 #print "generating plurals...\n" if $VERBOSE;
1022 #generate_plurals;
1023
633 print "writing archetypes...\n" if $VERBOSE; 1024 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
634 open my $fh, ">:utf8", "$DATADIR/archetypes~" 1025 open my $fh, ">:utf8", "$DATADIR/archetypes~"
635 or die "$DATADIR/archetypes~: $!"; 1026 or die "$DATADIR/archetypes~: $!";
636 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 1027 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
637 } 1028 }
638 1029
639 { 1030 {
640 print "writing treasures...\n" if $VERBOSE; 1031 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
641 open my $fh, ">:utf8", "$DATADIR/treasures~" 1032 open my $fh, ">:utf8", "$DATADIR/treasures~"
642 or die "$DATADIR/treasures~: $!"; 1033 or die "$DATADIR/treasures~: $!";
643 print $fh $TRS; 1034 print $fh $TRS;
644 } 1035 }
645 1036
646 { 1037 {
647 print "processing facedata...\n" if $VERBOSE; 1038 print "processing facedata...\n" if $VERBOSE;
648 while (my ($k, $v) = each %FACEINFO) { 1039 while (my ($k, $v) = each %FACEINFO) {
649 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";
650 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";
651 1042
1043 make_hash $k, $v->{data32}, $v->{hash32};
1044 make_hash $k, $v->{data64}, $v->{hash64};
1045
652 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";
653 #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";
654 1048
655 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 1049 $v->{glyph} // warn "ERROR: face '$k' has no glyph - missing faceinfo entry?\n";
656 $v->{chksum64} = Digest::MD5::md5 $v->{data64}; 1050 $v->{visibility} // warn "ERROR: face '$k' has no visibility info - missing faceinfo entry?\n";
1051 $v->{magicmap} // warn "ERROR: face '$k' has no foreground colour - missing faceinfo entry?\n";
657 1052
658 if (my $magicmap = $v->{magicmap}) { 1053 delete @$v{qw(arc stem derive)}; # not used by the server
659 $magicmap =~ y/A-Z_\-/a-z/d; 1054 }
660 $v->{magicmap} = $COLOR{$magicmap}; 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};
661 } 1081 }
662 1082
663 delete $v->{arc}; 1083 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
664 } 1084 }
1085 }
665 1086
666 print "writing facedata...\n" if $VERBOSE; 1087 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
1088 scalar keys %FACEINFO,
1089 scalar keys %ANIMINFO,
1090 scalar keys %RESOURCE
1091 if $VERBOSE;
1092
667 open my $fh, ">:perlio", "$DATADIR/facedata~" 1093 open my $fh, ">:perlio", "$DATADIR/facedata~"
668 or die "$DATADIR/facedata~: $!"; 1094 or die "$DATADIR/facedata~: $!";
669 1095
670 print $fh freeze { 1096 print $fh nfreeze {
671 version => 2, 1097 version => 2,
672 faceinfo => \%FACEINFO, 1098 faceinfo => \%FACEINFO,
673 animinfo => \%ANIMINFO, 1099 animinfo => \%ANIMINFO,
674 resource => \%RESOURCE, 1100 resource => \%RESOURCE,
675 }; 1101 };
676 } 1102 }
677 1103
678 print "committing files...\n" if $VERBOSE; 1104 print "committing files...\n" if $VERBOSE;
679 1105
680 for (qw(archetypes facedata treasures)) { 1106 for (qw(archetypes facedata treasures), @COMMIT) {
681 chmod 0644, "$DATADIR/$_~"; 1107 chmod 0644, "$DATADIR/$_~";
682 rename "$DATADIR/$_~", "$DATADIR/$_" 1108 rename "$DATADIR/$_~", "$DATADIR/$_"
683 or die "$DATADIR/$_: $!"; 1109 or die "$DATADIR/$_: $!";
684 } 1110 }
685 1111

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines