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

Diff Legend

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