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.94 by root, Sat Mar 3 20:07:04 2007 UTC vs.
Revision 1.129 by root, Sun Jan 11 22:03:03 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.23';
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 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string, 163 '""' => \&as_string,
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]} : undef },
… …
184 'eq' => sub { "$_[0]" eq "$_[1]" }, 184 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" }, 185 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ; 186 ;
187} 187}
188 188
189sub Crossfire::MoveType::new { 189sub Deliantra::MoveType::new {
190 my ($class, $string) = @_; 190 my ($class, $string) = @_;
191 191
192 my $mask; 192 my $mask;
193 my $value; 193 my $value;
194 194
… …
208 } 208 }
209 209
210 (bless [$mask, $value], $class)->normalise 210 (bless [$mask, $value], $class)->normalise
211} 211}
212 212
213sub Crossfire::MoveType::normalise { 213sub Deliantra::MoveType::normalise {
214 my ($self) = @_; 214 my ($self) = @_;
215 215
216 if ($self->[0] & MOVE_ALL) { 216 if ($self->[0] & MOVE_ALL) {
217 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);
218 $self->[0] &= $mask; 218 $self->[0] &= $mask;
… …
222 $self->[1] &= $self->[0]; 222 $self->[1] &= $self->[0];
223 223
224 $self 224 $self
225} 225}
226 226
227sub Crossfire::MoveType::as_string { 227sub Deliantra::MoveType::as_string {
228 my ($self) = @_; 228 my ($self) = @_;
229 229
230 my @res; 230 my @res;
231 231
232 my ($mask, $value) = @$self; 232 my ($mask, $value) = @$self;
233 233
234 for (@Crossfire::MOVE_TYPE) { 234 for (@Deliantra::MOVE_TYPE) {
235 my $bit = $Crossfire::MOVE_TYPE{$_}; 235 my $bit = $Deliantra::MOVE_TYPE{$_};
236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
237 $mask &= ~$bit; 237 $mask &= ~$bit;
238 push @res, $value & $bit ? $_ : "-$_"; 238 push @res, $value & $bit ? $_ : "-$_";
239 } 239 }
240 } 240 }
… …
352 } else { 352 } else {
353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
354 } 354 }
355 } 355 }
356 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
357 # nuke outdated or never supported fields 371 # nuke outdated or never supported fields
358 delete @$ob{qw( 372 delete @$ob{qw(
359 can_knockback can_parry can_impale can_cut can_dam_armour 373 can_knockback can_parry can_impale can_cut can_dam_armour
360 can_apply pass_thru can_pass_thru 374 can_apply pass_thru can_pass_thru color_bg color_fg
361 )}; 375 )};
362 376
363 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 377 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
364 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 378 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
365 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 379 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
366 380
367 # convert movement strings to bitsets 381 # convert movement strings to bitsets
368 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
369 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
370 384
371 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
372 } 386 }
373 387
374 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
375 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
376 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
377 } 391 }
378 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
379 $ob->{move_slow} += "walk"; 393 $ob->{move_slow} += "walk";
380 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
381 } 395 }
382 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
383 $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" }
384 } 398 }
385 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
386 $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" }
387 } 401 }
388 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
389 $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" }
390 } 404 }
391 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
392 $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" }
393 } 407 }
394 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
395 $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" }
396 } 410 }
397 411
398 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
399 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
400 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
… …
416# arch as in "arch xxx", ie.. objects 430# arch as in "arch xxx", ie.. objects
417sub normalize_arch($) { 431sub normalize_arch($) {
418 my ($ob) = @_; 432 my ($ob) = @_;
419 433
420 normalize_object $ob; 434 normalize_object $ob;
435
436 return if $ob->{_atype} eq "object";
421 437
422 my $arch = $ARCH{$ob->{_name}} 438 my $arch = $ARCH{$ob->{_name}}
423 or (warn "$ob->{_name}: no such archetype", return $ob); 439 or (warn "$ob->{_name}: no such archetype", return $ob);
424 440
425 if ($arch->{type} == 22) { # map 441 if ($arch->{type} == 22) { # map
… …
461} 477}
462 478
463sub attr_thaw($) { 479sub attr_thaw($) {
464 my ($ob) = @_; 480 my ($ob) = @_;
465 481
466 $ob->{attach} = from_json $ob->{attach} 482 $ob->{attach} = decode_json $ob->{attach}
467 if exists $ob->{attach}; 483 if exists $ob->{attach};
468 484
469 $ob 485 $ob
470} 486}
471 487
472sub attr_freeze($) { 488sub attr_freeze($) {
473 my ($ob) = @_; 489 my ($ob) = @_;
474 490
475 $ob->{attach} = Crossfire::to_json $ob->{attach} 491 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
476 if exists $ob->{attach}; 492 if exists $ob->{attach};
477 493
478 $ob 494 $ob
479} 495}
480 496
… …
500 516
501 my %arc; 517 my %arc;
502 my ($more, $prev); 518 my ($more, $prev);
503 my $comment; 519 my $comment;
504 520
505 open my $fh, "<:raw:perlio:utf8", $path 521 open my $fh, "<:utf8", $path
506 or Carp::croak "$path: $!"; 522 or Carp::croak "$path: $!";
507 523
508# binmode $fh; 524# binmode $fh;
509 525
510 my $parse_block; $parse_block = sub { 526 my $parse_block; $parse_block = sub {
… …
610 my $str; 626 my $str;
611 627
612 my $append; $append = sub { 628 my $append; $append = sub {
613 my %a = %{$_[0]}; 629 my %a = %{$_[0]};
614 630
615 Crossfire::attr_freeze \%a; 631 Deliantra::attr_freeze \%a;
616 Crossfire::normalize_arch \%a; 632 Deliantra::normalize_arch \%a;
617 633
618 # undo the bit-split we did before 634 # undo the bit-split we did before
619 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}) {
620 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 636 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
621 | (delete $a{attack_movement_bits_4_7}); 637 | (delete $a{attack_movement_bits_4_7});
… …
639 } 655 }
640 656
641 my @kv; 657 my @kv;
642 658
643 for ($a{_name} eq "map" 659 for ($a{_name} eq "map"
644 ? @Crossfire::FIELD_ORDER_MAP 660 ? @Deliantra::FIELD_ORDER_MAP
645 : @Crossfire::FIELD_ORDER) { 661 : @Deliantra::FIELD_ORDER) {
646 push @kv, [$_, delete $a{$_}] 662 push @kv, [$_, delete $a{$_}]
647 if exists $a{$_}; 663 if exists $a{$_};
648 } 664 }
649 665
650 for (sort keys %a) { 666 for (sort keys %a) {
… …
653 } 669 }
654 670
655 for (@kv) { 671 for (@kv) {
656 my ($k, $v) = @$_; 672 my ($k, $v) = @$_;
657 673
658 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 674 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
659 $v =~ s/\n$//; 675 $v =~ s/\n$//;
660 $str .= "$k\n$v\n$end\n"; 676 $str .= "$k\n$v\n$end\n";
661 } else { 677 } else {
662 $str .= "$k $v\n"; 678 $str .= "$k $v\n";
663 } 679 }
… …
759=cut 775=cut
760 776
761sub arch_attr($) { 777sub arch_attr($) {
762 my ($obj) = @_; 778 my ($obj) = @_;
763 779
764 require Crossfire::Data; 780 require Deliantra::Data;
765 781
766 my $root; 782 my $root;
767 my $attr = { }; 783 my $attr = { };
768 784
769 my $arch = $ARCH{ $obj->{_name} }; 785 my $arch = $ARCH{ $obj->{_name} };
770 my $type = $obj->{type} || $arch->{type}; 786 my $type = $obj->{type} || $arch->{type};
771 787
772 if ($type > 0) { 788 if ($type > 0) {
773 $root = $Crossfire::Data::ATTR{$type}; 789 $root = $Deliantra::Data::ATTR{$type};
774 } else { 790 } else {
775 my %a = (%$arch, %$obj); 791 my %a = (%$arch, %$obj);
776 792
777 if ($a{is_floor} && !$a{alive}) { 793 if ($a{is_floor} && !$a{alive}) {
778 $root = $Crossfire::Data::TYPE{Floor}; 794 $root = $Deliantra::Data::TYPE{Floor};
779 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 795 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
780 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 796 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
781 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 797 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
782 $root = $Crossfire::Data::TYPE{Wall}; 798 $root = $Deliantra::Data::TYPE{Wall};
783 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
784 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 800 $root = $Deliantra::Data::TYPE{"Weak Wall"};
785 } else { 801 } else {
786 $root = $Crossfire::Data::TYPE{Misc}; 802 $root = $Deliantra::Data::TYPE{Misc};
787 } 803 }
788 } 804 }
789 805
790 my @import = ($root); 806 my @import = ($root);
791 807
792 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 808 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
793 unless $type == 116; 809 unless $type == 116;
794 810
795 my (%ignore); 811 my (%ignore);
796 my (@section_order, %section, @attr_order); 812 my (@section_order, %section, @attr_order);
797 813
798 while (my $type = shift @import) { 814 while (my $type = shift @import) {
815 push @import,
816 grep $_,
817 map $Deliantra::Data::TYPE{$_},
799 push @import, @{$type->{import} || []}; 818 @{$type->{import} || []};
800 819
801 $attr->{$_} ||= $type->{$_} 820 $attr->{$_} ||= $type->{$_}
802 for qw(name desc use); 821 for qw(name desc use);
803 822
804 for (@{$type->{ignore} || []}) { 823 for (@{$type->{ignore} || []}) {
… …
890 }, sub { 909 }, sub {
891 read_arch "$LIB/archetypes" 910 read_arch "$LIB/archetypes"
892 }; 911 };
893} 912}
894 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
895=item load_tilecache 944=item load_tilecache
896 945
897(Re-)Load %TILE and %FACE. 946(Re-)Load %TILE and %FACE.
898 947
899=cut 948=cut
900 949
901sub load_tilecache() { 950sub load_tilecache() {
902 require Gtk2; 951 require Gtk2;
903 952
904 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 953 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
905 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
906 or die "$VARDIR/tilecache.png: $!";
907 *FACE = $_[0];
908 }, sub { 954 sub {
909 my $tile = read_pak "$LIB/crossfire.0";
910
911 my %cache; 955 my %cache;
956 my $facedata = Storable::retrieve "$LIB/facedata";
912 957
958 $facedata->{version} == 2
959 or die "$LIB/facedata: version mismatch, cannot proceed.";
960
961 my $faces = $facedata->{faceinfo};
913 my $idx = 0; 962 my $idx = 0;
914 963
915 for my $name (sort keys %$tile) { 964 for (sort keys %$faces) {
965 my ($face, $info) = ($_, $faces->{$_});
966
916 my $pb = new Gtk2::Gdk::PixbufLoader; 967 my $pb = new Gtk2::Gdk::PixbufLoader;
917 $pb->write ($tile->{$name}); 968 $pb->write ($info->{data32});
918 $pb->close; 969 $pb->close;
919 my $pb = $pb->get_pixbuf; 970 my $pb = $pb->get_pixbuf;
920 971
921 my $tile = $cache{$name} = { 972 my $tile = $cache{$face} = {
922 pb => $pb, 973 pb => $pb,
923 idx => $idx, 974 idx => $idx,
924 w => int $pb->get_width / TILESIZE, 975 w => int $pb->get_width / TILESIZE,
925 h => int $pb->get_height / TILESIZE, 976 h => int $pb->get_height / TILESIZE,
926 }; 977 };
927
928 978
929 $idx += $tile->{w} * $tile->{h}; 979 $idx += $tile->{w} * $tile->{h};
980 }
981
982 construct_tilecache_pb $idx, \%cache;
983
984 \%cache
930 } 985 };
931
932 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
933
934 while (my ($name, $tile) = each %cache) {
935 my $tpb = delete $tile->{pb};
936 my $ofs = $tile->{idx};
937
938 for my $x (0 .. $tile->{w} - 1) {
939 for my $y (0 .. $tile->{h} - 1) {
940 my $idx = $ofs + $x + $y * $tile->{w};
941 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
942 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
943 }
944 }
945 }
946
947 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
948
949 \%cache
950 };
951} 986}
952 987
953=head1 AUTHOR 988=head1 AUTHOR
954 989
955 Marc Lehmann <schmorp@schmorp.de> 990 Marc Lehmann <schmorp@schmorp.de>
… …
959 http://www.ta-sa.org/ 994 http://www.ta-sa.org/
960 995
961=cut 996=cut
962 997
9631 9981
999

Diff Legend

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