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.135 by root, Tue Nov 3 14:56:58 2009 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4
5=over 4
4 6
5=cut 7=cut
6 8
7package Crossfire; 9package Deliantra;
8 10
9our $VERSION = '0.96'; 11our $VERSION = '1.25';
10 12
11use strict; 13use common::sense;
12 14
13use base 'Exporter'; 15use base 'Exporter';
14 16
15use Carp (); 17use Carp ();
16use File::Spec; 18use File::Spec;
17use List::Util qw(min max); 19use List::Util qw(min max);
18use Storable qw(freeze thaw); 20use Storable qw(freeze thaw);
19 21
20our @EXPORT = qw( 22our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 23 read_pak read_arch
24 *ARCH $TILE *FACE *FACEDATA
25 TILESIZE CACHESTRIDE
26 editor_archs arch_extents
22); 27);
23 28
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working 29use JSON::XS qw(decode_json encode_json);
25 30
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}; 31our $LIB = $ENV{DELIANTRA_LIBDIR};
37 32
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 33our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 34 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
40 : File::Spec->tmpdir . "/crossfire"; 35 : File::Spec->tmpdir . "/deliantra";
41 36
42mkdir $VARDIR, 0777; 37mkdir $VARDIR, 0777;
43 38
44sub TILESIZE (){ 32 } 39sub TILESIZE (){ 32 }
40sub CACHESTRIDE (){ 64 }
45 41
46our %ARCH; 42our %ARCH;
43our %FACE; # face32
47our %FACE; 44our %FACEDATA;
48our $TILE; 45our $TILE;
49 46
50our %FIELD_MULTILINE = ( 47our %FIELD_MULTILINE = (
51 msg => "endmsg", 48 msg => "endmsg",
52 lore => "endlore", 49 lore => "endlore",
… …
68 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
69 tile_path_1 tile_path_2 tile_path_3 tile_path_4 66 tile_path_1 tile_path_2 tile_path_3 tile_path_4
70)); 67));
71 68
72our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
70 inherit
71
73 elevation 72 elevation
74 73
75 name name_pl custom_name attach title race 74 name name_pl custom_name attach title race
76 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch
77 #todo-events 76 sound sound_destroy face animation is_animated
78 animation is_animated 77 magicmap smoothlevel smoothface
79 str dex con wis pow cha int 78 str dex con wis pow cha int
80 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
81 exp perm_exp expmul 80 exp perm_exp expmul
82 food dam luck wc ac x y speed speed_left move_state attack_movement 81 food dam luck wc ac x y speed speed_left move_state attack_movement
83 nrof level direction type subtype attacktype 82 nrof level direction type subtype attacktype
… …
91 resist_life_stealing resist_disease 90 resist_life_stealing resist_disease
92 91
93 path_attuned path_repelled path_denied material materialname 92 path_attuned path_repelled path_denied material materialname
94 value carrying weight invisible state magic 93 value carrying weight invisible state magic
95 last_heal last_sp last_grace last_eat 94 last_heal last_sp last_grace last_eat
96 connected glow_radius randomitems npx_status npc_program 95 connected glow_radius randomitems tresure_env npx_status npc_program
97 run_away pick_up container will_apply smoothlevel 96 run_away pick_up container will_apply smoothlevel
98 current_weapon_script weapontype tooltype elevation client_type 97 current_weapon_script weapontype tooltype elevation client_type
99 item_power duration range 98 item_power duration range
100 range_modifier duration_modifier dam_modifier gen_sp_armour 99 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 100 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 111 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 112 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 113 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 114 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 115 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
116 precious
117 117
118 body_range body_arm body_torso body_head body_neck body_skill 118 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 119 body_finger body_shoulder body_foot body_hand body_wrist body_waist
120)); 120));
121 121
… …
138sub MOVE_FLY_LOW (){ 0x02 } 138sub MOVE_FLY_LOW (){ 0x02 }
139sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
140sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
141sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
142sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
143sub MOVE_SHIP (){ 0x20 }
143sub MOVE_KNOWN (){ 0x1f } # all of above 144sub MOVE_KNOWN (){ 0x3f } # all of above
144sub MOVE_ALL (){ 0x10000 } # very special value 145sub MOVE_ALL (){ 0x10000 } # very special value
145 146
146our %MOVE_TYPE = ( 147our %MOVE_TYPE = (
147 walk => MOVE_WALK, 148 walk => MOVE_WALK,
148 fly_low => MOVE_FLY_LOW, 149 fly_low => MOVE_FLY_LOW,
149 fly_high => MOVE_FLY_HIGH, 150 fly_high => MOVE_FLY_HIGH,
150 flying => MOVE_FLYING, 151 flying => MOVE_FLYING,
151 swim => MOVE_SWIM, 152 swim => MOVE_SWIM,
152 boat => MOVE_BOAT, 153 boat => MOVE_BOAT,
154 ship => MOVE_SHIP,
153 all => MOVE_ALL, 155 all => MOVE_ALL,
154); 156);
155 157
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); 158our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
157 159
158{ 160{
159 package Crossfire::MoveType; 161 package Deliantra::MoveType;
160 162
161 use overload 163 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 164 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string, 165 '""' => \&as_string,
164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 166 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
… …
182 $_[0] 184 $_[0]
183 }, 185 },
184 'eq' => sub { "$_[0]" eq "$_[1]" }, 186 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" }, 187 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ; 188 ;
187}
188 189
189sub Crossfire::MoveType::new { 190 sub TO_JSON {
191 $_[0][0]
192 }
193}
194
195sub Deliantra::MoveType::new {
190 my ($class, $string) = @_; 196 my ($class, $string) = @_;
191 197
192 my $mask; 198 my $mask;
193 my $value; 199 my $value;
194 200
… …
208 } 214 }
209 215
210 (bless [$mask, $value], $class)->normalise 216 (bless [$mask, $value], $class)->normalise
211} 217}
212 218
213sub Crossfire::MoveType::normalise { 219sub Deliantra::MoveType::normalise {
214 my ($self) = @_; 220 my ($self) = @_;
215 221
216 if ($self->[0] & MOVE_ALL) { 222 if ($self->[0] & MOVE_ALL) {
217 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 223 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
218 $self->[0] &= $mask; 224 $self->[0] &= $mask;
… …
222 $self->[1] &= $self->[0]; 228 $self->[1] &= $self->[0];
223 229
224 $self 230 $self
225} 231}
226 232
227sub Crossfire::MoveType::as_string { 233sub Deliantra::MoveType::as_string {
228 my ($self) = @_; 234 my ($self) = @_;
229 235
230 my @res; 236 my @res;
231 237
232 my ($mask, $value) = @$self; 238 my ($mask, $value) = @$self;
233 239
234 for (@Crossfire::MOVE_TYPE) { 240 for (@Deliantra::MOVE_TYPE) {
235 my $bit = $Crossfire::MOVE_TYPE{$_}; 241 my $bit = $Deliantra::MOVE_TYPE{$_};
236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 242 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
237 $mask &= ~$bit; 243 $mask &= ~$bit;
238 push @res, $value & $bit ? $_ : "-$_"; 244 push @res, $value & $bit ? $_ : "-$_";
239 } 245 }
240 } 246 }
… …
333 339
334# object as in "Object xxx", i.e. archetypes 340# object as in "Object xxx", i.e. archetypes
335sub normalize_object($) { 341sub normalize_object($) {
336 my ($ob) = @_; 342 my ($ob) = @_;
337 343
344 delete $ob->{editable}; # deprecated
345
338 # convert material bitset to materialname, if possible 346 # convert material bitset to materialname, if possible
339 if (exists $ob->{material}) { 347 if (exists $ob->{material}) {
340 if (!$ob->{material}) { 348 if (!$ob->{material}) {
341 delete $ob->{material}; 349 delete $ob->{material};
342 } elsif (exists $ob->{materialname}) { 350 } elsif (exists $ob->{materialname}) {
… …
352 } else { 360 } else {
353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 361 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
354 } 362 }
355 } 363 }
356 364
365 # check whether attachment is the same as in the archetype
366 if (exists $ob->{attach}) {
367 my $arch = $ARCH{$ob->{_name}};
368 my $js = JSON::XS->new->utf8->canonical (1);
369
370 if (defined $arch->{attach}
371 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
372 delete $ob->{attach}
373 }
374 }
375
376 # color_fg is used as default for magicmap if magicmap does not exist
377 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
378
357 # nuke outdated or never supported fields 379 # nuke outdated or never supported fields
358 delete @$ob{qw( 380 delete @$ob{qw(
359 can_knockback can_parry can_impale can_cut can_dam_armour 381 can_knockback can_parry can_impale can_cut can_dam_armour
360 can_apply pass_thru can_pass_thru 382 can_apply pass_thru can_pass_thru color_bg color_fg
361 )}; 383 )};
362 384
363 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 385 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
364 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 386 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
365 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 387 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
366 388
367 # convert movement strings to bitsets 389 # convert movement strings to bitsets
368 for my $attr (keys %FIELD_MOVEMENT) { 390 for my $attr (keys %FIELD_MOVEMENT) {
369 next unless exists $ob->{$attr}; 391 next unless exists $ob->{$attr};
370 392
371 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 393 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
372 } 394 }
373 395
374 # convert outdated movement flags to new movement sets 396 # convert outdated movement flags to new movement sets
375 if (defined (my $v = delete $ob->{no_pass})) { 397 if (defined (my $v = delete $ob->{no_pass})) {
376 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 398 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
377 } 399 }
378 if (defined (my $v = delete $ob->{slow_move})) { 400 if (defined (my $v = delete $ob->{slow_move})) {
379 $ob->{move_slow} += "walk"; 401 $ob->{move_slow} += "walk";
380 $ob->{move_slow_penalty} = $v; 402 $ob->{move_slow_penalty} = $v;
381 } 403 }
382 if (defined (my $v = delete $ob->{walk_on})) { 404 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" } 405 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
384 } 406 }
385 if (defined (my $v = delete $ob->{walk_off})) { 407 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" } 408 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
387 } 409 }
388 if (defined (my $v = delete $ob->{fly_on})) { 410 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" } 411 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
390 } 412 }
391 if (defined (my $v = delete $ob->{fly_off})) { 413 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" } 414 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
393 } 415 }
394 if (defined (my $v = delete $ob->{flying})) { 416 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" } 417 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
396 } 418 }
397 419
398 # convert idiotic event_xxx things into objects 420 # convert idiotic event_xxx things into objects
399 while (my ($event, $subtype) = each %EVENT_TYPE) { 421 while (my ($event, $subtype) = each %EVENT_TYPE) {
400 if (exists $ob->{"event_${event}_plugin"}) { 422 if (exists $ob->{"event_${event}_plugin"}) {
… …
416# arch as in "arch xxx", ie.. objects 438# arch as in "arch xxx", ie.. objects
417sub normalize_arch($) { 439sub normalize_arch($) {
418 my ($ob) = @_; 440 my ($ob) = @_;
419 441
420 normalize_object $ob; 442 normalize_object $ob;
443
444 return if $ob->{_atype} eq "object";
421 445
422 my $arch = $ARCH{$ob->{_name}} 446 my $arch = $ARCH{$ob->{_name}}
423 or (warn "$ob->{_name}: no such archetype", return $ob); 447 or (warn "$ob->{_name}: no such archetype", return $ob);
424 448
425 if ($arch->{type} == 22) { # map 449 if ($arch->{type} == 22) { # map
… …
461} 485}
462 486
463sub attr_thaw($) { 487sub attr_thaw($) {
464 my ($ob) = @_; 488 my ($ob) = @_;
465 489
466 $ob->{attach} = from_json $ob->{attach} 490 $ob->{attach} = decode_json $ob->{attach}
467 if exists $ob->{attach}; 491 if exists $ob->{attach};
468 492
469 $ob 493 $ob
470} 494}
471 495
472sub attr_freeze($) { 496sub attr_freeze($) {
473 my ($ob) = @_; 497 my ($ob) = @_;
474 498
475 $ob->{attach} = Crossfire::to_json $ob->{attach} 499 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
476 if exists $ob->{attach}; 500 if exists $ob->{attach};
477 501
478 $ob 502 $ob
479} 503}
480 504
… …
500 524
501 my %arc; 525 my %arc;
502 my ($more, $prev); 526 my ($more, $prev);
503 my $comment; 527 my $comment;
504 528
505 open my $fh, "<:raw:perlio:utf8", $path 529 open my $fh, "<:utf8", $path
506 or Carp::croak "$path: $!"; 530 or Carp::croak "$path: $!";
507 531
508# binmode $fh; 532# binmode $fh;
509 533
510 my $parse_block; $parse_block = sub { 534 my $parse_block; $parse_block = sub {
… …
610 my $str; 634 my $str;
611 635
612 my $append; $append = sub { 636 my $append; $append = sub {
613 my %a = %{$_[0]}; 637 my %a = %{$_[0]};
614 638
615 Crossfire::attr_freeze \%a; 639 Deliantra::attr_freeze \%a;
616 Crossfire::normalize_arch \%a; 640 Deliantra::normalize_arch \%a;
617 641
618 # undo the bit-split we did before 642 # undo the bit-split we did before
619 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 643 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}) 644 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
621 | (delete $a{attack_movement_bits_4_7}); 645 | (delete $a{attack_movement_bits_4_7});
… …
639 } 663 }
640 664
641 my @kv; 665 my @kv;
642 666
643 for ($a{_name} eq "map" 667 for ($a{_name} eq "map"
644 ? @Crossfire::FIELD_ORDER_MAP 668 ? @Deliantra::FIELD_ORDER_MAP
645 : @Crossfire::FIELD_ORDER) { 669 : @Deliantra::FIELD_ORDER) {
646 push @kv, [$_, delete $a{$_}] 670 push @kv, [$_, delete $a{$_}]
647 if exists $a{$_}; 671 if exists $a{$_};
648 } 672 }
649 673
650 for (sort keys %a) { 674 for (sort keys %a) {
… …
653 } 677 }
654 678
655 for (@kv) { 679 for (@kv) {
656 my ($k, $v) = @$_; 680 my ($k, $v) = @$_;
657 681
658 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 682 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
659 $v =~ s/\n$//; 683 $v =~ s/\n$//;
660 $str .= "$k\n$v\n$end\n"; 684 $str .= "$k\n$v\n$end\n";
661 } else { 685 } else {
662 $str .= "$k $v\n"; 686 $str .= "$k $v\n";
663 } 687 }
… …
759=cut 783=cut
760 784
761sub arch_attr($) { 785sub arch_attr($) {
762 my ($obj) = @_; 786 my ($obj) = @_;
763 787
764 require Crossfire::Data; 788 require Deliantra::Data;
765 789
766 my $root; 790 my $root;
767 my $attr = { }; 791 my $attr = { };
768 792
769 my $arch = $ARCH{ $obj->{_name} }; 793 my $arch = $ARCH{ $obj->{_name} };
770 my $type = $obj->{type} || $arch->{type}; 794 my $type = $obj->{type} || $arch->{type};
771 795
772 if ($type > 0) { 796 if ($type > 0) {
773 $root = $Crossfire::Data::ATTR{$type}; 797 $root = $Deliantra::Data::ATTR{$type};
774 } else { 798 } else {
775 my %a = (%$arch, %$obj); 799 my %a = (%$arch, %$obj);
776 800
777 if ($a{is_floor} && !$a{alive}) { 801 if ($a{is_floor} && !$a{alive}) {
778 $root = $Crossfire::Data::TYPE{Floor}; 802 $root = $Deliantra::Data::TYPE{Floor};
779 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
780 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 804 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
781 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 805 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
782 $root = $Crossfire::Data::TYPE{Wall}; 806 $root = $Deliantra::Data::TYPE{Wall};
783 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 807 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
784 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 808 $root = $Deliantra::Data::TYPE{"Weak Wall"};
785 } else { 809 } else {
786 $root = $Crossfire::Data::TYPE{Misc}; 810 $root = $Deliantra::Data::TYPE{Misc};
787 } 811 }
788 } 812 }
789 813
790 my @import = ($root); 814 my @import = ($root);
791 815
792 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 816 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
793 unless $type == 116; 817 unless $type == 116;
794 818
795 my (%ignore); 819 my (%ignore);
796 my (@section_order, %section, @attr_order); 820 my (@section_order, %section, @attr_order);
797 821
798 while (my $type = shift @import) { 822 while (my $type = shift @import) {
823 push @import,
824 grep $_,
825 map $Deliantra::Data::TYPE{$_},
799 push @import, @{$type->{import} || []}; 826 @{$type->{import} || []};
800 827
801 $attr->{$_} ||= $type->{$_} 828 $attr->{$_} ||= $type->{$_}
802 for qw(name desc use); 829 for qw(name desc use);
803 830
804 for (@{$type->{ignore} || []}) { 831 for (@{$type->{ignore} || []}) {
… …
890 }, sub { 917 }, sub {
891 read_arch "$LIB/archetypes" 918 read_arch "$LIB/archetypes"
892 }; 919 };
893} 920}
894 921
922sub construct_tilecache_pb {
923 my ($idx, $cache) = @_;
924
925 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
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 % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
936 }
937 }
938 }
939
940 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
941
942 $cache
943}
944
945sub use_tilecache {
946 my ($face) = @_;
947 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
948 or die "$VARDIR/tilecache.png: $!";
949 *FACE = $_[0];
950}
951
895=item load_tilecache 952=item load_tilecache
896 953
897(Re-)Load %TILE and %FACE. 954(Re-)Load %TILE and %FACE.
898 955
899=cut 956=cut
900 957
901sub load_tilecache() { 958sub load_tilecache() {
902 require Gtk2; 959 require Gtk2;
903 960
904 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 961 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 { 962 sub {
909 my $tile = read_pak "$LIB/crossfire.0";
910
911 my %cache; 963 my %cache;
964 my $facedata = Storable::retrieve "$LIB/facedata";
912 965
966 $facedata->{version} == 2
967 or die "$LIB/facedata: version mismatch, cannot proceed.";
968
969 my $faces = $facedata->{faceinfo};
913 my $idx = 0; 970 my $idx = 0;
914 971
915 for my $name (sort keys %$tile) { 972 for (sort keys %$faces) {
973 my ($face, $info) = ($_, $faces->{$_});
974
916 my $pb = new Gtk2::Gdk::PixbufLoader; 975 my $pb = new Gtk2::Gdk::PixbufLoader;
917 $pb->write ($tile->{$name}); 976 $pb->write ($info->{data32});
918 $pb->close; 977 $pb->close;
919 my $pb = $pb->get_pixbuf; 978 my $pb = $pb->get_pixbuf;
920 979
921 my $tile = $cache{$name} = { 980 my $tile = $cache{$face} = {
922 pb => $pb, 981 pb => $pb,
923 idx => $idx, 982 idx => $idx,
924 w => int $pb->get_width / TILESIZE, 983 w => int $pb->get_width / TILESIZE,
925 h => int $pb->get_height / TILESIZE, 984 h => int $pb->get_height / TILESIZE,
926 }; 985 };
927
928 986
929 $idx += $tile->{w} * $tile->{h}; 987 $idx += $tile->{w} * $tile->{h};
988 }
989
990 construct_tilecache_pb $idx, \%cache;
991
992 \%cache
930 } 993 };
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} 994}
995
996=back
952 997
953=head1 AUTHOR 998=head1 AUTHOR
954 999
955 Marc Lehmann <schmorp@schmorp.de> 1000 Marc Lehmann <schmorp@schmorp.de>
956 http://home.schmorp.de/ 1001 http://home.schmorp.de/
… …
959 http://www.ta-sa.org/ 1004 http://www.ta-sa.org/
960 1005
961=cut 1006=cut
962 1007
9631 10081
1009

Diff Legend

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