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

Diff Legend

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