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

Diff Legend

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