[ViewVC] Diff of: cvs/deliantra/Deliantra/Deliantra.pm

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.80 by root, Tue Feb 6 22:08:14 2007 UTC vs.
Revision 1.89 by root, Tue Feb 27 23:29:59 2007 UTC

    qw(move_type move_block move_allow move_on move_off move_slow);
 # same as in server save routine, to (hopefully) be compatible
 # to the other editors.
 our @FIELD_ORDER_MAP = (qw(
+   file_format_version
    name attach swap_time reset_timeout fixed_resettime difficulty region
    shopitems shopgreed shopmin shopmax shoprace
    darkness width height enter_x enter_y msg maplore
    unique template
    outdoor temp pressure humid windspeed winddir sky nosmooth
    while (my ($k, $v) = each %attack_mask) {
       $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
    }
 }
+my %MATERIAL = reverse
+ paper      =>    1,
+ iron       =>    2,
+ glass      =>    4,
+ leather    =>    8,
+ wood       =>   16,
+ organic    =>   32,
+ stone      =>   64,
+ cloth      =>  128,
+ adamant    =>  256,
+ liquid     =>  512,
+ tin        => 1024,
+ bone       => 2048,
+ ice        => 4096,
+ # guesses
+ runestone  =>   12,
+ bronze     =>   18,
+ "ancient wood" => 20,
+ glass      =>   36,
+ marble     =>   66,
+ ice        =>   68,
+ stone      =>   70,
+ stone      =>   80,
+ cloth      =>  136,
+ ironwood   =>  144,
+ adamantium =>  258,
+ glacium    =>  260,
+ blood      =>  544,
+;
 # object as in "Object xxx", i.e. archetypes
 sub normalize_object($) {
    my ($ob) = @_;
+   # convert material bitset to materialname, if possible
+   if (exists $ob->{material}) {
+      if (!$ob->{material}) {
+         delete $ob->{material};
+      } elsif (exists $ob->{materialname}) {
+         if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
+            delete $ob->{material};
+         } else {
+            warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
+            delete $ob->{material}; # assume materilname is more specific and nuke material
+         }
+      } elsif (my $name = $MATERIAL{$ob->{material}}) {
+         delete $ob->{material};
+         $ob->{materialname} = $name;
+      } else {
+         warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
+      }
+   }
    # nuke outdated or never supported fields
    delete @$ob{qw(
       can_knockback can_parry can_impale can_cut can_dam_armour
       can_apply pass_thru can_pass_thru
    if (defined (my $v = delete $ob->{slow_move})) {
       $ob->{move_slow} |= MOVE_WALK;
       $ob->{move_slow_penalty} = $v;
    }
    if (defined (my $v = delete $ob->{walk_on})) {
-      $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
+      $ob->{move_on} = 0 unless exists $ob->{move_on};
       $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
                           : $ob->{move_on} & ~MOVE_WALK;
    }
    if (defined (my $v = delete $ob->{walk_off})) {
-      $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
+      $ob->{move_off} = 0 unless exists $ob->{move_off};
       $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
                            : $ob->{move_off} & ~MOVE_WALK;
    }
    if (defined (my $v = delete $ob->{fly_on})) {
-      $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
+      $ob->{move_on} = 0 unless exists $ob->{move_on};
       $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
                           : $ob->{move_on} & ~MOVE_FLY_LOW;
    }
    if (defined (my $v = delete $ob->{fly_off})) {
-      $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
+      $ob->{move_off} = 0 unless exists $ob->{move_off};
       $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
                            : $ob->{move_off} & ~MOVE_FLY_LOW;
    }
    if (defined (my $v = delete $ob->{flying})) {
-      $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
+      $ob->{move_type} = 0 unless exists $ob->{move_type};
       $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
                             : $ob->{move_type} & ~MOVE_FLY_LOW;
    }
    # convert idiotic event_xxx things into objects
                push @{ $arc{anim} }, $_;
             }
          } elsif (/^(\S+)\s*(.*)$/) {
             $arc{lc $1} = $2;
          } elsif (/^\s*#/) {
-            $arc{_comment} .= $_;
+            $arc{_comment} .= "$_\n";
          } elsif (/^\s*$/) {
             #
          } else {
             warn "$path: unparsable line '$_' in arch $arc{_name}";
    while (<$fh>) {
       s/\s+$//;
       if (/^more$/i) {
          $more = $prev;
-      } elsif (/^\s*#/) {
-         $comment .= $_;
       } elsif (/^object (\S+)$/i) {
          my $name = $1;
          my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
+         undef $comment;
          delete $arc{_comment} unless length $arc{_comment};
          $arc->{_atype} = 'object';
          if ($more) {
             $more->{more} = $arc;
          $prev = $arc;
          $more = undef;
       } elsif (/^arch (\S+)$/i) {
          my $name = $1;
          my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
+         undef $comment;
          delete $arc{_comment} unless length $arc{_comment};
          $arc->{_atype} = 'arch';
          if ($more) {
             $more->{more} = $arc;
                push @{$toplevel->{lev_array}}, $_+0;
             }
          } else {
             $toplevel->{$1} = $2;
          }
+      } elsif (/^\s*#/) {
+         $comment .= "$_\n";
       } elsif (/^\s*($|#)/) {
          #
       } else {
          die "$path: unparseable top-level line '$_'";
       }
       if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
          $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
                              | (delete $a{attack_movement_bits_4_7});
       }
+      if (my $comment = delete $a{_comment}) {
+         if ($comment =~ /[^\n\s#]/) {
+            $str .= $comment;
+         }
+      }
       $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
-      my $inv = delete $a{inventory};
+      my $inv  = delete $a{inventory};
       my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
       my $anim = delete $a{anim};
+      if ($a{_atype} eq 'object') {
+         $str .= join "\n", "anim", @$anim, "mina\n"
+            if $anim;
+      }
       my @kv;
       for ($a{_name} eq "map"
            ? @Crossfire::FIELD_ORDER_MAP
       if ($inv) {
          $append->($_) for @$inv;
       }
+      $str .= "end\n";
       if ($a{_atype} eq 'object') {
-         $str .= join "\n", "anim", @$anim, "mina\n"
+         if ($more) {
-            if $anim;
-      }
-      $str .= "end\n";
-      if (($a{_atype} eq 'object') && $more) {
-         $str .= "\nmore\n";
+            $str .= "more\n";
-         $append->($more) if $more;
+            $append->($more) if $more;
+         } else {
+            $str .= "\n";
+         }
       }
    };
    for (@$arch) {
       $append->($_);
    ];
    $attr
 }
-sub arch_edit_sections {
-#      if (edit_type == IGUIConstants.TILE_EDIT_NONE)
-#           edit_type = 0;
-#       else if (edit_type != 0) {
-#           // all flags from 'check_type' must be unset in this arch because they get recalculated now
-#           edit_type &= ~check_type;
-#       }
-#
-#       }
-#       if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
-#           getAttributeValue("alive", defarch) == 1 &&
-#           (getAttributeValue("monster", defarch) == 1 ||
-#           getAttributeValue("generator", defarch) == 1)) {
-#           // Monster: monsters/npcs/generators
-#           edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
-#       }
-#       if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
-#           arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
-#           // Walls
-#           edit_type |= IGUIConstants.TILE_EDIT_WALL;
-#       }
-#       if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
-#           getAttributeValue("connected", defarch) != 0) {
-#           // Connected Objects
-#           edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
-#       }
-#       if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
-#           arch_type == 66 || arch_type == 41 || arch_type == 95) {
-#           // Exit: teleporter/exit/trapdoors
-#           edit_type |= IGUIConstants.TILE_EDIT_EXIT;
-#       }
-#       if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
-#           getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
-#           arch_type == 5 || arch_type == 36 || arch_type == 60 ||
-#           arch_type == 85 || arch_type == 111 || arch_type == 123 ||
-#           arch_type == 124 || arch_type == 130)) {
-#           // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
-#           edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
-#       }
-#       if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
-#           arch_type == 20 || arch_type == 23 || arch_type == 26 ||
-#           arch_type == 91 || arch_type == 21 || arch_type == 24) {
-#       // Door: door/special door/gates  + keys
-#       edit_type |= IGUIConstants.TILE_EDIT_DOOR;
-#       }
-#       if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
-#           getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
-#           arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
-#           arch_type == 35 || arch_type == 39 || arch_type == 70 ||
-#           arch_type == 87 || arch_type == 99 || arch_type == 100 ||
-#           arch_type == 104 || arch_type == 109 || arch_type == 113 ||
-#           arch_type == 122 || arch_type == 3)) {
-#           // Equipment: weapons/armour/wands/rods
-#           edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
-#       }
-#
-#       return(edit_type);
-#
-#
-}
 sub cache_file($$&&) {
    my ($src, $cache, $load, $create) = @_;
    my ($size, $mtime) = (stat $src)[7,9]
       or Carp::croak "$src: $!";

Diff Legend

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

Comparing deliantra/Deliantra/Deliantra.pm (file contents): Revision 1.80 by root, Tue Feb 6 22:08:14 2007 UTC vs. Revision 1.89 by root, Tue Feb 27 23:29:59 2007 UTC

Diff Legend

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.80 by root, Tue Feb 6 22:08:14 2007 UTC vs.
Revision 1.89 by root, Tue Feb 27 23:29:59 2007 UTC