| 1 | #!@PERL@ |
1 | #!@PERL@ |
| 2 | |
2 | |
| 3 | use strict; |
3 | # |
|
|
4 | # This file is part of Deliantra, the Roguelike Realtime MMORPG. |
|
|
5 | # |
|
|
6 | # Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
|
|
7 | # |
|
|
8 | # Deliantra is free software: you can redistribute it and/or modify it under |
|
|
9 | # the terms of the Affero GNU General Public License as published by the |
|
|
10 | # Free Software Foundation, either version 3 of the License, or (at your |
|
|
11 | # option) any later version. |
|
|
12 | # |
|
|
13 | # This program is distributed in the hope that it will be useful, |
|
|
14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
|
15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
|
16 | # GNU General Public License for more details. |
|
|
17 | # |
|
|
18 | # You should have received a copy of the Affero GNU General Public License |
|
|
19 | # and the GNU General Public License along with this program. If not, see |
|
|
20 | # <http://www.gnu.org/licenses/>. |
|
|
21 | # |
|
|
22 | # The authors can be reached via e-mail to <support@deliantra.net> |
|
|
23 | # |
|
|
24 | |
|
|
25 | use common::sense; |
| 4 | |
26 | |
| 5 | my $prefix = "@prefix@"; |
27 | my $prefix = "@prefix@"; |
| 6 | my $exec_prefix = "@exec_prefix@"; |
28 | my $exec_prefix = "@exec_prefix@"; |
| 7 | my $datarootdir = "@datarootdir@"; |
29 | my $datarootdir = "@datarootdir@"; |
| 8 | my $DATADIR = "@datadir@/@PACKAGE@"; |
30 | my $DATADIR = "@datadir@/@PACKAGE@"; |
| … | |
… | |
| 12 | my $OPTIPNG = "@OPTIPNG@"; |
34 | my $OPTIPNG = "@OPTIPNG@"; |
| 13 | my $RSYNC = "@RSYNC@"; |
35 | my $RSYNC = "@RSYNC@"; |
| 14 | my $PNGNQ = "@PNGNQ@"; |
36 | my $PNGNQ = "@PNGNQ@"; |
| 15 | |
37 | |
| 16 | use Getopt::Long; |
38 | use Getopt::Long; |
|
|
39 | use File::Temp; |
|
|
40 | use POSIX (); |
|
|
41 | use Carp; |
|
|
42 | |
| 17 | use Coro::Event; |
43 | use Coro::EV; |
| 18 | use AnyEvent; |
44 | use AnyEvent; |
|
|
45 | use YAML::XS (); |
|
|
46 | use JSON::XS (); |
| 19 | use IO::AIO (); |
47 | use IO::AIO (); |
| 20 | use File::Temp; |
48 | use Digest::MD5 (); |
| 21 | use Crossfire; |
49 | |
| 22 | use Coro; |
50 | use Coro 5.12; |
| 23 | use Coro::AIO; |
51 | use Coro::AIO; |
| 24 | use Coro::Util; |
52 | use Coro::Util; |
| 25 | use POSIX (); |
53 | use Coro::Channel; |
| 26 | use Digest::MD5; |
|
|
| 27 | use Carp; |
|
|
| 28 | use Coro::Storable; $Storable::canonical = 1; |
54 | use Coro::Storable; $Storable::canonical = 1; |
|
|
55 | |
|
|
56 | use Deliantra; |
| 29 | |
57 | |
| 30 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
58 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
| 31 | |
59 | |
| 32 | sub usage { |
60 | sub usage { |
| 33 | warn <<EOF; |
61 | warn <<EOF; |
| … | |
… | |
| 46 | my $VERBOSE = 1; |
74 | my $VERBOSE = 1; |
| 47 | my $CACHE = 0; |
75 | my $CACHE = 0; |
| 48 | my $FORCE; |
76 | my $FORCE; |
| 49 | my $TMPDIR = "/tmp/cfutil$$~"; |
77 | my $TMPDIR = "/tmp/cfutil$$~"; |
| 50 | my $TMPFILE = "aaaa0"; |
78 | my $TMPFILE = "aaaa0"; |
|
|
79 | my @COMMIT; |
| 51 | |
80 | |
| 52 | our %COLOR = ( |
81 | our %COLOR = ( |
| 53 | black => 0, |
82 | black => 0, |
| 54 | white => 1, |
83 | white => 1, |
| 55 | navy => 2, |
84 | navy => 2, |
| … | |
… | |
| 65 | tan => 12, |
94 | tan => 12, |
| 66 | ); |
95 | ); |
| 67 | |
96 | |
| 68 | END { system "rm", "-rf", $TMPDIR } |
97 | END { system "rm", "-rf", $TMPDIR } |
| 69 | |
98 | |
| 70 | Event->signal (signal => "INT", cb => sub { exit 1 }); |
99 | my $s_INT = EV::signal INT => sub { exit 1 }; |
| 71 | Event->signal (signal => "TERM", cb => sub { exit 1 }); |
100 | my $s_TERM = EV::signal TERM => sub { exit 1 }; |
|
|
101 | |
|
|
102 | our %hash; |
|
|
103 | |
|
|
104 | # here we could try to avoid collisions and reduce chksum size further |
|
|
105 | sub make_hash($\$\$;$) { |
|
|
106 | my ($id, $dataref, $hashref, $clen) = @_; |
|
|
107 | |
|
|
108 | my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; |
|
|
109 | |
|
|
110 | if (exists $hash{$hash}) { |
|
|
111 | # hahs collinion, but some files are simply identical |
|
|
112 | if (${$hash{$hash}[1]} ne $$dataref) { |
|
|
113 | warn "hash collision $hash{$hash}[0] vs. $id\n"; |
|
|
114 | exit 1; |
|
|
115 | } else { |
|
|
116 | print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; |
|
|
117 | } |
|
|
118 | } |
|
|
119 | $hash{$hash} = [$id, $dataref, $hashref]; |
|
|
120 | |
|
|
121 | $$hashref = $hash; |
|
|
122 | } |
| 72 | |
123 | |
| 73 | mkdir $TMPDIR, 0700 |
124 | mkdir $TMPDIR, 0700 |
| 74 | or die "$TMPDIR: $!"; |
125 | or die "$TMPDIR: $!"; |
| 75 | |
126 | |
| 76 | sub fork_sub(&) { |
127 | sub fork_sub(&) { |
| … | |
… | |
| 96 | if (!-f "$path/regions") { |
147 | if (!-f "$path/regions") { |
| 97 | warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; |
148 | warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; |
| 98 | exit 1 unless $FORCE; |
149 | exit 1 unless $FORCE; |
| 99 | } |
150 | } |
| 100 | |
151 | |
| 101 | system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" |
152 | system $RSYNC, "-av", "--chmod=u=rwX,go=rX", |
|
|
153 | "$path/.", "$DATADIR/maps/.", |
|
|
154 | "--exclude", "CVS", "--exclude", "/world-precomposed", |
|
|
155 | "--delete", "--delete-excluded" |
| 102 | and die "map installation failed.\n"; |
156 | and die "map installation failed.\n"; |
| 103 | |
157 | |
| 104 | print "maps installed successfully.\n"; |
158 | print "maps installed successfully.\n"; |
|
|
159 | } |
|
|
160 | |
|
|
161 | sub autoglyph { |
|
|
162 | my ($stem, $face) = @_; |
|
|
163 | |
|
|
164 | if ($stem =~ /^wall\/|Nimwall/) { |
|
|
165 | # warn $stem; |
|
|
166 | "+" |
|
|
167 | } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) { |
|
|
168 | "." |
|
|
169 | } elsif ($stem =~ /^player\//) { |
|
|
170 | "@" |
|
|
171 | } else { |
|
|
172 | substr $stem, 0, 1 |
|
|
173 | } |
| 105 | } |
174 | } |
| 106 | |
175 | |
| 107 | { |
176 | { |
| 108 | our %ANIMINFO; |
177 | our %ANIMINFO; |
| 109 | our %FACEINFO; |
178 | our %FACEINFO; |
| … | |
… | |
| 114 | our $NFILE; |
183 | our $NFILE; |
| 115 | our $PATH; |
184 | our $PATH; |
| 116 | |
185 | |
| 117 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
186 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
| 118 | |
187 | |
| 119 | our (@png, @trs, @arc, @res); # files we are interested in |
188 | our $c_arc = new Coro::Channel; |
|
|
189 | our $c_trs = new Coro::Channel; |
|
|
190 | our $c_res = new Coro::Channel; |
| 120 | |
191 | |
|
|
192 | our @c_png; |
|
|
193 | |
| 121 | sub commit_png($$$) { |
194 | sub commit_png($$$$) { |
| 122 | my ($name, $data, $T) = @_; |
195 | my ($stem, $name, $data, $T) = @_; |
| 123 | |
196 | |
|
|
197 | $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH; |
| 124 | $FACEINFO{$name}{"data$T"} = $data; |
198 | $FACEINFO{$name}{"data$T"} = $data; |
| 125 | } |
199 | } |
| 126 | |
200 | |
| 127 | sub process_png { |
201 | sub process_png { |
| 128 | while (@png) { |
202 | while (@c_png) { |
| 129 | my ($path, $delete) = @{pop @png}; |
203 | my ($path, $delete) = @{pop @c_png}; |
| 130 | |
204 | |
| 131 | my $png; |
205 | my $png; |
| 132 | aio_lstat $path; |
206 | aio_lstat $path; |
| 133 | my ($size, $mtime) = (stat _)[7,9]; |
207 | my ($size, $mtime) = (stat _)[7,9]; |
| 134 | |
208 | |
| … | |
… | |
| 165 | if ($w % $T || $h % $T) { |
239 | if ($w % $T || $h % $T) { |
| 166 | warn "$path: weird png size ($w $h), skipping.\n"; |
240 | warn "$path: weird png size ($w $h), skipping.\n"; |
| 167 | next; |
241 | next; |
| 168 | } |
242 | } |
| 169 | |
243 | |
|
|
244 | (my $base = $stem) =~ s/^.*\///; |
|
|
245 | |
|
|
246 | my $fi = $FACEINFO{$base}; |
|
|
247 | unless ($fi) { |
|
|
248 | #warn "$path: <$base> not referenced by any archetype, skipping.\n"; |
|
|
249 | #next; |
|
|
250 | } |
|
|
251 | |
|
|
252 | my $arc = $fi->{arc} || { }; |
|
|
253 | |
| 170 | unless ($path =~ /~$/) { |
254 | unless ($path =~ /~$/) { |
| 171 | # possibly enlarge |
255 | # possibly enlarge |
| 172 | if (0 > aio_stat "$stem.64x64.png") { |
256 | if (0 > aio_stat "$stem.64x64.png") { |
| 173 | my $other = "$stem.64x64.png~"; |
257 | my $other = "$stem.64x64.png~"; |
| 174 | |
258 | |
| 175 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
259 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
| 176 | fork_sub { |
260 | fork_sub { |
| 177 | my $CROP; |
261 | my $CROP; |
| 178 | my $SRC = "png:\Q$path\E"; |
262 | my $SRC = "png:\Q$path\E"; |
| 179 | |
263 | |
| 180 | # check if this is a wall. ultra-ugly. ultra-ultra-ugly. |
264 | my $is_floor = $arc->{is_floor}; |
|
|
265 | my $is_wall = 0; |
|
|
266 | |
|
|
267 | my ($wall_pfx, $wall_dir, $wall_sfx); |
|
|
268 | |
|
|
269 | if ( |
|
|
270 | !$is_floor |
|
|
271 | && !$arc->{alive} |
|
|
272 | && $arc->{move_block} eq "all" |
| 181 | if ($path =~ /^(.*\/wall\/.*_)([0-9A-F])(\.x11.*\.png)$/) { |
273 | && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/ |
|
|
274 | ) { |
| 182 | my ($pfx, $dir, $sfx) = ($1, hex $2, $3); |
275 | ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3); |
| 183 | #check for 0..F images to be sure(?) this is a wall |
276 | |
| 184 | unless (grep { !-e sprintf "%s%X%s", $pfx, $_, $sfx } 0..15) { |
277 | unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) { |
|
|
278 | $is_wall = 1; |
|
|
279 | } |
|
|
280 | } |
|
|
281 | |
|
|
282 | if ($is_wall || $is_floor) { |
| 185 | # add a 4px border and add other images around it |
283 | # add a 4px border and add other images around it |
| 186 | $CROP = "-shave 8x8 +repage"; |
284 | $CROP = "-shave 8x8 +repage"; |
| 187 | |
285 | |
| 188 | $w += 8; |
286 | $w += 8; |
| 189 | $h += 8; |
287 | $h += 8; |
| 190 | |
288 | |
| 191 | $SRC = "-size ${w}x${h} xc:transparent"; |
289 | $SRC = "-size ${w}x${h} xc:transparent"; |
| 192 | $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; |
290 | $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; |
| 193 | |
291 | |
| 194 | # 8 surrounding images |
292 | # 8 surrounding images |
| 195 | for ( |
293 | for ( |
| 196 | # x y b r0 r1 |
294 | # x y b r0 r1 |
| 197 | [-1, -1, 0, 6], |
295 | [-1, -1, 0, 6], |
| 198 | [ 0, -1, 1, 10, 14], |
296 | [ 0, -1, 1, 10, 14], |
| 199 | [+1, -1, 0, 12], |
297 | [+1, -1, 0, 12], |
| 200 | |
298 | |
| 201 | [-1, 0, 8, 5, 7], |
299 | [-1, 0, 8, 5, 7], |
| 202 | # |
300 | # |
| 203 | [+1, 0, 2, 5, 13], |
301 | [+1, 0, 2, 5, 13], |
| 204 | |
302 | |
| 205 | [-1, +1, 0, 3], |
303 | [-1, +1, 0, 3], |
| 206 | [ 0, +1, 4, 10, 11], |
304 | [ 0, +1, 4, 10, 11], |
| 207 | [+1, +1, 0, 9], |
305 | [+1, +1, 0, 9], |
| 208 | ) { |
306 | ) { |
| 209 | my ($x, $y, $d, $r0, $r1) = @$_; |
307 | my ($x, $y, $d, $r0, $r1) = @$_; |
|
|
308 | |
|
|
309 | my $tile = $is_floor ? $path |
|
|
310 | : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx |
|
|
311 | : die; |
|
|
312 | |
| 210 | $SRC .= sprintf " png:%s%X%s -geometry %+d%+d -composite", |
313 | $SRC .= sprintf " png:%s -geometry %+d%+d -composite", |
| 211 | "\Q$pfx", |
314 | "\Q$tile", |
| 212 | ($dir & $d) ? $r1 : $r0, |
|
|
| 213 | "\Q$sfx", |
|
|
| 214 | $x * ($w - 8) + 4, |
315 | $x * ($w - 8) + 4, |
| 215 | $y * ($h - 8) + 4; |
316 | $y * ($h - 8) + 4; |
| 216 | } |
|
|
| 217 | } |
317 | } |
| 218 | } |
318 | } |
| 219 | |
319 | |
| 220 | system "convert -depth 8 $SRC rgba:-" |
320 | system "convert -depth 8 $SRC rgba:-" |
| 221 | . "| $exec_prefix/bin/cfhq2xa $w $h 0" |
321 | . "| $exec_prefix/bin/cfhq2xa $w $h 0" |
| … | |
… | |
| 225 | die "$other~ has zero size, aborting." unless -s "$other~"; |
325 | die "$other~ has zero size, aborting." unless -s "$other~"; |
| 226 | rename "$other~", $other; |
326 | rename "$other~", $other; |
| 227 | }; |
327 | }; |
| 228 | } |
328 | } |
| 229 | |
329 | |
| 230 | push @png, [$other, !$CACHE]; |
330 | push @c_png, [$other, !$CACHE]; |
| 231 | } |
331 | } |
| 232 | |
332 | |
| 233 | # possibly scale down |
333 | # possibly scale down |
| 234 | if (0 > aio_stat "$stem.32x32.png") { |
334 | if (0 > aio_stat "$stem.32x32.png") { |
| 235 | my $other = "$stem.32x32.png~"; |
335 | my $other = "$stem.32x32.png~"; |
| … | |
… | |
| 238 | fork_sub { |
338 | fork_sub { |
| 239 | system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; |
339 | system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; |
| 240 | system $OPTIPNG, "-i0", "-q", "$other~"; |
340 | system $OPTIPNG, "-i0", "-q", "$other~"; |
| 241 | |
341 | |
| 242 | # reduce smoothfaces >10000 bytes |
342 | # reduce smoothfaces >10000 bytes |
|
|
343 | # obsolete, no longer required |
| 243 | if ($stem =~ /_S\./ && (-s "$other~") > 10000) { |
344 | if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { |
| 244 | my $ncolor = 256; |
345 | my $ncolor = 256; |
| 245 | while () { |
346 | while () { |
| 246 | system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; |
347 | system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; |
| 247 | system $OPTIPNG, "-i0", "-q", "$other~~"; |
348 | system $OPTIPNG, "-i0", "-q", "$other~~"; |
| 248 | last if 10000 > -s "$other~~"; |
349 | last if 10000 > -s "$other~~"; |
| … | |
… | |
| 260 | rename "$other~", $other; |
361 | rename "$other~", $other; |
| 261 | }; |
362 | }; |
| 262 | } |
363 | } |
| 263 | |
364 | |
| 264 | #warn "scaled down $path to $other\n";#d# |
365 | #warn "scaled down $path to $other\n";#d# |
| 265 | push @png, [$other, !$CACHE]; |
366 | push @c_png, [$other, !$CACHE]; |
| 266 | } |
367 | } |
| 267 | } |
368 | } |
| 268 | |
369 | |
| 269 | (my $face = $stem) =~ s/^.*\///; |
370 | (my $face = $stem) =~ s/^.*\///; |
| 270 | |
371 | |
| … | |
… | |
| 319 | |
420 | |
| 320 | if (0 > aio_load $file, $tile) { |
421 | if (0 > aio_load $file, $tile) { |
| 321 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
422 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
| 322 | } |
423 | } |
| 323 | IO::AIO::aio_unlink $file unless $CACHE; |
424 | IO::AIO::aio_unlink $file unless $CACHE; |
| 324 | commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; |
425 | commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T; |
| 325 | } |
426 | } |
| 326 | } else { |
427 | } else { |
| 327 | # use as-is (either small, use smooth) |
428 | # use as-is (either small, use smooth) |
| 328 | commit_png $face, $png, $T; |
429 | commit_png $stem, $face, $png, $T; |
| 329 | } |
430 | } |
| 330 | |
431 | |
| 331 | aio_unlink $path if $delete; |
432 | aio_unlink $path if $delete; |
| 332 | } |
433 | } |
| 333 | } |
434 | } |
| 334 | |
435 | |
| 335 | sub process_arc { |
436 | sub process_arc { |
| 336 | while (@arc) { |
437 | while (my $job = $c_arc->get) { |
| 337 | my ($dir, $file) = @{pop @arc}; |
438 | my ($dir, $file) = @$job; |
| 338 | |
439 | |
| 339 | my $arc; |
440 | my $arc; |
| 340 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
441 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
| 341 | |
442 | |
| 342 | my $arc = read_arch "$dir/$file"; |
443 | my $arc = read_arch "$dir/$file"; |
| … | |
… | |
| 344 | push @ARC, $o; |
445 | push @ARC, $o; |
| 345 | for (my $m = $o; $m; $m = $m->{more}) { |
446 | for (my $m = $o; $m; $m = $m->{more}) { |
| 346 | $ARC{$m->{_name}} = $m; |
447 | $ARC{$m->{_name}} = $m; |
| 347 | } |
448 | } |
| 348 | |
449 | |
| 349 | $o->{editor_folder} = $dir; |
450 | $o->{editor_folder} ||= "\x00$dir"; # horrible kludge |
| 350 | |
451 | |
| 351 | my $visibility = delete $o->{visibility}; |
452 | my $visibility = delete $o->{visibility}; |
| 352 | my $magicmap = delete $o->{magicmap}; |
453 | my $magicmap = delete $o->{magicmap}; |
|
|
454 | my $glyph = delete $o->{glyph}; |
| 353 | |
455 | |
| 354 | # find upper left corner :/ |
456 | # find upper left corner :/ |
| 355 | # omg, this is sooo broken |
457 | # omg, this is sooo broken |
| 356 | my ($dx, $dy); |
458 | my ($dx, $dy); |
| 357 | for (my $o = $o; $o; $o = $o->{more}) { |
459 | for (my $o = $o; $o; $o = $o->{more}) { |
| … | |
… | |
| 367 | |
469 | |
| 368 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
470 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
| 369 | |
471 | |
| 370 | $visibility = delete $o->{visibility} if exists $o->{visibility}; |
472 | $visibility = delete $o->{visibility} if exists $o->{visibility}; |
| 371 | $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
473 | $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
|
|
474 | $glyph = delete $o->{glyph} if exists $o->{glyph}; |
| 372 | |
475 | |
| 373 | my $anim = delete $o->{anim}; |
476 | my $anim = delete $o->{anim}; |
| 374 | |
477 | |
| 375 | if ($anim) { |
478 | if ($anim) { |
| 376 | # possibly add $ext to the animation name to avoid |
479 | # possibly add $ext to the animation name to avoid |
| … | |
… | |
| 394 | facings => $facings, |
497 | facings => $facings, |
| 395 | frames => \@frames, |
498 | frames => \@frames, |
| 396 | }; |
499 | }; |
| 397 | } |
500 | } |
| 398 | |
501 | |
| 399 | for my $face ($o->{face} || (), @{$anim || []}) { |
502 | for ($o->{face} || (), @{$anim || []}) { |
| 400 | next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; |
503 | next if /^facings\s/; |
| 401 | |
504 | |
|
|
505 | my $face = $_; |
|
|
506 | $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates |
|
|
507 | |
| 402 | my $info = $FACEINFO{$face} ||= {}; |
508 | my $info = $FACEINFO{$face} ||= { }; |
|
|
509 | $info->{arc} = $o; |
|
|
510 | |
|
|
511 | next if $face =~ /^blank.x11$|^empty.x11$/; |
| 403 | |
512 | |
| 404 | $info->{visibility} = $visibility if defined $visibility; |
513 | $info->{visibility} = $visibility if defined $visibility; |
| 405 | $info->{magicmap} = $magicmap if defined $magicmap; |
514 | $info->{magicmap} = $magicmap if defined $magicmap; |
|
|
515 | $info->{glyph} = $glyph if defined $glyph; |
| 406 | } |
516 | } |
| 407 | |
517 | |
| 408 | if (my $smooth = delete $o->{smoothface}) { |
518 | if (my $smooth = delete $o->{smoothface}) { |
| 409 | my %kv =split /\s+/, $smooth; |
519 | my %kv = split /\s+/, $smooth; |
| 410 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
520 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
| 411 | while (my ($face, $smooth) = each %kv) { |
521 | while (my ($face, $smooth) = each %kv) { |
|
|
522 | $FACEINFO{$smooth}{arc} = $o; |
|
|
523 | |
| 412 | $FACEINFO{$face}{smooth} = $smooth; |
524 | $FACEINFO{$face}{smooth} = $smooth; |
| 413 | $FACEINFO{$face}{smoothlevel} = $level; |
525 | $FACEINFO{$face}{smoothlevel} = $level; |
| 414 | } |
526 | } |
| 415 | } |
527 | } |
| 416 | } |
528 | } |
| 417 | } |
529 | } |
| 418 | } |
530 | } |
| 419 | } |
531 | } |
| 420 | |
532 | |
| 421 | sub process_trs { |
533 | sub process_trs { |
| 422 | while (@trs) { |
534 | while (my $job = $c_trs->get) { |
| 423 | my ($dir, $file) = @{pop @trs}; |
535 | my ($dir, $file) = @$job; |
| 424 | my $path = "$dir/$file"; |
536 | my $path = "$dir/$file"; |
| 425 | |
537 | |
| 426 | my $trs; |
538 | my $trs; |
| 427 | if (0 > aio_load $path, $trs) { |
539 | if (0 > aio_load $path, $trs) { |
| 428 | warn "$path: $!, skipping.\n"; |
540 | warn "$path: $!, skipping.\n"; |
| … | |
… | |
| 450 | |
562 | |
| 451 | $FILECACHE{$_[0]} |
563 | $FILECACHE{$_[0]} |
| 452 | } |
564 | } |
| 453 | |
565 | |
| 454 | sub process_res { |
566 | sub process_res { |
| 455 | while (@res) { |
567 | while (my $job = $c_res->get) { |
| 456 | my ($dir, $file, $type) = @{pop @res}; |
568 | my ($dir, $file, $type) = @$job; |
| 457 | |
569 | |
| 458 | my $data; |
570 | my $data; |
| 459 | aio_load "$dir/$file", $data; |
571 | aio_load "$dir/$file", $data; |
| 460 | |
572 | |
| 461 | my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; |
573 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
| 462 | |
574 | |
| 463 | next if $meta && !exists $meta->{$file}; |
575 | utf8::decode $dir; |
|
|
576 | utf8::decode $file; |
|
|
577 | |
|
|
578 | # a meta file for resources is now mandatory |
|
|
579 | unless (exists $meta->{$file}) { |
|
|
580 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
|
|
581 | next; |
|
|
582 | } |
| 464 | |
583 | |
| 465 | $meta = { |
584 | $meta = { |
| 466 | %{ $meta->{"" } || {} }, |
585 | %{ $meta->{"" } || {} }, |
| 467 | %{ $meta->{$file} || {} }, |
586 | %{ $meta->{$file} || {} }, |
| 468 | }; |
587 | }; |
| … | |
… | |
| 470 | if ($meta->{license} =~ s/^#//) { |
589 | if ($meta->{license} =~ s/^#//) { |
| 471 | $meta->{license} = ({ |
590 | $meta->{license} = ({ |
| 472 | "pd" => "Public Domain", |
591 | "pd" => "Public Domain", |
| 473 | "gpl" => "GNU General Public License, version 3.0 or any later", |
592 | "gpl" => "GNU General Public License, version 3.0 or any later", |
| 474 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
593 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
|
|
594 | "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", |
| 475 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.5/", |
595 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
| 476 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
596 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
| 477 | })->{$meta->{license}} |
597 | })->{$meta->{license}} |
| 478 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
598 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
| 479 | } |
599 | } |
| 480 | |
600 | |
|
|
601 | if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { |
|
|
602 | ($meta->{author} = $1) =~ s/_/ /g; |
|
|
603 | } |
|
|
604 | |
| 481 | $file =~ s/\.res$//; |
605 | $file =~ s/\.res$//; |
| 482 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
606 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
| 483 | |
607 | |
| 484 | substr $dir, 0, 1 + length $PATH, ""; |
608 | substr $dir, 0, 1 + length $PATH, ""; |
| 485 | |
609 | |
|
|
610 | if (my $filter = $meta->{cfutil_filter}) { |
|
|
611 | if ($filter eq "yaml2json") { |
|
|
612 | $data = JSON::XS::encode_json YAML::XS::Load $data; |
|
|
613 | } elsif ($filter eq "json2json") { |
|
|
614 | $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); |
|
|
615 | } elsif ($filter eq "perl2json") { |
|
|
616 | $data = eval $data; die if $@; |
|
|
617 | $data = JSON::XS::encode_json $data; |
|
|
618 | } else { |
|
|
619 | warn "$dir/$file: unknown filter $filter, skipping\n"; |
|
|
620 | } |
|
|
621 | } |
|
|
622 | |
| 486 | $RESOURCE{"$dir/$file"} = { |
623 | $RESOURCE{"$dir/$file"} = { |
| 487 | type => (delete $meta->{type}) || $type, |
624 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
| 488 | data => $data, |
625 | data => $data, |
| 489 | chksum => (Digest::MD5::md5 $data), |
|
|
| 490 | %$meta ? (meta => $meta) : (), |
626 | %$meta ? (meta => $meta) : (), |
| 491 | }; |
627 | }; |
| 492 | } |
628 | } |
| 493 | } |
629 | } |
| 494 | |
630 | |
| … | |
… | |
| 499 | IO::AIO::aioreq_pri 4; |
635 | IO::AIO::aioreq_pri 4; |
| 500 | IO::AIO::aio_scandir $path, 4, sub { |
636 | IO::AIO::aio_scandir $path, 4, sub { |
| 501 | my ($dirs, $nondirs) = @_; |
637 | my ($dirs, $nondirs) = @_; |
| 502 | |
638 | |
| 503 | find_files "$path/$_" |
639 | find_files "$path/$_" |
| 504 | for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; |
640 | for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; |
| 505 | |
641 | |
| 506 | my $dir = $path; |
642 | my $dir = $path; |
| 507 | substr $dir, 0, 1 + length $PATH, ""; |
643 | substr $dir, 0, 1 + length $PATH, ""; |
| 508 | |
644 | |
| 509 | for my $file (@$nondirs) { |
645 | for my $file (@$nondirs) { |
| 510 | if ($dir =~ /^music(?:\/|$)/) { |
646 | if ($dir =~ /^music(?:\/|$)/) { |
| 511 | push @res, [$path, $file, 3] # FT_MUSIC |
647 | $c_res->put ([$path, $file, 3]) # FT_MUSIC |
| 512 | if $file =~ /\.(ogg)$/; |
648 | if $file =~ /\.(ogg)$/; |
| 513 | |
649 | |
| 514 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
650 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
| 515 | push @res, [$path, $file, 5] # FT_SOUND |
651 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
| 516 | if $file =~ /\.(wav|ogg)$/; |
652 | if $file =~ /\.(wav|ogg)$/; |
| 517 | |
653 | |
| 518 | } elsif ($dir =~ /^res(?:\/|$)/) { |
654 | } elsif ($dir =~ /^res(?:\/|$)/) { |
| 519 | push @res, [$path, $file, 0] # FT_FACE |
|
|
| 520 | if $file =~ /\.(jpg|png)$/; |
655 | if ($file =~ /\.(jpg|png)$/) { |
| 521 | push @res, [$path, $file, 7] # FT_RSRC |
656 | $c_res->put ([$path, $file, 0]) # FT_FACE |
| 522 | if $file =~ /\.(res)$/; |
657 | } elsif ($file =~ /\.(res)$/) { |
|
|
658 | $c_res->put ([$path, $file, 6]) # FT_RSRC |
|
|
659 | } else { |
|
|
660 | $c_res->put ([$path, $file, undef]); |
|
|
661 | } |
| 523 | |
662 | |
| 524 | } elsif ($file =~ /\.png$/) { |
663 | } elsif ($file =~ /\.png$/) { |
| 525 | push @png, ["$path/$file", 0]; |
664 | push @c_png, ["$path/$file", 0]; |
| 526 | |
665 | |
| 527 | } elsif ($file =~ /\.trs$/) { |
666 | } elsif ($file =~ /\.trs$/) { |
| 528 | push @trs, [$path, $file]; |
667 | $c_trs->put ([$path, $file]); |
| 529 | |
668 | |
| 530 | } elsif ($file =~ /\.arc$/) { |
669 | } elsif ($file =~ /\.arc$/) { |
| 531 | push @arc, [$path, $file]; |
670 | $c_arc->put ([$path, $file]); |
| 532 | |
671 | |
| 533 | } else { |
672 | } else { |
| 534 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
673 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
| 535 | } |
674 | } |
| 536 | } |
675 | } |
| 537 | }; |
676 | }; |
|
|
677 | } |
|
|
678 | |
|
|
679 | sub generate_plurals { |
|
|
680 | # use Lingua::EN::Inflect (); |
|
|
681 | # Lingua::EN::Inflect::classical; |
|
|
682 | # Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy |
|
|
683 | # Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack |
|
|
684 | # |
|
|
685 | # for my $a (@ARC) { |
|
|
686 | # my $name = $a->{name} || $a->{_name}; |
|
|
687 | # |
|
|
688 | # next unless $a->{name_pl}; |
|
|
689 | # next if $a->{invisible}; |
|
|
690 | # next if $a->{is_floor}; |
|
|
691 | # next if $a->{no_pick}; |
|
|
692 | # |
|
|
693 | # my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name; |
|
|
694 | # my $pl = $test =~ /^(?:eq|p:.)$/ |
|
|
695 | # ? $name |
|
|
696 | # : Lingua::EN::Inflect::PL $name; |
|
|
697 | # |
|
|
698 | # if ($pl ne $a->{name_pl}) { |
|
|
699 | # warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n"; |
|
|
700 | # } |
|
|
701 | # } |
| 538 | } |
702 | } |
| 539 | |
703 | |
| 540 | sub inst_arch($) { |
704 | sub inst_arch($) { |
| 541 | my (undef, $path) = @_; |
705 | my (undef, $path) = @_; |
| 542 | |
706 | |
| … | |
… | |
| 555 | if (!-d "$path/treasures") { |
719 | if (!-d "$path/treasures") { |
| 556 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
720 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
| 557 | exit 1 unless $FORCE; |
721 | exit 1 unless $FORCE; |
| 558 | } |
722 | } |
| 559 | |
723 | |
|
|
724 | print "scanning files...\n" if $VERBOSE; |
|
|
725 | |
| 560 | find_files $path; |
726 | find_files $path; |
|
|
727 | |
|
|
728 | my @a_arc = map +(async \&process_arc), 1..2; |
|
|
729 | my @a_res = map +(async \&process_res), 1..2; |
|
|
730 | my @a_trs = map +(async \&process_trs), 1..2; |
|
|
731 | |
| 561 | IO::AIO::flush; |
732 | IO::AIO::flush; |
| 562 | |
733 | |
| 563 | $_->join for ( |
734 | $c_res->shutdown; |
|
|
735 | $c_arc->shutdown; |
|
|
736 | $c_trs->shutdown; |
|
|
737 | |
|
|
738 | print "start file scan, arc, res processing...\n" if $VERBOSE; |
|
|
739 | |
|
|
740 | $_->join for @a_arc; # need to parse all archetypes before png processing |
|
|
741 | |
|
|
742 | print "end arc, start png processing...\n" if $VERBOSE; |
|
|
743 | |
| 564 | # four png crunchers work fine for my 2x smp machine |
744 | # eight png crunchers work fine for my 4x smp machine |
| 565 | (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), |
745 | my @a_png = map +(async \&process_png), 1..8; |
| 566 | (async \&process_trs), (async \&process_trs), |
|
|
| 567 | (async \&process_arc), (async \&process_arc), |
|
|
| 568 | (async \&process_res), (async \&process_res), |
|
|
| 569 | ); |
|
|
| 570 | |
746 | |
|
|
747 | $_->join for (@a_trs, @a_res, @a_png); |
|
|
748 | |
|
|
749 | print "scanning done, processing results...\n" if $VERBOSE; |
| 571 | { |
750 | { |
| 572 | # remove path prefix from editor_folder |
751 | # remove path prefix from editor_folder |
|
|
752 | $_->{editor_folder} =~ /^\x00/ |
| 573 | substr $_->{editor_folder}, 0, 1 + length $path, "" |
753 | and substr $_->{editor_folder}, 0, 2 + length $path, "" |
| 574 | for values %ARC; |
754 | for values %ARC; |
| 575 | |
755 | |
|
|
756 | print "resolving inheritance tree...\n" if $VERBOSE; |
| 576 | # resolve inherit |
757 | # resolve inherit |
| 577 | while () { |
758 | while () { |
| 578 | my $progress; |
759 | my $progress; |
| 579 | my $loop; |
760 | my $loop; |
| 580 | |
761 | |
| 581 | for my $o (values %ARC) { |
762 | for my $o (values %ARC) { |
| 582 | if (my $other = $o->{inherit}) { |
763 | for my $other (split /,/, $o->{inherit}) { |
| 583 | if (my $s = $ARC{$other}) { |
764 | if (my $s = $ARC{$other}) { |
| 584 | if ($s->{inherit}) { |
765 | if ($s->{inherit}) { |
| 585 | $loop = $s; |
766 | $loop = $s; |
| 586 | } else { |
767 | } else { |
| 587 | delete $o->{inherit}; |
768 | delete $o->{inherit}; |
| … | |
… | |
| 606 | } |
787 | } |
| 607 | |
788 | |
| 608 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
789 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
| 609 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
790 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
| 610 | |
791 | |
|
|
792 | print "generating plurals...\n" if $VERBOSE; |
|
|
793 | generate_plurals; |
|
|
794 | |
|
|
795 | printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; |
| 611 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
796 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
| 612 | or die "$DATADIR/archetypes~: $!"; |
797 | or die "$DATADIR/archetypes~: $!"; |
| 613 | print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
798 | print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
| 614 | } |
799 | } |
| 615 | |
800 | |
| 616 | { |
801 | { |
|
|
802 | printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE; |
| 617 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
803 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
| 618 | or die "$DATADIR/treasures~: $!"; |
804 | or die "$DATADIR/treasures~: $!"; |
| 619 | print $fh $TRS; |
805 | print $fh $TRS; |
| 620 | } |
806 | } |
| 621 | |
807 | |
| 622 | { |
808 | { |
|
|
809 | print "processing facedata...\n" if $VERBOSE; |
| 623 | while (my ($k, $v) = each %FACEINFO) { |
810 | while (my ($k, $v) = each %FACEINFO) { |
| 624 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
811 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
| 625 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
812 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
| 626 | |
813 | |
|
|
814 | make_hash $k, $v->{data32}, $v->{hash32}; |
|
|
815 | make_hash $k, $v->{data64}, $v->{hash64}; |
|
|
816 | |
| 627 | length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
817 | #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
| 628 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
818 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
| 629 | |
819 | |
| 630 | $v->{chksum32} = Digest::MD5::md5 $v->{data32}; |
820 | my $stem = delete $v->{stem}; |
| 631 | $v->{chksum64} = Digest::MD5::md5 $v->{data64}; |
821 | $v->{glyph} //= autoglyph $stem, $v; |
| 632 | |
822 | |
| 633 | if (my $magicmap = $v->{magicmap}) { |
823 | if (my $magicmap = $v->{magicmap}) { |
| 634 | $magicmap =~ y/A-Z_\-/a-z/d; |
824 | $magicmap =~ y/A-Z_\-/a-z/d; |
| 635 | $v->{magicmap} = $COLOR{$magicmap}; |
825 | $v->{magicmap} = $COLOR{$magicmap}; |
| 636 | } |
826 | } |
|
|
827 | |
|
|
828 | delete $v->{arc}; |
|
|
829 | } |
|
|
830 | |
|
|
831 | print "processing resources...\n" if $VERBOSE; |
|
|
832 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
|
|
833 | while (my ($k, $v) = each %RESOURCE) { |
|
|
834 | |
|
|
835 | if ($v->{meta} && $v->{meta}{datadir}) { |
|
|
836 | delete $RESOURCE{$k}; |
|
|
837 | |
|
|
838 | $k =~ s/^res\/// or die "$k: datadir files must be in res/"; |
|
|
839 | |
|
|
840 | printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE; |
|
|
841 | open my $fh, ">:raw", "$DATADIR/$k~" |
|
|
842 | or die "$DATADIR/$k~: $!"; |
|
|
843 | syswrite $fh, $v->{data}; |
|
|
844 | push @COMMIT, $k; |
|
|
845 | |
|
|
846 | } else { |
|
|
847 | if ($v->{type} & 1) { |
|
|
848 | # prepend meta info |
|
|
849 | |
|
|
850 | my $meta = $enc->encode ({ |
|
|
851 | name => $k, |
|
|
852 | %{ $v->{meta} || {} }, |
|
|
853 | }); |
|
|
854 | |
|
|
855 | $v->{data} = pack "(w/a*)*", $meta, $v->{data}; |
|
|
856 | } |
|
|
857 | |
|
|
858 | make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients |
| 637 | } |
859 | } |
|
|
860 | } |
|
|
861 | |
|
|
862 | printf "writing facedata (%d faces, %d anims, %d resources)...\n", |
|
|
863 | scalar keys %FACEINFO, |
|
|
864 | scalar keys %ANIMINFO, |
|
|
865 | scalar keys %RESOURCE |
|
|
866 | if $VERBOSE; |
| 638 | |
867 | |
| 639 | open my $fh, ">:perlio", "$DATADIR/facedata~" |
868 | open my $fh, ">:perlio", "$DATADIR/facedata~" |
| 640 | or die "$DATADIR/facedata~: $!"; |
869 | or die "$DATADIR/facedata~: $!"; |
| 641 | |
870 | |
| 642 | print $fh freeze { |
871 | print $fh nfreeze { |
| 643 | version => 2, |
872 | version => 2, |
| 644 | faceinfo => \%FACEINFO, |
873 | faceinfo => \%FACEINFO, |
| 645 | animinfo => \%ANIMINFO, |
874 | animinfo => \%ANIMINFO, |
| 646 | resource => \%RESOURCE, |
875 | resource => \%RESOURCE, |
| 647 | }; |
876 | }; |
| 648 | } |
|
|
| 649 | |
877 | |
|
|
878 | } |
|
|
879 | |
|
|
880 | print "committing files...\n" if $VERBOSE; |
|
|
881 | |
| 650 | for (qw(archetypes facedata treasures)) { |
882 | for (qw(archetypes facedata treasures), @COMMIT) { |
| 651 | chmod 0644, "$DATADIR/$_~"; |
883 | chmod 0644, "$DATADIR/$_~"; |
| 652 | rename "$DATADIR/$_~", "$DATADIR/$_" |
884 | rename "$DATADIR/$_~", "$DATADIR/$_" |
| 653 | or die "$DATADIR/$_: $!"; |
885 | or die "$DATADIR/$_: $!"; |
| 654 | } |
886 | } |
| 655 | |
887 | |
