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.91 by root, Sat Mar 3 19:06:03 2007 UTC vs.
Revision 1.122 by root, Mon May 26 03:33:43 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.2';
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($) { 29our $LIB = $ENV{DELIANTRA_LIBDIR} || $ENV{CROSSFIRE_LIBDIR};
27 $JSON::Syck::ImplicitUnicode = 1;
28 JSON::Syck::Load $_[0]
29}
30 30
31sub to_json($) {
32 $JSON::Syck::ImplicitUnicode = 0;
33 JSON::Syck::Dump $_[0]
34}
35
36our $LIB = $ENV{CROSSFIRE_LIBDIR};
37
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 31our $OLDDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
40 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/crossfire";
41 34
35our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
36 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
37 : File::Spec->tmpdir . "/deliantra";
38
42mkdir $VARDIR, 0777; 39mkdir $VARDIR, 0777;
43 40
44sub TILESIZE (){ 32 } 41sub TILESIZE (){ 32 }
42sub CACHESTRIDE (){ 64 }
45 43
46our %ARCH; 44our %ARCH;
45our %FACE; # face32
47our %FACE; 46our %FACEDATA;
48our $TILE; 47our $TILE;
49 48
50our %FIELD_MULTILINE = ( 49our %FIELD_MULTILINE = (
51 msg => "endmsg", 50 msg => "endmsg",
52 lore => "endlore", 51 lore => "endlore",
… …
68 outdoor temp pressure humid windspeed winddir sky nosmooth 67 outdoor temp pressure humid windspeed winddir sky nosmooth
69 tile_path_1 tile_path_2 tile_path_3 tile_path_4 68 tile_path_1 tile_path_2 tile_path_3 tile_path_4
70)); 69));
71 70
72our @FIELD_ORDER = (qw( 71our @FIELD_ORDER = (qw(
72 inherit
73
73 elevation 74 elevation
74 75
75 name name_pl custom_name attach title race 76 name name_pl custom_name attach title race
76 slaying skill msg lore other_arch face 77 slaying skill msg lore other_arch
77 #todo-events
78 animation is_animated 78 face animation is_animated
79 magicmap smoothlevel smoothface
79 str dex con wis pow cha int 80 str dex con wis pow cha int
80 hp maxhp sp maxsp grace maxgrace 81 hp maxhp sp maxsp grace maxgrace
81 exp perm_exp expmul 82 exp perm_exp expmul
82 food dam luck wc ac x y speed speed_left move_state attack_movement 83 food dam luck wc ac x y speed speed_left move_state attack_movement
83 nrof level direction type subtype attacktype 84 nrof level direction type subtype attacktype
… …
91 resist_life_stealing resist_disease 92 resist_life_stealing resist_disease
92 93
93 path_attuned path_repelled path_denied material materialname 94 path_attuned path_repelled path_denied material materialname
94 value carrying weight invisible state magic 95 value carrying weight invisible state magic
95 last_heal last_sp last_grace last_eat 96 last_heal last_sp last_grace last_eat
96 connected glow_radius randomitems npx_status npc_program 97 connected glow_radius randomitems tresure_env npx_status npc_program
97 run_away pick_up container will_apply smoothlevel 98 run_away pick_up container will_apply smoothlevel
98 current_weapon_script weapontype tooltype elevation client_type 99 current_weapon_script weapontype tooltype elevation client_type
99 item_power duration range 100 item_power duration range
100 range_modifier duration_modifier dam_modifier gen_sp_armour 101 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 102 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 113 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 114 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 115 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 116 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 117 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
118 precious
117 119
118 body_range body_arm body_torso body_head body_neck body_skill 120 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 121 body_finger body_shoulder body_foot body_hand body_wrist body_waist
120)); 122));
121 123
… …
138sub MOVE_FLY_LOW (){ 0x02 } 140sub MOVE_FLY_LOW (){ 0x02 }
139sub MOVE_FLY_HIGH (){ 0x04 } 141sub MOVE_FLY_HIGH (){ 0x04 }
140sub MOVE_FLYING (){ 0x06 } 142sub MOVE_FLYING (){ 0x06 }
141sub MOVE_SWIM (){ 0x08 } 143sub MOVE_SWIM (){ 0x08 }
142sub MOVE_BOAT (){ 0x10 } 144sub MOVE_BOAT (){ 0x10 }
145sub MOVE_SHIP (){ 0x20 }
143sub MOVE_KNOWN (){ 0x1f } # all of above 146sub MOVE_KNOWN (){ 0x3f } # all of above
144sub MOVE_ALL (){ 0x10000 } # very special value 147sub MOVE_ALL (){ 0x10000 } # very special value
145 148
146our %MOVE_TYPE = ( 149our %MOVE_TYPE = (
147 walk => MOVE_WALK, 150 walk => MOVE_WALK,
148 fly_low => MOVE_FLY_LOW, 151 fly_low => MOVE_FLY_LOW,
149 fly_high => MOVE_FLY_HIGH, 152 fly_high => MOVE_FLY_HIGH,
150 flying => MOVE_FLYING, 153 flying => MOVE_FLYING,
151 swim => MOVE_SWIM, 154 swim => MOVE_SWIM,
152 boat => MOVE_BOAT, 155 boat => MOVE_BOAT,
156 ship => MOVE_SHIP,
153 all => MOVE_ALL, 157 all => MOVE_ALL,
154); 158);
155 159
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); 160our @MOVE_TYPE = keys %MOVE_TYPE;
157 161
158{ 162{
159 package Crossfire::MoveType; 163 package Deliantra::MoveType;
160 164
161 use overload 165 use overload
166 '=' => sub { bless [@{$_[0]}], ref $_[0] },
162 '""' => \&as_string, 167 '""' => \&as_string,
163 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 168 '>=' => 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 }, 169 '+=' => 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 }, 170 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
166 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 171 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 'x=' => sub { 172 'x=' => sub {
168 my $cur = $_[0] >= $_[1]; 173 my $cur = $_[0] >= $_[1];
169 if (!defined $cur) { 174 if (!defined $cur) {
175 if ($_[0] >= "all") {
176 $_[0] -= $_[1];
177 } else {
170 $_[0] += $_[1]; 178 $_[0] += $_[1];
179 }
171 } elsif ($cur) { 180 } elsif ($cur) {
172 $_[0] -= $_[1]; 181 $_[0] -= $_[1];
173 } else { 182 } else {
174 $_[0] /= $_[1]; 183 $_[0] /= $_[1];
175 } 184 }
… …
179 'eq' => sub { "$_[0]" eq "$_[1]" }, 188 'eq' => sub { "$_[0]" eq "$_[1]" },
180 'ne' => sub { "$_[0]" ne "$_[1]" }, 189 'ne' => sub { "$_[0]" ne "$_[1]" },
181 ; 190 ;
182} 191}
183 192
184sub Crossfire::MoveType::new { 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
199 if ($string =~ /^\s*\d+\s*$/) {
200 $mask = MOVE_ALL;
201 $value = $string+0;
202 } else {
190 for (split /\s+/, lc $string) { 203 for (split /\s+/, lc $string) {
191 if (s/^-//) { 204 if (s/^-//) {
192 $mask |= $MOVE_TYPE{$_}; 205 $mask |= $MOVE_TYPE{$_};
193 $value &= ~$MOVE_TYPE{$_}; 206 $value &= ~$MOVE_TYPE{$_};
194 } else { 207 } else {
195 $mask |= $MOVE_TYPE{$_}; 208 $mask |= $MOVE_TYPE{$_};
196 $value |= $MOVE_TYPE{$_}; 209 $value |= $MOVE_TYPE{$_};
210 }
197 } 211 }
198 } 212 }
199 213
200 (bless [$mask, $value], $class)->normalise 214 (bless [$mask, $value], $class)->normalise
201} 215}
202 216
203sub Crossfire::MoveType::normalise { 217sub Deliantra::MoveType::normalise {
204 my ($self) = @_; 218 my ($self) = @_;
205 219
206 if ($self->[0] & MOVE_ALL) { 220 if ($self->[0] & MOVE_ALL) {
207 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);
208 $self->[0] &= $mask; 222 $self->[0] &= $mask;
… …
212 $self->[1] &= $self->[0]; 226 $self->[1] &= $self->[0];
213 227
214 $self 228 $self
215} 229}
216 230
217sub Crossfire::MoveType::as_string { 231sub Deliantra::MoveType::as_string {
218 my ($self) = @_; 232 my ($self) = @_;
219 233
220 my @res; 234 my @res;
221 235
222 my ($mask, $value) = @$self; 236 my ($mask, $value) = @$self;
223 237
224 for (@Crossfire::MOVE_TYPE) { 238 for (@Deliantra::MOVE_TYPE) {
225 my $bit = $Crossfire::MOVE_TYPE{$_}; 239 my $bit = $Deliantra::MOVE_TYPE{$_};
226 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 240 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
227 $mask &= ~$bit; 241 $mask &= ~$bit;
228 push @res, $value & $bit ? $_ : "-$_"; 242 push @res, $value & $bit ? $_ : "-$_";
229 } 243 }
230 } 244 }
… …
342 } else { 356 } else {
343 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 357 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
344 } 358 }
345 } 359 }
346 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
347 # nuke outdated or never supported fields 375 # nuke outdated or never supported fields
348 delete @$ob{qw( 376 delete @$ob{qw(
349 can_knockback can_parry can_impale can_cut can_dam_armour 377 can_knockback can_parry can_impale can_cut can_dam_armour
350 can_apply pass_thru can_pass_thru 378 can_apply pass_thru can_pass_thru color_bg color_fg
351 )}; 379 )};
352 380
353 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 381 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
354 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 382 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
355 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 383 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
356 384
357 # convert movement strings to bitsets 385 # convert movement strings to bitsets
358 for my $attr (keys %FIELD_MOVEMENT) { 386 for my $attr (keys %FIELD_MOVEMENT) {
359 next unless exists $ob->{$attr}; 387 next unless exists $ob->{$attr};
360 388
361 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 389 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
362 } 390 }
363 391
364 # convert outdated movement flags to new movement sets 392 # convert outdated movement flags to new movement sets
365 if (defined (my $v = delete $ob->{no_pass})) { 393 if (defined (my $v = delete $ob->{no_pass})) {
366 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 394 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
367 } 395 }
368 if (defined (my $v = delete $ob->{slow_move})) { 396 if (defined (my $v = delete $ob->{slow_move})) {
369 $ob->{move_slow} += "walk"; 397 $ob->{move_slow} += "walk";
370 $ob->{move_slow_penalty} = $v; 398 $ob->{move_slow_penalty} = $v;
371 } 399 }
372 if (defined (my $v = delete $ob->{walk_on})) { 400 if (defined (my $v = delete $ob->{walk_on})) {
373 $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" }
374 } 402 }
375 if (defined (my $v = delete $ob->{walk_off})) { 403 if (defined (my $v = delete $ob->{walk_off})) {
376 $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" }
377 } 405 }
378 if (defined (my $v = delete $ob->{fly_on})) { 406 if (defined (my $v = delete $ob->{fly_on})) {
379 $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" }
380 } 408 }
381 if (defined (my $v = delete $ob->{fly_off})) { 409 if (defined (my $v = delete $ob->{fly_off})) {
382 $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" }
383 } 411 }
384 if (defined (my $v = delete $ob->{flying})) { 412 if (defined (my $v = delete $ob->{flying})) {
385 $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" }
386 } 414 }
387 415
388 # convert idiotic event_xxx things into objects 416 # convert idiotic event_xxx things into objects
389 while (my ($event, $subtype) = each %EVENT_TYPE) { 417 while (my ($event, $subtype) = each %EVENT_TYPE) {
390 if (exists $ob->{"event_${event}_plugin"}) { 418 if (exists $ob->{"event_${event}_plugin"}) {
… …
451} 479}
452 480
453sub attr_thaw($) { 481sub attr_thaw($) {
454 my ($ob) = @_; 482 my ($ob) = @_;
455 483
456 $ob->{attach} = from_json $ob->{attach} 484 $ob->{attach} = decode_json $ob->{attach}
457 if exists $ob->{attach}; 485 if exists $ob->{attach};
458 486
459 $ob 487 $ob
460} 488}
461 489
462sub attr_freeze($) { 490sub attr_freeze($) {
463 my ($ob) = @_; 491 my ($ob) = @_;
464 492
465 $ob->{attach} = Crossfire::to_json $ob->{attach} 493 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
466 if exists $ob->{attach}; 494 if exists $ob->{attach};
467 495
468 $ob 496 $ob
469} 497}
470 498
… …
600 my $str; 628 my $str;
601 629
602 my $append; $append = sub { 630 my $append; $append = sub {
603 my %a = %{$_[0]}; 631 my %a = %{$_[0]};
604 632
605 Crossfire::attr_freeze \%a; 633 Deliantra::attr_freeze \%a;
606 Crossfire::normalize_arch \%a; 634 Deliantra::normalize_arch \%a;
607 635
608 # undo the bit-split we did before 636 # undo the bit-split we did before
609 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 637 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
610 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 638 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
611 | (delete $a{attack_movement_bits_4_7}); 639 | (delete $a{attack_movement_bits_4_7});
… …
629 } 657 }
630 658
631 my @kv; 659 my @kv;
632 660
633 for ($a{_name} eq "map" 661 for ($a{_name} eq "map"
634 ? @Crossfire::FIELD_ORDER_MAP 662 ? @Deliantra::FIELD_ORDER_MAP
635 : @Crossfire::FIELD_ORDER) { 663 : @Deliantra::FIELD_ORDER) {
636 push @kv, [$_, delete $a{$_}] 664 push @kv, [$_, delete $a{$_}]
637 if exists $a{$_}; 665 if exists $a{$_};
638 } 666 }
639 667
640 for (sort keys %a) { 668 for (sort keys %a) {
… …
643 } 671 }
644 672
645 for (@kv) { 673 for (@kv) {
646 my ($k, $v) = @$_; 674 my ($k, $v) = @$_;
647 675
648 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 676 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
649 $v =~ s/\n$//; 677 $v =~ s/\n$//;
650 $str .= "$k\n$v\n$end\n"; 678 $str .= "$k\n$v\n$end\n";
651 } else { 679 } else {
652 $str .= "$k $v\n"; 680 $str .= "$k $v\n";
653 } 681 }
… …
749=cut 777=cut
750 778
751sub arch_attr($) { 779sub arch_attr($) {
752 my ($obj) = @_; 780 my ($obj) = @_;
753 781
754 require Crossfire::Data; 782 require Deliantra::Data;
755 783
756 my $root; 784 my $root;
757 my $attr = { }; 785 my $attr = { };
758 786
759 my $arch = $ARCH{ $obj->{_name} }; 787 my $arch = $ARCH{ $obj->{_name} };
760 my $type = $obj->{type} || $arch->{type}; 788 my $type = $obj->{type} || $arch->{type};
761 789
762 if ($type > 0) { 790 if ($type > 0) {
763 $root = $Crossfire::Data::ATTR{$type}; 791 $root = $Deliantra::Data::ATTR{$type};
764 } else { 792 } else {
765 my %a = (%$arch, %$obj); 793 my %a = (%$arch, %$obj);
766 794
767 if ($a{is_floor} && !$a{alive}) { 795 if ($a{is_floor} && !$a{alive}) {
768 $root = $Crossfire::Data::TYPE{Floor}; 796 $root = $Deliantra::Data::TYPE{Floor};
769 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 797 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
770 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 798 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
771 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 799 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
772 $root = $Crossfire::Data::TYPE{Wall}; 800 $root = $Deliantra::Data::TYPE{Wall};
773 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 801 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
774 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 802 $root = $Deliantra::Data::TYPE{"Weak Wall"};
775 } else { 803 } else {
776 $root = $Crossfire::Data::TYPE{Misc}; 804 $root = $Deliantra::Data::TYPE{Misc};
777 } 805 }
778 } 806 }
779 807
780 my @import = ($root); 808 my @import = ($root);
781 809
782 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 810 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
783 unless $type == 116; 811 unless $type == 116;
784 812
785 my (%ignore); 813 my (%ignore);
786 my (@section_order, %section, @attr_order); 814 my (@section_order, %section, @attr_order);
787 815
788 while (my $type = shift @import) { 816 while (my $type = shift @import) {
817 push @import,
818 grep $_,
819 map $Deliantra::Data::TYPE{$_},
789 push @import, @{$type->{import} || []}; 820 @{$type->{import} || []};
790 821
791 $attr->{$_} ||= $type->{$_} 822 $attr->{$_} ||= $type->{$_}
792 for qw(name desc use); 823 for qw(name desc use);
793 824
794 for (@{$type->{ignore} || []}) { 825 for (@{$type->{ignore} || []}) {
… …
880 }, sub { 911 }, sub {
881 read_arch "$LIB/archetypes" 912 read_arch "$LIB/archetypes"
882 }; 913 };
883} 914}
884 915
916sub construct_tilecache_pb {
917 my ($idx, $cache) = @_;
918
919 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
920
921 while (my ($name, $tile) = each %$cache) {
922 my $tpb = delete $tile->{pb};
923 my $ofs = $tile->{idx};
924
925 for my $x (0 .. $tile->{w} - 1) {
926 for my $y (0 .. $tile->{h} - 1) {
927 my $idx = $ofs + $x + $y * $tile->{w};
928 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
929 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
930 }
931 }
932 }
933
934 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
935
936 $cache
937}
938
939sub use_tilecache {
940 my ($face) = @_;
941 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
942 or die "$VARDIR/tilecache.png: $!";
943 *FACE = $_[0];
944}
945
885=item load_tilecache 946=item load_tilecache
886 947
887(Re-)Load %TILE and %FACE. 948(Re-)Load %TILE and %FACE.
888 949
889=cut 950=cut
890 951
891sub load_tilecache() { 952sub load_tilecache() {
892 require Gtk2; 953 require Gtk2;
893 954
894 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 955 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
895 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
896 or die "$VARDIR/tilecache.png: $!";
897 *FACE = $_[0];
898 }, sub { 956 sub {
899 my $tile = read_pak "$LIB/crossfire.0";
900
901 my %cache; 957 my %cache;
958 my $facedata = Storable::retrieve "$LIB/facedata";
902 959
960 $facedata->{version} == 2
961 or die "$LIB/facedata: version mismatch, cannot proceed.";
962
963 my $faces = $facedata->{faceinfo};
903 my $idx = 0; 964 my $idx = 0;
904 965
905 for my $name (sort keys %$tile) { 966 for (sort keys %$faces) {
967 my ($face, $info) = ($_, $faces->{$_});
968
906 my $pb = new Gtk2::Gdk::PixbufLoader; 969 my $pb = new Gtk2::Gdk::PixbufLoader;
907 $pb->write ($tile->{$name}); 970 $pb->write ($info->{data32});
908 $pb->close; 971 $pb->close;
909 my $pb = $pb->get_pixbuf; 972 my $pb = $pb->get_pixbuf;
910 973
911 my $tile = $cache{$name} = { 974 my $tile = $cache{$face} = {
912 pb => $pb, 975 pb => $pb,
913 idx => $idx, 976 idx => $idx,
914 w => int $pb->get_width / TILESIZE, 977 w => int $pb->get_width / TILESIZE,
915 h => int $pb->get_height / TILESIZE, 978 h => int $pb->get_height / TILESIZE,
916 }; 979 };
917
918 980
919 $idx += $tile->{w} * $tile->{h}; 981 $idx += $tile->{w} * $tile->{h};
982 }
983
984 construct_tilecache_pb $idx, \%cache;
985
986 \%cache
920 } 987 };
921
922 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
923
924 while (my ($name, $tile) = each %cache) {
925 my $tpb = delete $tile->{pb};
926 my $ofs = $tile->{idx};
927
928 for my $x (0 .. $tile->{w} - 1) {
929 for my $y (0 .. $tile->{h} - 1) {
930 my $idx = $ofs + $x + $y * $tile->{w};
931 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
932 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
933 }
934 }
935 }
936
937 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
938
939 \%cache
940 };
941} 988}
942 989
943=head1 AUTHOR 990=head1 AUTHOR
944 991
945 Marc Lehmann <schmorp@schmorp.de> 992 Marc Lehmann <schmorp@schmorp.de>
… …
949 http://www.ta-sa.org/ 996 http://www.ta-sa.org/
950 997
951=cut 998=cut
952 999
9531 10001
1001

Diff Legend

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