[ViewVC] Diff of: cvs/cfmaps/cfmap2html

Comparing cfmaps/cfmap2html (file contents):
Revision 1.29 by root, Thu Jun 21 12:30:10 2007 UTC vs.
Revision 1.39 by root, Thu Jan 14 18:29:03 2010 UTC

 #!/opt/bin/perl
-# cfmap2html - convert crossfire maps to html
+# cfmap2html - convert deliantra maps to html
-# Copyright (C) 2005,2007 Marc Lehmann <cfmaps@schmorp.de>
+# Copyright (C) 2005,2007,2008,2009 Marc Lehmann <cfmaps@schmorp.de>
 #
 # CFMAP2HTML is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # You should have received a copy of the GNU General Public License
 # along with cfmaps; if not, write to the Free Software
 # Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-our $VERSION = '2.001';
+our $VERSION = '2.202';
-use Crossfire 1.0;
+use strict;
+use List::Util qw(min max);
+use Deliantra;
 my $T = 32;
-my $arch;
 sub escape_html($) {
    local $_ = shift;
    s/([<>&])/sprintf "&#%d;", ord $1/ge;
    $_
    if (!-e "$base.png"
        || -M "$base.png" > -M "$base.map") {
       # regenerate png and metainfo
       push @cfmap2png, $path;
+      # force xhtml file to be remade as well
+      utime 1, 1, "$base.xhtml";
-   };
+   }
 }
 system "cfmap2png", @cfmap2png
    if @cfmap2png;
+Deliantra::load_archetypes;
 for my $path (@ARGV) {
    (my $base = $path) =~ s/\.map//;
    if (!-e "$base.xhtml"
        || -M "$base.xhtml" > -M "$base.map") {
-      Crossfire::load_archetypes
-         unless %ARCH;
-      my $meta = read_arch "$base.map";
+      my $meta = eval { read_arch "$base.map" }
+         or next;
+      my $arch = $meta->{arch};
       open my $fh, ">:utf8", "$base.xhtml"
          or die "$base.xhtml: $!";
       select $fh;
-      my $W = $meta->{width}  * $T;
+      my $W = (1 + max map $_->{x}, @$arch);
-      my $H = $meta->{height} * $T;
+      my $H = (1 + max map $_->{y}, @$arch);
+      my $info = shift @$arch;
+      my @map;
+      push @{ $map[$_->{x}][$_->{y}] }, $_
+         for @$arch;
-      my $W2 = $W + 600;
+      my $W2 = $W * $T + 600;
       my (@path) = split /\//, $base;
       print "<?xml version='1.0' encoding='utf-8'?>",
             '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
             "<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en'>",
             "<head>",
-               "<title>Crossfire Map \"$path\"</title>",
+               "<title>Deliantra Map \"$path\"</title>",
                "<link rel='stylesheet' type='text/css' media='all' href='/common.css'/>\n",
                "<link rel='stylesheet' type='text/css' media='all' href='/overlay.css' title='Show Overlays'/>\n",
                "<link rel='alternate stylesheet' type='text/css' media='all' href='/plain.css' title='Hide Overlays'/>\n",
                "<style type='text/css'>\n",
                ".map { width: ${W}px; height: ${H}px; background-image: url($path[-1].png); }\n",
             "</head>",
             "<body>";
       print "<table class='nav'>",
             "<tr class='center'><td class='title' rowspan='3'>",
-            "Crossfire Map<br/>",
+            "Deliantra Map<br/>",
             "<span class='big'>";
       print "<a href='/'>/</a> ";
       for (0 .. $#path - 1) {
          print "<a href='/", (join "/", @path[0..$_]), "/'>$path[$_]</a> / ";
       }
       my @dir = qw(none up right down left);
       my @tile = map {
-         $meta->{info}{"tile_path_$_"}
+         my $path = delete $info->{"tile_path_$_"};
+         $path
-            ? "<a href='$meta->{info}{\"tile_path_$_\"}.xhtml'><img class='tile' src='$meta->{info}{\"tile_path_$_\"}.jpg' alt='$dir[$_]'/></a>"
+            ? "<a href='$path.xhtml'><img class='tile' src='$path.jpg' alt='$dir[$_]'/></a>"
             : ""
       } 1..4;
-      #"}"# vim misparses without this comment
       print "$path[-1]",
             "</span>",
-            "<p class='about'><a href='/about.txt'>[more about cfmaps.schmorp.de]</a></p>",
+            "<p class='about'><a href='/about.txt'>[more about maps.deliantra.net]</a></p>",
             "</td>",
             "<td/><td>$tile[0]</td><td/></tr>",
             "<tr><td>$tile[3]</td>",
-            "<td><img class='thumb' src='@path[-1].jpg' width='$meta->{width}' height='$meta->{height}' alt='map thumbnail'/></td>",
+            "<td><img class='thumb' src='@path[-1].jpg' width='$W' height='$H' alt='map thumbnail'/></td>",
             "<td>$tile[1]</td></tr>",
             "<tr><td/><td>$tile[2]</td><td/></tr>",
             "</table>";
-      my $W1 = $W + 600;
+      my $W1 = $W * $T + 600;
       print "<p class='m'>",
-               escape_html $meta->{info}{msg},
+               escape_html delete $info->{msg},
             "</p>";
+      if (open my $fh, "<", "$base.png.err") {
+         local $/;
+         print "<p class='m'>",
+                  (escape_html scalar <$fh>),
+               "</p>";
+      }
+      print "<table class='i'>",
+               (map "<tr><td>" . (escape_html $_) . "</td><td>" . (escape_html $info->{$_}) . "</td></tr>",
+                    grep !/^_/, keys %$info),
+            "</table>",
+            "<p />";
       print "<table class='map'>";
       my %ignore = map +($_ => 1), qw(name _name _atype x y);
       my %is_exit = map +($_ => 1), 41, 57, 66;
-      for my $y (0.. $meta->{height} - 1) {
+      for my $y (0.. $H - 1) {
          print "<tr>";
-         for my $x (0.. $meta->{width} - 1) {
+         for my $x (0.. $W - 1) {
-             if (my $as = $meta->{map}[$x][$y]) {
+             if (my $as = $map[$x][$y]) {
                 my @class;
-                push @class, "fishy"  if grep $_->{invisible} || $_->{face} || exists $_->{no_pass} || exists $_->{no_pick}, @$as;
+                push @class, "fishy"  if grep exists $_->{invisible}  || exists $_->{face}
+                                           || exists $_->{move_block} || exists $_->{move_allow}
+                                           || exists $_->{no_pick}    || exists $_->{tag}
+                                           , @$as
-                push @class, "exit"   if grep $is_exit{$arch->{$_->{_name}}{type}} && $_->{slaying}, @$as;
+                push @class, "exit"   if grep $is_exit{$ARCH{$_->{_name}}{type}} && $_->{slaying}, @$as;
                 push @class, "dialog" if grep $_->{msg} =~ /^\@match/m, @$as;
                 print "<td", (@class ? " class='" . (join " ", @class) . "'" : ""), ">";
                 print "<div>";
                 print "<div>($x|$y)";
                 sub print_archs {
                    print "<ul>";
-                   for my $a (@{$_[0]}) {
+                   for my $a (reverse @{$_[0]}) {
-                      my $o = $arch->{$a->{_name}};
+                      my $o = $ARCH{$a->{_name}};
                       my $type = $a->{type} || $o->{type};
                       my $aname = escape_html $a->{_name};
                       my $name = escape_html $a->{name} || $o->{name};
                       print "<li><a href='/a/$a->{_name}'>$aname \"$name\"</a>\n";
                          if ($_ eq "slaying" && $is_exit{$type}) { # door, teleporter, player_changer
                             $a->{msg} =~ /^final_map\s*(\S+)\s*$/m, $v = $1
                                if $v eq "/!"; # random map
+                            if ($v =~ s/^\*//) {
+                               print "slaying => <a href='/search?t=$v'>*$v</a>\n";
+                            } else {
-                            print "slaying => <a href='$v.xhtml'>$v</a>\n";
+                               print "slaying => <a href='$v.xhtml'>$v</a>\n";
+                            }
                          } elsif ($_ eq "other_arch") {
                             print "$_ => <a href='/a/$a->{$_}'>$v</a>\n";
                          } elsif ($_ eq "inventory") {
                             print "inventory =>\n";
                             print_archs ($a->{$_});

Diff Legend

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

Comparing cfmaps/cfmap2html (file contents): Revision 1.29 by root, Thu Jun 21 12:30:10 2007 UTC vs. Revision 1.39 by root, Thu Jan 14 18:29:03 2010 UTC

Diff Legend

Comparing cfmaps/cfmap2html (file contents):
Revision 1.29 by root, Thu Jun 21 12:30:10 2007 UTC vs.
Revision 1.39 by root, Thu Jan 14 18:29:03 2010 UTC