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

Diff Legend

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