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

Diff Legend

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