… | |
… | |
20 | # <http://www.gnu.org/licenses/>. |
20 | # <http://www.gnu.org/licenses/>. |
21 | # |
21 | # |
22 | # The authors can be reached via e-mail to <support@deliantra.net> |
22 | # The authors can be reached via e-mail to <support@deliantra.net> |
23 | # |
23 | # |
24 | |
24 | |
25 | use strict; |
25 | use common::sense; |
26 | |
26 | |
27 | my $prefix = "@prefix@"; |
27 | my $prefix = "@prefix@"; |
28 | my $exec_prefix = "@exec_prefix@"; |
28 | my $exec_prefix = "@exec_prefix@"; |
29 | my $datarootdir = "@datarootdir@"; |
29 | my $datarootdir = "@datarootdir@"; |
30 | my $DATADIR = "@datadir@/@PACKAGE@"; |
30 | my $DATADIR = "@datadir@/@PACKAGE@"; |
… | |
… | |
74 | my $VERBOSE = 1; |
74 | my $VERBOSE = 1; |
75 | my $CACHE = 0; |
75 | my $CACHE = 0; |
76 | my $FORCE; |
76 | my $FORCE; |
77 | my $TMPDIR = "/tmp/cfutil$$~"; |
77 | my $TMPDIR = "/tmp/cfutil$$~"; |
78 | my $TMPFILE = "aaaa0"; |
78 | my $TMPFILE = "aaaa0"; |
|
|
79 | my @COMMIT; |
79 | |
80 | |
80 | our %COLOR = ( |
81 | our %COLOR = ( |
81 | black => 0, |
82 | black => 0, |
82 | white => 1, |
83 | white => 1, |
83 | navy => 2, |
84 | navy => 2, |
… | |
… | |
105 | my ($id, $dataref, $hashref, $clen) = @_; |
106 | my ($id, $dataref, $hashref, $clen) = @_; |
106 | |
107 | |
107 | my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; |
108 | my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; |
108 | |
109 | |
109 | if (exists $hash{$hash}) { |
110 | if (exists $hash{$hash}) { |
110 | # hahs collinion, but some files are simply identical |
111 | # hash collision, but some files are simply identical |
111 | if (${$hash{$hash}[1]} ne $$dataref) { |
112 | if (${$hash{$hash}[1]} ne $$dataref) { |
112 | warn "hash collision $hash{$hash}[0] vs. $id\n"; |
113 | warn "hash collision $hash{$hash}[0] vs. $id\n"; |
113 | exit 1; |
114 | exit 1; |
114 | } else { |
115 | } else { |
115 | print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; |
116 | print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; |
… | |
… | |
155 | and die "map installation failed.\n"; |
156 | and die "map installation failed.\n"; |
156 | |
157 | |
157 | print "maps installed successfully.\n"; |
158 | print "maps installed successfully.\n"; |
158 | } |
159 | } |
159 | |
160 | |
|
|
161 | our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋); |
|
|
162 | |
|
|
163 | # used to create crude text glyphs for text-based clients |
|
|
164 | sub autoglyph { |
|
|
165 | my ($stem, $face) = @_; |
|
|
166 | |
|
|
167 | if ($stem =~ /^wall\/|Nimwall/) { |
|
|
168 | return $WALL_SUFFIX[hex $1] |
|
|
169 | if $stem =~ /(_[0-9A-F]).x11/; |
|
|
170 | |
|
|
171 | "█" |
|
|
172 | |
|
|
173 | } elsif ($stem =~ /^traps\//) { |
|
|
174 | "☠" |
|
|
175 | |
|
|
176 | } elsif ($stem =~ /^armour\//) { |
|
|
177 | "☗" |
|
|
178 | |
|
|
179 | } elsif ($stem =~ /^weapon\//) { |
|
|
180 | "†" |
|
|
181 | |
|
|
182 | } elsif ($stem =~ /^readable\//) { |
|
|
183 | "✉" |
|
|
184 | |
|
|
185 | } elsif ($stem =~ /^river\//) { |
|
|
186 | "⌇" |
|
|
187 | |
|
|
188 | } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) { |
|
|
189 | "." |
|
|
190 | |
|
|
191 | } elsif ($stem =~ /^player\//) { |
|
|
192 | "\@" |
|
|
193 | |
|
|
194 | } elsif ($stem =~ /^(?:monster|misc|class|connect|gods|indoor|inorganic|mining|music|skills).*\/(.)/) { |
|
|
195 | $1 |
|
|
196 | |
|
|
197 | } else { |
|
|
198 | substr $stem, 0, 1 |
|
|
199 | } |
|
|
200 | } |
|
|
201 | |
160 | { |
202 | { |
161 | our %ANIMINFO; |
203 | our %ANIMINFO; |
162 | our %FACEINFO; |
204 | our %FACEINFO; |
163 | our %RESOURCE; |
205 | our %RESOURCE; |
164 | our @ARC; |
206 | our @ARC; |
… | |
… | |
173 | our $c_trs = new Coro::Channel; |
215 | our $c_trs = new Coro::Channel; |
174 | our $c_res = new Coro::Channel; |
216 | our $c_res = new Coro::Channel; |
175 | |
217 | |
176 | our @c_png; |
218 | our @c_png; |
177 | |
219 | |
178 | sub commit_png($$$) { |
220 | sub commit_png($$$$) { |
179 | my ($name, $data, $T) = @_; |
221 | my ($stem, $name, $data, $T) = @_; |
180 | |
222 | |
|
|
223 | $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH; |
181 | $FACEINFO{$name}{"data$T"} = $data; |
224 | $FACEINFO{$name}{"data$T"} = $data; |
182 | } |
225 | } |
183 | |
226 | |
184 | sub process_png { |
227 | sub process_png { |
185 | while (@c_png) { |
228 | while (@c_png) { |
… | |
… | |
403 | |
446 | |
404 | if (0 > aio_load $file, $tile) { |
447 | if (0 > aio_load $file, $tile) { |
405 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
448 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
406 | } |
449 | } |
407 | IO::AIO::aio_unlink $file unless $CACHE; |
450 | IO::AIO::aio_unlink $file unless $CACHE; |
408 | commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; |
451 | commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T; |
409 | } |
452 | } |
410 | } else { |
453 | } else { |
411 | # use as-is (either small, use smooth) |
454 | # use as-is (either small, use smooth) |
412 | commit_png $face, $png, $T; |
455 | commit_png $stem, $face, $png, $T; |
413 | } |
456 | } |
414 | |
457 | |
415 | aio_unlink $path if $delete; |
458 | aio_unlink $path if $delete; |
416 | } |
459 | } |
417 | } |
460 | } |
… | |
… | |
432 | |
475 | |
433 | $o->{editor_folder} ||= "\x00$dir"; # horrible kludge |
476 | $o->{editor_folder} ||= "\x00$dir"; # horrible kludge |
434 | |
477 | |
435 | my $visibility = delete $o->{visibility}; |
478 | my $visibility = delete $o->{visibility}; |
436 | my $magicmap = delete $o->{magicmap}; |
479 | my $magicmap = delete $o->{magicmap}; |
|
|
480 | my $glyph = delete $o->{glyph}; |
437 | |
481 | |
438 | # find upper left corner :/ |
482 | # find upper left corner :/ |
439 | # omg, this is sooo broken |
483 | # omg, this is sooo broken |
440 | my ($dx, $dy); |
484 | my ($dx, $dy); |
441 | for (my $o = $o; $o; $o = $o->{more}) { |
485 | for (my $o = $o; $o; $o = $o->{more}) { |
… | |
… | |
451 | |
495 | |
452 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
496 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
453 | |
497 | |
454 | $visibility = delete $o->{visibility} if exists $o->{visibility}; |
498 | $visibility = delete $o->{visibility} if exists $o->{visibility}; |
455 | $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
499 | $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
|
|
500 | $glyph = delete $o->{glyph} if exists $o->{glyph}; |
456 | |
501 | |
457 | my $anim = delete $o->{anim}; |
502 | my $anim = delete $o->{anim}; |
458 | |
503 | |
459 | if ($anim) { |
504 | if ($anim) { |
460 | # possibly add $ext to the animation name to avoid |
505 | # possibly add $ext to the animation name to avoid |
… | |
… | |
491 | |
536 | |
492 | next if $face =~ /^blank.x11$|^empty.x11$/; |
537 | next if $face =~ /^blank.x11$|^empty.x11$/; |
493 | |
538 | |
494 | $info->{visibility} = $visibility if defined $visibility; |
539 | $info->{visibility} = $visibility if defined $visibility; |
495 | $info->{magicmap} = $magicmap if defined $magicmap; |
540 | $info->{magicmap} = $magicmap if defined $magicmap; |
|
|
541 | $info->{glyph} = $glyph if defined $glyph; |
496 | } |
542 | } |
497 | |
543 | |
498 | if (my $smooth = delete $o->{smoothface}) { |
544 | if (my $smooth = delete $o->{smoothface}) { |
499 | my %kv = split /\s+/, $smooth; |
545 | my %kv = split /\s+/, $smooth; |
500 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
546 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
… | |
… | |
569 | if ($meta->{license} =~ s/^#//) { |
615 | if ($meta->{license} =~ s/^#//) { |
570 | $meta->{license} = ({ |
616 | $meta->{license} = ({ |
571 | "pd" => "Public Domain", |
617 | "pd" => "Public Domain", |
572 | "gpl" => "GNU General Public License, version 3.0 or any later", |
618 | "gpl" => "GNU General Public License, version 3.0 or any later", |
573 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
619 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
|
|
620 | "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", |
574 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
621 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
575 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
622 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
576 | })->{$meta->{license}} |
623 | })->{$meta->{license}} |
577 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
624 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
|
|
625 | } |
|
|
626 | |
|
|
627 | if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { |
|
|
628 | ($meta->{author} = $1) =~ s/_/ /g; |
578 | } |
629 | } |
579 | |
630 | |
580 | $file =~ s/\.res$//; |
631 | $file =~ s/\.res$//; |
581 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
632 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
582 | |
633 | |
… | |
… | |
610 | IO::AIO::aioreq_pri 4; |
661 | IO::AIO::aioreq_pri 4; |
611 | IO::AIO::aio_scandir $path, 4, sub { |
662 | IO::AIO::aio_scandir $path, 4, sub { |
612 | my ($dirs, $nondirs) = @_; |
663 | my ($dirs, $nondirs) = @_; |
613 | |
664 | |
614 | find_files "$path/$_" |
665 | find_files "$path/$_" |
615 | for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; |
666 | for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; |
616 | |
667 | |
617 | my $dir = $path; |
668 | my $dir = $path; |
618 | substr $dir, 0, 1 + length $PATH, ""; |
669 | substr $dir, 0, 1 + length $PATH, ""; |
619 | |
670 | |
620 | for my $file (@$nondirs) { |
671 | for my $file (@$nondirs) { |
… | |
… | |
733 | while () { |
784 | while () { |
734 | my $progress; |
785 | my $progress; |
735 | my $loop; |
786 | my $loop; |
736 | |
787 | |
737 | for my $o (values %ARC) { |
788 | for my $o (values %ARC) { |
738 | if (my $other = $o->{inherit}) { |
789 | for my $other (split /,/, $o->{inherit}) { |
739 | if (my $s = $ARC{$other}) { |
790 | if (my $s = $ARC{$other}) { |
740 | if ($s->{inherit}) { |
791 | if ($s->{inherit}) { |
741 | $loop = $s; |
792 | $loop = $s; |
742 | } else { |
793 | } else { |
743 | delete $o->{inherit}; |
794 | delete $o->{inherit}; |
… | |
… | |
795 | if (my $magicmap = $v->{magicmap}) { |
846 | if (my $magicmap = $v->{magicmap}) { |
796 | $magicmap =~ y/A-Z_\-/a-z/d; |
847 | $magicmap =~ y/A-Z_\-/a-z/d; |
797 | $v->{magicmap} = $COLOR{$magicmap}; |
848 | $v->{magicmap} = $COLOR{$magicmap}; |
798 | } |
849 | } |
799 | |
850 | |
|
|
851 | my $stem = delete $v->{stem}; |
|
|
852 | $v->{glyph} //= autoglyph $stem, $v; |
|
|
853 | utf8::encode $v->{glyph}; |
|
|
854 | $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph}; |
|
|
855 | |
800 | delete $v->{arc}; |
856 | delete $v->{arc}; |
801 | } |
857 | } |
802 | |
858 | |
803 | print "processing resources...\n" if $VERBOSE; |
859 | print "processing resources...\n" if $VERBOSE; |
804 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
860 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
805 | while (my ($k, $v) = each %RESOURCE) { |
861 | while (my ($k, $v) = each %RESOURCE) { |
806 | |
862 | |
|
|
863 | if ($v->{meta} && $v->{meta}{datadir}) { |
|
|
864 | delete $RESOURCE{$k}; |
|
|
865 | |
|
|
866 | $k =~ s/^res\/// or die "$k: datadir files must be in res/"; |
|
|
867 | |
|
|
868 | printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE; |
|
|
869 | open my $fh, ">:raw", "$DATADIR/$k~" |
|
|
870 | or die "$DATADIR/$k~: $!"; |
|
|
871 | syswrite $fh, $v->{data}; |
|
|
872 | push @COMMIT, $k; |
|
|
873 | |
|
|
874 | } else { |
807 | if ($v->{type} & 1) { |
875 | if ($v->{type} & 1) { |
808 | # prepend meta info |
876 | # prepend meta info |
809 | |
877 | |
810 | my $meta = $enc->encode ({ |
878 | my $meta = $enc->encode ({ |
811 | name => $k, |
879 | name => $k, |
812 | %{ $v->{meta} || {} }, |
880 | %{ $v->{meta} || {} }, |
813 | }); |
881 | }); |
814 | |
882 | |
815 | $v->{data} = pack "(w/a*)*", $meta, $v->{data}; |
883 | $v->{data} = pack "(w/a*)*", $meta, $v->{data}; |
816 | } |
884 | } |
817 | |
885 | |
818 | make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients |
886 | make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients |
|
|
887 | } |
819 | } |
888 | } |
820 | |
889 | |
821 | printf "writing facedata (%d faces, %d anims, %d resources)...\n", |
890 | printf "writing facedata (%d faces, %d anims, %d resources)...\n", |
822 | scalar keys %FACEINFO, |
891 | scalar keys %FACEINFO, |
823 | scalar keys %ANIMINFO, |
892 | scalar keys %ANIMINFO, |
… | |
… | |
825 | if $VERBOSE; |
894 | if $VERBOSE; |
826 | |
895 | |
827 | open my $fh, ">:perlio", "$DATADIR/facedata~" |
896 | open my $fh, ">:perlio", "$DATADIR/facedata~" |
828 | or die "$DATADIR/facedata~: $!"; |
897 | or die "$DATADIR/facedata~: $!"; |
829 | |
898 | |
830 | print $fh freeze { |
899 | print $fh nfreeze { |
831 | version => 2, |
900 | version => 2, |
832 | faceinfo => \%FACEINFO, |
901 | faceinfo => \%FACEINFO, |
833 | animinfo => \%ANIMINFO, |
902 | animinfo => \%ANIMINFO, |
834 | resource => \%RESOURCE, |
903 | resource => \%RESOURCE, |
835 | }; |
904 | }; |
836 | |
905 | |
837 | } |
906 | } |
838 | |
907 | |
839 | print "committing files...\n" if $VERBOSE; |
908 | print "committing files...\n" if $VERBOSE; |
840 | |
909 | |
841 | for (qw(archetypes facedata treasures)) { |
910 | for (qw(archetypes facedata treasures), @COMMIT) { |
842 | chmod 0644, "$DATADIR/$_~"; |
911 | chmod 0644, "$DATADIR/$_~"; |
843 | rename "$DATADIR/$_~", "$DATADIR/$_" |
912 | rename "$DATADIR/$_~", "$DATADIR/$_" |
844 | or die "$DATADIR/$_: $!"; |
913 | or die "$DATADIR/$_: $!"; |
845 | } |
914 | } |
846 | |
915 | |