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.90 by root, Sat Mar 3 18:58:25 2007 UTC vs.
Revision 1.134 by root, Wed Oct 28 10:17:01 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
164 '=' => sub { bless [@{$_[0]}], ref $_[0] },
162 '""' => \&as_string, 165 '""' => \&as_string,
163 '>=' => 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 },
164 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, 167 '+=' => 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 }, 168 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
166 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 169 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 'x=' => sub { 170 'x=' => sub {
168 my $cur = $_[0] >= $_[1]; 171 my $cur = $_[0] >= $_[1];
169 if (!defined $cur) { 172 if (!defined $cur) {
173 if ($_[0] >= "all") {
174 $_[0] -= $_[1];
175 } else {
170 $_[0] += $_[1]; 176 $_[0] += $_[1];
177 }
171 } elsif ($cur) { 178 } elsif ($cur) {
172 $_[0] -= $_[1]; 179 $_[0] -= $_[1];
173 } else { 180 } else {
174 $_[0] /= $_[1]; 181 $_[0] /= $_[1];
175 } 182 }
176 183
177 $_[0] 184 $_[0]
178 }, 185 },
186 'eq' => sub { "$_[0]" eq "$_[1]" },
187 'ne' => sub { "$_[0]" ne "$_[1]" },
179 ; 188 ;
180}
181 189
182sub Crossfire::MoveType::new { 190 sub TO_JSON {
191 $_[0][0]
192 }
193}
194
195sub Deliantra::MoveType::new {
183 my ($class, $string) = @_; 196 my ($class, $string) = @_;
184 197
185 my $mask; 198 my $mask;
186 my $value; 199 my $value;
187 200
201 if ($string =~ /^\s*\d+\s*$/) {
202 $mask = MOVE_ALL;
203 $value = $string+0;
204 } else {
188 for (split /\s+/, lc $string) { 205 for (split /\s+/, lc $string) {
189 if (s/^-//) { 206 if (s/^-//) {
190 $mask |= $MOVE_TYPE{$_}; 207 $mask |= $MOVE_TYPE{$_};
191 $value &= ~$MOVE_TYPE{$_}; 208 $value &= ~$MOVE_TYPE{$_};
192 } else { 209 } else {
193 $mask |= $MOVE_TYPE{$_}; 210 $mask |= $MOVE_TYPE{$_};
194 $value |= $MOVE_TYPE{$_}; 211 $value |= $MOVE_TYPE{$_};
212 }
195 } 213 }
196 } 214 }
197 215
198 (bless [$mask, $value], $class)->normalise 216 (bless [$mask, $value], $class)->normalise
199} 217}
200 218
201sub Crossfire::MoveType::normalise { 219sub Deliantra::MoveType::normalise {
202 my ($self) = @_; 220 my ($self) = @_;
203 221
204 if ($self->[0] & MOVE_ALL) { 222 if ($self->[0] & MOVE_ALL) {
205 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);
206 $self->[0] &= $mask; 224 $self->[0] &= $mask;
… …
210 $self->[1] &= $self->[0]; 228 $self->[1] &= $self->[0];
211 229
212 $self 230 $self
213} 231}
214 232
215sub Crossfire::MoveType::as_string { 233sub Deliantra::MoveType::as_string {
216 my ($self) = @_; 234 my ($self) = @_;
217 235
218 my @res; 236 my @res;
219 237
220 my ($mask, $value) = @$self; 238 my ($mask, $value) = @$self;
221 239
222 for (@Crossfire::MOVE_TYPE) { 240 for (@Deliantra::MOVE_TYPE) {
223 my $bit = $Crossfire::MOVE_TYPE{$_}; 241 my $bit = $Deliantra::MOVE_TYPE{$_};
224 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 242 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
225 $mask &= ~$bit; 243 $mask &= ~$bit;
226 push @res, $value & $bit ? $_ : "-$_"; 244 push @res, $value & $bit ? $_ : "-$_";
227 } 245 }
228 } 246 }
… …
340 } else { 358 } else {
341 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 359 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
342 } 360 }
343 } 361 }
344 362
363 # check whether attachment is the same as in the archetype
364 if (exists $ob->{attach}) {
365 my $arch = $ARCH{$ob->{_name}};
366 my $js = JSON::XS->new->utf8->canonical (1);
367
368 if (defined $arch->{attach}
369 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
370 delete $ob->{attach}
371 }
372 }
373
374 # color_fg is used as default for magicmap if magicmap does not exist
375 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
376
345 # nuke outdated or never supported fields 377 # nuke outdated or never supported fields
346 delete @$ob{qw( 378 delete @$ob{qw(
347 can_knockback can_parry can_impale can_cut can_dam_armour 379 can_knockback can_parry can_impale can_cut can_dam_armour
348 can_apply pass_thru can_pass_thru 380 can_apply pass_thru can_pass_thru color_bg color_fg
349 )}; 381 )};
350 382
351 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 383 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
352 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 384 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
353 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 385 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
354 386
355 # convert movement strings to bitsets 387 # convert movement strings to bitsets
356 for my $attr (keys %FIELD_MOVEMENT) { 388 for my $attr (keys %FIELD_MOVEMENT) {
357 next unless exists $ob->{$attr}; 389 next unless exists $ob->{$attr};
358 390
359 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 391 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
360 } 392 }
361 393
362 # convert outdated movement flags to new movement sets 394 # convert outdated movement flags to new movement sets
363 if (defined (my $v = delete $ob->{no_pass})) { 395 if (defined (my $v = delete $ob->{no_pass})) {
364 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 396 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
365 } 397 }
366 if (defined (my $v = delete $ob->{slow_move})) { 398 if (defined (my $v = delete $ob->{slow_move})) {
367 $ob->{move_slow} += "walk"; 399 $ob->{move_slow} += "walk";
368 $ob->{move_slow_penalty} = $v; 400 $ob->{move_slow_penalty} = $v;
369 } 401 }
370 if (defined (my $v = delete $ob->{walk_on})) { 402 if (defined (my $v = delete $ob->{walk_on})) {
371 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } 403 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
372 } 404 }
373 if (defined (my $v = delete $ob->{walk_off})) { 405 if (defined (my $v = delete $ob->{walk_off})) {
374 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } 406 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
375 } 407 }
376 if (defined (my $v = delete $ob->{fly_on})) { 408 if (defined (my $v = delete $ob->{fly_on})) {
377 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } 409 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
378 } 410 }
379 if (defined (my $v = delete $ob->{fly_off})) { 411 if (defined (my $v = delete $ob->{fly_off})) {
380 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } 412 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
381 } 413 }
382 if (defined (my $v = delete $ob->{flying})) { 414 if (defined (my $v = delete $ob->{flying})) {
383 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } 415 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
384 } 416 }
385 417
386 # convert idiotic event_xxx things into objects 418 # convert idiotic event_xxx things into objects
387 while (my ($event, $subtype) = each %EVENT_TYPE) { 419 while (my ($event, $subtype) = each %EVENT_TYPE) {
388 if (exists $ob->{"event_${event}_plugin"}) { 420 if (exists $ob->{"event_${event}_plugin"}) {
… …
404# arch as in "arch xxx", ie.. objects 436# arch as in "arch xxx", ie.. objects
405sub normalize_arch($) { 437sub normalize_arch($) {
406 my ($ob) = @_; 438 my ($ob) = @_;
407 439
408 normalize_object $ob; 440 normalize_object $ob;
441
442 return if $ob->{_atype} eq "object";
409 443
410 my $arch = $ARCH{$ob->{_name}} 444 my $arch = $ARCH{$ob->{_name}}
411 or (warn "$ob->{_name}: no such archetype", return $ob); 445 or (warn "$ob->{_name}: no such archetype", return $ob);
412 446
413 if ($arch->{type} == 22) { # map 447 if ($arch->{type} == 22) { # map
… …
449} 483}
450 484
451sub attr_thaw($) { 485sub attr_thaw($) {
452 my ($ob) = @_; 486 my ($ob) = @_;
453 487
454 $ob->{attach} = from_json $ob->{attach} 488 $ob->{attach} = decode_json $ob->{attach}
455 if exists $ob->{attach}; 489 if exists $ob->{attach};
456 490
457 $ob 491 $ob
458} 492}
459 493
460sub attr_freeze($) { 494sub attr_freeze($) {
461 my ($ob) = @_; 495 my ($ob) = @_;
462 496
463 $ob->{attach} = Crossfire::to_json $ob->{attach} 497 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
464 if exists $ob->{attach}; 498 if exists $ob->{attach};
465 499
466 $ob 500 $ob
467} 501}
468 502
… …
488 522
489 my %arc; 523 my %arc;
490 my ($more, $prev); 524 my ($more, $prev);
491 my $comment; 525 my $comment;
492 526
493 open my $fh, "<:raw:perlio:utf8", $path 527 open my $fh, "<:utf8", $path
494 or Carp::croak "$path: $!"; 528 or Carp::croak "$path: $!";
495 529
496# binmode $fh; 530# binmode $fh;
497 531
498 my $parse_block; $parse_block = sub { 532 my $parse_block; $parse_block = sub {
… …
598 my $str; 632 my $str;
599 633
600 my $append; $append = sub { 634 my $append; $append = sub {
601 my %a = %{$_[0]}; 635 my %a = %{$_[0]};
602 636
603 Crossfire::attr_freeze \%a; 637 Deliantra::attr_freeze \%a;
604 Crossfire::normalize_arch \%a; 638 Deliantra::normalize_arch \%a;
605 639
606 # undo the bit-split we did before 640 # undo the bit-split we did before
607 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 641 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
608 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 642 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
609 | (delete $a{attack_movement_bits_4_7}); 643 | (delete $a{attack_movement_bits_4_7});
… …
627 } 661 }
628 662
629 my @kv; 663 my @kv;
630 664
631 for ($a{_name} eq "map" 665 for ($a{_name} eq "map"
632 ? @Crossfire::FIELD_ORDER_MAP 666 ? @Deliantra::FIELD_ORDER_MAP
633 : @Crossfire::FIELD_ORDER) { 667 : @Deliantra::FIELD_ORDER) {
634 push @kv, [$_, delete $a{$_}] 668 push @kv, [$_, delete $a{$_}]
635 if exists $a{$_}; 669 if exists $a{$_};
636 } 670 }
637 671
638 for (sort keys %a) { 672 for (sort keys %a) {
… …
641 } 675 }
642 676
643 for (@kv) { 677 for (@kv) {
644 my ($k, $v) = @$_; 678 my ($k, $v) = @$_;
645 679
646 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 680 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
647 $v =~ s/\n$//; 681 $v =~ s/\n$//;
648 $str .= "$k\n$v\n$end\n"; 682 $str .= "$k\n$v\n$end\n";
649 } else { 683 } else {
650 $str .= "$k $v\n"; 684 $str .= "$k $v\n";
651 } 685 }
… …
747=cut 781=cut
748 782
749sub arch_attr($) { 783sub arch_attr($) {
750 my ($obj) = @_; 784 my ($obj) = @_;
751 785
752 require Crossfire::Data; 786 require Deliantra::Data;
753 787
754 my $root; 788 my $root;
755 my $attr = { }; 789 my $attr = { };
756 790
757 my $arch = $ARCH{ $obj->{_name} }; 791 my $arch = $ARCH{ $obj->{_name} };
758 my $type = $obj->{type} || $arch->{type}; 792 my $type = $obj->{type} || $arch->{type};
759 793
760 if ($type > 0) { 794 if ($type > 0) {
761 $root = $Crossfire::Data::ATTR{$type}; 795 $root = $Deliantra::Data::ATTR{$type};
762 } else { 796 } else {
763 my %a = (%$arch, %$obj); 797 my %a = (%$arch, %$obj);
764 798
765 if ($a{is_floor} && !$a{alive}) { 799 if ($a{is_floor} && !$a{alive}) {
766 $root = $Crossfire::Data::TYPE{Floor}; 800 $root = $Deliantra::Data::TYPE{Floor};
767 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 801 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
768 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 802 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
769 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 803 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
770 $root = $Crossfire::Data::TYPE{Wall}; 804 $root = $Deliantra::Data::TYPE{Wall};
771 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 805 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
772 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 806 $root = $Deliantra::Data::TYPE{"Weak Wall"};
773 } else { 807 } else {
774 $root = $Crossfire::Data::TYPE{Misc}; 808 $root = $Deliantra::Data::TYPE{Misc};
775 } 809 }
776 } 810 }
777 811
778 my @import = ($root); 812 my @import = ($root);
779 813
780 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 814 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
781 unless $type == 116; 815 unless $type == 116;
782 816
783 my (%ignore); 817 my (%ignore);
784 my (@section_order, %section, @attr_order); 818 my (@section_order, %section, @attr_order);
785 819
786 while (my $type = shift @import) { 820 while (my $type = shift @import) {
821 push @import,
822 grep $_,
823 map $Deliantra::Data::TYPE{$_},
787 push @import, @{$type->{import} || []}; 824 @{$type->{import} || []};
788 825
789 $attr->{$_} ||= $type->{$_} 826 $attr->{$_} ||= $type->{$_}
790 for qw(name desc use); 827 for qw(name desc use);
791 828
792 for (@{$type->{ignore} || []}) { 829 for (@{$type->{ignore} || []}) {
… …
878 }, sub { 915 }, sub {
879 read_arch "$LIB/archetypes" 916 read_arch "$LIB/archetypes"
880 }; 917 };
881} 918}
882 919
920sub construct_tilecache_pb {
921 my ($idx, $cache) = @_;
922
923 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
924
925 while (my ($name, $tile) = each %$cache) {
926 my $tpb = delete $tile->{pb};
927 my $ofs = $tile->{idx};
928
929 for my $x (0 .. $tile->{w} - 1) {
930 for my $y (0 .. $tile->{h} - 1) {
931 my $idx = $ofs + $x + $y * $tile->{w};
932 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
933 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
934 }
935 }
936 }
937
938 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
939
940 $cache
941}
942
943sub use_tilecache {
944 my ($face) = @_;
945 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
946 or die "$VARDIR/tilecache.png: $!";
947 *FACE = $_[0];
948}
949
883=item load_tilecache 950=item load_tilecache
884 951
885(Re-)Load %TILE and %FACE. 952(Re-)Load %TILE and %FACE.
886 953
887=cut 954=cut
888 955
889sub load_tilecache() { 956sub load_tilecache() {
890 require Gtk2; 957 require Gtk2;
891 958
892 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 959 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
893 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
894 or die "$VARDIR/tilecache.png: $!";
895 *FACE = $_[0];
896 }, sub { 960 sub {
897 my $tile = read_pak "$LIB/crossfire.0";
898
899 my %cache; 961 my %cache;
962 my $facedata = Storable::retrieve "$LIB/facedata";
900 963
964 $facedata->{version} == 2
965 or die "$LIB/facedata: version mismatch, cannot proceed.";
966
967 my $faces = $facedata->{faceinfo};
901 my $idx = 0; 968 my $idx = 0;
902 969
903 for my $name (sort keys %$tile) { 970 for (sort keys %$faces) {
971 my ($face, $info) = ($_, $faces->{$_});
972
904 my $pb = new Gtk2::Gdk::PixbufLoader; 973 my $pb = new Gtk2::Gdk::PixbufLoader;
905 $pb->write ($tile->{$name}); 974 $pb->write ($info->{data32});
906 $pb->close; 975 $pb->close;
907 my $pb = $pb->get_pixbuf; 976 my $pb = $pb->get_pixbuf;
908 977
909 my $tile = $cache{$name} = { 978 my $tile = $cache{$face} = {
910 pb => $pb, 979 pb => $pb,
911 idx => $idx, 980 idx => $idx,
912 w => int $pb->get_width / TILESIZE, 981 w => int $pb->get_width / TILESIZE,
913 h => int $pb->get_height / TILESIZE, 982 h => int $pb->get_height / TILESIZE,
914 }; 983 };
915
916 984
917 $idx += $tile->{w} * $tile->{h}; 985 $idx += $tile->{w} * $tile->{h};
986 }
987
988 construct_tilecache_pb $idx, \%cache;
989
990 \%cache
918 } 991 };
919
920 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
921
922 while (my ($name, $tile) = each %cache) {
923 my $tpb = delete $tile->{pb};
924 my $ofs = $tile->{idx};
925
926 for my $x (0 .. $tile->{w} - 1) {
927 for my $y (0 .. $tile->{h} - 1) {
928 my $idx = $ofs + $x + $y * $tile->{w};
929 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
930 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
931 }
932 }
933 }
934
935 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
936
937 \%cache
938 };
939} 992}
993
994=back
940 995
941=head1 AUTHOR 996=head1 AUTHOR
942 997
943 Marc Lehmann <schmorp@schmorp.de> 998 Marc Lehmann <schmorp@schmorp.de>
944 http://home.schmorp.de/ 999 http://home.schmorp.de/
… …
947 http://www.ta-sa.org/ 1002 http://www.ta-sa.org/
948 1003
949=cut 1004=cut
950 1005
9511 10061
1007

Diff Legend

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