1 | =head1 NAME |
1 | =head1 NAME |
2 | |
2 | |
3 | Deliantra - Deliantra suppport module to read/write archetypes, maps etc. |
3 | Deliantra - Deliantra suppport module to read/write archetypes, maps etc. |
4 | |
4 | |
|
|
5 | =over 4 |
|
|
6 | |
5 | =cut |
7 | =cut |
6 | |
8 | |
7 | package Deliantra; |
9 | package Deliantra; |
8 | |
10 | |
9 | our $VERSION = '1.23'; |
11 | our $VERSION = '1.29'; |
10 | |
12 | |
11 | use strict; |
13 | use common::sense; |
12 | |
14 | |
13 | use base 'Exporter'; |
15 | use base 'Exporter'; |
14 | |
16 | |
15 | use Carp (); |
17 | use Carp (); |
16 | use File::Spec; |
18 | use File::Spec; |
… | |
… | |
151 | boat => MOVE_BOAT, |
153 | boat => MOVE_BOAT, |
152 | ship => MOVE_SHIP, |
154 | ship => MOVE_SHIP, |
153 | all => MOVE_ALL, |
155 | all => MOVE_ALL, |
154 | ); |
156 | ); |
155 | |
157 | |
156 | our @MOVE_TYPE = keys %MOVE_TYPE; |
158 | our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship); |
157 | |
159 | |
158 | { |
160 | { |
159 | package Deliantra::MoveType; |
161 | package Deliantra::MoveType; |
160 | |
162 | |
161 | use overload |
163 | use overload |
162 | '=' => sub { bless [@{$_[0]}], ref $_[0] }, |
164 | '=' => sub { bless [@{$_[0]}], ref $_[0] }, |
163 | '""' => \&as_string, |
165 | '""' => \&as_string, |
164 | '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, |
166 | '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, |
|
|
167 | '<=' => sub { |
|
|
168 | ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]} |
|
|
169 | ? $_[0][1] & $MOVE_TYPE{$_[1]} |
|
|
170 | : undef |
|
|
171 | }, |
165 | '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, |
172 | '+=' => 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 }, |
173 | '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise }, |
167 | '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, |
174 | '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, |
168 | 'x=' => sub { |
175 | 'x=' => sub { # toggle between off, + and - |
169 | my $cur = $_[0] >= $_[1]; |
176 | my $cur = $_[0] >= $_[1]; |
170 | if (!defined $cur) { |
177 | if (!defined $cur) { |
171 | if ($_[0] >= "all") { |
178 | if ($_[0] >= "all") { |
172 | $_[0] -= $_[1]; |
179 | $_[0] -= $_[1]; |
173 | } else { |
180 | } else { |
… | |
… | |
337 | |
344 | |
338 | # object as in "Object xxx", i.e. archetypes |
345 | # object as in "Object xxx", i.e. archetypes |
339 | sub normalize_object($) { |
346 | sub normalize_object($) { |
340 | my ($ob) = @_; |
347 | my ($ob) = @_; |
341 | |
348 | |
|
|
349 | delete $ob->{editable}; # deprecated |
|
|
350 | |
342 | # convert material bitset to materialname, if possible |
351 | # convert material bitset to materialname, if possible |
343 | if (exists $ob->{material}) { |
352 | if (exists $ob->{material}) { |
344 | if (!$ob->{material}) { |
353 | if (!$ob->{material}) { |
345 | delete $ob->{material}; |
354 | delete $ob->{material}; |
346 | } elsif (exists $ob->{materialname}) { |
355 | } elsif (exists $ob->{materialname}) { |
… | |
… | |
389 | $ob->{$attr} = new Deliantra::MoveType $ob->{$attr}; |
398 | $ob->{$attr} = new Deliantra::MoveType $ob->{$attr}; |
390 | } |
399 | } |
391 | |
400 | |
392 | # convert outdated movement flags to new movement sets |
401 | # convert outdated movement flags to new movement sets |
393 | if (defined (my $v = delete $ob->{no_pass})) { |
402 | if (defined (my $v = delete $ob->{no_pass})) { |
394 | $ob->{move_block} = new Deliantra::MoveType $v ? "all" : ""; |
403 | $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0"; |
395 | } |
404 | } |
396 | if (defined (my $v = delete $ob->{slow_move})) { |
405 | if (defined (my $v = delete $ob->{slow_move})) { |
397 | $ob->{move_slow} += "walk"; |
406 | $ob->{move_slow} += "walk"; |
398 | $ob->{move_slow_penalty} = $v; |
407 | $ob->{move_slow_penalty} = $v; |
399 | } |
408 | } |
400 | if (defined (my $v = delete $ob->{walk_on})) { |
409 | if (defined (my $v = delete $ob->{walk_on})) { |
401 | $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } |
410 | $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } |
402 | } |
411 | } |
403 | if (defined (my $v = delete $ob->{walk_off})) { |
412 | if (defined (my $v = delete $ob->{walk_off})) { |
404 | $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } |
413 | $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } |
405 | } |
414 | } |
406 | if (defined (my $v = delete $ob->{fly_on})) { |
415 | if (defined (my $v = delete $ob->{fly_on})) { |
… | |
… | |
806 | $root = $Deliantra::Data::TYPE{Misc}; |
815 | $root = $Deliantra::Data::TYPE{Misc}; |
807 | } |
816 | } |
808 | } |
817 | } |
809 | |
818 | |
810 | my @import = ($root); |
819 | my @import = ($root); |
811 | |
820 | |
812 | unshift @import, \%Deliantra::Data::DEFAULT_ATTR |
821 | unshift @import, \%Deliantra::Data::DEFAULT_ATTR |
813 | unless $type == 116; |
822 | unless $type == 116; |
814 | |
823 | |
815 | my (%ignore); |
824 | my (%ignore); |
816 | my (@section_order, %section, @attr_order); |
825 | my (@section_order, %section, @attr_order); |
… | |
… | |
837 | $section{$name}{$k} ||= $v; |
846 | $section{$name}{$k} ||= $v; |
838 | } |
847 | } |
839 | } |
848 | } |
840 | } |
849 | } |
841 | |
850 | |
|
|
851 | # remove ignores for "root" type |
|
|
852 | for (map @{$_->[1]}, # section attributes |
|
|
853 | [general => ($root->{attr} || [])], |
|
|
854 | @{$root->{section} || []}) |
|
|
855 | { |
|
|
856 | my ($k, $v) = @$_; |
|
|
857 | # skip fixed attributes, if they are ignored thats fine |
|
|
858 | next if $v->{type} eq 'fixed'; |
|
|
859 | |
|
|
860 | delete $ignore{$k}; # if the attributes are defined explicitly they |
|
|
861 | # should NOT be ignored. ignore should mainly |
|
|
862 | # hit imported/inherited attributes. |
|
|
863 | } |
|
|
864 | |
842 | $attr->{section} = [ |
865 | $attr->{section} = [ |
843 | map !exists $section{$_} ? () : do { |
866 | map !exists $section{$_} ? () : do { |
844 | my $attr = delete $section{$_}; |
867 | my $attr = delete $section{$_}; |
845 | |
868 | |
846 | [ |
869 | [ |
… | |
… | |
848 | map exists $attr->{$_} && !$ignore{$_} |
871 | map exists $attr->{$_} && !$ignore{$_} |
849 | ? [$_ => delete $attr->{$_}] : (), |
872 | ? [$_ => delete $attr->{$_}] : (), |
850 | @attr_order |
873 | @attr_order |
851 | ] |
874 | ] |
852 | }, |
875 | }, |
853 | |
|
|
854 | exists $section{$_} ? [$_ => delete $section{$_}] : (), |
876 | exists $section{$_} ? [$_ => delete $section{$_}] : (), |
855 | @section_order |
877 | @section_order |
856 | ]; |
878 | ]; |
857 | |
879 | |
858 | $attr |
880 | $attr |
… | |
… | |
987 | |
1009 | |
988 | \%cache |
1010 | \%cache |
989 | }; |
1011 | }; |
990 | } |
1012 | } |
991 | |
1013 | |
|
|
1014 | =back |
|
|
1015 | |
992 | =head1 AUTHOR |
1016 | =head1 AUTHOR |
993 | |
1017 | |
994 | Marc Lehmann <schmorp@schmorp.de> |
1018 | Marc Lehmann <schmorp@schmorp.de> |
995 | http://home.schmorp.de/ |
1019 | http://home.schmorp.de/ |
996 | |
1020 | |