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.13 by root, Mon Mar 12 17:33:12 2007 UTC vs.
Revision 1.44 by root, Tue Jul 24 04:55:35 2007 UTC

… …
6my $exec_prefix = "@exec_prefix@"; 6my $exec_prefix = "@exec_prefix@";
7my $datarootdir = "@datarootdir@"; 7my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 8my $DATADIR = "@datadir@/@PACKAGE@";
9 9
10my $CONVERT = "@CONVERT@"; 10my $CONVERT = "@CONVERT@";
11my $IDENTIFY = "@IDENTIFY@"; 11#my $IDENTIFY = "@IDENTIFY@";
12my $OPTIPNG = "@OPTIPNG@"; 12my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 13my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@";
14 15
15use Getopt::Long; 16use Getopt::Long;
16use Coro::Event; 17use Coro::Event;
17use AnyEvent; 18use AnyEvent;
18use IO::AIO (); 19use IO::AIO ();
… …
20use Crossfire; 21use Crossfire;
21use Coro; 22use Coro;
22use Coro::AIO; 23use Coro::AIO;
23use POSIX (); 24use POSIX ();
24use Digest::MD5; 25use Digest::MD5;
26use Carp;
27use Coro::Storable; $Storable::canonical = 1;
28
29$SIG{QUIT} = sub { Carp::cluck "QUIT" };
25 30
26sub usage { 31sub usage {
27 warn <<EOF; 32 warn <<EOF;
28Usage: cfutil [-v] [-q] [--force] [--cache] 33Usage: cfutil [-v] [-q] [--force] [--cache]
29 [--install-arch path] 34 [--install-arch path]
… …
41my $CACHE = 0; 46my $CACHE = 0;
42my $FORCE; 47my $FORCE;
43my $TMPDIR = "/tmp/cfutil$$~"; 48my $TMPDIR = "/tmp/cfutil$$~";
44my $TMPFILE = "aaaa0"; 49my $TMPFILE = "aaaa0";
45 50
51our %COLOR = (
52 black => 0,
53 white => 1,
54 navy => 2,
55 red => 3,
56 orange => 4,
57 blue => 5,
58 darkorange => 6,
59 green => 7,
60 lightgreen => 8,
61 grey => 9,
62 brown => 10,
63 gold => 11,
64 tan => 12,
65);
66
46END { system "rm", "-rf", $TMPDIR } 67END { system "rm", "-rf", $TMPDIR }
47 68
48Event->signal (signal => "INT", cb => sub { exit 1 }); 69Event->signal (signal => "INT", cb => sub { exit 1 });
49Event->signal (signal => "TERM", cb => sub { exit 1 }); 70Event->signal (signal => "TERM", cb => sub { exit 1 });
50 71
… …
67} 88}
68 89
69sub inst_maps($) { 90sub inst_maps($) {
70 my (undef, $path) = @_; 91 my (undef, $path) = @_;
71 92
72 print "installing '$path' to '$DATADIR/maps'\n"; 93 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
73 94
74 if (!-f "$path/regions") { 95 if (!-f "$path/regions") {
75 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 96 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
76 exit 1 unless $FORCE; 97 exit 1 unless $FORCE;
77 } 98 }
78 99
79 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 100 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
80 or die "map installation failed.\n"; 101 and die "map installation failed.\n";
81 102
82 print "maps installed successfully.\n"; 103 print "maps installed successfully.\n";
83} 104}
84 105
85{ 106{
86 our %PNG32; 107 our %ANIMINFO;
87 our %FACEINFO; 108 our %FACEINFO;
109 our %RESOURCE;
88 our @ARC; 110 our @ARC;
111 our %ARC;
89 our $TRS; 112 our $TRS;
90 our $NFILE; 113 our $NFILE;
91 our %ANIM;
92 our $SMOOTH; 114 our $PATH;
93 115
116 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
117
94 our (@png, @trs, @arc); # files we are interested in 118 our (@png, @trs, @arc, @res); # files we are interested in
95 119
96 sub commit_png { 120 sub commit_png($$$) {
97 my ($name, $data) = @_; 121 my ($name, $data, $T) = @_;
98 122
99 $PNG32{$name} = $data; 123 $FACEINFO{$name}{"data$T"} = $data;
100 $FACEINFO{$name} ||= {};
101 } 124 }
102 125
103 sub process_png { 126 sub process_png {
104 while (@png) { 127 while (@png) {
105 my $path = pop @png; 128 my ($path, $delete) = @{pop @png};
106 129
107 my $png; 130 my $png;
108 aio_lstat $path; 131 aio_lstat $path;
109 my ($size, $mtime) = (stat _)[7,9]; 132 my ($size, $mtime) = (stat _)[7,9];
110 133
111 if (0 > aio_load $path, $png) { 134 if (0 > aio_load $path, $png) {
112 warn "$path: $!, skipping.\n"; 135 warn "$path: $!, skipping.\n";
113 next; 136 next;
114 } 137 }
115 138
139 my $stem = $path;
140 my $T;
141
142 if ($stem =~ s/\.32x32\.png~?$//) {
143 $T = 32;
144 } elsif ($stem =~ s/\.64x64\.png~?$//) {
145 $T = 64;
146 } else {
147 warn "$path: weird filename, skipping.\n";
148 next;
149 }
150
116 # quickly extract width and height of the (necessarily PNG) image 151 # quickly extract width and height of the (necessarily PNG) image
117 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 152 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
118 warn "$path: not a recongized png file, skipping.\n"; 153 warn "$path: not a recognized png file, skipping.\n";
119 next; 154 next;
120 } 155 }
121 156
122 my ($w, $h) = unpack "NN", $1; 157 my ($w, $h) = unpack "NN", $1;
123
124 (my $face = $path) =~ s/^.*\///;
125 my $T = 32;
126
127 unless ($face =~ s/\.base\.(...)\.png$/.$1/) {
128 warn "$path: weird filename, skipping.\n";
129 next;
130 }
131 158
132 if ($w < $T || $h < $T) { 159 if ($w < $T || $h < $T) {
133 warn "$path: too small ($w $h), skipping.\n"; 160 warn "$path: too small ($w $h), skipping.\n";
134 next; 161 next;
135 } 162 }
… …
137 if ($w % $T || $h % $T) { 164 if ($w % $T || $h % $T) {
138 warn "$path: weird png size ($w $h), skipping.\n"; 165 warn "$path: weird png size ($w $h), skipping.\n";
139 next; 166 next;
140 } 167 }
141 168
169 unless ($path =~ /~$/) {
170 # possibly enlarge
171 if (0 > aio_stat "$stem.64x64.png") {
172 my $other = "$stem.64x64.png~";
173
174 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
175 my $wrap = 0; # for the time being
176 fork_sub {
177 system "convert png:\Q$path\E -depth 8 rgba:-"
178 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap"
179 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~"
180 and die "convert/hq2xa pipeline error: status $? ($!)";
181 system $OPTIPNG, "-i0", "-q", "$other~";
182 die "$other~ has zero size, aborting." unless -s "$other~";
183 rename "$other~", $other;
184 };
185 }
186
187 push @png, [$other, !$CACHE];
188 }
189
190 # possibly scale down
191 if (0 > aio_stat "$stem.32x32.png") {
192 my $other = "$stem.32x32.png~";
193
194 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
195 fork_sub {
196 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
197 system $OPTIPNG, "-i0", "-q", "$other~";
198
199 # reduce smoothfaces >10000 bytes
200 if ($stem =~ /_S\./ && (-s "$other~") > 10000) {
201 my $ncolor = 256;
202 while () {
203 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
204 system $OPTIPNG, "-i0", "-q", "$other~~";
205 last if 10000 > -s "$other~~";
206 $ncolor = int $ncolor * 0.9;
207 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
208 }
209
210 printf "reduced %s from %d to %d bytes using %d colours.\n",
211 $other, -s "$other~", -s "$other~~", $ncolor
212 if $VERBOSE >= 2;
213 rename "$other~~", "$other~";
214 }
215
216 die "$other~ has zero size, aborting." unless -s "$other~";
217 rename "$other~", $other;
218 };
219 }
220
221 #warn "scaled down $path to $other\n";#d#
222 push @png, [$other, !$CACHE];
223 }
224 }
225
226 (my $face = $stem) =~ s/^.*\///;
227
228 # split all bigfaces, but avoid smoothfaces (*_S)
142 if (($w > $T || $h > $T) && $face !~ /_S\./) { 229 if (($w > $T || $h > $T) && $face !~ /_S\./) {
143 # split 230 # split
144 my @tile; 231 my @tile;
145 for my $x (0 .. (int $w / $T) - 1) { 232 for my $x (0 .. (int $w / $T) - 1) {
146 for my $y (0 .. (int $h / $T) - 1) { 233 for my $y (0 .. (int $h / $T) - 1) {
… …
160 ( 247 (
161 "(", 248 "(",
162 "+clone", 249 "+clone",
163 -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T), 250 -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T),
164 "+repage", 251 "+repage",
252 -quality => "00",
165 -write => "png:$_->[2]~", 253 -write => "png32:$_->[2]~",
166 "+delete", 254 "+delete",
167 ")", 255 ")",
168 ) 256 )
169 } @todo), 257 } @todo),
170 "null:"; 258 "null:";
… …
174 close $convert; 262 close $convert;
175 263
176 # pass 2, optimise, and rename 264 # pass 2, optimise, and rename
177 for (@todo) { 265 for (@todo) {
178 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 266 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
267 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
179 rename "$_->[2]~", $_->[2]; 268 rename "$_->[2]~", $_->[2];
180 } 269 }
181 }; 270 };
182 } 271 }
183 272
… …
187 276
188 if (0 > aio_load $file, $tile) { 277 if (0 > aio_load $file, $tile) {
189 die "$path: unable to read tile +$x+$y, aborting.\n"; 278 die "$path: unable to read tile +$x+$y, aborting.\n";
190 } 279 }
191 IO::AIO::aio_unlink $file unless $CACHE; 280 IO::AIO::aio_unlink $file unless $CACHE;
192 commit_png $x|$y ? "$face+$x+$y" : $face, $tile; 281 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T;
193 } 282 }
194 } else { 283 } else {
195 # use as-is (either small, use smooth) 284 # use as-is (either small, use smooth)
196 commit_png $face, $png; 285 commit_png $face, $png, $T;
197 } 286 }
287
288 aio_unlink $path if $delete;
198 } 289 }
199 } 290 }
200 291
201 sub process_arc { 292 sub process_arc {
202 while (@arc) { 293 while (@arc) {
… …
206 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 297 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
207 298
208 my $arc = read_arch "$dir/$file"; 299 my $arc = read_arch "$dir/$file";
209 for my $o (values %$arc) { 300 for my $o (values %$arc) {
210 push @ARC, $o; 301 push @ARC, $o;
302 for (my $m = $o; $m; $m = $m->{more}) {
303 $ARC{$m->{_name}} = $m;
304 }
211 305
212 $o->{editor_folder} = $dir; 306 $o->{editor_folder} = $dir;
213 307
214 my $visibility = delete $o->{visibility}; 308 my $visibility = delete $o->{visibility};
215 my $magicmap = delete $o->{magicmap}; 309 my $magicmap = delete $o->{magicmap};
… …
226 my $x = $o->{x} - $dx; 320 my $x = $o->{x} - $dx;
227 my $y = $o->{y} - $dy; 321 my $y = $o->{y} - $dy;
228 322
229 my $ext = $x|$y ? "+$x+$y" : ""; 323 my $ext = $x|$y ? "+$x+$y" : "";
230 324
231 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/; 325 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
232 326
233 my $visibility = delete $o->{visibility} if exists $o->{visibility}; 327 $visibility = delete $o->{visibility} if exists $o->{visibility};
234 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 328 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
235 329
236 my $anim = delete $o->{anim}; 330 my $anim = delete $o->{anim};
237 331
238 if ($anim) { 332 if ($anim) {
333 # possibly add $ext to the animation name to avoid
334 # the need to specify archnames for all parts
335 # of a multipart archetype.
239 $o->{animation} = "$o->{_name}"; 336 $o->{animation} = "$o->{_name}";
337 my $facings = 1;
338 my @frames;
240 339
241 for (@$anim) { 340 for (@$anim) {
242 $_ .= $ext unless /^facings\s|^blank.x11$|^empty.x11$/; 341 if (/^facings\s+(\d+)/) {
342 $facings = $1*1;
343 } elsif (/^blank.x11$|^empty.x11$/) {
344 push @frames, $_;
345 } else {
346 push @frames, "$_$ext";
347 }
243 } 348 }
244 349
245 $ANIM{"$o->{_name}$ext"} = 350 $ANIMINFO{$o->{animation}} = {
246 join "", map "$_\n", 351 facings => $facings,
247 "anim $o->{_name}", 352 frames => \@frames,
248 @$anim, 353 };
249 "mina";
250 } 354 }
251 355
252 for my $face ($o->{face} || (), @{$anim || []}) { 356 for my $face ($o->{face} || (), @{$anim || []}) {
253 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 357 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
254 358
… …
257 $info->{visibility} = $visibility if defined $visibility; 361 $info->{visibility} = $visibility if defined $visibility;
258 $info->{magicmap} = $magicmap if defined $magicmap; 362 $info->{magicmap} = $magicmap if defined $magicmap;
259 } 363 }
260 364
261 if (my $smooth = delete $o->{smoothface}) { 365 if (my $smooth = delete $o->{smoothface}) {
262 $SMOOTH .= "$smooth\n"; 366 my %kv =split /\s+/, $smooth;
367 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
368 while (my ($face, $smooth) = each %kv) {
369 $FACEINFO{$face}{smooth} = $smooth;
370 $FACEINFO{$face}{smoothlevel} = $level;
371 }
263 } 372 }
264 } 373 }
265 } 374 }
266 } 375 }
267 } 376 }
… …
279 388
280 $TRS .= $trs; 389 $TRS .= $trs;
281 } 390 }
282 } 391 }
283 392
393 sub process_res {
394 while (@res) {
395 my ($dir, $file, $type) = @{pop @res};
396
397 my $data;
398 aio_load "$dir/$file", $data;
399
400 my $copyright;
401 aio_load "$dir/copyright", $copyright;
402
403 $file =~ s/\.res$//;
404 $file =~ /\.([^.]+)$/
405 or next;
406
407 substr $dir, 0, 1 + length $PATH, "";
408
409 $RESOURCE{"$dir/$file"} = {
410 type => $type,
411 copyright => $copyright,
412 data => $data,
413 chksum => Digest::MD5::md5 $data,
414 };
415 }
416 }
417
284 sub find_files; 418 sub find_files;
285 sub find_files { 419 sub find_files {
286 my ($path) = @_; 420 my ($path) = @_;
287 421
288 IO::AIO::aioreq_pri 4; 422 IO::AIO::aioreq_pri 4;
… …
290 my ($dirs, $nondirs) = @_; 424 my ($dirs, $nondirs) = @_;
291 425
292 find_files "$path/$_" 426 find_files "$path/$_"
293 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 427 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
294 428
429 my $dir = $path;
430 substr $dir, 0, 1 + length $PATH, "";
431
295 for my $file (@$nondirs) { 432 for my $file (@$nondirs) {
433 if ($dir =~ /^music(?:\/|$)/) {
434 push @res, [$path, $file, 3] # FT_MUSIC
435 if $file =~ /\.(ogg)$/;
436
437 } elsif ($dir =~ /^sounds(?:\/|$)/) {
438 push @res, [$path, $file, 5] # FT_SOUND
439 if $file =~ /\.(wav|ogg)$/;
440
441 } elsif ($dir =~ /^res(?:\/|$)/) {
442 push @res, [$path, $file, 0] # FT_FACE
443 if $file =~ /\.(jpg|png)$/;
444 push @res, [$path, $file, 7] # FT_RSRC
445 if $file =~ /\.(res)$/;
446
296 if ($file =~ /\.png$/) { 447 } elsif ($file =~ /\.png$/) {
297 push @png, "$path/$file"; 448 push @png, ["$path/$file", 0];
449
298 } elsif ($file =~ /\.trs$/) { 450 } elsif ($file =~ /\.trs$/) {
299 push @trs, [$path, $file]; 451 push @trs, [$path, $file];
452
300 } elsif ($file =~ /\.arc$/) { 453 } elsif ($file =~ /\.arc$/) {
301 push @arc, [$path, $file]; 454 push @arc, [$path, $file];
455
302 } else { 456 } else {
303 warn "ignoring $path/$file\n" if $VERBOSE >= 2; 457 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
304 } 458 }
305 } 459 }
306 }; 460 };
307 } 461 }
308 462
309 sub inst_arch($) { 463 sub inst_arch($) {
310 my (undef, $path) = @_; 464 my (undef, $path) = @_;
311 465
466 $PATH = $path;
467
468 print "\n",
312 print "installing '$path' to '$DATADIR'\n"; 469 "Installing '$path' to '$DATADIR'\n",
470 "\n",
471 "This can take a long time if you run this\n",
472 "for the first time or do not use --cache.\n",
473 "\n",
474 "Unless you run verbosely, all following warning\n",
475 "or error messages indicate serious problems.\n",
476 "\n";
313 477
314 if (!-d "$path/treasures") { 478 if (!-d "$path/treasures") {
315 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 479 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
316 exit 1 unless $FORCE; 480 exit 1 unless $FORCE;
317 } 481 }
318 482
319 find_files $path; 483 find_files $path;
320 IO::AIO::flush; 484 IO::AIO::flush;
321 485
322 $_->join for ( 486 $_->join for (
323 (async \&process_png), (async \&process_png), 487 # four png crunchers work fine for my 2x smp machine
488 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),
324 (async \&process_trs), (async \&process_trs), 489 (async \&process_trs), (async \&process_trs),
325 (async \&process_arc), (async \&process_arc), 490 (async \&process_arc), (async \&process_arc),
491 (async \&process_res), (async \&process_res),
326 ); 492 );
327 493
328 { 494 {
329 open my $fh, ">:utf8", "$DATADIR/animations~" 495 # remove path prefix from editor_folder
330 or die "$DATADIR/animations~: $!"; 496 substr $_->{editor_folder}, 0, 1 + length $path, ""
331 print $fh join "", map $ANIM{$_}, sort keys %ANIM 497 for values %ARC;
498
499 # resolve inherit
500 while () {
501 my $progress;
502 my $loop;
503
504 for my $o (values %ARC) {
505 if (my $other = $o->{inherit}) {
506 if (my $s = $ARC{$other}) {
507 if ($s->{inherit}) {
508 $loop = $s;
509 } else {
510 delete $o->{inherit};
511 my %s = %$s;
512 delete @s{qw(_name more name name_pl)};
513 %$o = ( %s, %$o );
514 ++$progress;
515 }
516 } else {
517 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
518 delete $ARC{$o->{_name}};
519 }
520 }
521 }
522
523 unless ($progress) {
524 die "inheritance loop detected starting at archetype '$loop->{_name}', aborting.\n"
525 if $loop;
526
527 last;
528 }
332 } 529 }
333 530
334 { 531 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
532 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
533
335 open my $fh, ">:utf8", "$DATADIR/archetypes~" 534 open my $fh, ">:utf8", "$DATADIR/archetypes~"
336 or die "$DATADIR/archetypes~: $!"; 535 or die "$DATADIR/archetypes~: $!";
337 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC; 536 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
338 print $fh Crossfire::archlist_to_string \@ARC;
339 }
340
341 {
342 open my $fh, ">:utf8", "$DATADIR/smooth~"
343 or die "$DATADIR/smooth~: $!";
344 print $fh $SMOOTH;
345 } 537 }
346 538
347 { 539 {
348 open my $fh, ">:utf8", "$DATADIR/treasures~" 540 open my $fh, ">:utf8", "$DATADIR/treasures~"
349 or die "$DATADIR/treasures~: $!"; 541 or die "$DATADIR/treasures~: $!";
350 print $fh $TRS; 542 print $fh $TRS;
351 } 543 }
352 544
353 { 545 {
354 while (my ($k, $v) = each %FACEINFO) { 546 while (my ($k, $v) = each %FACEINFO) {
355 $v->{data32} ||= delete $PNG32{$k};
356 }
357
358 while (my ($k, $v) = each %FACEINFO) {
359 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 547 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
548 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
549
550 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
551 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
360 552
361 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 553 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
554 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
555
556 if (my $magicmap = $v->{magicmap}) {
557 $magicmap =~ y/A-Z_\-/a-z/d;
558 $v->{magicmap} = $COLOR{$magicmap};
362 } 559 }
560 }
363 561
364 open my $fh, ">:perlio", "$DATADIR/faces~" 562 open my $fh, ">:perlio", "$DATADIR/facedata~"
365 or die "$DATADIR/faces~: $!"; 563 or die "$DATADIR/facedata~: $!";
366 564
367 print $fh Storable::nfreeze \%FACEINFO; 565 print $fh freeze {
566 version => 2,
567 faceinfo => \%FACEINFO,
568 animinfo => \%ANIMINFO,
569 resource => \%RESOURCE,
368 } 570 };
571 }
369 572
370 for (qw(archetypes faces animations treasures smooth)) { 573 for (qw(archetypes facedata treasures)) {
371 chmod 0644, "$DATADIR/$_~"; 574 chmod 0644, "$DATADIR/$_~";
372 rename "$DATADIR/$_~", "$DATADIR/$_" 575 rename "$DATADIR/$_~", "$DATADIR/$_"
373 or die "$DATADIR/$_: $!"; 576 or die "$DATADIR/$_: $!";
374 } 577 }
375 578

Diff Legend

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