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.89 by root, Tue Feb 27 23:29:59 2007 UTC vs.
Revision 1.121 by root, Mon Apr 14 00:35:17 2008 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.14';
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($) { 29our $LIB = $ENV{DELIANTRA_LIBDIR} || $ENV{CROSSFIRE_LIBDIR};
27 $JSON::Syck::ImplicitUnicode = 1;
28 JSON::Syck::Load $_[0]
29}
30 30
31sub to_json($) {
32 $JSON::Syck::ImplicitUnicode = 0;
33 JSON::Syck::Dump $_[0]
34}
35
36our $LIB = $ENV{CROSSFIRE_LIBDIR};
37
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 31our $OLDDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
40 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/crossfire";
41 34
35our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
36 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
37 : File::Spec->tmpdir . "/deliantra";
38
42mkdir $VARDIR, 0777; 39mkdir $VARDIR, 0777;
43 40
44sub TILESIZE (){ 32 } 41sub TILESIZE (){ 32 }
42sub CACHESTRIDE (){ 64 }
45 43
46our %ARCH; 44our %ARCH;
45our %FACE; # face32
47our %FACE; 46our %FACEDATA;
48our $TILE; 47our $TILE;
49 48
50our %FIELD_MULTILINE = ( 49our %FIELD_MULTILINE = (
51 msg => "endmsg", 50 msg => "endmsg",
52 lore => "endlore", 51 lore => "endlore",
… …
68 outdoor temp pressure humid windspeed winddir sky nosmooth 67 outdoor temp pressure humid windspeed winddir sky nosmooth
69 tile_path_1 tile_path_2 tile_path_3 tile_path_4 68 tile_path_1 tile_path_2 tile_path_3 tile_path_4
70)); 69));
71 70
72our @FIELD_ORDER = (qw( 71our @FIELD_ORDER = (qw(
72 inherit
73
73 elevation 74 elevation
74 75
75 name name_pl custom_name attach title race 76 name name_pl custom_name attach title race
76 slaying skill msg lore other_arch face 77 slaying skill msg lore other_arch
77 #todo-events
78 animation is_animated 78 face animation is_animated
79 magicmap smoothlevel smoothface
79 str dex con wis pow cha int 80 str dex con wis pow cha int
80 hp maxhp sp maxsp grace maxgrace 81 hp maxhp sp maxsp grace maxgrace
81 exp perm_exp expmul 82 exp perm_exp expmul
82 food dam luck wc ac x y speed speed_left move_state attack_movement 83 food dam luck wc ac x y speed speed_left move_state attack_movement
83 nrof level direction type subtype attacktype 84 nrof level direction type subtype attacktype
… …
91 resist_life_stealing resist_disease 92 resist_life_stealing resist_disease
92 93
93 path_attuned path_repelled path_denied material materialname 94 path_attuned path_repelled path_denied material materialname
94 value carrying weight invisible state magic 95 value carrying weight invisible state magic
95 last_heal last_sp last_grace last_eat 96 last_heal last_sp last_grace last_eat
96 connected glow_radius randomitems npx_status npc_program 97 connected glow_radius randomitems tresure_env npx_status npc_program
97 run_away pick_up container will_apply smoothlevel 98 run_away pick_up container will_apply smoothlevel
98 current_weapon_script weapontype tooltype elevation client_type 99 current_weapon_script weapontype tooltype elevation client_type
99 item_power duration range 100 item_power duration range
100 range_modifier duration_modifier dam_modifier gen_sp_armour 101 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 102 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 113 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 114 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 115 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 116 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 117 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
118 precious
117 119
118 body_range body_arm body_torso body_head body_neck body_skill 120 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 121 body_finger body_shoulder body_foot body_hand body_wrist body_waist
120)); 122));
121 123
… …
138sub MOVE_FLY_LOW (){ 0x02 } 140sub MOVE_FLY_LOW (){ 0x02 }
139sub MOVE_FLY_HIGH (){ 0x04 } 141sub MOVE_FLY_HIGH (){ 0x04 }
140sub MOVE_FLYING (){ 0x06 } 142sub MOVE_FLYING (){ 0x06 }
141sub MOVE_SWIM (){ 0x08 } 143sub MOVE_SWIM (){ 0x08 }
142sub MOVE_BOAT (){ 0x10 } 144sub MOVE_BOAT (){ 0x10 }
145sub MOVE_SHIP (){ 0x20 }
143sub MOVE_KNOWN (){ 0x1f } # all of above 146sub MOVE_KNOWN (){ 0x3f } # all of above
144sub MOVE_ALLBIT (){ 0x10000 }
145sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 147sub MOVE_ALL (){ 0x10000 } # very special value
148
149our %MOVE_TYPE = (
150 walk => MOVE_WALK,
151 fly_low => MOVE_FLY_LOW,
152 fly_high => MOVE_FLY_HIGH,
153 flying => MOVE_FLYING,
154 swim => MOVE_SWIM,
155 boat => MOVE_BOAT,
156 ship => MOVE_SHIP,
157 all => MOVE_ALL,
158);
159
160our @MOVE_TYPE = keys %MOVE_TYPE;
161
162{
163 package Deliantra::MoveType;
164
165 use overload
166 '=' => sub { bless [@{$_[0]}], ref $_[0] },
167 '""' => \&as_string,
168 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
169 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
170 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
171 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
172 'x=' => sub {
173 my $cur = $_[0] >= $_[1];
174 if (!defined $cur) {
175 if ($_[0] >= "all") {
176 $_[0] -= $_[1];
177 } else {
178 $_[0] += $_[1];
179 }
180 } elsif ($cur) {
181 $_[0] -= $_[1];
182 } else {
183 $_[0] /= $_[1];
184 }
185
186 $_[0]
187 },
188 'eq' => sub { "$_[0]" eq "$_[1]" },
189 'ne' => sub { "$_[0]" ne "$_[1]" },
190 ;
191}
192
193sub Deliantra::MoveType::new {
194 my ($class, $string) = @_;
195
196 my $mask;
197 my $value;
198
199 if ($string =~ /^\s*\d+\s*$/) {
200 $mask = MOVE_ALL;
201 $value = $string+0;
202 } else {
203 for (split /\s+/, lc $string) {
204 if (s/^-//) {
205 $mask |= $MOVE_TYPE{$_};
206 $value &= ~$MOVE_TYPE{$_};
207 } else {
208 $mask |= $MOVE_TYPE{$_};
209 $value |= $MOVE_TYPE{$_};
210 }
211 }
212 }
213
214 (bless [$mask, $value], $class)->normalise
215}
216
217sub Deliantra::MoveType::normalise {
218 my ($self) = @_;
219
220 if ($self->[0] & MOVE_ALL) {
221 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
222 $self->[0] &= $mask;
223 $self->[1] &= $mask;
224 }
225
226 $self->[1] &= $self->[0];
227
228 $self
229}
230
231sub Deliantra::MoveType::as_string {
232 my ($self) = @_;
233
234 my @res;
235
236 my ($mask, $value) = @$self;
237
238 for (@Deliantra::MOVE_TYPE) {
239 my $bit = $Deliantra::MOVE_TYPE{$_};
240 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
241 $mask &= ~$bit;
242 push @res, $value & $bit ? $_ : "-$_";
243 }
244 }
245
246 join " ", @res
247}
146 248
147sub load_ref($) { 249sub load_ref($) {
148 my ($path) = @_; 250 my ($path) = @_;
149 251
150 open my $fh, "<:raw:perlio", $path 252 open my $fh, "<:raw:perlio", $path
… …
254 } else { 356 } else {
255 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 357 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
256 } 358 }
257 } 359 }
258 360
361 # check whether attachment is the same as in the archetype
362 if (exists $ob->{attach}) {
363 my $arch = $ARCH{$ob->{_name}};
364 my $js = JSON::XS->new->utf8->canonical (1);
365
366 if (defined $arch->{attach}
367 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
368 delete $ob->{attach}
369 }
370 }
371
372 # color_fg is used as default for magicmap if magicmap does not exist
373 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
374
259 # nuke outdated or never supported fields 375 # nuke outdated or never supported fields
260 delete @$ob{qw( 376 delete @$ob{qw(
261 can_knockback can_parry can_impale can_cut can_dam_armour 377 can_knockback can_parry can_impale can_cut can_dam_armour
262 can_apply pass_thru can_pass_thru 378 can_apply pass_thru can_pass_thru color_bg color_fg
263 )}; 379 )};
264 380
265 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 381 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
266 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 382 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
267 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 383 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
268 384
269 # convert movement strings to bitsets 385 # convert movement strings to bitsets
270 for my $attr (keys %FIELD_MOVEMENT) { 386 for my $attr (keys %FIELD_MOVEMENT) {
271 next unless exists $ob->{$attr}; 387 next unless exists $ob->{$attr};
272 388
273 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 389 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
274
275 next if $ob->{$attr} =~ /^\d+$/;
276
277 my $flags = 0;
278
279 # assume list
280 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
281 $flags |= MOVE_WALK if $flag eq "walk";
282 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
283 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
284 $flags |= MOVE_FLYING if $flag eq "flying";
285 $flags |= MOVE_SWIM if $flag eq "swim";
286 $flags |= MOVE_BOAT if $flag eq "boat";
287 $flags |= MOVE_ALL if $flag eq "all";
288
289 $flags &= ~MOVE_WALK if $flag eq "-walk";
290 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
291 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
292 $flags &= ~MOVE_FLYING if $flag eq "-flying";
293 $flags &= ~MOVE_SWIM if $flag eq "-swim";
294 $flags &= ~MOVE_BOAT if $flag eq "-boat";
295 $flags &= ~MOVE_ALL if $flag eq "-all";
296 }
297
298 $ob->{$attr} = $flags;
299 } 390 }
300 391
301 # convert outdated movement flags to new movement sets 392 # convert outdated movement flags to new movement sets
302 if (defined (my $v = delete $ob->{no_pass})) { 393 if (defined (my $v = delete $ob->{no_pass})) {
303 $ob->{move_block} = $v ? MOVE_ALL : 0; 394 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
304 } 395 }
305 if (defined (my $v = delete $ob->{slow_move})) { 396 if (defined (my $v = delete $ob->{slow_move})) {
306 $ob->{move_slow} |= MOVE_WALK; 397 $ob->{move_slow} += "walk";
307 $ob->{move_slow_penalty} = $v; 398 $ob->{move_slow_penalty} = $v;
308 } 399 }
309 if (defined (my $v = delete $ob->{walk_on})) { 400 if (defined (my $v = delete $ob->{walk_on})) {
310 $ob->{move_on} = 0 unless exists $ob->{move_on}; 401 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
311 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
312 : $ob->{move_on} & ~MOVE_WALK;
313 } 402 }
314 if (defined (my $v = delete $ob->{walk_off})) { 403 if (defined (my $v = delete $ob->{walk_off})) {
315 $ob->{move_off} = 0 unless exists $ob->{move_off}; 404 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
316 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
317 : $ob->{move_off} & ~MOVE_WALK;
318 } 405 }
319 if (defined (my $v = delete $ob->{fly_on})) { 406 if (defined (my $v = delete $ob->{fly_on})) {
320 $ob->{move_on} = 0 unless exists $ob->{move_on}; 407 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
321 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
322 : $ob->{move_on} & ~MOVE_FLY_LOW;
323 } 408 }
324 if (defined (my $v = delete $ob->{fly_off})) { 409 if (defined (my $v = delete $ob->{fly_off})) {
325 $ob->{move_off} = 0 unless exists $ob->{move_off}; 410 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
326 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
327 : $ob->{move_off} & ~MOVE_FLY_LOW;
328 } 411 }
329 if (defined (my $v = delete $ob->{flying})) { 412 if (defined (my $v = delete $ob->{flying})) {
330 $ob->{move_type} = 0 unless exists $ob->{move_type}; 413 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
331 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
332 : $ob->{move_type} & ~MOVE_FLY_LOW;
333 } 414 }
334 415
335 # convert idiotic event_xxx things into objects 416 # convert idiotic event_xxx things into objects
336 while (my ($event, $subtype) = each %EVENT_TYPE) { 417 while (my ($event, $subtype) = each %EVENT_TYPE) {
337 if (exists $ob->{"event_${event}_plugin"}) { 418 if (exists $ob->{"event_${event}_plugin"}) {
… …
398} 479}
399 480
400sub attr_thaw($) { 481sub attr_thaw($) {
401 my ($ob) = @_; 482 my ($ob) = @_;
402 483
403 $ob->{attach} = from_json $ob->{attach} 484 $ob->{attach} = decode_json $ob->{attach}
404 if exists $ob->{attach}; 485 if exists $ob->{attach};
405 486
406 $ob 487 $ob
407} 488}
408 489
409sub attr_freeze($) { 490sub attr_freeze($) {
410 my ($ob) = @_; 491 my ($ob) = @_;
411 492
412 $ob->{attach} = Crossfire::to_json $ob->{attach} 493 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
413 if exists $ob->{attach}; 494 if exists $ob->{attach};
414 495
415 $ob 496 $ob
416} 497}
417 498
… …
547 my $str; 628 my $str;
548 629
549 my $append; $append = sub { 630 my $append; $append = sub {
550 my %a = %{$_[0]}; 631 my %a = %{$_[0]};
551 632
552 Crossfire::attr_freeze \%a; 633 Deliantra::attr_freeze \%a;
553 Crossfire::normalize_arch \%a; 634 Deliantra::normalize_arch \%a;
554 635
555 # undo the bit-split we did before 636 # undo the bit-split we did before
556 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 637 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
557 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 638 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
558 | (delete $a{attack_movement_bits_4_7}); 639 | (delete $a{attack_movement_bits_4_7});
… …
576 } 657 }
577 658
578 my @kv; 659 my @kv;
579 660
580 for ($a{_name} eq "map" 661 for ($a{_name} eq "map"
581 ? @Crossfire::FIELD_ORDER_MAP 662 ? @Deliantra::FIELD_ORDER_MAP
582 : @Crossfire::FIELD_ORDER) { 663 : @Deliantra::FIELD_ORDER) {
583 push @kv, [$_, delete $a{$_}] 664 push @kv, [$_, delete $a{$_}]
584 if exists $a{$_}; 665 if exists $a{$_};
585 } 666 }
586 667
587 for (sort keys %a) { 668 for (sort keys %a) {
… …
590 } 671 }
591 672
592 for (@kv) { 673 for (@kv) {
593 my ($k, $v) = @$_; 674 my ($k, $v) = @$_;
594 675
595 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 676 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
596 $v =~ s/\n$//; 677 $v =~ s/\n$//;
597 $str .= "$k\n$v\n$end\n"; 678 $str .= "$k\n$v\n$end\n";
598 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
599 if ($v & ~Crossfire::MOVE_ALL or !$v) {
600 $str .= "$k $v\n";
601
602 } elsif ($v & Crossfire::MOVE_ALLBIT) {
603 $str .= "$k all";
604
605 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
606 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
607 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
608 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
609 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
610
611 $str .= "\n";
612
613 } else {
614 $str .= $k;
615
616 $str .= " walk" if $v & Crossfire::MOVE_WALK;
617 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
618 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
619 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
620 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
621
622 $str .= "\n";
623 }
624 } else { 679 } else {
625 $str .= "$k $v\n"; 680 $str .= "$k $v\n";
626 } 681 }
627 } 682 }
628 683
… …
722=cut 777=cut
723 778
724sub arch_attr($) { 779sub arch_attr($) {
725 my ($obj) = @_; 780 my ($obj) = @_;
726 781
727 require Crossfire::Data; 782 require Deliantra::Data;
728 783
729 my $root; 784 my $root;
730 my $attr = { }; 785 my $attr = { };
731 786
732 my $arch = $ARCH{ $obj->{_name} }; 787 my $arch = $ARCH{ $obj->{_name} };
733 my $type = $obj->{type} || $arch->{type}; 788 my $type = $obj->{type} || $arch->{type};
734 789
735 if ($type > 0) { 790 if ($type > 0) {
736 $root = $Crossfire::Data::ATTR{$type}; 791 $root = $Deliantra::Data::ATTR{$type};
737 } else { 792 } else {
738 my %a = (%$arch, %$obj); 793 my %a = (%$arch, %$obj);
739 794
740 if ($a{is_floor} && !$a{alive}) { 795 if ($a{is_floor} && !$a{alive}) {
741 $root = $Crossfire::Data::TYPE{Floor}; 796 $root = $Deliantra::Data::TYPE{Floor};
742 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 797 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
743 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 798 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
744 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 799 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
745 $root = $Crossfire::Data::TYPE{Wall}; 800 $root = $Deliantra::Data::TYPE{Wall};
746 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 801 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
747 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 802 $root = $Deliantra::Data::TYPE{"Weak Wall"};
748 } else { 803 } else {
749 $root = $Crossfire::Data::TYPE{Misc}; 804 $root = $Deliantra::Data::TYPE{Misc};
750 } 805 }
751 } 806 }
752 807
753 my @import = ($root); 808 my @import = ($root);
754 809
755 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 810 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
756 unless $type == 116; 811 unless $type == 116;
757 812
758 my (%ignore); 813 my (%ignore);
759 my (@section_order, %section, @attr_order); 814 my (@section_order, %section, @attr_order);
760 815
761 while (my $type = shift @import) { 816 while (my $type = shift @import) {
817 push @import,
818 grep $_,
819 map $Deliantra::Data::TYPE{$_},
762 push @import, @{$type->{import} || []}; 820 @{$type->{import} || []};
763 821
764 $attr->{$_} ||= $type->{$_} 822 $attr->{$_} ||= $type->{$_}
765 for qw(name desc use); 823 for qw(name desc use);
766 824
767 for (@{$type->{ignore} || []}) { 825 for (@{$type->{ignore} || []}) {
… …
853 }, sub { 911 }, sub {
854 read_arch "$LIB/archetypes" 912 read_arch "$LIB/archetypes"
855 }; 913 };
856} 914}
857 915
916sub construct_tilecache_pb {
917 my ($idx, $cache) = @_;
918
919 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
920
921 while (my ($name, $tile) = each %$cache) {
922 my $tpb = delete $tile->{pb};
923 my $ofs = $tile->{idx};
924
925 for my $x (0 .. $tile->{w} - 1) {
926 for my $y (0 .. $tile->{h} - 1) {
927 my $idx = $ofs + $x + $y * $tile->{w};
928 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
929 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
930 }
931 }
932 }
933
934 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
935
936 $cache
937}
938
939sub use_tilecache {
940 my ($face) = @_;
941 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
942 or die "$VARDIR/tilecache.png: $!";
943 *FACE = $_[0];
944}
945
858=item load_tilecache 946=item load_tilecache
859 947
860(Re-)Load %TILE and %FACE. 948(Re-)Load %TILE and %FACE.
861 949
862=cut 950=cut
863 951
864sub load_tilecache() { 952sub load_tilecache() {
865 require Gtk2; 953 require Gtk2;
866 954
867 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 955 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
868 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
869 or die "$VARDIR/tilecache.png: $!";
870 *FACE = $_[0];
871 }, sub { 956 sub {
872 my $tile = read_pak "$LIB/crossfire.0";
873
874 my %cache; 957 my %cache;
958 my $facedata = Storable::retrieve "$LIB/facedata";
875 959
960 $facedata->{version} == 2
961 or die "$LIB/facedata: version mismatch, cannot proceed.";
962
963 my $faces = $facedata->{faceinfo};
876 my $idx = 0; 964 my $idx = 0;
877 965
878 for my $name (sort keys %$tile) { 966 for (sort keys %$faces) {
967 my ($face, $info) = ($_, $faces->{$_});
968
879 my $pb = new Gtk2::Gdk::PixbufLoader; 969 my $pb = new Gtk2::Gdk::PixbufLoader;
880 $pb->write ($tile->{$name}); 970 $pb->write ($info->{data32});
881 $pb->close; 971 $pb->close;
882 my $pb = $pb->get_pixbuf; 972 my $pb = $pb->get_pixbuf;
883 973
884 my $tile = $cache{$name} = { 974 my $tile = $cache{$face} = {
885 pb => $pb, 975 pb => $pb,
886 idx => $idx, 976 idx => $idx,
887 w => int $pb->get_width / TILESIZE, 977 w => int $pb->get_width / TILESIZE,
888 h => int $pb->get_height / TILESIZE, 978 h => int $pb->get_height / TILESIZE,
889 }; 979 };
890
891 980
892 $idx += $tile->{w} * $tile->{h}; 981 $idx += $tile->{w} * $tile->{h};
982 }
983
984 construct_tilecache_pb $idx, \%cache;
985
986 \%cache
893 } 987 };
894
895 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
896
897 while (my ($name, $tile) = each %cache) {
898 my $tpb = delete $tile->{pb};
899 my $ofs = $tile->{idx};
900
901 for my $x (0 .. $tile->{w} - 1) {
902 for my $y (0 .. $tile->{h} - 1) {
903 my $idx = $ofs + $x + $y * $tile->{w};
904 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
905 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
906 }
907 }
908 }
909
910 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
911
912 \%cache
913 };
914} 988}
915 989
916=head1 AUTHOR 990=head1 AUTHOR
917 991
918 Marc Lehmann <schmorp@schmorp.de> 992 Marc Lehmann <schmorp@schmorp.de>
… …
922 http://www.ta-sa.org/ 996 http://www.ta-sa.org/
923 997
924=cut 998=cut
925 999
9261 10001
1001

Diff Legend

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