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.98 by root, Sun Mar 11 00:34:12 2007 UTC vs.
Revision 1.138 by elmex, Wed Dec 16 17:00:09 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.97'; 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 },
167 '<=' => sub {
168 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
169 ? $_[0][1] & $MOVE_TYPE{$_[1]}
170 : undef
171 },
165 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, 172 '+=' => 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 }, 173 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 174 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub { 175 'x=' => sub { # toggle between off, + and -
169 my $cur = $_[0] >= $_[1]; 176 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) { 177 if (!defined $cur) {
171 if ($_[0] >= "all") { 178 if ($_[0] >= "all") {
172 $_[0] -= $_[1]; 179 $_[0] -= $_[1];
173 } else { 180 } else {
… …
182 $_[0] 189 $_[0]
183 }, 190 },
184 'eq' => sub { "$_[0]" eq "$_[1]" }, 191 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" }, 192 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ; 193 ;
187}
188 194
189sub Crossfire::MoveType::new { 195 sub TO_JSON {
196 $_[0][0]
197 }
198}
199
200sub Deliantra::MoveType::new {
190 my ($class, $string) = @_; 201 my ($class, $string) = @_;
191 202
192 my $mask; 203 my $mask;
193 my $value; 204 my $value;
194 205
… …
208 } 219 }
209 220
210 (bless [$mask, $value], $class)->normalise 221 (bless [$mask, $value], $class)->normalise
211} 222}
212 223
213sub Crossfire::MoveType::normalise { 224sub Deliantra::MoveType::normalise {
214 my ($self) = @_; 225 my ($self) = @_;
215 226
216 if ($self->[0] & MOVE_ALL) { 227 if ($self->[0] & MOVE_ALL) {
217 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 228 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
218 $self->[0] &= $mask; 229 $self->[0] &= $mask;
… …
222 $self->[1] &= $self->[0]; 233 $self->[1] &= $self->[0];
223 234
224 $self 235 $self
225} 236}
226 237
227sub Crossfire::MoveType::as_string { 238sub Deliantra::MoveType::as_string {
228 my ($self) = @_; 239 my ($self) = @_;
229 240
230 my @res; 241 my @res;
231 242
232 my ($mask, $value) = @$self; 243 my ($mask, $value) = @$self;
233 244
234 for (@Crossfire::MOVE_TYPE) { 245 for (@Deliantra::MOVE_TYPE) {
235 my $bit = $Crossfire::MOVE_TYPE{$_}; 246 my $bit = $Deliantra::MOVE_TYPE{$_};
236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 247 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
237 $mask &= ~$bit; 248 $mask &= ~$bit;
238 push @res, $value & $bit ? $_ : "-$_"; 249 push @res, $value & $bit ? $_ : "-$_";
239 } 250 }
240 } 251 }
… …
333 344
334# object as in "Object xxx", i.e. archetypes 345# object as in "Object xxx", i.e. archetypes
335sub normalize_object($) { 346sub normalize_object($) {
336 my ($ob) = @_; 347 my ($ob) = @_;
337 348
349 delete $ob->{editable}; # deprecated
350
338 # convert material bitset to materialname, if possible 351 # convert material bitset to materialname, if possible
339 if (exists $ob->{material}) { 352 if (exists $ob->{material}) {
340 if (!$ob->{material}) { 353 if (!$ob->{material}) {
341 delete $ob->{material}; 354 delete $ob->{material};
342 } elsif (exists $ob->{materialname}) { 355 } elsif (exists $ob->{materialname}) {
… …
352 } else { 365 } else {
353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 366 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
354 } 367 }
355 } 368 }
356 369
370 # check whether attachment is the same as in the archetype
371 if (exists $ob->{attach}) {
372 my $arch = $ARCH{$ob->{_name}};
373 my $js = JSON::XS->new->utf8->canonical (1);
374
375 if (defined $arch->{attach}
376 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
377 delete $ob->{attach}
378 }
379 }
380
357 # color_fg is used as default for magicmap if magicmap does not exist 381 # color_fg is used as default for magicmap if magicmap does not exist
358 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; 382 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
359 383
360 # nuke outdated or never supported fields 384 # nuke outdated or never supported fields
361 delete @$ob{qw( 385 delete @$ob{qw(
… …
369 393
370 # convert movement strings to bitsets 394 # convert movement strings to bitsets
371 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
372 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
373 397
374 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
375 } 399 }
376 400
377 # convert outdated movement flags to new movement sets 401 # convert outdated movement flags to new movement sets
378 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
379 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
380 } 404 }
381 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
382 $ob->{move_slow} += "walk"; 406 $ob->{move_slow} += "walk";
383 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
384 } 408 }
385 if (defined (my $v = delete $ob->{walk_on})) { 409 if (defined (my $v = delete $ob->{walk_on})) {
386 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } 410 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
387 } 411 }
388 if (defined (my $v = delete $ob->{walk_off})) { 412 if (defined (my $v = delete $ob->{walk_off})) {
389 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } 413 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
390 } 414 }
391 if (defined (my $v = delete $ob->{fly_on})) { 415 if (defined (my $v = delete $ob->{fly_on})) {
392 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } 416 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
393 } 417 }
394 if (defined (my $v = delete $ob->{fly_off})) { 418 if (defined (my $v = delete $ob->{fly_off})) {
395 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } 419 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
396 } 420 }
397 if (defined (my $v = delete $ob->{flying})) { 421 if (defined (my $v = delete $ob->{flying})) {
398 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } 422 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
399 } 423 }
400 424
401 # convert idiotic event_xxx things into objects 425 # convert idiotic event_xxx things into objects
402 while (my ($event, $subtype) = each %EVENT_TYPE) { 426 while (my ($event, $subtype) = each %EVENT_TYPE) {
403 if (exists $ob->{"event_${event}_plugin"}) { 427 if (exists $ob->{"event_${event}_plugin"}) {
… …
419# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
420sub normalize_arch($) { 444sub normalize_arch($) {
421 my ($ob) = @_; 445 my ($ob) = @_;
422 446
423 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
424 450
425 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
426 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
427 453
428 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
464} 490}
465 491
466sub attr_thaw($) { 492sub attr_thaw($) {
467 my ($ob) = @_; 493 my ($ob) = @_;
468 494
469 $ob->{attach} = from_json $ob->{attach} 495 $ob->{attach} = decode_json $ob->{attach}
470 if exists $ob->{attach}; 496 if exists $ob->{attach};
471 497
472 $ob 498 $ob
473} 499}
474 500
475sub attr_freeze($) { 501sub attr_freeze($) {
476 my ($ob) = @_; 502 my ($ob) = @_;
477 503
478 $ob->{attach} = Crossfire::to_json $ob->{attach} 504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
479 if exists $ob->{attach}; 505 if exists $ob->{attach};
480 506
481 $ob 507 $ob
482} 508}
483 509
… …
503 529
504 my %arc; 530 my %arc;
505 my ($more, $prev); 531 my ($more, $prev);
506 my $comment; 532 my $comment;
507 533
508 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
509 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
510 536
511# binmode $fh; 537# binmode $fh;
512 538
513 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
… …
613 my $str; 639 my $str;
614 640
615 my $append; $append = sub { 641 my $append; $append = sub {
616 my %a = %{$_[0]}; 642 my %a = %{$_[0]};
617 643
618 Crossfire::attr_freeze \%a; 644 Deliantra::attr_freeze \%a;
619 Crossfire::normalize_arch \%a; 645 Deliantra::normalize_arch \%a;
620 646
621 # undo the bit-split we did before 647 # undo the bit-split we did before
622 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 648 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
623 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
624 | (delete $a{attack_movement_bits_4_7}); 650 | (delete $a{attack_movement_bits_4_7});
… …
642 } 668 }
643 669
644 my @kv; 670 my @kv;
645 671
646 for ($a{_name} eq "map" 672 for ($a{_name} eq "map"
647 ? @Crossfire::FIELD_ORDER_MAP 673 ? @Deliantra::FIELD_ORDER_MAP
648 : @Crossfire::FIELD_ORDER) { 674 : @Deliantra::FIELD_ORDER) {
649 push @kv, [$_, delete $a{$_}] 675 push @kv, [$_, delete $a{$_}]
650 if exists $a{$_}; 676 if exists $a{$_};
651 } 677 }
652 678
653 for (sort keys %a) { 679 for (sort keys %a) {
… …
656 } 682 }
657 683
658 for (@kv) { 684 for (@kv) {
659 my ($k, $v) = @$_; 685 my ($k, $v) = @$_;
660 686
661 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
662 $v =~ s/\n$//; 688 $v =~ s/\n$//;
663 $str .= "$k\n$v\n$end\n"; 689 $str .= "$k\n$v\n$end\n";
664 } else { 690 } else {
665 $str .= "$k $v\n"; 691 $str .= "$k $v\n";
666 } 692 }
… …
762=cut 788=cut
763 789
764sub arch_attr($) { 790sub arch_attr($) {
765 my ($obj) = @_; 791 my ($obj) = @_;
766 792
767 require Crossfire::Data; 793 require Deliantra::Data;
768 794
769 my $root; 795 my $root;
770 my $attr = { }; 796 my $attr = { };
771 797
772 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
773 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
774 800
775 if ($type > 0) { 801 if ($type > 0) {
776 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
777 } else { 803 } else {
778 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
779 805
780 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
781 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
782 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
783 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
784 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
785 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
786 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
787 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
788 } else { 814 } else {
789 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
790 } 816 }
791 } 817 }
792 818
793 my @import = ($root); 819 my @import = ($root);
794 820
795 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 821 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
796 unless $type == 116; 822 unless $type == 116;
797 823
798 my (%ignore); 824 my (%ignore);
799 my (@section_order, %section, @attr_order); 825 my (@section_order, %section, @attr_order);
800 826
801 while (my $type = shift @import) { 827 while (my $type = shift @import) {
828 push @import,
829 grep $_,
830 map $Deliantra::Data::TYPE{$_},
802 push @import, @{$type->{import} || []}; 831 @{$type->{import} || []};
803 832
804 $attr->{$_} ||= $type->{$_} 833 $attr->{$_} ||= $type->{$_}
805 for qw(name desc use); 834 for qw(name desc use);
806 835
807 for (@{$type->{ignore} || []}) { 836 for (@{$type->{ignore} || []}) {
… …
817 $section{$name}{$k} ||= $v; 846 $section{$name}{$k} ||= $v;
818 } 847 }
819 } 848 }
820 } 849 }
821 850
851 # remove ignores for "root" type
852 for (map @{$_->[1]}, # section attributes
853 [general => ($root->{attr} || [])],
854 @{$root->{section} || []})
855 {
856 my ($k, $v) = @$_;
857 # skip fixed attributes, if they are ignored thats fine
858 next if $v->{type} eq 'fixed';
859
860 delete $ignore{$k}; # if the attributes are defined explicitly they
861 # should NOT be ignored. ignore should mainly
862 # hit imported/inherited attributes.
863 }
864
822 $attr->{section} = [ 865 $attr->{section} = [
823 map !exists $section{$_} ? () : do { 866 map !exists $section{$_} ? () : do {
824 my $attr = delete $section{$_}; 867 my $attr = delete $section{$_};
825 868
826 [ 869 [
… …
828 map exists $attr->{$_} && !$ignore{$_} 871 map exists $attr->{$_} && !$ignore{$_}
829 ? [$_ => delete $attr->{$_}] : (), 872 ? [$_ => delete $attr->{$_}] : (),
830 @attr_order 873 @attr_order
831 ] 874 ]
832 }, 875 },
833
834 exists $section{$_} ? [$_ => delete $section{$_}] : (), 876 exists $section{$_} ? [$_ => delete $section{$_}] : (),
835 @section_order 877 @section_order
836 ]; 878 ];
837 879
838 $attr 880 $attr
… …
893 }, sub { 935 }, sub {
894 read_arch "$LIB/archetypes" 936 read_arch "$LIB/archetypes"
895 }; 937 };
896} 938}
897 939
940sub construct_tilecache_pb {
941 my ($idx, $cache) = @_;
942
943 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
944
945 while (my ($name, $tile) = each %$cache) {
946 my $tpb = delete $tile->{pb};
947 my $ofs = $tile->{idx};
948
949 for my $x (0 .. $tile->{w} - 1) {
950 for my $y (0 .. $tile->{h} - 1) {
951 my $idx = $ofs + $x + $y * $tile->{w};
952 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
953 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
954 }
955 }
956 }
957
958 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
959
960 $cache
961}
962
963sub use_tilecache {
964 my ($face) = @_;
965 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
966 or die "$VARDIR/tilecache.png: $!";
967 *FACE = $_[0];
968}
969
898=item load_tilecache 970=item load_tilecache
899 971
900(Re-)Load %TILE and %FACE. 972(Re-)Load %TILE and %FACE.
901 973
902=cut 974=cut
903 975
904sub load_tilecache() { 976sub load_tilecache() {
905 require Gtk2; 977 require Gtk2;
906 978
907 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 979 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
908 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
909 or die "$VARDIR/tilecache.png: $!";
910 *FACE = $_[0];
911 }, sub { 980 sub {
912 my $tile = read_pak "$LIB/crossfire.0";
913
914 my %cache; 981 my %cache;
982 my $facedata = Storable::retrieve "$LIB/facedata";
915 983
984 $facedata->{version} == 2
985 or die "$LIB/facedata: version mismatch, cannot proceed.";
986
987 my $faces = $facedata->{faceinfo};
916 my $idx = 0; 988 my $idx = 0;
917 989
918 for my $name (sort keys %$tile) { 990 for (sort keys %$faces) {
991 my ($face, $info) = ($_, $faces->{$_});
992
919 my $pb = new Gtk2::Gdk::PixbufLoader; 993 my $pb = new Gtk2::Gdk::PixbufLoader;
920 $pb->write ($tile->{$name}); 994 $pb->write ($info->{data32});
921 $pb->close; 995 $pb->close;
922 my $pb = $pb->get_pixbuf; 996 my $pb = $pb->get_pixbuf;
923 997
924 my $tile = $cache{$name} = { 998 my $tile = $cache{$face} = {
925 pb => $pb, 999 pb => $pb,
926 idx => $idx, 1000 idx => $idx,
927 w => int $pb->get_width / TILESIZE, 1001 w => int $pb->get_width / TILESIZE,
928 h => int $pb->get_height / TILESIZE, 1002 h => int $pb->get_height / TILESIZE,
929 }; 1003 };
930
931 1004
932 $idx += $tile->{w} * $tile->{h}; 1005 $idx += $tile->{w} * $tile->{h};
1006 }
1007
1008 construct_tilecache_pb $idx, \%cache;
1009
1010 \%cache
933 } 1011 };
934
935 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
936
937 while (my ($name, $tile) = each %cache) {
938 my $tpb = delete $tile->{pb};
939 my $ofs = $tile->{idx};
940
941 for my $x (0 .. $tile->{w} - 1) {
942 for my $y (0 .. $tile->{h} - 1) {
943 my $idx = $ofs + $x + $y * $tile->{w};
944 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
945 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
946 }
947 }
948 }
949
950 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
951
952 \%cache
953 };
954} 1012}
1013
1014=back
955 1015
956=head1 AUTHOR 1016=head1 AUTHOR
957 1017
958 Marc Lehmann <schmorp@schmorp.de> 1018 Marc Lehmann <schmorp@schmorp.de>
959 http://home.schmorp.de/ 1019 http://home.schmorp.de/
… …
962 http://www.ta-sa.org/ 1022 http://www.ta-sa.org/
963 1023
964=cut 1024=cut
965 1025
9661 10261
1027

Diff Legend

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