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

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.136 by elmex, Mon Nov 9 15:25:35 2009 UTC vs.
Revision 1.141 by root, Mon Mar 22 00:58:17 2010 UTC

 =cut
 package Deliantra;
-our $VERSION = '1.25';
+our $VERSION = '1.30';
 use common::sense;
 use base 'Exporter';
             : 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 {
       } 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
 }

Diff Legend

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

Comparing deliantra/Deliantra/Deliantra.pm (file contents): Revision 1.136 by elmex, Mon Nov 9 15:25:35 2009 UTC vs. Revision 1.141 by root, Mon Mar 22 00:58:17 2010 UTC

Diff Legend

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.136 by elmex, Mon Nov 9 15:25:35 2009 UTC vs.
Revision 1.141 by root, Mon Mar 22 00:58:17 2010 UTC