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.92 by root, Sat Mar 3 19:32:00 2007 UTC vs.
Revision 1.128 by root, Sun Sep 28 05:58:01 2008 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Deliantra;
8 8
9our $VERSION = '0.96'; 9our $VERSION = '1.222';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
16use File::Spec; 16use File::Spec;
17use List::Util qw(min max); 17use List::Util qw(min max);
18use Storable qw(freeze thaw); 18use Storable qw(freeze thaw);
19 19
20our @EXPORT = qw( 20our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 21 read_pak read_arch
22 *ARCH $TILE *FACE *FACEDATA
23 TILESIZE CACHESTRIDE
24 editor_archs arch_extents
22); 25);
23 26
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working 27use JSON::XS qw(decode_json encode_json);
25 28
26sub from_json($) {
27 $JSON::Syck::ImplicitUnicode = 1;
28 JSON::Syck::Load $_[0]
29}
30
31sub to_json($) {
32 $JSON::Syck::ImplicitUnicode = 0;
33 JSON::Syck::Dump $_[0]
34}
35
36our $LIB = $ENV{CROSSFIRE_LIBDIR}; 29our $LIB = $ENV{DELIANTRA_LIBDIR};
37 30
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
40 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/deliantra";
41 34
42mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
43 36
44sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
45 39
46our %ARCH; 40our %ARCH;
41our %FACE; # face32
47our %FACE; 42our %FACEDATA;
48our $TILE; 43our $TILE;
49 44
50our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
51 msg => "endmsg", 46 msg => "endmsg",
52 lore => "endlore", 47 lore => "endlore",
… …
68 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
69 tile_path_1 tile_path_2 tile_path_3 tile_path_4 64 tile_path_1 tile_path_2 tile_path_3 tile_path_4
70)); 65));
71 66
72our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
73 elevation 70 elevation
74 71
75 name name_pl custom_name attach title race 72 name name_pl custom_name attach title race
76 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
77 #todo-events 74 sound sound_destroy face animation is_animated
78 animation is_animated 75 magicmap smoothlevel smoothface
79 str dex con wis pow cha int 76 str dex con wis pow cha int
80 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
81 exp perm_exp expmul 78 exp perm_exp expmul
82 food dam luck wc ac x y speed speed_left move_state attack_movement 79 food dam luck wc ac x y speed speed_left move_state attack_movement
83 nrof level direction type subtype attacktype 80 nrof level direction type subtype attacktype
… …
91 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
92 89
93 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
94 value carrying weight invisible state magic 91 value carrying weight invisible state magic
95 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
96 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
97 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
98 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
99 item_power duration range 96 item_power duration range
100 range_modifier duration_modifier dam_modifier gen_sp_armour 97 range_modifier duration_modifier dam_modifier gen_sp_armour
101 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 98 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
112 known_magical known_cursed can_use_skill been_applied has_ready_scroll 109 known_magical known_cursed can_use_skill been_applied has_ready_scroll
113 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 110 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
114 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 111 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
115 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 112 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
116 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
114 precious
117 115
118 body_range body_arm body_torso body_head body_neck body_skill 116 body_range body_arm body_torso body_head body_neck body_skill
119 body_finger body_shoulder body_foot body_hand body_wrist body_waist 117 body_finger body_shoulder body_foot body_hand body_wrist body_waist
120)); 118));
121 119
… …
138sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
139sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
140sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
141sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
142sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
143sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
144sub MOVE_ALL (){ 0x10000 } # very special value 143sub MOVE_ALL (){ 0x10000 } # very special value
145 144
146our %MOVE_TYPE = ( 145our %MOVE_TYPE = (
147 walk => MOVE_WALK, 146 walk => MOVE_WALK,
148 fly_low => MOVE_FLY_LOW, 147 fly_low => MOVE_FLY_LOW,
149 fly_high => MOVE_FLY_HIGH, 148 fly_high => MOVE_FLY_HIGH,
150 flying => MOVE_FLYING, 149 flying => MOVE_FLYING,
151 swim => MOVE_SWIM, 150 swim => MOVE_SWIM,
152 boat => MOVE_BOAT, 151 boat => MOVE_BOAT,
152 ship => MOVE_SHIP,
153 all => MOVE_ALL, 153 all => MOVE_ALL,
154); 154);
155 155
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); 156our @MOVE_TYPE = keys %MOVE_TYPE;
157 157
158{ 158{
159 package Crossfire::MoveType; 159 package Deliantra::MoveType;
160 160
161 use overload 161 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
162 '""' => \&as_string, 163 '""' => \&as_string,
163 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
164 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, 165 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
165 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 166 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
166 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 'x=' => sub { 168 'x=' => sub {
168 my $cur = $_[0] >= $_[1]; 169 my $cur = $_[0] >= $_[1];
169 if (!defined $cur) { 170 if (!defined $cur) {
171 if ($_[0] >= "all") {
172 $_[0] -= $_[1];
173 } else {
170 $_[0] += $_[1]; 174 $_[0] += $_[1];
175 }
171 } elsif ($cur) { 176 } elsif ($cur) {
172 $_[0] -= $_[1]; 177 $_[0] -= $_[1];
173 } else { 178 } else {
174 $_[0] /= $_[1]; 179 $_[0] /= $_[1];
175 } 180 }
… …
179 'eq' => sub { "$_[0]" eq "$_[1]" }, 184 'eq' => sub { "$_[0]" eq "$_[1]" },
180 'ne' => sub { "$_[0]" ne "$_[1]" }, 185 'ne' => sub { "$_[0]" ne "$_[1]" },
181 ; 186 ;
182} 187}
183 188
184sub Crossfire::MoveType::new { 189sub Deliantra::MoveType::new {
185 my ($class, $string) = @_; 190 my ($class, $string) = @_;
186 191
187 my $mask; 192 my $mask;
188 my $value; 193 my $value;
189 194
… …
203 } 208 }
204 209
205 (bless [$mask, $value], $class)->normalise 210 (bless [$mask, $value], $class)->normalise
206} 211}
207 212
208sub Crossfire::MoveType::normalise { 213sub Deliantra::MoveType::normalise {
209 my ($self) = @_; 214 my ($self) = @_;
210 215
211 if ($self->[0] & MOVE_ALL) { 216 if ($self->[0] & MOVE_ALL) {
212 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 217 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
213 $self->[0] &= $mask; 218 $self->[0] &= $mask;
… …
217 $self->[1] &= $self->[0]; 222 $self->[1] &= $self->[0];
218 223
219 $self 224 $self
220} 225}
221 226
222sub Crossfire::MoveType::as_string { 227sub Deliantra::MoveType::as_string {
223 my ($self) = @_; 228 my ($self) = @_;
224 229
225 my @res; 230 my @res;
226 231
227 my ($mask, $value) = @$self; 232 my ($mask, $value) = @$self;
228 233
229 for (@Crossfire::MOVE_TYPE) { 234 for (@Deliantra::MOVE_TYPE) {
230 my $bit = $Crossfire::MOVE_TYPE{$_}; 235 my $bit = $Deliantra::MOVE_TYPE{$_};
231 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
232 $mask &= ~$bit; 237 $mask &= ~$bit;
233 push @res, $value & $bit ? $_ : "-$_"; 238 push @res, $value & $bit ? $_ : "-$_";
234 } 239 }
235 } 240 }
… …
347 } else { 352 } else {
348 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
349 } 354 }
350 } 355 }
351 356
357 # check whether attachment is the same as in the archetype
358 if (exists $ob->{attach}) {
359 my $arch = $ARCH{$ob->{_name}};
360 my $js = JSON::XS->new->utf8->canonical (1);
361
362 if (defined $arch->{attach}
363 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
364 delete $ob->{attach}
365 }
366 }
367
368 # color_fg is used as default for magicmap if magicmap does not exist
369 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
370
352 # nuke outdated or never supported fields 371 # nuke outdated or never supported fields
353 delete @$ob{qw( 372 delete @$ob{qw(
354 can_knockback can_parry can_impale can_cut can_dam_armour 373 can_knockback can_parry can_impale can_cut can_dam_armour
355 can_apply pass_thru can_pass_thru 374 can_apply pass_thru can_pass_thru color_bg color_fg
356 )}; 375 )};
357 376
358 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 377 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
359 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 378 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
360 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 379 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
361 380
362 # convert movement strings to bitsets 381 # convert movement strings to bitsets
363 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
364 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
365 384
366 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
367 } 386 }
368 387
369 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
370 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
371 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
372 } 391 }
373 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
374 $ob->{move_slow} += "walk"; 393 $ob->{move_slow} += "walk";
375 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
376 } 395 }
377 if (defined (my $v = delete $ob->{walk_on})) { 396 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" } 397 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
379 } 398 }
380 if (defined (my $v = delete $ob->{walk_off})) { 399 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" } 400 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
382 } 401 }
383 if (defined (my $v = delete $ob->{fly_on})) { 402 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" } 403 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
385 } 404 }
386 if (defined (my $v = delete $ob->{fly_off})) { 405 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" } 406 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
388 } 407 }
389 if (defined (my $v = delete $ob->{flying})) { 408 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" } 409 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
391 } 410 }
392 411
393 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
394 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
395 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
… …
411# arch as in "arch xxx", ie.. objects 430# arch as in "arch xxx", ie.. objects
412sub normalize_arch($) { 431sub normalize_arch($) {
413 my ($ob) = @_; 432 my ($ob) = @_;
414 433
415 normalize_object $ob; 434 normalize_object $ob;
435
436 return if $ob->{_atype} eq "object";
416 437
417 my $arch = $ARCH{$ob->{_name}} 438 my $arch = $ARCH{$ob->{_name}}
418 or (warn "$ob->{_name}: no such archetype", return $ob); 439 or (warn "$ob->{_name}: no such archetype", return $ob);
419 440
420 if ($arch->{type} == 22) { # map 441 if ($arch->{type} == 22) { # map
… …
456} 477}
457 478
458sub attr_thaw($) { 479sub attr_thaw($) {
459 my ($ob) = @_; 480 my ($ob) = @_;
460 481
461 $ob->{attach} = from_json $ob->{attach} 482 $ob->{attach} = decode_json $ob->{attach}
462 if exists $ob->{attach}; 483 if exists $ob->{attach};
463 484
464 $ob 485 $ob
465} 486}
466 487
467sub attr_freeze($) { 488sub attr_freeze($) {
468 my ($ob) = @_; 489 my ($ob) = @_;
469 490
470 $ob->{attach} = Crossfire::to_json $ob->{attach} 491 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
471 if exists $ob->{attach}; 492 if exists $ob->{attach};
472 493
473 $ob 494 $ob
474} 495}
475 496
… …
495 516
496 my %arc; 517 my %arc;
497 my ($more, $prev); 518 my ($more, $prev);
498 my $comment; 519 my $comment;
499 520
500 open my $fh, "<:raw:perlio:utf8", $path 521 open my $fh, "<:utf8", $path
501 or Carp::croak "$path: $!"; 522 or Carp::croak "$path: $!";
502 523
503# binmode $fh; 524# binmode $fh;
504 525
505 my $parse_block; $parse_block = sub { 526 my $parse_block; $parse_block = sub {
… …
605 my $str; 626 my $str;
606 627
607 my $append; $append = sub { 628 my $append; $append = sub {
608 my %a = %{$_[0]}; 629 my %a = %{$_[0]};
609 630
610 Crossfire::attr_freeze \%a; 631 Deliantra::attr_freeze \%a;
611 Crossfire::normalize_arch \%a; 632 Deliantra::normalize_arch \%a;
612 633
613 # undo the bit-split we did before 634 # undo the bit-split we did before
614 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 635 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}) 636 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
616 | (delete $a{attack_movement_bits_4_7}); 637 | (delete $a{attack_movement_bits_4_7});
… …
634 } 655 }
635 656
636 my @kv; 657 my @kv;
637 658
638 for ($a{_name} eq "map" 659 for ($a{_name} eq "map"
639 ? @Crossfire::FIELD_ORDER_MAP 660 ? @Deliantra::FIELD_ORDER_MAP
640 : @Crossfire::FIELD_ORDER) { 661 : @Deliantra::FIELD_ORDER) {
641 push @kv, [$_, delete $a{$_}] 662 push @kv, [$_, delete $a{$_}]
642 if exists $a{$_}; 663 if exists $a{$_};
643 } 664 }
644 665
645 for (sort keys %a) { 666 for (sort keys %a) {
… …
648 } 669 }
649 670
650 for (@kv) { 671 for (@kv) {
651 my ($k, $v) = @$_; 672 my ($k, $v) = @$_;
652 673
653 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 674 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
654 $v =~ s/\n$//; 675 $v =~ s/\n$//;
655 $str .= "$k\n$v\n$end\n"; 676 $str .= "$k\n$v\n$end\n";
656 } else { 677 } else {
657 $str .= "$k $v\n"; 678 $str .= "$k $v\n";
658 } 679 }
… …
754=cut 775=cut
755 776
756sub arch_attr($) { 777sub arch_attr($) {
757 my ($obj) = @_; 778 my ($obj) = @_;
758 779
759 require Crossfire::Data; 780 require Deliantra::Data;
760 781
761 my $root; 782 my $root;
762 my $attr = { }; 783 my $attr = { };
763 784
764 my $arch = $ARCH{ $obj->{_name} }; 785 my $arch = $ARCH{ $obj->{_name} };
765 my $type = $obj->{type} || $arch->{type}; 786 my $type = $obj->{type} || $arch->{type};
766 787
767 if ($type > 0) { 788 if ($type > 0) {
768 $root = $Crossfire::Data::ATTR{$type}; 789 $root = $Deliantra::Data::ATTR{$type};
769 } else { 790 } else {
770 my %a = (%$arch, %$obj); 791 my %a = (%$arch, %$obj);
771 792
772 if ($a{is_floor} && !$a{alive}) { 793 if ($a{is_floor} && !$a{alive}) {
773 $root = $Crossfire::Data::TYPE{Floor}; 794 $root = $Deliantra::Data::TYPE{Floor};
774 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 795 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
775 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 796 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
776 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 797 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
777 $root = $Crossfire::Data::TYPE{Wall}; 798 $root = $Deliantra::Data::TYPE{Wall};
778 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
779 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 800 $root = $Deliantra::Data::TYPE{"Weak Wall"};
780 } else { 801 } else {
781 $root = $Crossfire::Data::TYPE{Misc}; 802 $root = $Deliantra::Data::TYPE{Misc};
782 } 803 }
783 } 804 }
784 805
785 my @import = ($root); 806 my @import = ($root);
786 807
787 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 808 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
788 unless $type == 116; 809 unless $type == 116;
789 810
790 my (%ignore); 811 my (%ignore);
791 my (@section_order, %section, @attr_order); 812 my (@section_order, %section, @attr_order);
792 813
793 while (my $type = shift @import) { 814 while (my $type = shift @import) {
815 push @import,
816 grep $_,
817 map $Deliantra::Data::TYPE{$_},
794 push @import, @{$type->{import} || []}; 818 @{$type->{import} || []};
795 819
796 $attr->{$_} ||= $type->{$_} 820 $attr->{$_} ||= $type->{$_}
797 for qw(name desc use); 821 for qw(name desc use);
798 822
799 for (@{$type->{ignore} || []}) { 823 for (@{$type->{ignore} || []}) {
… …
885 }, sub { 909 }, sub {
886 read_arch "$LIB/archetypes" 910 read_arch "$LIB/archetypes"
887 }; 911 };
888} 912}
889 913
914sub construct_tilecache_pb {
915 my ($idx, $cache) = @_;
916
917 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
918
919 while (my ($name, $tile) = each %$cache) {
920 my $tpb = delete $tile->{pb};
921 my $ofs = $tile->{idx};
922
923 for my $x (0 .. $tile->{w} - 1) {
924 for my $y (0 .. $tile->{h} - 1) {
925 my $idx = $ofs + $x + $y * $tile->{w};
926 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
927 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
928 }
929 }
930 }
931
932 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
933
934 $cache
935}
936
937sub use_tilecache {
938 my ($face) = @_;
939 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
940 or die "$VARDIR/tilecache.png: $!";
941 *FACE = $_[0];
942}
943
890=item load_tilecache 944=item load_tilecache
891 945
892(Re-)Load %TILE and %FACE. 946(Re-)Load %TILE and %FACE.
893 947
894=cut 948=cut
895 949
896sub load_tilecache() { 950sub load_tilecache() {
897 require Gtk2; 951 require Gtk2;
898 952
899 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 953 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
900 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
901 or die "$VARDIR/tilecache.png: $!";
902 *FACE = $_[0];
903 }, sub { 954 sub {
904 my $tile = read_pak "$LIB/crossfire.0";
905
906 my %cache; 955 my %cache;
956 my $facedata = Storable::retrieve "$LIB/facedata";
907 957
958 $facedata->{version} == 2
959 or die "$LIB/facedata: version mismatch, cannot proceed.";
960
961 my $faces = $facedata->{faceinfo};
908 my $idx = 0; 962 my $idx = 0;
909 963
910 for my $name (sort keys %$tile) { 964 for (sort keys %$faces) {
965 my ($face, $info) = ($_, $faces->{$_});
966
911 my $pb = new Gtk2::Gdk::PixbufLoader; 967 my $pb = new Gtk2::Gdk::PixbufLoader;
912 $pb->write ($tile->{$name}); 968 $pb->write ($info->{data32});
913 $pb->close; 969 $pb->close;
914 my $pb = $pb->get_pixbuf; 970 my $pb = $pb->get_pixbuf;
915 971
916 my $tile = $cache{$name} = { 972 my $tile = $cache{$face} = {
917 pb => $pb, 973 pb => $pb,
918 idx => $idx, 974 idx => $idx,
919 w => int $pb->get_width / TILESIZE, 975 w => int $pb->get_width / TILESIZE,
920 h => int $pb->get_height / TILESIZE, 976 h => int $pb->get_height / TILESIZE,
921 }; 977 };
922
923 978
924 $idx += $tile->{w} * $tile->{h}; 979 $idx += $tile->{w} * $tile->{h};
980 }
981
982 construct_tilecache_pb $idx, \%cache;
983
984 \%cache
925 } 985 };
926
927 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
928
929 while (my ($name, $tile) = each %cache) {
930 my $tpb = delete $tile->{pb};
931 my $ofs = $tile->{idx};
932
933 for my $x (0 .. $tile->{w} - 1) {
934 for my $y (0 .. $tile->{h} - 1) {
935 my $idx = $ofs + $x + $y * $tile->{w};
936 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
937 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
938 }
939 }
940 }
941
942 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
943
944 \%cache
945 };
946} 986}
947 987
948=head1 AUTHOR 988=head1 AUTHOR
949 989
950 Marc Lehmann <schmorp@schmorp.de> 990 Marc Lehmann <schmorp@schmorp.de>
… …
954 http://www.ta-sa.org/ 994 http://www.ta-sa.org/
955 995
956=cut 996=cut
957 997
9581 9981
999

Diff Legend

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