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

Diff Legend

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