ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cfmaps/cfmap2html
(Generate patch)

Comparing cfmaps/cfmap2html (file contents):
Revision 1.35 by root, Thu Oct 22 03:02:00 2009 UTC vs.
Revision 1.40 by root, Tue Apr 6 04:13:51 2010 UTC

… …
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the GNU General Public License
17# along with cfmaps; if not, write to the Free Software 17# along with cfmaps; if not, write to the Free Software
18# Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 18# Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 19
20our $VERSION = '2.122'; 20our $VERSION = '2.202';
21 21
22use strict; 22use common::sense;
23 23
24use List::Util qw(min max); 24use List::Util qw(min max);
25use Deliantra; 25use Deliantra;
26 26
27my $T = 32; 27my $T = 32;
… …
40 40
41 if (!-e "$base.png" 41 if (!-e "$base.png"
42 || -M "$base.png" > -M "$base.map") { 42 || -M "$base.png" > -M "$base.map") {
43 # regenerate png and metainfo 43 # regenerate png and metainfo
44 push @cfmap2png, $path; 44 push @cfmap2png, $path;
45 # force xhtml file to be remade as well
46 utime 1, 1, "$base.xhtml";
45 } 47 }
46} 48}
47 49
48system "cfmap2png", @cfmap2png 50system "cfmap2png", @cfmap2png
49 if @cfmap2png; 51 if @cfmap2png;
52
53Deliantra::load_archetypes;
50 54
51for my $path (@ARGV) { 55for my $path (@ARGV) {
52 (my $base = $path) =~ s/\.map//; 56 (my $base = $path) =~ s/\.map//;
53 if (!-e "$base.xhtml" 57 if (!-e "$base.xhtml"
54 || -M "$base.xhtml" > -M "$base.map") { 58 || -M "$base.xhtml" > -M "$base.map") {
55 59
56 Deliantra::load_archetypes
57 unless %ARCH;
58
59 my $meta = read_arch "$base.map"; 60 my $meta = eval { read_arch "$base.map" }
61 or next;
60 my $arch = $meta->{arch}; 62 my $arch = $meta->{arch};
61 63
62 open my $fh, ">:utf8", "$base.xhtml" 64 open my $fh, ">:utf8", "$base.xhtml"
63 or die "$base.xhtml: $!"; 65 or die "$base.xhtml: $!";
64 66
… …
148 print "<tr>"; 150 print "<tr>";
149 for my $x (0.. $W - 1) { 151 for my $x (0.. $W - 1) {
150 if (my $as = $map[$x][$y]) { 152 if (my $as = $map[$x][$y]) {
151 my @class; 153 my @class;
152 154
153 push @class, "fishy" if grep $_->{invisible} || $_->{face} || exists $_->{no_pass} || exists $_->{no_pick}, @$as; 155 push @class, "fishy" if grep exists $_->{invisible} || exists $_->{face}
156 || exists $_->{move_block} || exists $_->{move_allow}
157 || exists $_->{no_pick} || exists $_->{tag}
158 , @$as;
154 push @class, "exit" if grep $is_exit{$ARCH{$_->{_name}}{type}} && $_->{slaying}, @$as; 159 push @class, "exit" if grep $is_exit{$ARCH{$_->{_name}}{type}} && $_->{slaying}, @$as;
155 push @class, "dialog" if grep $_->{msg} =~ /^\@match/m, @$as; 160 push @class, "dialog" if grep $_->{msg} =~ /^\@match/m, @$as;
156 161
157 print "<td", (@class ? " class='" . (join " ", @class) . "'" : ""), ">"; 162 print "<td", (@class ? " class='" . (join " ", @class) . "'" : ""), ">";
158 print "<div>"; 163 print "<div>";
… …
178 183
179 if ($_ eq "slaying" && $is_exit{$type}) { # door, teleporter, player_changer 184 if ($_ eq "slaying" && $is_exit{$type}) { # door, teleporter, player_changer
180 $a->{msg} =~ /^final_map\s*(\S+)\s*$/m, $v = $1 185 $a->{msg} =~ /^final_map\s*(\S+)\s*$/m, $v = $1
181 if $v eq "/!"; # random map 186 if $v eq "/!"; # random map
182 187
188 if ($v =~ s/^\*//) {
189 print "slaying => <a href='/search?t=$v'>*$v</a>\n";
190 } else {
183 print "slaying => <a href='$v.xhtml'>$v</a>\n"; 191 print "slaying => <a href='$v.xhtml'>$v</a>\n";
192 }
184 } elsif ($_ eq "other_arch") { 193 } elsif ($_ eq "other_arch") {
185 print "$_ => <a href='/a/$a->{$_}'>$v</a>\n"; 194 print "$_ => <a href='/a/$a->{$_}'>$v</a>\n";
186 } elsif ($_ eq "inventory") { 195 } elsif ($_ eq "inventory") {
187 print "inventory =>\n"; 196 print "inventory =>\n";
188 print_archs ($a->{$_}); 197 print_archs ($a->{$_});

Diff Legend

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