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.106 by root, Mon Apr 23 19:09:48 2007 UTC vs.
Revision 1.142 by root, Sat May 15 00:30:53 2010 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4
5=over 4
4 6
5=cut 7=cut
6 8
7package Crossfire; 9package Deliantra;
8 10
9our $VERSION = '0.98'; 11our $VERSION = '1.30';
10 12
11use strict; 13use common::sense;
12 14
13use base 'Exporter'; 15use base 'Exporter';
14 16
15use Carp (); 17use Carp ();
16use File::Spec; 18use File::Spec;
17use List::Util qw(min max); 19use List::Util qw(min max);
18use Storable qw(freeze thaw); 20use Storable qw(freeze thaw);
19 21
20our @EXPORT = qw( 22our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 23 read_pak read_arch
24 *ARCH $TILE *FACE *FACEDATA
25 TILESIZE CACHESTRIDE
26 editor_archs arch_extents
22); 27);
23 28
24use JSON::XS qw(from_json to_json); 29use JSON::XS qw(decode_json encode_json);
25 30
26our $LIB = $ENV{CROSSFIRE_LIBDIR}; 31our $LIB = $ENV{DELIANTRA_LIBDIR};
27 32
28our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 33our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
29 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 34 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
30 : File::Spec->tmpdir . "/crossfire"; 35 : File::Spec->tmpdir . "/deliantra";
31 36
32mkdir $VARDIR, 0777; 37mkdir $VARDIR, 0777;
33 38
34sub TILESIZE (){ 32 } 39sub TILESIZE (){ 32 }
40sub CACHESTRIDE (){ 64 }
35 41
36our %ARCH; 42our %ARCH;
43our %FACE; # face32
37our %FACE; 44our %FACEDATA;
38our $TILE; 45our $TILE;
39 46
40our %FIELD_MULTILINE = ( 47our %FIELD_MULTILINE = (
41 msg => "endmsg", 48 msg => "endmsg",
42 lore => "endlore", 49 lore => "endlore",
… …
49 56
50# same as in server save routine, to (hopefully) be compatible 57# same as in server save routine, to (hopefully) be compatible
51# to the other editors. 58# to the other editors.
52our @FIELD_ORDER_MAP = (qw( 59our @FIELD_ORDER_MAP = (qw(
53 file_format_version 60 file_format_version
54 name attach swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty
62 region music
55 shopitems shopgreed shopmin shopmax shoprace 63 shopitems shopgreed shopmin shopmax shoprace
56 darkness width height enter_x enter_y msg maplore 64 darkness width height enter_x enter_y msg maplore
57 unique template 65 unique template
58 outdoor temp pressure humid windspeed winddir sky nosmooth 66 outdoor temp pressure humid windspeed winddir sky nosmooth
59 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
… …
64 72
65 elevation 73 elevation
66 74
67 name name_pl custom_name attach title race 75 name name_pl custom_name attach title race
68 slaying skill msg lore other_arch 76 slaying skill msg lore other_arch
69 face animation is_animated 77 sound sound_destroy face animation is_animated
70 magicmap smoothlevel smoothface 78 magicmap smoothlevel smoothface
71 str dex con wis pow cha int 79 str dex con wis pow cha int
72 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
73 exp perm_exp expmul 81 exp perm_exp expmul
74 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
… …
83 resist_life_stealing resist_disease 91 resist_life_stealing resist_disease
84 92
85 path_attuned path_repelled path_denied material materialname 93 path_attuned path_repelled path_denied material materialname
86 value carrying weight invisible state magic 94 value carrying weight invisible state magic
87 last_heal last_sp last_grace last_eat 95 last_heal last_sp last_grace last_eat
88 connected glow_radius randomitems npx_status npc_program 96 connected glow_radius randomitems tresure_env npx_status npc_program
89 run_away pick_up container will_apply smoothlevel 97 run_away pick_up container will_apply smoothlevel
90 current_weapon_script weapontype tooltype elevation client_type 98 current_weapon_script weapontype tooltype elevation client_type
91 item_power duration range 99 item_power duration range
92 range_modifier duration_modifier dam_modifier gen_sp_armour 100 range_modifier duration_modifier dam_modifier gen_sp_armour
93 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 101 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
104 known_magical known_cursed can_use_skill been_applied has_ready_scroll 112 known_magical known_cursed can_use_skill been_applied has_ready_scroll
105 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 113 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
106 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 114 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
107 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 115 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
108 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 116 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
117 precious
109 118
110 body_range body_arm body_torso body_head body_neck body_skill 119 body_range body_arm body_torso body_head body_neck body_skill
111 body_finger body_shoulder body_foot body_hand body_wrist body_waist 120 body_finger body_shoulder body_foot body_hand body_wrist body_waist
112)); 121));
113 122
… …
145 boat => MOVE_BOAT, 154 boat => MOVE_BOAT,
146 ship => MOVE_SHIP, 155 ship => MOVE_SHIP,
147 all => MOVE_ALL, 156 all => MOVE_ALL,
148); 157);
149 158
150our @MOVE_TYPE = keys %MOVE_TYPE; 159our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
151 160
152{ 161{
153 package Crossfire::MoveType; 162 package Deliantra::MoveType;
154 163
155 use overload 164 use overload
156 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 165 '=' => sub { bless [@{$_[0]}], ref $_[0] },
157 '""' => \&as_string, 166 '""' => \&as_string,
158 '>=' => 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 },
159 '+=' => 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 },
160 '-=' => 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 },
161 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 175 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
162 'x=' => sub { 176 'x=' => sub { # toggle between off, + and -
163 my $cur = $_[0] >= $_[1]; 177 my $cur = $_[0] >= $_[1];
164 if (!defined $cur) { 178 if (!defined $cur) {
165 if ($_[0] >= "all") { 179 if ($_[0] >= "all") {
166 $_[0] -= $_[1]; 180 $_[0] -= $_[1];
167 } else { 181 } else {
… …
176 $_[0] 190 $_[0]
177 }, 191 },
178 'eq' => sub { "$_[0]" eq "$_[1]" }, 192 'eq' => sub { "$_[0]" eq "$_[1]" },
179 'ne' => sub { "$_[0]" ne "$_[1]" }, 193 'ne' => sub { "$_[0]" ne "$_[1]" },
180 ; 194 ;
181}
182 195
183sub Crossfire::MoveType::new { 196 sub TO_JSON {
197 $_[0][0]
198 }
199}
200
201sub Deliantra::MoveType::new {
184 my ($class, $string) = @_; 202 my ($class, $string) = @_;
185 203
186 my $mask; 204 my $mask;
187 my $value; 205 my $value;
188 206
… …
202 } 220 }
203 221
204 (bless [$mask, $value], $class)->normalise 222 (bless [$mask, $value], $class)->normalise
205} 223}
206 224
207sub Crossfire::MoveType::normalise { 225sub Deliantra::MoveType::normalise {
208 my ($self) = @_; 226 my ($self) = @_;
209 227
210 if ($self->[0] & MOVE_ALL) { 228 if ($self->[0] & MOVE_ALL) {
211 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 229 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
212 $self->[0] &= $mask; 230 $self->[0] &= $mask;
… …
216 $self->[1] &= $self->[0]; 234 $self->[1] &= $self->[0];
217 235
218 $self 236 $self
219} 237}
220 238
221sub Crossfire::MoveType::as_string { 239sub Deliantra::MoveType::as_string {
222 my ($self) = @_; 240 my ($self) = @_;
223 241
224 my @res; 242 my @res;
225 243
226 my ($mask, $value) = @$self; 244 my ($mask, $value) = @$self;
227 245
228 for (@Crossfire::MOVE_TYPE) { 246 for (@Deliantra::MOVE_TYPE) {
229 my $bit = $Crossfire::MOVE_TYPE{$_}; 247 my $bit = $Deliantra::MOVE_TYPE{$_};
230 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 248 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
231 $mask &= ~$bit; 249 $mask &= ~$bit;
232 push @res, $value & $bit ? $_ : "-$_"; 250 push @res, $value & $bit ? $_ : "-$_";
233 } 251 }
234 } 252 }
… …
327 345
328# object as in "Object xxx", i.e. archetypes 346# object as in "Object xxx", i.e. archetypes
329sub normalize_object($) { 347sub normalize_object($) {
330 my ($ob) = @_; 348 my ($ob) = @_;
331 349
350 delete $ob->{editable}; # deprecated
351
332 # convert material bitset to materialname, if possible 352 # convert material bitset to materialname, if possible
333 if (exists $ob->{material}) { 353 if (exists $ob->{material}) {
334 if (!$ob->{material}) { 354 if (!$ob->{material}) {
335 delete $ob->{material}; 355 delete $ob->{material};
336 } elsif (exists $ob->{materialname}) { 356 } elsif (exists $ob->{materialname}) {
… …
346 } else { 366 } else {
347 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 367 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
348 } 368 }
349 } 369 }
350 370
371 # check whether attachment is the same as in the archetype
372 if (exists $ob->{attach}) {
373 my $arch = $ARCH{$ob->{_name}};
374 my $js = JSON::XS->new->utf8->canonical (1);
375
376 if (defined $arch->{attach}
377 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
378 delete $ob->{attach}
379 }
380 }
381
351 # color_fg is used as default for magicmap if magicmap does not exist 382 # color_fg is used as default for magicmap if magicmap does not exist
352 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; 383 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
353 384
354 # nuke outdated or never supported fields 385 # nuke outdated or never supported fields
355 delete @$ob{qw( 386 delete @$ob{qw(
… …
363 394
364 # convert movement strings to bitsets 395 # convert movement strings to bitsets
365 for my $attr (keys %FIELD_MOVEMENT) { 396 for my $attr (keys %FIELD_MOVEMENT) {
366 next unless exists $ob->{$attr}; 397 next unless exists $ob->{$attr};
367 398
368 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 399 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
369 } 400 }
370 401
371 # convert outdated movement flags to new movement sets 402 # convert outdated movement flags to new movement sets
372 if (defined (my $v = delete $ob->{no_pass})) { 403 if (defined (my $v = delete $ob->{no_pass})) {
373 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 404 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
374 } 405 }
375 if (defined (my $v = delete $ob->{slow_move})) { 406 if (defined (my $v = delete $ob->{slow_move})) {
376 $ob->{move_slow} += "walk"; 407 $ob->{move_slow} += "walk";
377 $ob->{move_slow_penalty} = $v; 408 $ob->{move_slow_penalty} = $v;
378 } 409 }
379 if (defined (my $v = delete $ob->{walk_on})) { 410 if (defined (my $v = delete $ob->{walk_on})) {
380 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } 411 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
381 } 412 }
382 if (defined (my $v = delete $ob->{walk_off})) { 413 if (defined (my $v = delete $ob->{walk_off})) {
383 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } 414 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
384 } 415 }
385 if (defined (my $v = delete $ob->{fly_on})) { 416 if (defined (my $v = delete $ob->{fly_on})) {
386 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } 417 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
387 } 418 }
388 if (defined (my $v = delete $ob->{fly_off})) { 419 if (defined (my $v = delete $ob->{fly_off})) {
389 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } 420 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
390 } 421 }
391 if (defined (my $v = delete $ob->{flying})) { 422 if (defined (my $v = delete $ob->{flying})) {
392 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } 423 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
393 } 424 }
394 425
395 # convert idiotic event_xxx things into objects 426 # convert idiotic event_xxx things into objects
396 while (my ($event, $subtype) = each %EVENT_TYPE) { 427 while (my ($event, $subtype) = each %EVENT_TYPE) {
397 if (exists $ob->{"event_${event}_plugin"}) { 428 if (exists $ob->{"event_${event}_plugin"}) {
… …
413# arch as in "arch xxx", ie.. objects 444# arch as in "arch xxx", ie.. objects
414sub normalize_arch($) { 445sub normalize_arch($) {
415 my ($ob) = @_; 446 my ($ob) = @_;
416 447
417 normalize_object $ob; 448 normalize_object $ob;
449
450 return if $ob->{_atype} eq "object";
418 451
419 my $arch = $ARCH{$ob->{_name}} 452 my $arch = $ARCH{$ob->{_name}}
420 or (warn "$ob->{_name}: no such archetype", return $ob); 453 or (warn "$ob->{_name}: no such archetype", return $ob);
421 454
422 if ($arch->{type} == 22) { # map 455 if ($arch->{type} == 22) { # map
… …
458} 491}
459 492
460sub attr_thaw($) { 493sub attr_thaw($) {
461 my ($ob) = @_; 494 my ($ob) = @_;
462 495
463 $ob->{attach} = from_json $ob->{attach} 496 $ob->{attach} = decode_json $ob->{attach}
464 if exists $ob->{attach}; 497 if exists $ob->{attach};
465 498
466 $ob 499 $ob
467} 500}
468 501
469sub attr_freeze($) { 502sub attr_freeze($) {
470 my ($ob) = @_; 503 my ($ob) = @_;
471 504
472 $ob->{attach} = Crossfire::to_json $ob->{attach} 505 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
473 if exists $ob->{attach}; 506 if exists $ob->{attach};
474 507
475 $ob 508 $ob
476} 509}
477 510
… …
497 530
498 my %arc; 531 my %arc;
499 my ($more, $prev); 532 my ($more, $prev);
500 my $comment; 533 my $comment;
501 534
502 open my $fh, "<:raw:perlio:utf8", $path 535 open my $fh, "<:utf8", $path
503 or Carp::croak "$path: $!"; 536 or Carp::croak "$path: $!";
504 537
505# binmode $fh; 538# binmode $fh;
506 539
507 my $parse_block; $parse_block = sub { 540 my $parse_block; $parse_block = sub {
… …
607 my $str; 640 my $str;
608 641
609 my $append; $append = sub { 642 my $append; $append = sub {
610 my %a = %{$_[0]}; 643 my %a = %{$_[0]};
611 644
612 Crossfire::attr_freeze \%a; 645 Deliantra::attr_freeze \%a;
613 Crossfire::normalize_arch \%a; 646 Deliantra::normalize_arch \%a;
614 647
615 # undo the bit-split we did before 648 # undo the bit-split we did before
616 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 649 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
617 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 650 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
618 | (delete $a{attack_movement_bits_4_7}); 651 | (delete $a{attack_movement_bits_4_7});
… …
636 } 669 }
637 670
638 my @kv; 671 my @kv;
639 672
640 for ($a{_name} eq "map" 673 for ($a{_name} eq "map"
641 ? @Crossfire::FIELD_ORDER_MAP 674 ? @Deliantra::FIELD_ORDER_MAP
642 : @Crossfire::FIELD_ORDER) { 675 : @Deliantra::FIELD_ORDER) {
643 push @kv, [$_, delete $a{$_}] 676 push @kv, [$_, delete $a{$_}]
644 if exists $a{$_}; 677 if exists $a{$_};
645 } 678 }
646 679
647 for (sort keys %a) { 680 for (sort keys %a) {
… …
650 } 683 }
651 684
652 for (@kv) { 685 for (@kv) {
653 my ($k, $v) = @$_; 686 my ($k, $v) = @$_;
654 687
655 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 688 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
656 $v =~ s/\n$//; 689 $v =~ s/\n$//;
657 $str .= "$k\n$v\n$end\n"; 690 $str .= "$k\n$v\n$end\n";
658 } else { 691 } else {
659 $str .= "$k $v\n"; 692 $str .= "$k $v\n";
660 } 693 }
… …
756=cut 789=cut
757 790
758sub arch_attr($) { 791sub arch_attr($) {
759 my ($obj) = @_; 792 my ($obj) = @_;
760 793
761 require Crossfire::Data; 794 require Deliantra::Data;
762 795
763 my $root; 796 my $root;
764 my $attr = { }; 797 my $attr = { };
765 798
766 my $arch = $ARCH{ $obj->{_name} }; 799 my $arch = $ARCH{ $obj->{_name} };
767 my $type = $obj->{type} || $arch->{type}; 800 my $type = $obj->{type} || $arch->{type};
768 801
769 if ($type > 0) { 802 if ($type > 0) {
770 $root = $Crossfire::Data::ATTR{$type}; 803 $root = $Deliantra::Data::ATTR{$type};
771 } else { 804 } else {
772 my %a = (%$arch, %$obj); 805 my %a = (%$arch, %$obj);
773 806
774 if ($a{is_floor} && !$a{alive}) { 807 if ($a{is_floor} && !$a{alive}) {
775 $root = $Crossfire::Data::TYPE{Floor}; 808 $root = $Deliantra::Data::TYPE{Floor};
776 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 809 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
777 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 810 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
778 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 811 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
779 $root = $Crossfire::Data::TYPE{Wall}; 812 $root = $Deliantra::Data::TYPE{Wall};
780 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 813 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
781 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 814 $root = $Deliantra::Data::TYPE{"Weak Wall"};
782 } else { 815 } else {
783 $root = $Crossfire::Data::TYPE{Misc}; 816 $root = $Deliantra::Data::TYPE{Misc};
784 } 817 }
785 } 818 }
786 819
820 my (%ignore);
787 my @import = ($root); 821 my @import = ($root);
822
823 my @new_import;
824 while (my $type = shift @import) {
825 # first import everything we will need:
826 push @import,
827 grep $_,
828 map $Deliantra::Data::TYPE{$_},
829 @{$type->{import} || []};
830
831 # and compute the ignored attributes
832 for (@{$type->{ignore} || []}) {
833 $ignore{$_}++ for ref $_ ? @$_ : $_;
834 }
835
836 push @new_import, $type;
788 837 }
838 (@import) = @new_import;
839
840 # then add defaults to the back of the list, so they are added
841 # as last resort.
789 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 842 push @import, \%Deliantra::Data::DEFAULT_ATTR
790 unless $type == 116; 843 unless $type == 116;
791 844
792 my (%ignore);
793 my (@section_order, %section, @attr_order); 845 my (@section_order, %section, @attr_order);
794 846
847 # @import = root, imported, default
795 while (my $type = shift @import) { 848 while (my $type = pop @import) {
796 push @import, @{$type->{import} || []};
797
798 $attr->{$_} ||= $type->{$_} 849 $attr->{$_} ||= $type->{$_}
799 for qw(name desc use); 850 for qw(name desc use);
800
801 for (@{$type->{ignore} || []}) {
802 $ignore{$_}++ for ref $_ ? @$_ : $_;
803 }
804 851
805 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 852 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
806 my ($name, $attr) = @$_; 853 my ($name, $attr) = @$_;
807 push @section_order, $name; 854 push @section_order, $name;
808 for (@$attr) { 855 for (@$attr) {
809 my ($k, $v) = @$_; 856 my ($k, $v) = @$_;
810 push @attr_order, $k; 857 push @attr_order, $k;
811 $section{$name}{$k} ||= $v; 858 $section{$name}{$k} = $v; # overwrite, so that the root decides
812 }
813 } 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.
814 } 876 }
815 877
816 $attr->{section} = [ 878 $attr->{section} = [
817 map !exists $section{$_} ? () : do { 879 map !exists $section{$_} ? () : do {
818 my $attr = delete $section{$_}; 880 my $attr = delete $section{$_};
… …
822 map exists $attr->{$_} && !$ignore{$_} 884 map exists $attr->{$_} && !$ignore{$_}
823 ? [$_ => delete $attr->{$_}] : (), 885 ? [$_ => delete $attr->{$_}] : (),
824 @attr_order 886 @attr_order
825 ] 887 ]
826 }, 888 },
827
828 exists $section{$_} ? [$_ => delete $section{$_}] : (), 889 exists $section{$_} ? [$_ => delete $section{$_}] : (),
829 @section_order 890 @section_order
830 ]; 891 ];
831 892
832 $attr 893 $attr
833} 894}
… …
890} 951}
891 952
892sub construct_tilecache_pb { 953sub construct_tilecache_pb {
893 my ($idx, $cache) = @_; 954 my ($idx, $cache) = @_;
894 955
895 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 956 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
896 957
897 while (my ($name, $tile) = each %$cache) { 958 while (my ($name, $tile) = each %$cache) {
898 my $tpb = delete $tile->{pb}; 959 my $tpb = delete $tile->{pb};
899 my $ofs = $tile->{idx}; 960 my $ofs = $tile->{idx};
900 961
901 for my $x (0 .. $tile->{w} - 1) { 962 for my $x (0 .. $tile->{w} - 1) {
902 for my $y (0 .. $tile->{h} - 1) { 963 for my $y (0 .. $tile->{h} - 1) {
903 my $idx = $ofs + $x + $y * $tile->{w}; 964 my $idx = $ofs + $x + $y * $tile->{w};
904 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 965 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
905 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 966 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
906 } 967 }
907 } 968 }
908 } 969 }
909 970
910 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 971 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
926=cut 987=cut
927 988
928sub load_tilecache() { 989sub load_tilecache() {
929 require Gtk2; 990 require Gtk2;
930 991
931 if (-e "$LIB/crossfire.0") { # Crossfire1 version
932 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
933 sub {
934 my $tile = read_pak "$LIB/crossfire.0";
935
936 my %cache;
937
938 my $idx = 0;
939
940 for my $name (sort keys %$tile) {
941 my $pb = new Gtk2::Gdk::PixbufLoader;
942 $pb->write ($tile->{$name});
943 $pb->close;
944 my $pb = $pb->get_pixbuf;
945
946 my $tile = $cache{$name} = {
947 pb => $pb,
948 idx => $idx,
949 w => int $pb->get_width / TILESIZE,
950 h => int $pb->get_height / TILESIZE,
951 };
952
953 $idx += $tile->{w} * $tile->{h};
954 }
955
956 construct_tilecache_pb $idx, \%cache;
957
958 \%cache
959 };
960
961 } else { # Crossfire+ version
962 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, 992 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
963 sub { 993 sub {
964 my %cache; 994 my %cache;
965 my $facedata = Storable::retrieve "$LIB/facedata"; 995 my $facedata = Storable::retrieve "$LIB/facedata";
966 996
967 $facedata->{version} == 2 997 $facedata->{version} == 2
968 or die "$LIB/facedata: version mismatch, cannot proceed."; 998 or die "$LIB/facedata: version mismatch, cannot proceed.";
969 999
970 my $faces = $facedata->{faceinfo}; 1000 my $faces = $facedata->{faceinfo};
971 my $idx = 0; 1001 my $idx = 0;
972 1002
973 for (sort keys %$faces) { 1003 for (sort keys %$faces) {
974 my ($face, $info) = ($_, $faces->{$_}); 1004 my ($face, $info) = ($_, $faces->{$_});
975 1005
976 my $pb = new Gtk2::Gdk::PixbufLoader; 1006 my $pb = new Gtk2::Gdk::PixbufLoader;
977 $pb->write ($info->{data32}); 1007 $pb->write ($info->{data32});
978 $pb->close; 1008 $pb->close;
979 my $pb = $pb->get_pixbuf; 1009 my $pb = $pb->get_pixbuf;
980 1010
981 my $tile = $cache{$face} = { 1011 my $tile = $cache{$face} = {
982 pb => $pb, 1012 pb => $pb,
983 idx => $idx, 1013 idx => $idx,
984 w => int $pb->get_width / TILESIZE, 1014 w => int $pb->get_width / TILESIZE,
985 h => int $pb->get_height / TILESIZE, 1015 h => int $pb->get_height / TILESIZE,
986 }; 1016 };
987 1017
988 $idx += $tile->{w} * $tile->{h}; 1018 $idx += $tile->{w} * $tile->{h};
989 } 1019 }
990 1020
991 construct_tilecache_pb $idx, \%cache; 1021 construct_tilecache_pb $idx, \%cache;
992 1022
993 \%cache 1023 \%cache
994 }; 1024 };
995 }
996} 1025}
1026
1027=back
997 1028
998=head1 AUTHOR 1029=head1 AUTHOR
999 1030
1000 Marc Lehmann <schmorp@schmorp.de> 1031 Marc Lehmann <schmorp@schmorp.de>
1001 http://home.schmorp.de/ 1032 http://home.schmorp.de/
… …
1004 http://www.ta-sa.org/ 1035 http://www.ta-sa.org/
1005 1036
1006=cut 1037=cut
1007 1038
10081 10391
1040

Diff Legend

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