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.100 by root, Thu Apr 5 17:33:31 2007 UTC vs.
Revision 1.131 by root, Tue Sep 1 21:37:25 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.98'; 9our $VERSION = '1.24';
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::XS qw(from_json to_json); 27use JSON::XS qw(decode_json encode_json);
25 28
26our $LIB = $ENV{CROSSFIRE_LIBDIR}; 29our $LIB = $ENV{DELIANTRA_LIBDIR};
27 30
28our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
29 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
30 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/deliantra";
31 34
32mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
33 36
34sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
35 39
36our %ARCH; 40our %ARCH;
41our %FACE; # face32
37our %FACE; 42our %FACEDATA;
38our $TILE; 43our $TILE;
39 44
40our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
41 msg => "endmsg", 46 msg => "endmsg",
42 lore => "endlore", 47 lore => "endlore",
… …
58 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
59 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
60)); 65));
61 66
62our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
63 elevation 70 elevation
64 71
65 name name_pl custom_name attach title race 72 name name_pl custom_name attach title race
66 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
67 #todo-events 74 sound sound_destroy face animation is_animated
68 animation is_animated 75 magicmap smoothlevel smoothface
69 str dex con wis pow cha int 76 str dex con wis pow cha int
70 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
71 exp perm_exp expmul 78 exp perm_exp expmul
72 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
73 nrof level direction type subtype attacktype 80 nrof level direction type subtype attacktype
… …
81 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
82 89
83 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
84 value carrying weight invisible state magic 91 value carrying weight invisible state magic
85 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
86 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
87 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
88 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
89 item_power duration range 96 item_power duration range
90 range_modifier duration_modifier dam_modifier gen_sp_armour 97 range_modifier duration_modifier dam_modifier gen_sp_armour
91 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 98 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
102 known_magical known_cursed can_use_skill been_applied has_ready_scroll 109 known_magical known_cursed can_use_skill been_applied has_ready_scroll
103 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 110 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
104 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 111 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
105 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 112 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
106 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
114 precious
107 115
108 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
109 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
110)); 118));
111 119
… …
128sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
129sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
130sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
131sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
132sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
133sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
134sub MOVE_ALL (){ 0x10000 } # very special value 143sub MOVE_ALL (){ 0x10000 } # very special value
135 144
136our %MOVE_TYPE = ( 145our %MOVE_TYPE = (
137 walk => MOVE_WALK, 146 walk => MOVE_WALK,
138 fly_low => MOVE_FLY_LOW, 147 fly_low => MOVE_FLY_LOW,
139 fly_high => MOVE_FLY_HIGH, 148 fly_high => MOVE_FLY_HIGH,
140 flying => MOVE_FLYING, 149 flying => MOVE_FLYING,
141 swim => MOVE_SWIM, 150 swim => MOVE_SWIM,
142 boat => MOVE_BOAT, 151 boat => MOVE_BOAT,
152 ship => MOVE_SHIP,
143 all => MOVE_ALL, 153 all => MOVE_ALL,
144); 154);
145 155
146our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); 156our @MOVE_TYPE = qw(all ship boat swim flying fly_high fly_low walk);
147 157
148{ 158{
149 package Crossfire::MoveType; 159 package Deliantra::MoveType;
150 160
151 use overload 161 use overload
152 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
153 '""' => \&as_string, 163 '""' => \&as_string,
154 '>=' => 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 },
… …
172 $_[0] 182 $_[0]
173 }, 183 },
174 'eq' => sub { "$_[0]" eq "$_[1]" }, 184 'eq' => sub { "$_[0]" eq "$_[1]" },
175 'ne' => sub { "$_[0]" ne "$_[1]" }, 185 'ne' => sub { "$_[0]" ne "$_[1]" },
176 ; 186 ;
177}
178 187
179sub Crossfire::MoveType::new { 188 sub TO_JSON {
189 $_[0][0]
190 }
191}
192
193sub Deliantra::MoveType::new {
180 my ($class, $string) = @_; 194 my ($class, $string) = @_;
181 195
182 my $mask; 196 my $mask;
183 my $value; 197 my $value;
184 198
… …
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
347 # color_fg is used as default for magicmap if magicmap does not exist 372 # color_fg is used as default for magicmap if magicmap does not exist
348 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; 373 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
349 374
350 # nuke outdated or never supported fields 375 # nuke outdated or never supported fields
351 delete @$ob{qw( 376 delete @$ob{qw(
… …
359 384
360 # convert movement strings to bitsets 385 # convert movement strings to bitsets
361 for my $attr (keys %FIELD_MOVEMENT) { 386 for my $attr (keys %FIELD_MOVEMENT) {
362 next unless exists $ob->{$attr}; 387 next unless exists $ob->{$attr};
363 388
364 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 389 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
365 } 390 }
366 391
367 # convert outdated movement flags to new movement sets 392 # convert outdated movement flags to new movement sets
368 if (defined (my $v = delete $ob->{no_pass})) { 393 if (defined (my $v = delete $ob->{no_pass})) {
369 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 394 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
370 } 395 }
371 if (defined (my $v = delete $ob->{slow_move})) { 396 if (defined (my $v = delete $ob->{slow_move})) {
372 $ob->{move_slow} += "walk"; 397 $ob->{move_slow} += "walk";
373 $ob->{move_slow_penalty} = $v; 398 $ob->{move_slow_penalty} = $v;
374 } 399 }
375 if (defined (my $v = delete $ob->{walk_on})) { 400 if (defined (my $v = delete $ob->{walk_on})) {
376 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } 401 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
377 } 402 }
378 if (defined (my $v = delete $ob->{walk_off})) { 403 if (defined (my $v = delete $ob->{walk_off})) {
379 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } 404 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
380 } 405 }
381 if (defined (my $v = delete $ob->{fly_on})) { 406 if (defined (my $v = delete $ob->{fly_on})) {
382 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } 407 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
383 } 408 }
384 if (defined (my $v = delete $ob->{fly_off})) { 409 if (defined (my $v = delete $ob->{fly_off})) {
385 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } 410 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
386 } 411 }
387 if (defined (my $v = delete $ob->{flying})) { 412 if (defined (my $v = delete $ob->{flying})) {
388 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } 413 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
389 } 414 }
390 415
391 # convert idiotic event_xxx things into objects 416 # convert idiotic event_xxx things into objects
392 while (my ($event, $subtype) = each %EVENT_TYPE) { 417 while (my ($event, $subtype) = each %EVENT_TYPE) {
393 if (exists $ob->{"event_${event}_plugin"}) { 418 if (exists $ob->{"event_${event}_plugin"}) {
… …
409# arch as in "arch xxx", ie.. objects 434# arch as in "arch xxx", ie.. objects
410sub normalize_arch($) { 435sub normalize_arch($) {
411 my ($ob) = @_; 436 my ($ob) = @_;
412 437
413 normalize_object $ob; 438 normalize_object $ob;
439
440 return if $ob->{_atype} eq "object";
414 441
415 my $arch = $ARCH{$ob->{_name}} 442 my $arch = $ARCH{$ob->{_name}}
416 or (warn "$ob->{_name}: no such archetype", return $ob); 443 or (warn "$ob->{_name}: no such archetype", return $ob);
417 444
418 if ($arch->{type} == 22) { # map 445 if ($arch->{type} == 22) { # map
… …
454} 481}
455 482
456sub attr_thaw($) { 483sub attr_thaw($) {
457 my ($ob) = @_; 484 my ($ob) = @_;
458 485
459 $ob->{attach} = from_json $ob->{attach} 486 $ob->{attach} = decode_json $ob->{attach}
460 if exists $ob->{attach}; 487 if exists $ob->{attach};
461 488
462 $ob 489 $ob
463} 490}
464 491
465sub attr_freeze($) { 492sub attr_freeze($) {
466 my ($ob) = @_; 493 my ($ob) = @_;
467 494
468 $ob->{attach} = Crossfire::to_json $ob->{attach} 495 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
469 if exists $ob->{attach}; 496 if exists $ob->{attach};
470 497
471 $ob 498 $ob
472} 499}
473 500
… …
493 520
494 my %arc; 521 my %arc;
495 my ($more, $prev); 522 my ($more, $prev);
496 my $comment; 523 my $comment;
497 524
498 open my $fh, "<:raw:perlio:utf8", $path 525 open my $fh, "<:utf8", $path
499 or Carp::croak "$path: $!"; 526 or Carp::croak "$path: $!";
500 527
501# binmode $fh; 528# binmode $fh;
502 529
503 my $parse_block; $parse_block = sub { 530 my $parse_block; $parse_block = sub {
… …
603 my $str; 630 my $str;
604 631
605 my $append; $append = sub { 632 my $append; $append = sub {
606 my %a = %{$_[0]}; 633 my %a = %{$_[0]};
607 634
608 Crossfire::attr_freeze \%a; 635 Deliantra::attr_freeze \%a;
609 Crossfire::normalize_arch \%a; 636 Deliantra::normalize_arch \%a;
610 637
611 # undo the bit-split we did before 638 # undo the bit-split we did before
612 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}) {
613 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 640 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
614 | (delete $a{attack_movement_bits_4_7}); 641 | (delete $a{attack_movement_bits_4_7});
… …
632 } 659 }
633 660
634 my @kv; 661 my @kv;
635 662
636 for ($a{_name} eq "map" 663 for ($a{_name} eq "map"
637 ? @Crossfire::FIELD_ORDER_MAP 664 ? @Deliantra::FIELD_ORDER_MAP
638 : @Crossfire::FIELD_ORDER) { 665 : @Deliantra::FIELD_ORDER) {
639 push @kv, [$_, delete $a{$_}] 666 push @kv, [$_, delete $a{$_}]
640 if exists $a{$_}; 667 if exists $a{$_};
641 } 668 }
642 669
643 for (sort keys %a) { 670 for (sort keys %a) {
… …
646 } 673 }
647 674
648 for (@kv) { 675 for (@kv) {
649 my ($k, $v) = @$_; 676 my ($k, $v) = @$_;
650 677
651 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 678 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
652 $v =~ s/\n$//; 679 $v =~ s/\n$//;
653 $str .= "$k\n$v\n$end\n"; 680 $str .= "$k\n$v\n$end\n";
654 } else { 681 } else {
655 $str .= "$k $v\n"; 682 $str .= "$k $v\n";
656 } 683 }
… …
752=cut 779=cut
753 780
754sub arch_attr($) { 781sub arch_attr($) {
755 my ($obj) = @_; 782 my ($obj) = @_;
756 783
757 require Crossfire::Data; 784 require Deliantra::Data;
758 785
759 my $root; 786 my $root;
760 my $attr = { }; 787 my $attr = { };
761 788
762 my $arch = $ARCH{ $obj->{_name} }; 789 my $arch = $ARCH{ $obj->{_name} };
763 my $type = $obj->{type} || $arch->{type}; 790 my $type = $obj->{type} || $arch->{type};
764 791
765 if ($type > 0) { 792 if ($type > 0) {
766 $root = $Crossfire::Data::ATTR{$type}; 793 $root = $Deliantra::Data::ATTR{$type};
767 } else { 794 } else {
768 my %a = (%$arch, %$obj); 795 my %a = (%$arch, %$obj);
769 796
770 if ($a{is_floor} && !$a{alive}) { 797 if ($a{is_floor} && !$a{alive}) {
771 $root = $Crossfire::Data::TYPE{Floor}; 798 $root = $Deliantra::Data::TYPE{Floor};
772 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
773 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 800 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
774 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 801 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
775 $root = $Crossfire::Data::TYPE{Wall}; 802 $root = $Deliantra::Data::TYPE{Wall};
776 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
777 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 804 $root = $Deliantra::Data::TYPE{"Weak Wall"};
778 } else { 805 } else {
779 $root = $Crossfire::Data::TYPE{Misc}; 806 $root = $Deliantra::Data::TYPE{Misc};
780 } 807 }
781 } 808 }
782 809
783 my @import = ($root); 810 my @import = ($root);
784 811
785 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 812 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
786 unless $type == 116; 813 unless $type == 116;
787 814
788 my (%ignore); 815 my (%ignore);
789 my (@section_order, %section, @attr_order); 816 my (@section_order, %section, @attr_order);
790 817
791 while (my $type = shift @import) { 818 while (my $type = shift @import) {
819 push @import,
820 grep $_,
821 map $Deliantra::Data::TYPE{$_},
792 push @import, @{$type->{import} || []}; 822 @{$type->{import} || []};
793 823
794 $attr->{$_} ||= $type->{$_} 824 $attr->{$_} ||= $type->{$_}
795 for qw(name desc use); 825 for qw(name desc use);
796 826
797 for (@{$type->{ignore} || []}) { 827 for (@{$type->{ignore} || []}) {
… …
883 }, sub { 913 }, sub {
884 read_arch "$LIB/archetypes" 914 read_arch "$LIB/archetypes"
885 }; 915 };
886} 916}
887 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
888=item load_tilecache 948=item load_tilecache
889 949
890(Re-)Load %TILE and %FACE. 950(Re-)Load %TILE and %FACE.
891 951
892=cut 952=cut
893 953
894sub load_tilecache() { 954sub load_tilecache() {
895 require Gtk2; 955 require Gtk2;
896 956
897 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 957 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
898 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
899 or die "$VARDIR/tilecache.png: $!";
900 *FACE = $_[0];
901 }, sub { 958 sub {
902 my $tile = read_pak "$LIB/crossfire.0";
903
904 my %cache; 959 my %cache;
960 my $facedata = Storable::retrieve "$LIB/facedata";
905 961
962 $facedata->{version} == 2
963 or die "$LIB/facedata: version mismatch, cannot proceed.";
964
965 my $faces = $facedata->{faceinfo};
906 my $idx = 0; 966 my $idx = 0;
907 967
908 for my $name (sort keys %$tile) { 968 for (sort keys %$faces) {
969 my ($face, $info) = ($_, $faces->{$_});
970
909 my $pb = new Gtk2::Gdk::PixbufLoader; 971 my $pb = new Gtk2::Gdk::PixbufLoader;
910 $pb->write ($tile->{$name}); 972 $pb->write ($info->{data32});
911 $pb->close; 973 $pb->close;
912 my $pb = $pb->get_pixbuf; 974 my $pb = $pb->get_pixbuf;
913 975
914 my $tile = $cache{$name} = { 976 my $tile = $cache{$face} = {
915 pb => $pb, 977 pb => $pb,
916 idx => $idx, 978 idx => $idx,
917 w => int $pb->get_width / TILESIZE, 979 w => int $pb->get_width / TILESIZE,
918 h => int $pb->get_height / TILESIZE, 980 h => int $pb->get_height / TILESIZE,
919 }; 981 };
920
921 982
922 $idx += $tile->{w} * $tile->{h}; 983 $idx += $tile->{w} * $tile->{h};
984 }
985
986 construct_tilecache_pb $idx, \%cache;
987
988 \%cache
923 } 989 };
924
925 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
926
927 while (my ($name, $tile) = each %cache) {
928 my $tpb = delete $tile->{pb};
929 my $ofs = $tile->{idx};
930
931 for my $x (0 .. $tile->{w} - 1) {
932 for my $y (0 .. $tile->{h} - 1) {
933 my $idx = $ofs + $x + $y * $tile->{w};
934 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
935 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
936 }
937 }
938 }
939
940 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
941
942 \%cache
943 };
944} 990}
945 991
946=head1 AUTHOR 992=head1 AUTHOR
947 993
948 Marc Lehmann <schmorp@schmorp.de> 994 Marc Lehmann <schmorp@schmorp.de>
… …
952 http://www.ta-sa.org/ 998 http://www.ta-sa.org/
953 999
954=cut 1000=cut
955 1001
9561 10021
1003

Diff Legend

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