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.132 by root, Wed Sep 2 22:38:57 2009 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.25';
10 10
11use strict; 11use common::sense;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
15use Carp (); 15use Carp ();
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 = qw(all walk flying fly_low fly_high swim boat ship);
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 }
… …
177 $_[0] 182 $_[0]
178 }, 183 },
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}
183 187
184sub Crossfire::MoveType::new { 188 sub TO_JSON {
189 $_[0][0]
190 }
191}
192
193sub Deliantra::MoveType::new {
185 my ($class, $string) = @_; 194 my ($class, $string) = @_;
186 195
187 my $mask; 196 my $mask;
188 my $value; 197 my $value;
189 198
… …
203 } 212 }
204 213
205 (bless [$mask, $value], $class)->normalise 214 (bless [$mask, $value], $class)->normalise
206} 215}
207 216
208sub Crossfire::MoveType::normalise { 217sub Deliantra::MoveType::normalise {
209 my ($self) = @_; 218 my ($self) = @_;
210 219
211 if ($self->[0] & MOVE_ALL) { 220 if ($self->[0] & MOVE_ALL) {
212 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 221 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
213 $self->[0] &= $mask; 222 $self->[0] &= $mask;
… …
217 $self->[1] &= $self->[0]; 226 $self->[1] &= $self->[0];
218 227
219 $self 228 $self
220} 229}
221 230
222sub Crossfire::MoveType::as_string { 231sub Deliantra::MoveType::as_string {
223 my ($self) = @_; 232 my ($self) = @_;
224 233
225 my @res; 234 my @res;
226 235
227 my ($mask, $value) = @$self; 236 my ($mask, $value) = @$self;
228 237
229 for (@Crossfire::MOVE_TYPE) { 238 for (@Deliantra::MOVE_TYPE) {
230 my $bit = $Crossfire::MOVE_TYPE{$_}; 239 my $bit = $Deliantra::MOVE_TYPE{$_};
231 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 240 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
232 $mask &= ~$bit; 241 $mask &= ~$bit;
233 push @res, $value & $bit ? $_ : "-$_"; 242 push @res, $value & $bit ? $_ : "-$_";
234 } 243 }
235 } 244 }
… …
347 } else { 356 } else {
348 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 357 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
349 } 358 }
350 } 359 }
351 360
361 # check whether attachment is the same as in the archetype
362 if (exists $ob->{attach}) {
363 my $arch = $ARCH{$ob->{_name}};
364 my $js = JSON::XS->new->utf8->canonical (1);
365
366 if (defined $arch->{attach}
367 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
368 delete $ob->{attach}
369 }
370 }
371
372 # color_fg is used as default for magicmap if magicmap does not exist
373 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
374
352 # nuke outdated or never supported fields 375 # nuke outdated or never supported fields
353 delete @$ob{qw( 376 delete @$ob{qw(
354 can_knockback can_parry can_impale can_cut can_dam_armour 377 can_knockback can_parry can_impale can_cut can_dam_armour
355 can_apply pass_thru can_pass_thru 378 can_apply pass_thru can_pass_thru color_bg color_fg
356 )}; 379 )};
357 380
358 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 381 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
359 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 382 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
360 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 383 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
361 384
362 # convert movement strings to bitsets 385 # convert movement strings to bitsets
363 for my $attr (keys %FIELD_MOVEMENT) { 386 for my $attr (keys %FIELD_MOVEMENT) {
364 next unless exists $ob->{$attr}; 387 next unless exists $ob->{$attr};
365 388
366 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 389 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
367 } 390 }
368 391
369 # convert outdated movement flags to new movement sets 392 # convert outdated movement flags to new movement sets
370 if (defined (my $v = delete $ob->{no_pass})) { 393 if (defined (my $v = delete $ob->{no_pass})) {
371 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 394 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
372 } 395 }
373 if (defined (my $v = delete $ob->{slow_move})) { 396 if (defined (my $v = delete $ob->{slow_move})) {
374 $ob->{move_slow} += "walk"; 397 $ob->{move_slow} += "walk";
375 $ob->{move_slow_penalty} = $v; 398 $ob->{move_slow_penalty} = $v;
376 } 399 }
377 if (defined (my $v = delete $ob->{walk_on})) { 400 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" } 401 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
379 } 402 }
380 if (defined (my $v = delete $ob->{walk_off})) { 403 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" } 404 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
382 } 405 }
383 if (defined (my $v = delete $ob->{fly_on})) { 406 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" } 407 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
385 } 408 }
386 if (defined (my $v = delete $ob->{fly_off})) { 409 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" } 410 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
388 } 411 }
389 if (defined (my $v = delete $ob->{flying})) { 412 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" } 413 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
391 } 414 }
392 415
393 # convert idiotic event_xxx things into objects 416 # convert idiotic event_xxx things into objects
394 while (my ($event, $subtype) = each %EVENT_TYPE) { 417 while (my ($event, $subtype) = each %EVENT_TYPE) {
395 if (exists $ob->{"event_${event}_plugin"}) { 418 if (exists $ob->{"event_${event}_plugin"}) {
… …
411# arch as in "arch xxx", ie.. objects 434# arch as in "arch xxx", ie.. objects
412sub normalize_arch($) { 435sub normalize_arch($) {
413 my ($ob) = @_; 436 my ($ob) = @_;
414 437
415 normalize_object $ob; 438 normalize_object $ob;
439
440 return if $ob->{_atype} eq "object";
416 441
417 my $arch = $ARCH{$ob->{_name}} 442 my $arch = $ARCH{$ob->{_name}}
418 or (warn "$ob->{_name}: no such archetype", return $ob); 443 or (warn "$ob->{_name}: no such archetype", return $ob);
419 444
420 if ($arch->{type} == 22) { # map 445 if ($arch->{type} == 22) { # map
… …
456} 481}
457 482
458sub attr_thaw($) { 483sub attr_thaw($) {
459 my ($ob) = @_; 484 my ($ob) = @_;
460 485
461 $ob->{attach} = from_json $ob->{attach} 486 $ob->{attach} = decode_json $ob->{attach}
462 if exists $ob->{attach}; 487 if exists $ob->{attach};
463 488
464 $ob 489 $ob
465} 490}
466 491
467sub attr_freeze($) { 492sub attr_freeze($) {
468 my ($ob) = @_; 493 my ($ob) = @_;
469 494
470 $ob->{attach} = Crossfire::to_json $ob->{attach} 495 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
471 if exists $ob->{attach}; 496 if exists $ob->{attach};
472 497
473 $ob 498 $ob
474} 499}
475 500
… …
495 520
496 my %arc; 521 my %arc;
497 my ($more, $prev); 522 my ($more, $prev);
498 my $comment; 523 my $comment;
499 524
500 open my $fh, "<:raw:perlio:utf8", $path 525 open my $fh, "<:utf8", $path
501 or Carp::croak "$path: $!"; 526 or Carp::croak "$path: $!";
502 527
503# binmode $fh; 528# binmode $fh;
504 529
505 my $parse_block; $parse_block = sub { 530 my $parse_block; $parse_block = sub {
… …
605 my $str; 630 my $str;
606 631
607 my $append; $append = sub { 632 my $append; $append = sub {
608 my %a = %{$_[0]}; 633 my %a = %{$_[0]};
609 634
610 Crossfire::attr_freeze \%a; 635 Deliantra::attr_freeze \%a;
611 Crossfire::normalize_arch \%a; 636 Deliantra::normalize_arch \%a;
612 637
613 # undo the bit-split we did before 638 # undo the bit-split we did before
614 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 639 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}) 640 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
616 | (delete $a{attack_movement_bits_4_7}); 641 | (delete $a{attack_movement_bits_4_7});
… …
634 } 659 }
635 660
636 my @kv; 661 my @kv;
637 662
638 for ($a{_name} eq "map" 663 for ($a{_name} eq "map"
639 ? @Crossfire::FIELD_ORDER_MAP 664 ? @Deliantra::FIELD_ORDER_MAP
640 : @Crossfire::FIELD_ORDER) { 665 : @Deliantra::FIELD_ORDER) {
641 push @kv, [$_, delete $a{$_}] 666 push @kv, [$_, delete $a{$_}]
642 if exists $a{$_}; 667 if exists $a{$_};
643 } 668 }
644 669
645 for (sort keys %a) { 670 for (sort keys %a) {
… …
648 } 673 }
649 674
650 for (@kv) { 675 for (@kv) {
651 my ($k, $v) = @$_; 676 my ($k, $v) = @$_;
652 677
653 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 678 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
654 $v =~ s/\n$//; 679 $v =~ s/\n$//;
655 $str .= "$k\n$v\n$end\n"; 680 $str .= "$k\n$v\n$end\n";
656 } else { 681 } else {
657 $str .= "$k $v\n"; 682 $str .= "$k $v\n";
658 } 683 }
… …
754=cut 779=cut
755 780
756sub arch_attr($) { 781sub arch_attr($) {
757 my ($obj) = @_; 782 my ($obj) = @_;
758 783
759 require Crossfire::Data; 784 require Deliantra::Data;
760 785
761 my $root; 786 my $root;
762 my $attr = { }; 787 my $attr = { };
763 788
764 my $arch = $ARCH{ $obj->{_name} }; 789 my $arch = $ARCH{ $obj->{_name} };
765 my $type = $obj->{type} || $arch->{type}; 790 my $type = $obj->{type} || $arch->{type};
766 791
767 if ($type > 0) { 792 if ($type > 0) {
768 $root = $Crossfire::Data::ATTR{$type}; 793 $root = $Deliantra::Data::ATTR{$type};
769 } else { 794 } else {
770 my %a = (%$arch, %$obj); 795 my %a = (%$arch, %$obj);
771 796
772 if ($a{is_floor} && !$a{alive}) { 797 if ($a{is_floor} && !$a{alive}) {
773 $root = $Crossfire::Data::TYPE{Floor}; 798 $root = $Deliantra::Data::TYPE{Floor};
774 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
775 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 800 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
776 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 801 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
777 $root = $Crossfire::Data::TYPE{Wall}; 802 $root = $Deliantra::Data::TYPE{Wall};
778 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
779 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 804 $root = $Deliantra::Data::TYPE{"Weak Wall"};
780 } else { 805 } else {
781 $root = $Crossfire::Data::TYPE{Misc}; 806 $root = $Deliantra::Data::TYPE{Misc};
782 } 807 }
783 } 808 }
784 809
785 my @import = ($root); 810 my @import = ($root);
786 811
787 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 812 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
788 unless $type == 116; 813 unless $type == 116;
789 814
790 my (%ignore); 815 my (%ignore);
791 my (@section_order, %section, @attr_order); 816 my (@section_order, %section, @attr_order);
792 817
793 while (my $type = shift @import) { 818 while (my $type = shift @import) {
819 push @import,
820 grep $_,
821 map $Deliantra::Data::TYPE{$_},
794 push @import, @{$type->{import} || []}; 822 @{$type->{import} || []};
795 823
796 $attr->{$_} ||= $type->{$_} 824 $attr->{$_} ||= $type->{$_}
797 for qw(name desc use); 825 for qw(name desc use);
798 826
799 for (@{$type->{ignore} || []}) { 827 for (@{$type->{ignore} || []}) {
… …
885 }, sub { 913 }, sub {
886 read_arch "$LIB/archetypes" 914 read_arch "$LIB/archetypes"
887 }; 915 };
888} 916}
889 917
918sub construct_tilecache_pb {
919 my ($idx, $cache) = @_;
920
921 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
922
923 while (my ($name, $tile) = each %$cache) {
924 my $tpb = delete $tile->{pb};
925 my $ofs = $tile->{idx};
926
927 for my $x (0 .. $tile->{w} - 1) {
928 for my $y (0 .. $tile->{h} - 1) {
929 my $idx = $ofs + $x + $y * $tile->{w};
930 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
931 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
932 }
933 }
934 }
935
936 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
937
938 $cache
939}
940
941sub use_tilecache {
942 my ($face) = @_;
943 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
944 or die "$VARDIR/tilecache.png: $!";
945 *FACE = $_[0];
946}
947
890=item load_tilecache 948=item load_tilecache
891 949
892(Re-)Load %TILE and %FACE. 950(Re-)Load %TILE and %FACE.
893 951
894=cut 952=cut
895 953
896sub load_tilecache() { 954sub load_tilecache() {
897 require Gtk2; 955 require Gtk2;
898 956
899 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 957 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 { 958 sub {
904 my $tile = read_pak "$LIB/crossfire.0";
905
906 my %cache; 959 my %cache;
960 my $facedata = Storable::retrieve "$LIB/facedata";
907 961
962 $facedata->{version} == 2
963 or die "$LIB/facedata: version mismatch, cannot proceed.";
964
965 my $faces = $facedata->{faceinfo};
908 my $idx = 0; 966 my $idx = 0;
909 967
910 for my $name (sort keys %$tile) { 968 for (sort keys %$faces) {
969 my ($face, $info) = ($_, $faces->{$_});
970
911 my $pb = new Gtk2::Gdk::PixbufLoader; 971 my $pb = new Gtk2::Gdk::PixbufLoader;
912 $pb->write ($tile->{$name}); 972 $pb->write ($info->{data32});
913 $pb->close; 973 $pb->close;
914 my $pb = $pb->get_pixbuf; 974 my $pb = $pb->get_pixbuf;
915 975
916 my $tile = $cache{$name} = { 976 my $tile = $cache{$face} = {
917 pb => $pb, 977 pb => $pb,
918 idx => $idx, 978 idx => $idx,
919 w => int $pb->get_width / TILESIZE, 979 w => int $pb->get_width / TILESIZE,
920 h => int $pb->get_height / TILESIZE, 980 h => int $pb->get_height / TILESIZE,
921 }; 981 };
922
923 982
924 $idx += $tile->{w} * $tile->{h}; 983 $idx += $tile->{w} * $tile->{h};
984 }
985
986 construct_tilecache_pb $idx, \%cache;
987
988 \%cache
925 } 989 };
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} 990}
947 991
948=head1 AUTHOR 992=head1 AUTHOR
949 993
950 Marc Lehmann <schmorp@schmorp.de> 994 Marc Lehmann <schmorp@schmorp.de>
… …
954 http://www.ta-sa.org/ 998 http://www.ta-sa.org/
955 999
956=cut 1000=cut
957 1001
9581 10021
1003

Diff Legend

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