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.120 by root, Wed Dec 26 18:26:15 2007 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.14';
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
… …
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"}) {
… …
456} 479}
457 480
458sub attr_thaw($) { 481sub attr_thaw($) {
459 my ($ob) = @_; 482 my ($ob) = @_;
460 483
461 $ob->{attach} = from_json $ob->{attach} 484 $ob->{attach} = decode_json $ob->{attach}
462 if exists $ob->{attach}; 485 if exists $ob->{attach};
463 486
464 $ob 487 $ob
465} 488}
466 489
467sub attr_freeze($) { 490sub attr_freeze($) {
468 my ($ob) = @_; 491 my ($ob) = @_;
469 492
470 $ob->{attach} = Crossfire::to_json $ob->{attach} 493 $ob->{attach} = Deliantra::encode_json $ob->{attach}
471 if exists $ob->{attach}; 494 if exists $ob->{attach};
472 495
473 $ob 496 $ob
474} 497}
475 498
… …
605 my $str; 628 my $str;
606 629
607 my $append; $append = sub { 630 my $append; $append = sub {
608 my %a = %{$_[0]}; 631 my %a = %{$_[0]};
609 632
610 Crossfire::attr_freeze \%a; 633 Deliantra::attr_freeze \%a;
611 Crossfire::normalize_arch \%a; 634 Deliantra::normalize_arch \%a;
612 635
613 # undo the bit-split we did before 636 # undo the bit-split we did before
614 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}) {
615 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 638 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
616 | (delete $a{attack_movement_bits_4_7}); 639 | (delete $a{attack_movement_bits_4_7});
… …
634 } 657 }
635 658
636 my @kv; 659 my @kv;
637 660
638 for ($a{_name} eq "map" 661 for ($a{_name} eq "map"
639 ? @Crossfire::FIELD_ORDER_MAP 662 ? @Deliantra::FIELD_ORDER_MAP
640 : @Crossfire::FIELD_ORDER) { 663 : @Deliantra::FIELD_ORDER) {
641 push @kv, [$_, delete $a{$_}] 664 push @kv, [$_, delete $a{$_}]
642 if exists $a{$_}; 665 if exists $a{$_};
643 } 666 }
644 667
645 for (sort keys %a) { 668 for (sort keys %a) {
… …
648 } 671 }
649 672
650 for (@kv) { 673 for (@kv) {
651 my ($k, $v) = @$_; 674 my ($k, $v) = @$_;
652 675
653 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 676 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
654 $v =~ s/\n$//; 677 $v =~ s/\n$//;
655 $str .= "$k\n$v\n$end\n"; 678 $str .= "$k\n$v\n$end\n";
656 } else { 679 } else {
657 $str .= "$k $v\n"; 680 $str .= "$k $v\n";
658 } 681 }
… …
754=cut 777=cut
755 778
756sub arch_attr($) { 779sub arch_attr($) {
757 my ($obj) = @_; 780 my ($obj) = @_;
758 781
759 require Crossfire::Data; 782 require Deliantra::Data;
760 783
761 my $root; 784 my $root;
762 my $attr = { }; 785 my $attr = { };
763 786
764 my $arch = $ARCH{ $obj->{_name} }; 787 my $arch = $ARCH{ $obj->{_name} };
765 my $type = $obj->{type} || $arch->{type}; 788 my $type = $obj->{type} || $arch->{type};
766 789
767 if ($type > 0) { 790 if ($type > 0) {
768 $root = $Crossfire::Data::ATTR{$type}; 791 $root = $Deliantra::Data::ATTR{$type};
769 } else { 792 } else {
770 my %a = (%$arch, %$obj); 793 my %a = (%$arch, %$obj);
771 794
772 if ($a{is_floor} && !$a{alive}) { 795 if ($a{is_floor} && !$a{alive}) {
773 $root = $Crossfire::Data::TYPE{Floor}; 796 $root = $Deliantra::Data::TYPE{Floor};
774 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 797 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
775 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 798 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
776 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 799 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
777 $root = $Crossfire::Data::TYPE{Wall}; 800 $root = $Deliantra::Data::TYPE{Wall};
778 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 801 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
779 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 802 $root = $Deliantra::Data::TYPE{"Weak Wall"};
780 } else { 803 } else {
781 $root = $Crossfire::Data::TYPE{Misc}; 804 $root = $Deliantra::Data::TYPE{Misc};
782 } 805 }
783 } 806 }
784 807
785 my @import = ($root); 808 my @import = ($root);
786 809
787 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 810 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
788 unless $type == 116; 811 unless $type == 116;
789 812
790 my (%ignore); 813 my (%ignore);
791 my (@section_order, %section, @attr_order); 814 my (@section_order, %section, @attr_order);
792 815
793 while (my $type = shift @import) { 816 while (my $type = shift @import) {
817 push @import,
818 grep $_,
819 map $Deliantra::Data::TYPE{$_},
794 push @import, @{$type->{import} || []}; 820 @{$type->{import} || []};
795 821
796 $attr->{$_} ||= $type->{$_} 822 $attr->{$_} ||= $type->{$_}
797 for qw(name desc use); 823 for qw(name desc use);
798 824
799 for (@{$type->{ignore} || []}) { 825 for (@{$type->{ignore} || []}) {
… …
885 }, sub { 911 }, sub {
886 read_arch "$LIB/archetypes" 912 read_arch "$LIB/archetypes"
887 }; 913 };
888} 914}
889 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
890=item load_tilecache 946=item load_tilecache
891 947
892(Re-)Load %TILE and %FACE. 948(Re-)Load %TILE and %FACE.
893 949
894=cut 950=cut
895 951
896sub load_tilecache() { 952sub load_tilecache() {
897 require Gtk2; 953 require Gtk2;
898 954
899 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 955 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 { 956 sub {
904 my $tile = read_pak "$LIB/crossfire.0";
905
906 my %cache; 957 my %cache;
958 my $facedata = Storable::retrieve "$LIB/facedata";
907 959
960 $facedata->{version} == 2
961 or die "$LIB/facedata: version mismatch, cannot proceed.";
962
963 my $faces = $facedata->{faceinfo};
908 my $idx = 0; 964 my $idx = 0;
909 965
910 for my $name (sort keys %$tile) { 966 for (sort keys %$faces) {
967 my ($face, $info) = ($_, $faces->{$_});
968
911 my $pb = new Gtk2::Gdk::PixbufLoader; 969 my $pb = new Gtk2::Gdk::PixbufLoader;
912 $pb->write ($tile->{$name}); 970 $pb->write ($info->{data32});
913 $pb->close; 971 $pb->close;
914 my $pb = $pb->get_pixbuf; 972 my $pb = $pb->get_pixbuf;
915 973
916 my $tile = $cache{$name} = { 974 my $tile = $cache{$face} = {
917 pb => $pb, 975 pb => $pb,
918 idx => $idx, 976 idx => $idx,
919 w => int $pb->get_width / TILESIZE, 977 w => int $pb->get_width / TILESIZE,
920 h => int $pb->get_height / TILESIZE, 978 h => int $pb->get_height / TILESIZE,
921 }; 979 };
922
923 980
924 $idx += $tile->{w} * $tile->{h}; 981 $idx += $tile->{w} * $tile->{h};
982 }
983
984 construct_tilecache_pb $idx, \%cache;
985
986 \%cache
925 } 987 };
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} 988}
947 989
948=head1 AUTHOR 990=head1 AUTHOR
949 991
950 Marc Lehmann <schmorp@schmorp.de> 992 Marc Lehmann <schmorp@schmorp.de>
… …
954 http://www.ta-sa.org/ 996 http://www.ta-sa.org/
955 997
956=cut 998=cut
957 999
9581 10001
1001

Diff Legend

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