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

Diff Legend

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