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

Diff Legend

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