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.145 by root, Sun Nov 11 23:17:18 2012 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.31';
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 glyph 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
75 nrof level direction type subtype attacktype 83 nrof level direction type subtype attacktype
… …
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
… …
124 trigger => 10, 133 trigger => 10,
125 close => 11, 134 close => 11,
126 timer => 12, 135 timer => 12,
127); 136);
128 137
138# 1 up 2 right 4 down 8 left
139our %WALLDIR = (
140 0 => 0,
141 1_2 => 1,
142 1_4 => 2,
143 2_2_1 => 3,
144 1_1 => 4,
145 2_1_1 => 5,
146 2_2_2 => 6,
147 3_2 => 7,
148 1_3 => 8,
149 2_2_4 => 9,
150 2_1_2 => 10,
151 3_1 => 11,
152 2_2_3 => 12,
153 3_4 => 13,
154 3_3 => 14,
155 4 => 15,
156);
157
129sub MOVE_WALK (){ 0x01 } 158sub MOVE_WALK (){ 0x01 }
130sub MOVE_FLY_LOW (){ 0x02 } 159sub MOVE_FLY_LOW (){ 0x02 }
131sub MOVE_FLY_HIGH (){ 0x04 } 160sub MOVE_FLY_HIGH (){ 0x04 }
132sub MOVE_FLYING (){ 0x06 } 161sub MOVE_FLYING (){ 0x06 }
133sub MOVE_SWIM (){ 0x08 } 162sub MOVE_SWIM (){ 0x08 }
134sub MOVE_BOAT (){ 0x10 } 163sub MOVE_BOAT (){ 0x10 }
164sub MOVE_SHIP (){ 0x20 }
135sub MOVE_KNOWN (){ 0x1f } # all of above 165sub MOVE_KNOWN (){ 0x3f } # all of above
136sub MOVE_ALL (){ 0x10000 } # very special value 166sub MOVE_ALL (){ 0x10000 } # very special value
137 167
138our %MOVE_TYPE = ( 168our %MOVE_TYPE = (
139 walk => MOVE_WALK, 169 walk => MOVE_WALK,
140 fly_low => MOVE_FLY_LOW, 170 fly_low => MOVE_FLY_LOW,
141 fly_high => MOVE_FLY_HIGH, 171 fly_high => MOVE_FLY_HIGH,
142 flying => MOVE_FLYING, 172 flying => MOVE_FLYING,
143 swim => MOVE_SWIM, 173 swim => MOVE_SWIM,
144 boat => MOVE_BOAT, 174 boat => MOVE_BOAT,
175 ship => MOVE_SHIP,
145 all => MOVE_ALL, 176 all => MOVE_ALL,
146); 177);
147 178
148our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); 179our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
149 180
150{ 181{
151 package Crossfire::MoveType; 182 package Deliantra::MoveType;
152 183
153 use overload 184 use overload
154 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 185 '=' => sub { bless [@{$_[0]}], ref $_[0] },
155 '""' => \&as_string, 186 '""' => \&as_string,
156 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 187 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
188 '<=' => sub {
189 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
190 ? $_[0][1] & $MOVE_TYPE{$_[1]}
191 : undef
192 },
157 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, 193 '+=' => 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 }, 194 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
159 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 195 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
160 'x=' => sub { 196 'x=' => sub { # toggle between off, + and -
161 my $cur = $_[0] >= $_[1]; 197 my $cur = $_[0] >= $_[1];
162 if (!defined $cur) { 198 if (!defined $cur) {
163 if ($_[0] >= "all") { 199 if ($_[0] >= "all") {
164 $_[0] -= $_[1]; 200 $_[0] -= $_[1];
165 } else { 201 } else {
… …
174 $_[0] 210 $_[0]
175 }, 211 },
176 'eq' => sub { "$_[0]" eq "$_[1]" }, 212 'eq' => sub { "$_[0]" eq "$_[1]" },
177 'ne' => sub { "$_[0]" ne "$_[1]" }, 213 'ne' => sub { "$_[0]" ne "$_[1]" },
178 ; 214 ;
179}
180 215
181sub Crossfire::MoveType::new { 216 sub TO_JSON {
217 $_[0][0]
218 }
219}
220
221sub Deliantra::MoveType::new {
182 my ($class, $string) = @_; 222 my ($class, $string) = @_;
183 223
184 my $mask; 224 my $mask;
185 my $value; 225 my $value;
186 226
… …
200 } 240 }
201 241
202 (bless [$mask, $value], $class)->normalise 242 (bless [$mask, $value], $class)->normalise
203} 243}
204 244
205sub Crossfire::MoveType::normalise { 245sub Deliantra::MoveType::normalise {
206 my ($self) = @_; 246 my ($self) = @_;
207 247
208 if ($self->[0] & MOVE_ALL) { 248 if ($self->[0] & MOVE_ALL) {
209 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 249 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
210 $self->[0] &= $mask; 250 $self->[0] &= $mask;
… …
214 $self->[1] &= $self->[0]; 254 $self->[1] &= $self->[0];
215 255
216 $self 256 $self
217} 257}
218 258
219sub Crossfire::MoveType::as_string { 259sub Deliantra::MoveType::as_string {
220 my ($self) = @_; 260 my ($self) = @_;
221 261
222 my @res; 262 my @res;
223 263
224 my ($mask, $value) = @$self; 264 my ($mask, $value) = @$self;
225 265
226 for (@Crossfire::MOVE_TYPE) { 266 for (@Deliantra::MOVE_TYPE) {
227 my $bit = $Crossfire::MOVE_TYPE{$_}; 267 my $bit = $Deliantra::MOVE_TYPE{$_};
228 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 268 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
229 $mask &= ~$bit; 269 $mask &= ~$bit;
230 push @res, $value & $bit ? $_ : "-$_"; 270 push @res, $value & $bit ? $_ : "-$_";
231 } 271 }
232 } 272 }
… …
325 365
326# object as in "Object xxx", i.e. archetypes 366# object as in "Object xxx", i.e. archetypes
327sub normalize_object($) { 367sub normalize_object($) {
328 my ($ob) = @_; 368 my ($ob) = @_;
329 369
370 delete $ob->{editable}; # deprecated
371
330 # convert material bitset to materialname, if possible 372 # convert material bitset to materialname, if possible
331 if (exists $ob->{material}) { 373 if (exists $ob->{material}) {
332 if (!$ob->{material}) { 374 if (!$ob->{material}) {
333 delete $ob->{material}; 375 delete $ob->{material};
334 } elsif (exists $ob->{materialname}) { 376 } elsif (exists $ob->{materialname}) {
… …
344 } else { 386 } else {
345 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 387 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
346 } 388 }
347 } 389 }
348 390
391 # check whether attachment is the same as in the archetype
392 if (exists $ob->{attach}) {
393 my $arch = $ARCH{$ob->{_name}};
394 my $js = JSON::XS->new->utf8->canonical (1);
395
396 if (defined $arch->{attach}
397 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
398 delete $ob->{attach}
399 }
400 }
401
349 # color_fg is used as default for magicmap if magicmap does not exist 402 # 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}; 403 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
351 404
352 # nuke outdated or never supported fields 405 # nuke outdated or never supported fields
353 delete @$ob{qw( 406 delete @$ob{qw(
… …
361 414
362 # convert movement strings to bitsets 415 # convert movement strings to bitsets
363 for my $attr (keys %FIELD_MOVEMENT) { 416 for my $attr (keys %FIELD_MOVEMENT) {
364 next unless exists $ob->{$attr}; 417 next unless exists $ob->{$attr};
365 418
366 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 419 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
367 } 420 }
368 421
369 # convert outdated movement flags to new movement sets 422 # convert outdated movement flags to new movement sets
370 if (defined (my $v = delete $ob->{no_pass})) { 423 if (defined (my $v = delete $ob->{no_pass})) {
371 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 424 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
372 } 425 }
373 if (defined (my $v = delete $ob->{slow_move})) { 426 if (defined (my $v = delete $ob->{slow_move})) {
374 $ob->{move_slow} += "walk"; 427 $ob->{move_slow} += "walk";
375 $ob->{move_slow_penalty} = $v; 428 $ob->{move_slow_penalty} = $v;
376 } 429 }
377 if (defined (my $v = delete $ob->{walk_on})) { 430 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" } 431 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
379 } 432 }
380 if (defined (my $v = delete $ob->{walk_off})) { 433 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" } 434 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
382 } 435 }
383 if (defined (my $v = delete $ob->{fly_on})) { 436 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" } 437 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
385 } 438 }
386 if (defined (my $v = delete $ob->{fly_off})) { 439 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" } 440 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
388 } 441 }
389 if (defined (my $v = delete $ob->{flying})) { 442 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" } 443 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
391 } 444 }
392 445
393 # convert idiotic event_xxx things into objects 446 # convert idiotic event_xxx things into objects
394 while (my ($event, $subtype) = each %EVENT_TYPE) { 447 while (my ($event, $subtype) = each %EVENT_TYPE) {
395 if (exists $ob->{"event_${event}_plugin"}) { 448 if (exists $ob->{"event_${event}_plugin"}) {
… …
411# arch as in "arch xxx", ie.. objects 464# arch as in "arch xxx", ie.. objects
412sub normalize_arch($) { 465sub normalize_arch($) {
413 my ($ob) = @_; 466 my ($ob) = @_;
414 467
415 normalize_object $ob; 468 normalize_object $ob;
469
470 return if $ob->{_atype} eq "object";
416 471
417 my $arch = $ARCH{$ob->{_name}} 472 my $arch = $ARCH{$ob->{_name}}
418 or (warn "$ob->{_name}: no such archetype", return $ob); 473 or (warn "$ob->{_name}: no such archetype", return $ob);
419 474
420 if ($arch->{type} == 22) { # map 475 if ($arch->{type} == 22) { # map
… …
456} 511}
457 512
458sub attr_thaw($) { 513sub attr_thaw($) {
459 my ($ob) = @_; 514 my ($ob) = @_;
460 515
461 $ob->{attach} = from_json $ob->{attach} 516 $ob->{attach} = decode_json $ob->{attach}
462 if exists $ob->{attach}; 517 if exists $ob->{attach};
463 518
464 $ob 519 $ob
465} 520}
466 521
467sub attr_freeze($) { 522sub attr_freeze($) {
468 my ($ob) = @_; 523 my ($ob) = @_;
469 524
470 $ob->{attach} = Crossfire::to_json $ob->{attach} 525 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
471 if exists $ob->{attach}; 526 if exists $ob->{attach};
472 527
473 $ob 528 $ob
474} 529}
475 530
… …
495 550
496 my %arc; 551 my %arc;
497 my ($more, $prev); 552 my ($more, $prev);
498 my $comment; 553 my $comment;
499 554
500 open my $fh, "<:raw:perlio:utf8", $path 555 open my $fh, "<:utf8", $path
501 or Carp::croak "$path: $!"; 556 or Carp::croak "$path: $!";
502 557
503# binmode $fh; 558# binmode $fh;
504 559
505 my $parse_block; $parse_block = sub { 560 my $parse_block; $parse_block = sub {
… …
605 my $str; 660 my $str;
606 661
607 my $append; $append = sub { 662 my $append; $append = sub {
608 my %a = %{$_[0]}; 663 my %a = %{$_[0]};
609 664
610 Crossfire::attr_freeze \%a; 665 Deliantra::attr_freeze \%a;
611 Crossfire::normalize_arch \%a; 666 Deliantra::normalize_arch \%a;
612 667
613 # undo the bit-split we did before 668 # undo the bit-split we did before
614 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 669 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}) 670 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
616 | (delete $a{attack_movement_bits_4_7}); 671 | (delete $a{attack_movement_bits_4_7});
… …
634 } 689 }
635 690
636 my @kv; 691 my @kv;
637 692
638 for ($a{_name} eq "map" 693 for ($a{_name} eq "map"
639 ? @Crossfire::FIELD_ORDER_MAP 694 ? @Deliantra::FIELD_ORDER_MAP
640 : @Crossfire::FIELD_ORDER) { 695 : @Deliantra::FIELD_ORDER) {
641 push @kv, [$_, delete $a{$_}] 696 push @kv, [$_, delete $a{$_}]
642 if exists $a{$_}; 697 if exists $a{$_};
643 } 698 }
644 699
645 for (sort keys %a) { 700 for (sort keys %a) {
… …
648 } 703 }
649 704
650 for (@kv) { 705 for (@kv) {
651 my ($k, $v) = @$_; 706 my ($k, $v) = @$_;
652 707
653 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 708 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
654 $v =~ s/\n$//; 709 $v =~ s/\n$//;
655 $str .= "$k\n$v\n$end\n"; 710 $str .= "$k\n$v\n$end\n";
656 } else { 711 } else {
657 $str .= "$k $v\n"; 712 $str .= "$k $v\n";
658 } 713 }
… …
754=cut 809=cut
755 810
756sub arch_attr($) { 811sub arch_attr($) {
757 my ($obj) = @_; 812 my ($obj) = @_;
758 813
759 require Crossfire::Data; 814 require Deliantra::Data;
760 815
761 my $root; 816 my $root;
762 my $attr = { }; 817 my $attr = { };
763 818
764 my $arch = $ARCH{ $obj->{_name} }; 819 my $arch = $ARCH{ $obj->{_name} };
765 my $type = $obj->{type} || $arch->{type}; 820 my $type = $obj->{type} || $arch->{type};
766 821
767 if ($type > 0) { 822 if ($type > 0) {
768 $root = $Crossfire::Data::ATTR{$type}; 823 $root = $Deliantra::Data::ATTR{$type};
769 } else { 824 } else {
770 my %a = (%$arch, %$obj); 825 my %a = (%$arch, %$obj);
771 826
772 if ($a{is_floor} && !$a{alive}) { 827 if ($a{is_floor} && !$a{alive}) {
773 $root = $Crossfire::Data::TYPE{Floor}; 828 $root = $Deliantra::Data::TYPE{Floor};
774 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 829 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
775 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 830 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
776 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 831 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
777 $root = $Crossfire::Data::TYPE{Wall}; 832 $root = $Deliantra::Data::TYPE{Wall};
778 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 833 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
779 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 834 $root = $Deliantra::Data::TYPE{"Weak Wall"};
780 } else { 835 } else {
781 $root = $Crossfire::Data::TYPE{Misc}; 836 $root = $Deliantra::Data::TYPE{Misc};
782 } 837 }
783 } 838 }
784 839
840 my (%ignore);
785 my @import = ($root); 841 my @import = ($root);
842
843 my @new_import;
844 while (my $type = shift @import) {
845 # first import everything we will need:
846 push @import,
847 grep $_,
848 map $Deliantra::Data::TYPE{$_},
849 @{$type->{import} || []};
850
851 # and compute the ignored attributes
852 for (@{$type->{ignore} || []}) {
853 $ignore{$_}++ for ref $_ ? @$_ : $_;
854 }
855
856 push @new_import, $type;
786 857 }
858 (@import) = @new_import;
859
860 # then add defaults to the back of the list, so they are added
861 # as last resort.
787 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 862 push @import, \%Deliantra::Data::DEFAULT_ATTR
788 unless $type == 116; 863 unless $type == 116;
789 864
790 my (%ignore);
791 my (@section_order, %section, @attr_order); 865 my (@section_order, %section, @attr_order);
792 866
867 # @import = root, imported, default
793 while (my $type = shift @import) { 868 while (my $type = pop @import) {
794 push @import, @{$type->{import} || []};
795
796 $attr->{$_} ||= $type->{$_} 869 $attr->{$_} ||= $type->{$_}
797 for qw(name desc use); 870 for qw(name desc use);
798
799 for (@{$type->{ignore} || []}) {
800 $ignore{$_}++ for ref $_ ? @$_ : $_;
801 }
802 871
803 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 872 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
804 my ($name, $attr) = @$_; 873 my ($name, $attr) = @$_;
805 push @section_order, $name; 874 push @section_order, $name;
806 for (@$attr) { 875 for (@$attr) {
807 my ($k, $v) = @$_; 876 my ($k, $v) = @$_;
808 push @attr_order, $k; 877 push @attr_order, $k;
809 $section{$name}{$k} ||= $v; 878 $section{$name}{$k} = $v; # overwrite, so that the root decides
810 }
811 } 879 }
880 }
881 }
882
883 # remove ignores for "root" type
884 for (
885 map @{$_->[1]}, # section attributes
886 [general => ($root->{attr} || [])],
887 @{$root->{section} || []}
888 ) {
889 my ($k, $v) = @$_;
890 # skip fixed attributes, if they are ignored thats fine
891 next if $v->{type} eq 'fixed';
892
893 delete $ignore{$k}; # if the attributes are defined explicitly they
894 # should NOT be ignored. ignore should mainly
895 # hit imported/inherited attributes.
812 } 896 }
813 897
814 $attr->{section} = [ 898 $attr->{section} = [
815 map !exists $section{$_} ? () : do { 899 map !exists $section{$_} ? () : do {
816 my $attr = delete $section{$_}; 900 my $attr = delete $section{$_};
… …
820 map exists $attr->{$_} && !$ignore{$_} 904 map exists $attr->{$_} && !$ignore{$_}
821 ? [$_ => delete $attr->{$_}] : (), 905 ? [$_ => delete $attr->{$_}] : (),
822 @attr_order 906 @attr_order
823 ] 907 ]
824 }, 908 },
825
826 exists $section{$_} ? [$_ => delete $section{$_}] : (), 909 exists $section{$_} ? [$_ => delete $section{$_}] : (),
827 @section_order 910 @section_order
828 ]; 911 ];
829 912
830 $attr 913 $attr
831} 914}
… …
888} 971}
889 972
890sub construct_tilecache_pb { 973sub construct_tilecache_pb {
891 my ($idx, $cache) = @_; 974 my ($idx, $cache) = @_;
892 975
893 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 976 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
894 977
895 while (my ($name, $tile) = each %$cache) { 978 while (my ($name, $tile) = each %$cache) {
896 my $tpb = delete $tile->{pb}; 979 my $tpb = delete $tile->{pb};
897 my $ofs = $tile->{idx}; 980 my $ofs = $tile->{idx};
898 981
899 for my $x (0 .. $tile->{w} - 1) { 982 for my $x (0 .. $tile->{w} - 1) {
900 for my $y (0 .. $tile->{h} - 1) { 983 for my $y (0 .. $tile->{h} - 1) {
901 my $idx = $ofs + $x + $y * $tile->{w}; 984 my $idx = $ofs + $x + $y * $tile->{w};
902 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 985 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
903 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 986 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
904 } 987 }
905 } 988 }
906 } 989 }
907 990
908 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 991 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
924=cut 1007=cut
925 1008
926sub load_tilecache() { 1009sub load_tilecache() {
927 require Gtk2; 1010 require Gtk2;
928 1011
929 if (-e "$LIB/crossfire.0") { # Crossfire1 version
930 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache, 1012 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
931 sub { 1013 sub {
932 my $tile = read_pak "$LIB/crossfire.0";
933
934 my %cache; 1014 my %cache;
1015 my $facedata = Storable::retrieve "$LIB/faceinfo";
935 1016
1017 open my $fh, "<", "$LIB/facedata"
1018 or die "$LIB/facedata: $!";
1019
1020 $facedata->{version} == 2
1021 or die "$LIB/facedata: version mismatch, cannot proceed.";
1022
1023 my $faces = $facedata->{faceinfo};
936 my $idx = 0; 1024 my $idx = 0;
937 1025
938 for my $name (sort keys %$tile) { 1026 for (sort keys %$faces) {
1027 my ($face, $info) = ($_, $faces->{$_});
1028
939 my $pb = new Gtk2::Gdk::PixbufLoader; 1029 my $pb = new Gtk2::Gdk::PixbufLoader;
1030
1031 if (exists $info->{data32}) {
940 $pb->write ($tile->{$name}); 1032 $pb->write ($info->{data32});
941 $pb->close; 1033 } else {
942 my $pb = $pb->get_pixbuf; 1034 sysseek $fh, $info->{fofs32}, 0;
943 1035 sysread $fh, my $buf, $info->{size32};
944 my $tile = $cache{$name} = { 1036 $pb->write ($buf);
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 } 1037 }
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,
961 sub {
962 my %cache;
963 my $facedata = Storable::retrieve "$LIB/facedata";
964
965 $facedata->{version} == 2
966 or die "$LIB/facedata: version mismatch, cannot proceed.";
967
968 my $faces = $facedata->{faceinfo};
969 my $idx = 0;
970
971 for (sort keys %$faces) {
972 my ($face, $info) = ($_, $faces->{$_});
973
974 my $pb = new Gtk2::Gdk::PixbufLoader;
975 $pb->write ($info->{data32});
976 $pb->close; 1038 $pb->close;
977 my $pb = $pb->get_pixbuf; 1039 my $pb = $pb->get_pixbuf;
978 1040
979 my $tile = $cache{$face} = { 1041 my $tile = $cache{$face} = {
980 pb => $pb, 1042 pb => $pb,
981 idx => $idx, 1043 idx => $idx,
982 w => int $pb->get_width / TILESIZE, 1044 w => int $pb->get_width / TILESIZE,
983 h => int $pb->get_height / TILESIZE, 1045 h => int $pb->get_height / TILESIZE,
984 }; 1046 };
985 1047
986 $idx += $tile->{w} * $tile->{h}; 1048 $idx += $tile->{w} * $tile->{h};
987 } 1049 }
988 1050
989 construct_tilecache_pb $idx, \%cache; 1051 construct_tilecache_pb $idx, \%cache;
990 1052
991 \%cache 1053 \%cache
992 }; 1054 };
993 }
994} 1055}
1056
1057=back
995 1058
996=head1 AUTHOR 1059=head1 AUTHOR
997 1060
998 Marc Lehmann <schmorp@schmorp.de> 1061 Marc Lehmann <schmorp@schmorp.de>
999 http://home.schmorp.de/ 1062 http://home.schmorp.de/
… …
1002 http://www.ta-sa.org/ 1065 http://www.ta-sa.org/
1003 1066
1004=cut 1067=cut
1005 1068
10061 10691
1070

Diff Legend

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