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.105 by root, Tue Apr 17 18:50:41 2007 UTC vs.
Revision 1.138 by elmex, Wed Dec 16 17:00:09 2009 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.25';
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",
… …
64 71
65 elevation 72 elevation
66 73
67 name name_pl custom_name attach title race 74 name name_pl custom_name attach title race
68 slaying skill msg lore other_arch 75 slaying skill msg lore other_arch
69 face animation is_animated 76 sound sound_destroy face animation is_animated
70 magicmap smoothlevel smoothface 77 magicmap smoothlevel smoothface
71 str dex con wis pow cha int 78 str dex con wis pow cha int
72 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
73 exp perm_exp expmul 80 exp perm_exp expmul
74 food dam luck wc ac x y speed speed_left move_state attack_movement 81 food dam luck wc ac x y speed speed_left move_state attack_movement
… …
83 resist_life_stealing resist_disease 90 resist_life_stealing resist_disease
84 91
85 path_attuned path_repelled path_denied material materialname 92 path_attuned path_repelled path_denied material materialname
86 value carrying weight invisible state magic 93 value carrying weight invisible state magic
87 last_heal last_sp last_grace last_eat 94 last_heal last_sp last_grace last_eat
88 connected glow_radius randomitems npx_status npc_program 95 connected glow_radius randomitems tresure_env npx_status npc_program
89 run_away pick_up container will_apply smoothlevel 96 run_away pick_up container will_apply smoothlevel
90 current_weapon_script weapontype tooltype elevation client_type 97 current_weapon_script weapontype tooltype elevation client_type
91 item_power duration range 98 item_power duration range
92 range_modifier duration_modifier dam_modifier gen_sp_armour 99 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 100 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 111 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 112 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 113 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 114 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 115 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
116 precious
109 117
110 body_range body_arm body_torso body_head body_neck body_skill 118 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 119 body_finger body_shoulder body_foot body_hand body_wrist body_waist
112)); 120));
113 121
… …
130sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
131sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
132sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
133sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
134sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_SHIP (){ 0x20 }
135sub MOVE_KNOWN (){ 0x1f } # all of above 144sub MOVE_KNOWN (){ 0x3f } # all of above
136sub MOVE_ALL (){ 0x10000 } # very special value 145sub MOVE_ALL (){ 0x10000 } # very special value
137 146
138our %MOVE_TYPE = ( 147our %MOVE_TYPE = (
139 walk => MOVE_WALK, 148 walk => MOVE_WALK,
140 fly_low => MOVE_FLY_LOW, 149 fly_low => MOVE_FLY_LOW,
141 fly_high => MOVE_FLY_HIGH, 150 fly_high => MOVE_FLY_HIGH,
142 flying => MOVE_FLYING, 151 flying => MOVE_FLYING,
143 swim => MOVE_SWIM, 152 swim => MOVE_SWIM,
144 boat => MOVE_BOAT, 153 boat => MOVE_BOAT,
154 ship => MOVE_SHIP,
145 all => MOVE_ALL, 155 all => MOVE_ALL,
146); 156);
147 157
148our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); 158our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
149 159
150{ 160{
151 package Crossfire::MoveType; 161 package Deliantra::MoveType;
152 162
153 use overload 163 use overload
154 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 164 '=' => sub { bless [@{$_[0]}], ref $_[0] },
155 '""' => \&as_string, 165 '""' => \&as_string,
156 '>=' => 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 },
157 '+=' => 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 },
158 '-=' => 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 },
159 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 174 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
160 'x=' => sub { 175 'x=' => sub { # toggle between off, + and -
161 my $cur = $_[0] >= $_[1]; 176 my $cur = $_[0] >= $_[1];
162 if (!defined $cur) { 177 if (!defined $cur) {
163 if ($_[0] >= "all") { 178 if ($_[0] >= "all") {
164 $_[0] -= $_[1]; 179 $_[0] -= $_[1];
165 } else { 180 } else {
… …
174 $_[0] 189 $_[0]
175 }, 190 },
176 'eq' => sub { "$_[0]" eq "$_[1]" }, 191 'eq' => sub { "$_[0]" eq "$_[1]" },
177 'ne' => sub { "$_[0]" ne "$_[1]" }, 192 'ne' => sub { "$_[0]" ne "$_[1]" },
178 ; 193 ;
179}
180 194
181sub Crossfire::MoveType::new { 195 sub TO_JSON {
196 $_[0][0]
197 }
198}
199
200sub Deliantra::MoveType::new {
182 my ($class, $string) = @_; 201 my ($class, $string) = @_;
183 202
184 my $mask; 203 my $mask;
185 my $value; 204 my $value;
186 205
… …
200 } 219 }
201 220
202 (bless [$mask, $value], $class)->normalise 221 (bless [$mask, $value], $class)->normalise
203} 222}
204 223
205sub Crossfire::MoveType::normalise { 224sub Deliantra::MoveType::normalise {
206 my ($self) = @_; 225 my ($self) = @_;
207 226
208 if ($self->[0] & MOVE_ALL) { 227 if ($self->[0] & MOVE_ALL) {
209 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 228 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
210 $self->[0] &= $mask; 229 $self->[0] &= $mask;
… …
214 $self->[1] &= $self->[0]; 233 $self->[1] &= $self->[0];
215 234
216 $self 235 $self
217} 236}
218 237
219sub Crossfire::MoveType::as_string { 238sub Deliantra::MoveType::as_string {
220 my ($self) = @_; 239 my ($self) = @_;
221 240
222 my @res; 241 my @res;
223 242
224 my ($mask, $value) = @$self; 243 my ($mask, $value) = @$self;
225 244
226 for (@Crossfire::MOVE_TYPE) { 245 for (@Deliantra::MOVE_TYPE) {
227 my $bit = $Crossfire::MOVE_TYPE{$_}; 246 my $bit = $Deliantra::MOVE_TYPE{$_};
228 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 247 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
229 $mask &= ~$bit; 248 $mask &= ~$bit;
230 push @res, $value & $bit ? $_ : "-$_"; 249 push @res, $value & $bit ? $_ : "-$_";
231 } 250 }
232 } 251 }
… …
325 344
326# object as in "Object xxx", i.e. archetypes 345# object as in "Object xxx", i.e. archetypes
327sub normalize_object($) { 346sub normalize_object($) {
328 my ($ob) = @_; 347 my ($ob) = @_;
329 348
349 delete $ob->{editable}; # deprecated
350
330 # convert material bitset to materialname, if possible 351 # convert material bitset to materialname, if possible
331 if (exists $ob->{material}) { 352 if (exists $ob->{material}) {
332 if (!$ob->{material}) { 353 if (!$ob->{material}) {
333 delete $ob->{material}; 354 delete $ob->{material};
334 } elsif (exists $ob->{materialname}) { 355 } elsif (exists $ob->{materialname}) {
… …
344 } else { 365 } else {
345 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 366 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
346 } 367 }
347 } 368 }
348 369
370 # check whether attachment is the same as in the archetype
371 if (exists $ob->{attach}) {
372 my $arch = $ARCH{$ob->{_name}};
373 my $js = JSON::XS->new->utf8->canonical (1);
374
375 if (defined $arch->{attach}
376 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
377 delete $ob->{attach}
378 }
379 }
380
349 # color_fg is used as default for magicmap if magicmap does not exist 381 # color_fg is used as default for magicmap if magicmap does not exist
350 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; 382 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
351 383
352 # nuke outdated or never supported fields 384 # nuke outdated or never supported fields
353 delete @$ob{qw( 385 delete @$ob{qw(
… …
361 393
362 # convert movement strings to bitsets 394 # convert movement strings to bitsets
363 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
364 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
365 397
366 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
367 } 399 }
368 400
369 # convert outdated movement flags to new movement sets 401 # convert outdated movement flags to new movement sets
370 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
371 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
372 } 404 }
373 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
374 $ob->{move_slow} += "walk"; 406 $ob->{move_slow} += "walk";
375 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
376 } 408 }
377 if (defined (my $v = delete $ob->{walk_on})) { 409 if (defined (my $v = delete $ob->{walk_on})) {
378 $ob->{move_on} ||= new Crossfire::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" }
379 } 411 }
380 if (defined (my $v = delete $ob->{walk_off})) { 412 if (defined (my $v = delete $ob->{walk_off})) {
381 $ob->{move_off} ||= new Crossfire::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" }
382 } 414 }
383 if (defined (my $v = delete $ob->{fly_on})) { 415 if (defined (my $v = delete $ob->{fly_on})) {
384 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } 416 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
385 } 417 }
386 if (defined (my $v = delete $ob->{fly_off})) { 418 if (defined (my $v = delete $ob->{fly_off})) {
387 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } 419 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
388 } 420 }
389 if (defined (my $v = delete $ob->{flying})) { 421 if (defined (my $v = delete $ob->{flying})) {
390 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } 422 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
391 } 423 }
392 424
393 # convert idiotic event_xxx things into objects 425 # convert idiotic event_xxx things into objects
394 while (my ($event, $subtype) = each %EVENT_TYPE) { 426 while (my ($event, $subtype) = each %EVENT_TYPE) {
395 if (exists $ob->{"event_${event}_plugin"}) { 427 if (exists $ob->{"event_${event}_plugin"}) {
… …
411# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
412sub normalize_arch($) { 444sub normalize_arch($) {
413 my ($ob) = @_; 445 my ($ob) = @_;
414 446
415 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
416 450
417 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
418 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
419 453
420 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
456} 490}
457 491
458sub attr_thaw($) { 492sub attr_thaw($) {
459 my ($ob) = @_; 493 my ($ob) = @_;
460 494
461 $ob->{attach} = from_json $ob->{attach} 495 $ob->{attach} = decode_json $ob->{attach}
462 if exists $ob->{attach}; 496 if exists $ob->{attach};
463 497
464 $ob 498 $ob
465} 499}
466 500
467sub attr_freeze($) { 501sub attr_freeze($) {
468 my ($ob) = @_; 502 my ($ob) = @_;
469 503
470 $ob->{attach} = Crossfire::to_json $ob->{attach} 504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
471 if exists $ob->{attach}; 505 if exists $ob->{attach};
472 506
473 $ob 507 $ob
474} 508}
475 509
… …
495 529
496 my %arc; 530 my %arc;
497 my ($more, $prev); 531 my ($more, $prev);
498 my $comment; 532 my $comment;
499 533
500 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
501 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
502 536
503# binmode $fh; 537# binmode $fh;
504 538
505 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
… …
605 my $str; 639 my $str;
606 640
607 my $append; $append = sub { 641 my $append; $append = sub {
608 my %a = %{$_[0]}; 642 my %a = %{$_[0]};
609 643
610 Crossfire::attr_freeze \%a; 644 Deliantra::attr_freeze \%a;
611 Crossfire::normalize_arch \%a; 645 Deliantra::normalize_arch \%a;
612 646
613 # undo the bit-split we did before 647 # undo the bit-split we did before
614 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 648 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
615 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
616 | (delete $a{attack_movement_bits_4_7}); 650 | (delete $a{attack_movement_bits_4_7});
… …
634 } 668 }
635 669
636 my @kv; 670 my @kv;
637 671
638 for ($a{_name} eq "map" 672 for ($a{_name} eq "map"
639 ? @Crossfire::FIELD_ORDER_MAP 673 ? @Deliantra::FIELD_ORDER_MAP
640 : @Crossfire::FIELD_ORDER) { 674 : @Deliantra::FIELD_ORDER) {
641 push @kv, [$_, delete $a{$_}] 675 push @kv, [$_, delete $a{$_}]
642 if exists $a{$_}; 676 if exists $a{$_};
643 } 677 }
644 678
645 for (sort keys %a) { 679 for (sort keys %a) {
… …
648 } 682 }
649 683
650 for (@kv) { 684 for (@kv) {
651 my ($k, $v) = @$_; 685 my ($k, $v) = @$_;
652 686
653 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
654 $v =~ s/\n$//; 688 $v =~ s/\n$//;
655 $str .= "$k\n$v\n$end\n"; 689 $str .= "$k\n$v\n$end\n";
656 } else { 690 } else {
657 $str .= "$k $v\n"; 691 $str .= "$k $v\n";
658 } 692 }
… …
754=cut 788=cut
755 789
756sub arch_attr($) { 790sub arch_attr($) {
757 my ($obj) = @_; 791 my ($obj) = @_;
758 792
759 require Crossfire::Data; 793 require Deliantra::Data;
760 794
761 my $root; 795 my $root;
762 my $attr = { }; 796 my $attr = { };
763 797
764 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
765 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
766 800
767 if ($type > 0) { 801 if ($type > 0) {
768 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
769 } else { 803 } else {
770 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
771 805
772 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
773 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
774 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
775 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
776 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
777 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
778 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
779 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
780 } else { 814 } else {
781 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
782 } 816 }
783 } 817 }
784 818
785 my @import = ($root); 819 my @import = ($root);
786 820
787 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 821 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
788 unless $type == 116; 822 unless $type == 116;
789 823
790 my (%ignore); 824 my (%ignore);
791 my (@section_order, %section, @attr_order); 825 my (@section_order, %section, @attr_order);
792 826
793 while (my $type = shift @import) { 827 while (my $type = shift @import) {
828 push @import,
829 grep $_,
830 map $Deliantra::Data::TYPE{$_},
794 push @import, @{$type->{import} || []}; 831 @{$type->{import} || []};
795 832
796 $attr->{$_} ||= $type->{$_} 833 $attr->{$_} ||= $type->{$_}
797 for qw(name desc use); 834 for qw(name desc use);
798 835
799 for (@{$type->{ignore} || []}) { 836 for (@{$type->{ignore} || []}) {
… …
809 $section{$name}{$k} ||= $v; 846 $section{$name}{$k} ||= $v;
810 } 847 }
811 } 848 }
812 } 849 }
813 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
814 $attr->{section} = [ 865 $attr->{section} = [
815 map !exists $section{$_} ? () : do { 866 map !exists $section{$_} ? () : do {
816 my $attr = delete $section{$_}; 867 my $attr = delete $section{$_};
817 868
818 [ 869 [
… …
820 map exists $attr->{$_} && !$ignore{$_} 871 map exists $attr->{$_} && !$ignore{$_}
821 ? [$_ => delete $attr->{$_}] : (), 872 ? [$_ => delete $attr->{$_}] : (),
822 @attr_order 873 @attr_order
823 ] 874 ]
824 }, 875 },
825
826 exists $section{$_} ? [$_ => delete $section{$_}] : (), 876 exists $section{$_} ? [$_ => delete $section{$_}] : (),
827 @section_order 877 @section_order
828 ]; 878 ];
829 879
830 $attr 880 $attr
… …
888} 938}
889 939
890sub construct_tilecache_pb { 940sub construct_tilecache_pb {
891 my ($idx, $cache) = @_; 941 my ($idx, $cache) = @_;
892 942
893 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 943 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
894 944
895 while (my ($name, $tile) = each %$cache) { 945 while (my ($name, $tile) = each %$cache) {
896 my $tpb = delete $tile->{pb}; 946 my $tpb = delete $tile->{pb};
897 my $ofs = $tile->{idx}; 947 my $ofs = $tile->{idx};
898 948
899 for my $x (0 .. $tile->{w} - 1) { 949 for my $x (0 .. $tile->{w} - 1) {
900 for my $y (0 .. $tile->{h} - 1) { 950 for my $y (0 .. $tile->{h} - 1) {
901 my $idx = $ofs + $x + $y * $tile->{w}; 951 my $idx = $ofs + $x + $y * $tile->{w};
902 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 952 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
903 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 953 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
904 } 954 }
905 } 955 }
906 } 956 }
907 957
908 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 958 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
924=cut 974=cut
925 975
926sub load_tilecache() { 976sub load_tilecache() {
927 require Gtk2; 977 require Gtk2;
928 978
929 if (-e "$LIB/crossfire.0") { # Crossfire1 version
930 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
931 sub {
932 my $tile = read_pak "$LIB/crossfire.0";
933
934 my %cache;
935
936 my $idx = 0;
937
938 for my $name (sort keys %$tile) {
939 my $pb = new Gtk2::Gdk::PixbufLoader;
940 $pb->write ($tile->{$name});
941 $pb->close;
942 my $pb = $pb->get_pixbuf;
943
944 my $tile = $cache{$name} = {
945 pb => $pb,
946 idx => $idx,
947 w => int $pb->get_width / TILESIZE,
948 h => int $pb->get_height / TILESIZE,
949 };
950
951 $idx += $tile->{w} * $tile->{h};
952 }
953
954 construct_tilecache_pb $idx, \%cache;
955
956 \%cache
957 };
958
959 } else { # Crossfire+ version
960 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, 979 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
961 sub { 980 sub {
962 my %cache; 981 my %cache;
963 my $facedata = Storable::retrieve "$LIB/facedata"; 982 my $facedata = Storable::retrieve "$LIB/facedata";
964 983
965 $facedata->{version} == 2 984 $facedata->{version} == 2
966 or die "$LIB/facedata: version mismatch, cannot proceed."; 985 or die "$LIB/facedata: version mismatch, cannot proceed.";
967 986
968 my $faces = $facedata->{faceinfo}; 987 my $faces = $facedata->{faceinfo};
969 my $idx = 0; 988 my $idx = 0;
970 989
971 for (sort keys %$faces) { 990 for (sort keys %$faces) {
972 my ($face, $info) = ($_, $faces->{$_}); 991 my ($face, $info) = ($_, $faces->{$_});
973 992
974 my $pb = new Gtk2::Gdk::PixbufLoader; 993 my $pb = new Gtk2::Gdk::PixbufLoader;
975 $pb->write ($info->{data32}); 994 $pb->write ($info->{data32});
976 $pb->close; 995 $pb->close;
977 my $pb = $pb->get_pixbuf; 996 my $pb = $pb->get_pixbuf;
978 997
979 my $tile = $cache{$face} = { 998 my $tile = $cache{$face} = {
980 pb => $pb, 999 pb => $pb,
981 idx => $idx, 1000 idx => $idx,
982 w => int $pb->get_width / TILESIZE, 1001 w => int $pb->get_width / TILESIZE,
983 h => int $pb->get_height / TILESIZE, 1002 h => int $pb->get_height / TILESIZE,
984 }; 1003 };
985 1004
986 $idx += $tile->{w} * $tile->{h}; 1005 $idx += $tile->{w} * $tile->{h};
987 } 1006 }
988 1007
989 construct_tilecache_pb $idx, \%cache; 1008 construct_tilecache_pb $idx, \%cache;
990 1009
991 \%cache 1010 \%cache
992 }; 1011 };
993 }
994} 1012}
1013
1014=back
995 1015
996=head1 AUTHOR 1016=head1 AUTHOR
997 1017
998 Marc Lehmann <schmorp@schmorp.de> 1018 Marc Lehmann <schmorp@schmorp.de>
999 http://home.schmorp.de/ 1019 http://home.schmorp.de/
… …
1002 http://www.ta-sa.org/ 1022 http://www.ta-sa.org/
1003 1023
1004=cut 1024=cut
1005 1025
10061 10261
1027

Diff Legend

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