ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra/Deliantra.pm
(Generate patch)

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.133 by root, Wed Oct 28 08:51:27 2009 UTC vs.
Revision 1.142 by root, Sat May 15 00:30:53 2010 UTC

1=head1 NAME 1=head1 NAME
2 2
3Deliantra - Deliantra suppport module to read/write archetypes, maps etc. 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4 4
5=over 4
6
5=cut 7=cut
6 8
7package Deliantra; 9package Deliantra;
8 10
9our $VERSION = '1.25'; 11our $VERSION = '1.30';
10 12
11use common::sense; 13use common::sense;
12 14
13use base 'Exporter'; 15use base 'Exporter';
14 16
… …
54 56
55# same as in server save routine, to (hopefully) be compatible 57# same as in server save routine, to (hopefully) be compatible
56# to the other editors. 58# to the other editors.
57our @FIELD_ORDER_MAP = (qw( 59our @FIELD_ORDER_MAP = (qw(
58 file_format_version 60 file_format_version
59 name attach swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty
62 region music
60 shopitems shopgreed shopmin shopmax shoprace 63 shopitems shopgreed shopmin shopmax shoprace
61 darkness width height enter_x enter_y msg maplore 64 darkness width height enter_x enter_y msg maplore
62 unique template 65 unique template
63 outdoor temp pressure humid windspeed winddir sky nosmooth 66 outdoor temp pressure humid windspeed winddir sky nosmooth
64 tile_path_1 tile_path_2 tile_path_3 tile_path_4 67 tile_path_1 tile_path_2 tile_path_3 tile_path_4
… …
160 163
161 use overload 164 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 165 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string, 166 '""' => \&as_string,
164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 167 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
168 '<=' => sub {
169 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
170 ? $_[0][1] & $MOVE_TYPE{$_[1]}
171 : undef
172 },
165 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, 173 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
166 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 174 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 175 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub { 176 'x=' => sub { # toggle between off, + and -
169 my $cur = $_[0] >= $_[1]; 177 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) { 178 if (!defined $cur) {
171 if ($_[0] >= "all") { 179 if ($_[0] >= "all") {
172 $_[0] -= $_[1]; 180 $_[0] -= $_[1];
173 } else { 181 } else {
… …
337 345
338# object as in "Object xxx", i.e. archetypes 346# object as in "Object xxx", i.e. archetypes
339sub normalize_object($) { 347sub normalize_object($) {
340 my ($ob) = @_; 348 my ($ob) = @_;
341 349
350 delete $ob->{editable}; # deprecated
351
342 # convert material bitset to materialname, if possible 352 # convert material bitset to materialname, if possible
343 if (exists $ob->{material}) { 353 if (exists $ob->{material}) {
344 if (!$ob->{material}) { 354 if (!$ob->{material}) {
345 delete $ob->{material}; 355 delete $ob->{material};
346 } elsif (exists $ob->{materialname}) { 356 } elsif (exists $ob->{materialname}) {
… …
805 } else { 815 } else {
806 $root = $Deliantra::Data::TYPE{Misc}; 816 $root = $Deliantra::Data::TYPE{Misc};
807 } 817 }
808 } 818 }
809 819
820 my (%ignore);
810 my @import = ($root); 821 my @import = ($root);
811
812 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
813 unless $type == 116;
814 822
815 my (%ignore); 823 my @new_import;
816 my (@section_order, %section, @attr_order);
817
818 while (my $type = shift @import) { 824 while (my $type = shift @import) {
825 # first import everything we will need:
819 push @import, 826 push @import,
820 grep $_, 827 grep $_,
821 map $Deliantra::Data::TYPE{$_}, 828 map $Deliantra::Data::TYPE{$_},
822 @{$type->{import} || []}; 829 @{$type->{import} || []};
823 830
831 # and compute the ignored attributes
832 for (@{$type->{ignore} || []}) {
833 $ignore{$_}++ for ref $_ ? @$_ : $_;
834 }
835
836 push @new_import, $type;
837 }
838 (@import) = @new_import;
839
840 # then add defaults to the back of the list, so they are added
841 # as last resort.
842 push @import, \%Deliantra::Data::DEFAULT_ATTR
843 unless $type == 116;
844
845 my (@section_order, %section, @attr_order);
846
847 # @import = root, imported, default
848 while (my $type = pop @import) {
824 $attr->{$_} ||= $type->{$_} 849 $attr->{$_} ||= $type->{$_}
825 for qw(name desc use); 850 for qw(name desc use);
826
827 for (@{$type->{ignore} || []}) {
828 $ignore{$_}++ for ref $_ ? @$_ : $_;
829 }
830 851
831 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 852 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
832 my ($name, $attr) = @$_; 853 my ($name, $attr) = @$_;
833 push @section_order, $name; 854 push @section_order, $name;
834 for (@$attr) { 855 for (@$attr) {
835 my ($k, $v) = @$_; 856 my ($k, $v) = @$_;
836 push @attr_order, $k; 857 push @attr_order, $k;
837 $section{$name}{$k} ||= $v; 858 $section{$name}{$k} = $v; # overwrite, so that the root decides
838 }
839 } 859 }
860 }
861 }
862
863 # remove ignores for "root" type
864 for (
865 map @{$_->[1]}, # section attributes
866 [general => ($root->{attr} || [])],
867 @{$root->{section} || []}
868 ) {
869 my ($k, $v) = @$_;
870 # skip fixed attributes, if they are ignored thats fine
871 next if $v->{type} eq 'fixed';
872
873 delete $ignore{$k}; # if the attributes are defined explicitly they
874 # should NOT be ignored. ignore should mainly
875 # hit imported/inherited attributes.
840 } 876 }
841 877
842 $attr->{section} = [ 878 $attr->{section} = [
843 map !exists $section{$_} ? () : do { 879 map !exists $section{$_} ? () : do {
844 my $attr = delete $section{$_}; 880 my $attr = delete $section{$_};
… …
848 map exists $attr->{$_} && !$ignore{$_} 884 map exists $attr->{$_} && !$ignore{$_}
849 ? [$_ => delete $attr->{$_}] : (), 885 ? [$_ => delete $attr->{$_}] : (),
850 @attr_order 886 @attr_order
851 ] 887 ]
852 }, 888 },
853
854 exists $section{$_} ? [$_ => delete $section{$_}] : (), 889 exists $section{$_} ? [$_ => delete $section{$_}] : (),
855 @section_order 890 @section_order
856 ]; 891 ];
857 892
858 $attr 893 $attr
859} 894}
… …
987 1022
988 \%cache 1023 \%cache
989 }; 1024 };
990} 1025}
991 1026
1027=back
1028
992=head1 AUTHOR 1029=head1 AUTHOR
993 1030
994 Marc Lehmann <schmorp@schmorp.de> 1031 Marc Lehmann <schmorp@schmorp.de>
995 http://home.schmorp.de/ 1032 http://home.schmorp.de/
996 1033

Diff Legend

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