… | |
… | |
6 | |
6 | |
7 | =cut |
7 | =cut |
8 | |
8 | |
9 | package Deliantra; |
9 | package Deliantra; |
10 | |
10 | |
11 | our $VERSION = '1.25'; |
11 | our $VERSION = '2.0'; |
12 | |
12 | |
13 | use common::sense; |
13 | use common::sense; |
14 | |
14 | |
15 | use base 'Exporter'; |
15 | use base 'Exporter'; |
16 | |
16 | |
… | |
… | |
56 | |
56 | |
57 | # same as in server save routine, to (hopefully) be compatible |
57 | # same as in server save routine, to (hopefully) be compatible |
58 | # to the other editors. |
58 | # to the other editors. |
59 | our @FIELD_ORDER_MAP = (qw( |
59 | our @FIELD_ORDER_MAP = (qw( |
60 | file_format_version |
60 | file_format_version |
61 | name attach swap_time reset_timeout fixed_resettime difficulty region |
61 | name attach swap_time reset_timeout fixed_resettime difficulty |
|
|
62 | region music |
62 | shopitems shopgreed shopmin shopmax shoprace |
63 | shopitems shopgreed shopmin shopmax shoprace |
63 | darkness width height enter_x enter_y msg maplore |
64 | darkness width height enter_x enter_y msg maplore |
64 | unique template |
65 | unique template |
65 | outdoor temp pressure humid windspeed winddir sky nosmooth |
66 | outdoor temp pressure humid windspeed winddir sky nosmooth |
66 | 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 |
… | |
… | |
72 | elevation |
73 | elevation |
73 | |
74 | |
74 | name name_pl custom_name attach title race |
75 | name name_pl custom_name attach title race |
75 | slaying skill msg lore other_arch |
76 | slaying skill msg lore other_arch |
76 | sound sound_destroy face animation is_animated |
77 | sound sound_destroy face animation is_animated |
77 | magicmap smoothlevel smoothface |
78 | magicmap glyph smoothlevel smoothface |
78 | str dex con wis pow cha int |
79 | str dex con wis pow cha int |
79 | hp maxhp sp maxsp grace maxgrace |
80 | hp maxhp sp maxsp grace maxgrace |
80 | exp perm_exp expmul |
81 | exp perm_exp expmul |
81 | food dam luck wc ac x y speed speed_left move_state attack_movement |
82 | food dam luck wc ac x y speed speed_left move_state attack_movement |
82 | nrof level direction type subtype attacktype |
83 | nrof level direction type subtype attacktype |
… | |
… | |
130 | time => 8, |
131 | time => 8, |
131 | throw => 9, |
132 | throw => 9, |
132 | trigger => 10, |
133 | trigger => 10, |
133 | close => 11, |
134 | close => 11, |
134 | timer => 12, |
135 | timer => 12, |
|
|
136 | ); |
|
|
137 | |
|
|
138 | # 1 up 2 right 4 down 8 left |
|
|
139 | our %WALLDIR = ( |
|
|
140 | 0 => 0, |
|
|
141 | 1_2 => 1, |
|
|
142 | 1_4 => 2, |
|
|
143 | 2_2_1 => 3, |
|
|
144 | 1_1 => 4, |
|
|
145 | 2_1_1 => 5, |
|
|
146 | 2_2_2 => 6, |
|
|
147 | 3_2 => 7, |
|
|
148 | 1_3 => 8, |
|
|
149 | 2_2_4 => 9, |
|
|
150 | 2_1_2 => 10, |
|
|
151 | 3_1 => 11, |
|
|
152 | 2_2_3 => 12, |
|
|
153 | 3_4 => 13, |
|
|
154 | 3_3 => 14, |
|
|
155 | 4 => 15, |
135 | ); |
156 | ); |
136 | |
157 | |
137 | sub MOVE_WALK (){ 0x01 } |
158 | sub MOVE_WALK (){ 0x01 } |
138 | sub MOVE_FLY_LOW (){ 0x02 } |
159 | sub MOVE_FLY_LOW (){ 0x02 } |
139 | sub MOVE_FLY_HIGH (){ 0x04 } |
160 | sub MOVE_FLY_HIGH (){ 0x04 } |
… | |
… | |
814 | } else { |
835 | } else { |
815 | $root = $Deliantra::Data::TYPE{Misc}; |
836 | $root = $Deliantra::Data::TYPE{Misc}; |
816 | } |
837 | } |
817 | } |
838 | } |
818 | |
839 | |
|
|
840 | my (%ignore); |
819 | my @import = ($root); |
841 | my @import = ($root); |
820 | |
842 | |
821 | unshift @import, \%Deliantra::Data::DEFAULT_ATTR |
843 | my @new_import; |
822 | unless $type == 116; |
|
|
823 | |
|
|
824 | my (%ignore); |
|
|
825 | my (@section_order, %section, @attr_order); |
|
|
826 | |
|
|
827 | while (my $type = shift @import) { |
844 | while (my $type = shift @import) { |
|
|
845 | # first import everything we will need: |
828 | push @import, |
846 | push @import, |
829 | grep $_, |
847 | grep $_, |
830 | map $Deliantra::Data::TYPE{$_}, |
848 | map $Deliantra::Data::TYPE{$_}, |
831 | @{$type->{import} || []}; |
849 | @{$type->{import} || []}; |
832 | |
850 | |
|
|
851 | # and compute the ignored attributes |
|
|
852 | for (@{$type->{ignore} || []}) { |
|
|
853 | $ignore{$_}++ for ref $_ ? @$_ : $_; |
|
|
854 | } |
|
|
855 | |
|
|
856 | push @new_import, $type; |
|
|
857 | } |
|
|
858 | (@import) = @new_import; |
|
|
859 | |
|
|
860 | # then add defaults to the back of the list, so they are added |
|
|
861 | # as last resort. |
|
|
862 | push @import, \%Deliantra::Data::DEFAULT_ATTR |
|
|
863 | unless $type == 116; |
|
|
864 | |
|
|
865 | my (@section_order, %section, @attr_order); |
|
|
866 | |
|
|
867 | # @import = root, imported, default |
|
|
868 | while (my $type = pop @import) { |
833 | $attr->{$_} ||= $type->{$_} |
869 | $attr->{$_} ||= $type->{$_} |
834 | for qw(name desc use); |
870 | for qw(name desc use); |
835 | |
|
|
836 | for (@{$type->{ignore} || []}) { |
|
|
837 | $ignore{$_}++ for ref $_ ? @$_ : $_; |
|
|
838 | } |
|
|
839 | |
871 | |
840 | for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { |
872 | for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { |
841 | my ($name, $attr) = @$_; |
873 | my ($name, $attr) = @$_; |
842 | push @section_order, $name; |
874 | push @section_order, $name; |
843 | for (@$attr) { |
875 | for (@$attr) { |
844 | my ($k, $v) = @$_; |
876 | my ($k, $v) = @$_; |
845 | push @attr_order, $k; |
877 | push @attr_order, $k; |
846 | $section{$name}{$k} ||= $v; |
878 | $section{$name}{$k} = $v; # overwrite, so that the root decides |
847 | } |
879 | } |
848 | } |
880 | } |
849 | } |
881 | } |
850 | |
882 | |
851 | # remove ignores for "root" type |
883 | # remove ignores for "root" type |
|
|
884 | for ( |
852 | for (map @{$_->[1]}, # section attributes |
885 | map @{$_->[1]}, # section attributes |
853 | [general => ($root->{attr} || [])], |
886 | [general => ($root->{attr} || [])], |
854 | @{$root->{section} || []}) |
887 | @{$root->{section} || []} |
855 | { |
888 | ) { |
856 | my ($k, $v) = @$_; |
889 | my ($k, $v) = @$_; |
857 | # skip fixed attributes, if they are ignored thats fine |
890 | # skip fixed attributes, if they are ignored thats fine |
858 | next if $v->{type} eq 'fixed'; |
891 | next if $v->{type} eq 'fixed'; |
859 | |
892 | |
860 | delete $ignore{$k}; # if the attributes are defined explicitly they |
893 | delete $ignore{$k}; # if the attributes are defined explicitly they |
… | |
… | |
871 | map exists $attr->{$_} && !$ignore{$_} |
904 | map exists $attr->{$_} && !$ignore{$_} |
872 | ? [$_ => delete $attr->{$_}] : (), |
905 | ? [$_ => delete $attr->{$_}] : (), |
873 | @attr_order |
906 | @attr_order |
874 | ] |
907 | ] |
875 | }, |
908 | }, |
876 | exists $section{$_} ? [$_ => delete $section{$_}] : (), |
909 | exists $section{$_} ? [$_ => delete $section{$_}] : (), |
877 | @section_order |
910 | @section_order |
878 | ]; |
911 | ]; |
879 | |
912 | |
880 | $attr |
913 | $attr |
881 | } |
914 | } |
… | |
… | |
977 | require Gtk2; |
1010 | require Gtk2; |
978 | |
1011 | |
979 | cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, |
1012 | cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, |
980 | sub { |
1013 | sub { |
981 | my %cache; |
1014 | my %cache; |
982 | my $facedata = Storable::retrieve "$LIB/facedata"; |
1015 | my $facedata = Storable::retrieve "$LIB/faceinfo"; |
|
|
1016 | |
|
|
1017 | open my $fh, "<", "$LIB/facedata" |
|
|
1018 | or die "$LIB/facedata: $!"; |
983 | |
1019 | |
984 | $facedata->{version} == 2 |
1020 | $facedata->{version} == 2 |
985 | or die "$LIB/facedata: version mismatch, cannot proceed."; |
1021 | or die "$LIB/facedata: version mismatch, cannot proceed."; |
986 | |
1022 | |
987 | my $faces = $facedata->{faceinfo}; |
1023 | my $faces = $facedata->{faceinfo}; |
… | |
… | |
989 | |
1025 | |
990 | for (sort keys %$faces) { |
1026 | for (sort keys %$faces) { |
991 | my ($face, $info) = ($_, $faces->{$_}); |
1027 | my ($face, $info) = ($_, $faces->{$_}); |
992 | |
1028 | |
993 | my $pb = new Gtk2::Gdk::PixbufLoader; |
1029 | my $pb = new Gtk2::Gdk::PixbufLoader; |
|
|
1030 | |
|
|
1031 | if (exists $info->{data32}) { |
994 | $pb->write ($info->{data32}); |
1032 | $pb->write ($info->{data32}); |
|
|
1033 | } else { |
|
|
1034 | sysseek $fh, $info->{fofs32}, 0; |
|
|
1035 | sysread $fh, my $buf, $info->{size32}; |
|
|
1036 | $pb->write ($buf); |
|
|
1037 | } |
995 | $pb->close; |
1038 | $pb->close; |
996 | my $pb = $pb->get_pixbuf; |
1039 | my $pb = $pb->get_pixbuf; |
997 | |
1040 | |
998 | my $tile = $cache{$face} = { |
1041 | my $tile = $cache{$face} = { |
999 | pb => $pb, |
1042 | pb => $pb, |