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

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.121 by root, Mon Apr 14 00:35:17 2008 UTC vs.
Revision 1.142 by root, Sat May 15 00:30:53 2010 UTC

 =head1 NAME
 Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
+=over 4
 =cut
 package Deliantra;
-our $VERSION = '1.14';
+our $VERSION = '1.30';
-use strict;
+use common::sense;
 use base 'Exporter';
 use Carp ();
 use File::Spec;
    editor_archs arch_extents
 );
 use JSON::XS qw(decode_json encode_json);
-our $LIB = $ENV{DELIANTRA_LIBDIR} || $ENV{CROSSFIRE_LIBDIR};
+our $LIB = $ENV{DELIANTRA_LIBDIR};
-our $OLDDIR = $ENV{HOME}    ? "$ENV{HOME}/.crossfire"
-            : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
-            : File::Spec->tmpdir . "/crossfire";
 our $VARDIR = $ENV{HOME}    ? "$ENV{HOME}/.deliantra"
             : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
             : File::Spec->tmpdir . "/deliantra";
 # 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
+   name attach swap_time reset_timeout fixed_resettime difficulty
+   region music
    shopitems shopgreed shopmin shopmax shoprace
    darkness width height enter_x enter_y msg maplore
    unique template
    outdoor temp pressure humid windspeed winddir sky nosmooth
    tile_path_1 tile_path_2 tile_path_3 tile_path_4
    elevation
    name name_pl custom_name attach title race
    slaying skill msg lore other_arch
-   face animation is_animated
+   sound sound_destroy face animation is_animated
    magicmap smoothlevel smoothface
    str dex con wis pow cha int
    hp maxhp sp maxsp grace maxgrace
    exp perm_exp expmul
    food dam luck wc ac x y speed speed_left move_state attack_movement
    boat     => MOVE_BOAT,
    ship     => MOVE_SHIP,
    all      => MOVE_ALL,
 );
-our @MOVE_TYPE = keys %MOVE_TYPE;
+our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
 {
    package Deliantra::MoveType;
    use overload
       '='  => sub { bless [@{$_[0]}], ref $_[0] },
       '""' => \&as_string,
       '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
+      '<=' => sub {
+         ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
+            ? $_[0][1] & $MOVE_TYPE{$_[1]}
+            : undef
+      },
       '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |=  $MOVE_TYPE{$_[1]}; &normalise },
       '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
       '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
-      'x=' => sub {
+      'x=' => sub { # toggle between off, + and -
          my $cur = $_[0] >= $_[1];
          if (!defined $cur) {
             if ($_[0] >= "all") {
                $_[0] -= $_[1];
             } else {
          $_[0]
       },
       'eq' => sub { "$_[0]" eq "$_[1]" },
       'ne' => sub { "$_[0]" ne "$_[1]" },
    ;
+   sub TO_JSON {
+      $_[0][0]
+   }
 }
 sub Deliantra::MoveType::new {
    my ($class, $string) = @_;
 # object as in "Object xxx", i.e. archetypes
 sub normalize_object($) {
    my ($ob) = @_;
+   delete $ob->{editable}; # deprecated
    # convert material bitset to materialname, if possible
    if (exists $ob->{material}) {
       if (!$ob->{material}) {
          delete $ob->{material};
       } elsif (exists $ob->{materialname}) {
       $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
    }
    # convert outdated movement flags to new movement sets
    if (defined (my $v = delete $ob->{no_pass})) {
-      $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
+      $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
    }
    if (defined (my $v = delete $ob->{slow_move})) {
       $ob->{move_slow} += "walk";
       $ob->{move_slow_penalty} = $v;
    }
    if (defined (my $v = delete $ob->{walk_on})) {
-      $ob->{move_on}   ||= new Deliantra::MoveType; if ($v) { $ob->{move_on}  += "walk"     } else { $ob->{move_on}   -= "walk"    }
+      $ob->{move_on}   ||= new Deliantra::MoveType; if ($v) { $ob->{move_on}   += "walk"    } else { $ob->{move_on}   -= "walk"    }
    }
    if (defined (my $v = delete $ob->{walk_off})) {
       $ob->{move_off}  ||= new Deliantra::MoveType; if ($v) { $ob->{move_off}  += "walk"    } else { $ob->{move_off}  -= "walk"    }
    }
    if (defined (my $v = delete $ob->{fly_on})) {
 # arch as in "arch xxx", ie.. objects
 sub normalize_arch($) {
    my ($ob) = @_;
    normalize_object $ob;
+   return if $ob->{_atype} eq "object";
    my $arch = $ARCH{$ob->{_name}}
       or (warn "$ob->{_name}: no such archetype", return $ob);
    if ($arch->{type} == 22) { # map
    my %arc;
    my ($more, $prev);
    my $comment;
-   open my $fh, "<:raw:perlio:utf8", $path
+   open my $fh, "<:utf8", $path
       or Carp::croak "$path: $!";
 #  binmode $fh;
    my $parse_block; $parse_block = sub {
       } else {
          $root = $Deliantra::Data::TYPE{Misc};
       }
    }
+   my (%ignore);
    my @import = ($root);
-   unshift @import, \%Deliantra::Data::DEFAULT_ATTR
-      unless $type == 116;
-   my (%ignore);
+   my @new_import;
-   my (@section_order, %section, @attr_order);
    while (my $type = shift @import) {
+      # first import everything we will need:
       push @import,
          grep $_,
             map $Deliantra::Data::TYPE{$_},
                @{$type->{import} || []};
+      # and compute the ignored attributes
+      for (@{$type->{ignore} || []}) {
+         $ignore{$_}++ for ref $_ ? @$_ : $_;
+      }
+      push @new_import, $type;
+   }
+   (@import) = @new_import;
+   # then add defaults to the back of the list, so they are added
+   # as last resort.
+   push @import, \%Deliantra::Data::DEFAULT_ATTR
+      unless $type == 116;
+   my (@section_order, %section, @attr_order);
+   # @import = root, imported, default
+   while (my $type = pop @import) {
       $attr->{$_} ||= $type->{$_}
          for qw(name desc use);
-      for (@{$type->{ignore} || []}) {
-         $ignore{$_}++ for ref $_ ? @$_ : $_;
-      }
       for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
          my ($name, $attr) = @$_;
          push @section_order, $name;
          for (@$attr) {
             my ($k, $v) = @$_;
             push @attr_order, $k;
-            $section{$name}{$k} ||= $v;
+            $section{$name}{$k} = $v; # overwrite, so that the root decides
-         }
-      }
+         }
+      }
+   }
+   # remove ignores for "root" type
+   for (
+      map @{$_->[1]}, # section attributes
+        [general => ($root->{attr} || [])],
+        @{$root->{section} || []}
+   ) {
+      my ($k, $v) = @$_;
+      # skip fixed attributes, if they are ignored thats fine
+      next if $v->{type} eq 'fixed';
+      delete $ignore{$k}; # if the attributes are defined explicitly they
+                          # should NOT be ignored. ignore should mainly
+                          # hit imported/inherited attributes.
    }
    $attr->{section} = [
       map !exists $section{$_} ? () : do {
             my $attr = delete $section{$_};
                map exists $attr->{$_} && !$ignore{$_}
                       ? [$_ => delete $attr->{$_}] : (),
                    @attr_order
             ]
          },
          exists $section{$_} ? [$_ => delete $section{$_}] : (),
          @section_order
    ];
    $attr
 }
          \%cache
       };
 }
+=back
 =head1 AUTHOR
  Marc Lehmann <schmorp@schmorp.de>
  http://home.schmorp.de/

Diff Legend

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

Comparing deliantra/Deliantra/Deliantra.pm (file contents): Revision 1.121 by root, Mon Apr 14 00:35:17 2008 UTC vs. Revision 1.142 by root, Sat May 15 00:30:53 2010 UTC

Diff Legend

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.121 by root, Mon Apr 14 00:35:17 2008 UTC vs.
Revision 1.142 by root, Sat May 15 00:30:53 2010 UTC