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.88 by root, Sun Feb 18 20:20:58 2007 UTC vs.
Revision 1.134 by root, Wed Oct 28 10:17:01 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_ALLBIT (){ 0x10000 }
145sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 145sub MOVE_ALL (){ 0x10000 } # very special value
146
147our %MOVE_TYPE = (
148 walk => MOVE_WALK,
149 fly_low => MOVE_FLY_LOW,
150 fly_high => MOVE_FLY_HIGH,
151 flying => MOVE_FLYING,
152 swim => MOVE_SWIM,
153 boat => MOVE_BOAT,
154 ship => MOVE_SHIP,
155 all => MOVE_ALL,
156);
157
158our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
159
160{
161 package Deliantra::MoveType;
162
163 use overload
164 '=' => sub { bless [@{$_[0]}], ref $_[0] },
165 '""' => \&as_string,
166 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
167 '+=' => 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 },
169 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
170 'x=' => sub {
171 my $cur = $_[0] >= $_[1];
172 if (!defined $cur) {
173 if ($_[0] >= "all") {
174 $_[0] -= $_[1];
175 } else {
176 $_[0] += $_[1];
177 }
178 } elsif ($cur) {
179 $_[0] -= $_[1];
180 } else {
181 $_[0] /= $_[1];
182 }
183
184 $_[0]
185 },
186 'eq' => sub { "$_[0]" eq "$_[1]" },
187 'ne' => sub { "$_[0]" ne "$_[1]" },
188 ;
189
190 sub TO_JSON {
191 $_[0][0]
192 }
193}
194
195sub Deliantra::MoveType::new {
196 my ($class, $string) = @_;
197
198 my $mask;
199 my $value;
200
201 if ($string =~ /^\s*\d+\s*$/) {
202 $mask = MOVE_ALL;
203 $value = $string+0;
204 } else {
205 for (split /\s+/, lc $string) {
206 if (s/^-//) {
207 $mask |= $MOVE_TYPE{$_};
208 $value &= ~$MOVE_TYPE{$_};
209 } else {
210 $mask |= $MOVE_TYPE{$_};
211 $value |= $MOVE_TYPE{$_};
212 }
213 }
214 }
215
216 (bless [$mask, $value], $class)->normalise
217}
218
219sub Deliantra::MoveType::normalise {
220 my ($self) = @_;
221
222 if ($self->[0] & MOVE_ALL) {
223 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
224 $self->[0] &= $mask;
225 $self->[1] &= $mask;
226 }
227
228 $self->[1] &= $self->[0];
229
230 $self
231}
232
233sub Deliantra::MoveType::as_string {
234 my ($self) = @_;
235
236 my @res;
237
238 my ($mask, $value) = @$self;
239
240 for (@Deliantra::MOVE_TYPE) {
241 my $bit = $Deliantra::MOVE_TYPE{$_};
242 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
243 $mask &= ~$bit;
244 push @res, $value & $bit ? $_ : "-$_";
245 }
246 }
247
248 join " ", @res
249}
146 250
147sub load_ref($) { 251sub load_ref($) {
148 my ($path) = @_; 252 my ($path) = @_;
149 253
150 open my $fh, "<:raw:perlio", $path 254 open my $fh, "<:raw:perlio", $path
… …
254 } else { 358 } else {
255 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 359 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
256 } 360 }
257 } 361 }
258 362
363 # check whether attachment is the same as in the archetype
364 if (exists $ob->{attach}) {
365 my $arch = $ARCH{$ob->{_name}};
366 my $js = JSON::XS->new->utf8->canonical (1);
367
368 if (defined $arch->{attach}
369 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
370 delete $ob->{attach}
371 }
372 }
373
374 # color_fg is used as default for magicmap if magicmap does not exist
375 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
376
259 # nuke outdated or never supported fields 377 # nuke outdated or never supported fields
260 delete @$ob{qw( 378 delete @$ob{qw(
261 can_knockback can_parry can_impale can_cut can_dam_armour 379 can_knockback can_parry can_impale can_cut can_dam_armour
262 can_apply pass_thru can_pass_thru 380 can_apply pass_thru can_pass_thru color_bg color_fg
263 )}; 381 )};
264 382
265 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 383 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
266 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 384 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
267 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 385 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
268 386
269 # convert movement strings to bitsets 387 # convert movement strings to bitsets
270 for my $attr (keys %FIELD_MOVEMENT) { 388 for my $attr (keys %FIELD_MOVEMENT) {
271 next unless exists $ob->{$attr}; 389 next unless exists $ob->{$attr};
272 390
273 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 391 $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 } 392 }
300 393
301 # convert outdated movement flags to new movement sets 394 # convert outdated movement flags to new movement sets
302 if (defined (my $v = delete $ob->{no_pass})) { 395 if (defined (my $v = delete $ob->{no_pass})) {
303 $ob->{move_block} = $v ? MOVE_ALL : 0; 396 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
304 } 397 }
305 if (defined (my $v = delete $ob->{slow_move})) { 398 if (defined (my $v = delete $ob->{slow_move})) {
306 $ob->{move_slow} |= MOVE_WALK; 399 $ob->{move_slow} += "walk";
307 $ob->{move_slow_penalty} = $v; 400 $ob->{move_slow_penalty} = $v;
308 } 401 }
309 if (defined (my $v = delete $ob->{walk_on})) { 402 if (defined (my $v = delete $ob->{walk_on})) {
310 $ob->{move_on} = MOVE_NONE unless exists $ob->{move_on}; 403 $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 } 404 }
314 if (defined (my $v = delete $ob->{walk_off})) { 405 if (defined (my $v = delete $ob->{walk_off})) {
315 $ob->{move_off} = MOVE_NONE unless exists $ob->{move_off}; 406 $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 } 407 }
319 if (defined (my $v = delete $ob->{fly_on})) { 408 if (defined (my $v = delete $ob->{fly_on})) {
320 $ob->{move_on} = MOVE_NONE unless exists $ob->{move_on}; 409 $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 } 410 }
324 if (defined (my $v = delete $ob->{fly_off})) { 411 if (defined (my $v = delete $ob->{fly_off})) {
325 $ob->{move_off} = MOVE_NONE unless exists $ob->{move_off}; 412 $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 } 413 }
329 if (defined (my $v = delete $ob->{flying})) { 414 if (defined (my $v = delete $ob->{flying})) {
330 $ob->{move_type} = MOVE_NONE unless exists $ob->{move_type}; 415 $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 } 416 }
334 417
335 # convert idiotic event_xxx things into objects 418 # convert idiotic event_xxx things into objects
336 while (my ($event, $subtype) = each %EVENT_TYPE) { 419 while (my ($event, $subtype) = each %EVENT_TYPE) {
337 if (exists $ob->{"event_${event}_plugin"}) { 420 if (exists $ob->{"event_${event}_plugin"}) {
… …
353# arch as in "arch xxx", ie.. objects 436# arch as in "arch xxx", ie.. objects
354sub normalize_arch($) { 437sub normalize_arch($) {
355 my ($ob) = @_; 438 my ($ob) = @_;
356 439
357 normalize_object $ob; 440 normalize_object $ob;
441
442 return if $ob->{_atype} eq "object";
358 443
359 my $arch = $ARCH{$ob->{_name}} 444 my $arch = $ARCH{$ob->{_name}}
360 or (warn "$ob->{_name}: no such archetype", return $ob); 445 or (warn "$ob->{_name}: no such archetype", return $ob);
361 446
362 if ($arch->{type} == 22) { # map 447 if ($arch->{type} == 22) { # map
… …
398} 483}
399 484
400sub attr_thaw($) { 485sub attr_thaw($) {
401 my ($ob) = @_; 486 my ($ob) = @_;
402 487
403 $ob->{attach} = from_json $ob->{attach} 488 $ob->{attach} = decode_json $ob->{attach}
404 if exists $ob->{attach}; 489 if exists $ob->{attach};
405 490
406 $ob 491 $ob
407} 492}
408 493
409sub attr_freeze($) { 494sub attr_freeze($) {
410 my ($ob) = @_; 495 my ($ob) = @_;
411 496
412 $ob->{attach} = Crossfire::to_json $ob->{attach} 497 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
413 if exists $ob->{attach}; 498 if exists $ob->{attach};
414 499
415 $ob 500 $ob
416} 501}
417 502
… …
437 522
438 my %arc; 523 my %arc;
439 my ($more, $prev); 524 my ($more, $prev);
440 my $comment; 525 my $comment;
441 526
442 open my $fh, "<:raw:perlio:utf8", $path 527 open my $fh, "<:utf8", $path
443 or Carp::croak "$path: $!"; 528 or Carp::croak "$path: $!";
444 529
445# binmode $fh; 530# binmode $fh;
446 531
447 my $parse_block; $parse_block = sub { 532 my $parse_block; $parse_block = sub {
… …
547 my $str; 632 my $str;
548 633
549 my $append; $append = sub { 634 my $append; $append = sub {
550 my %a = %{$_[0]}; 635 my %a = %{$_[0]};
551 636
552 Crossfire::attr_freeze \%a; 637 Deliantra::attr_freeze \%a;
553 Crossfire::normalize_arch \%a; 638 Deliantra::normalize_arch \%a;
554 639
555 # undo the bit-split we did before 640 # undo the bit-split we did before
556 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 641 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}) 642 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
558 | (delete $a{attack_movement_bits_4_7}); 643 | (delete $a{attack_movement_bits_4_7});
… …
576 } 661 }
577 662
578 my @kv; 663 my @kv;
579 664
580 for ($a{_name} eq "map" 665 for ($a{_name} eq "map"
581 ? @Crossfire::FIELD_ORDER_MAP 666 ? @Deliantra::FIELD_ORDER_MAP
582 : @Crossfire::FIELD_ORDER) { 667 : @Deliantra::FIELD_ORDER) {
583 push @kv, [$_, delete $a{$_}] 668 push @kv, [$_, delete $a{$_}]
584 if exists $a{$_}; 669 if exists $a{$_};
585 } 670 }
586 671
587 for (sort keys %a) { 672 for (sort keys %a) {
… …
590 } 675 }
591 676
592 for (@kv) { 677 for (@kv) {
593 my ($k, $v) = @$_; 678 my ($k, $v) = @$_;
594 679
595 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 680 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
596 $v =~ s/\n$//; 681 $v =~ s/\n$//;
597 $str .= "$k\n$v\n$end\n"; 682 $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 { 683 } else {
625 $str .= "$k $v\n"; 684 $str .= "$k $v\n";
626 } 685 }
627 } 686 }
628 687
… …
722=cut 781=cut
723 782
724sub arch_attr($) { 783sub arch_attr($) {
725 my ($obj) = @_; 784 my ($obj) = @_;
726 785
727 require Crossfire::Data; 786 require Deliantra::Data;
728 787
729 my $root; 788 my $root;
730 my $attr = { }; 789 my $attr = { };
731 790
732 my $arch = $ARCH{ $obj->{_name} }; 791 my $arch = $ARCH{ $obj->{_name} };
733 my $type = $obj->{type} || $arch->{type}; 792 my $type = $obj->{type} || $arch->{type};
734 793
735 if ($type > 0) { 794 if ($type > 0) {
736 $root = $Crossfire::Data::ATTR{$type}; 795 $root = $Deliantra::Data::ATTR{$type};
737 } else { 796 } else {
738 my %a = (%$arch, %$obj); 797 my %a = (%$arch, %$obj);
739 798
740 if ($a{is_floor} && !$a{alive}) { 799 if ($a{is_floor} && !$a{alive}) {
741 $root = $Crossfire::Data::TYPE{Floor}; 800 $root = $Deliantra::Data::TYPE{Floor};
742 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 801 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
743 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 802 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
744 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 803 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
745 $root = $Crossfire::Data::TYPE{Wall}; 804 $root = $Deliantra::Data::TYPE{Wall};
746 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 805 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
747 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 806 $root = $Deliantra::Data::TYPE{"Weak Wall"};
748 } else { 807 } else {
749 $root = $Crossfire::Data::TYPE{Misc}; 808 $root = $Deliantra::Data::TYPE{Misc};
750 } 809 }
751 } 810 }
752 811
753 my @import = ($root); 812 my @import = ($root);
754 813
755 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 814 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
756 unless $type == 116; 815 unless $type == 116;
757 816
758 my (%ignore); 817 my (%ignore);
759 my (@section_order, %section, @attr_order); 818 my (@section_order, %section, @attr_order);
760 819
761 while (my $type = shift @import) { 820 while (my $type = shift @import) {
821 push @import,
822 grep $_,
823 map $Deliantra::Data::TYPE{$_},
762 push @import, @{$type->{import} || []}; 824 @{$type->{import} || []};
763 825
764 $attr->{$_} ||= $type->{$_} 826 $attr->{$_} ||= $type->{$_}
765 for qw(name desc use); 827 for qw(name desc use);
766 828
767 for (@{$type->{ignore} || []}) { 829 for (@{$type->{ignore} || []}) {
… …
853 }, sub { 915 }, sub {
854 read_arch "$LIB/archetypes" 916 read_arch "$LIB/archetypes"
855 }; 917 };
856} 918}
857 919
920sub construct_tilecache_pb {
921 my ($idx, $cache) = @_;
922
923 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
924
925 while (my ($name, $tile) = each %$cache) {
926 my $tpb = delete $tile->{pb};
927 my $ofs = $tile->{idx};
928
929 for my $x (0 .. $tile->{w} - 1) {
930 for my $y (0 .. $tile->{h} - 1) {
931 my $idx = $ofs + $x + $y * $tile->{w};
932 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
933 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
934 }
935 }
936 }
937
938 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
939
940 $cache
941}
942
943sub use_tilecache {
944 my ($face) = @_;
945 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
946 or die "$VARDIR/tilecache.png: $!";
947 *FACE = $_[0];
948}
949
858=item load_tilecache 950=item load_tilecache
859 951
860(Re-)Load %TILE and %FACE. 952(Re-)Load %TILE and %FACE.
861 953
862=cut 954=cut
863 955
864sub load_tilecache() { 956sub load_tilecache() {
865 require Gtk2; 957 require Gtk2;
866 958
867 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 959 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 { 960 sub {
872 my $tile = read_pak "$LIB/crossfire.0";
873
874 my %cache; 961 my %cache;
962 my $facedata = Storable::retrieve "$LIB/facedata";
875 963
964 $facedata->{version} == 2
965 or die "$LIB/facedata: version mismatch, cannot proceed.";
966
967 my $faces = $facedata->{faceinfo};
876 my $idx = 0; 968 my $idx = 0;
877 969
878 for my $name (sort keys %$tile) { 970 for (sort keys %$faces) {
971 my ($face, $info) = ($_, $faces->{$_});
972
879 my $pb = new Gtk2::Gdk::PixbufLoader; 973 my $pb = new Gtk2::Gdk::PixbufLoader;
880 $pb->write ($tile->{$name}); 974 $pb->write ($info->{data32});
881 $pb->close; 975 $pb->close;
882 my $pb = $pb->get_pixbuf; 976 my $pb = $pb->get_pixbuf;
883 977
884 my $tile = $cache{$name} = { 978 my $tile = $cache{$face} = {
885 pb => $pb, 979 pb => $pb,
886 idx => $idx, 980 idx => $idx,
887 w => int $pb->get_width / TILESIZE, 981 w => int $pb->get_width / TILESIZE,
888 h => int $pb->get_height / TILESIZE, 982 h => int $pb->get_height / TILESIZE,
889 }; 983 };
890
891 984
892 $idx += $tile->{w} * $tile->{h}; 985 $idx += $tile->{w} * $tile->{h};
986 }
987
988 construct_tilecache_pb $idx, \%cache;
989
990 \%cache
893 } 991 };
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} 992}
993
994=back
915 995
916=head1 AUTHOR 996=head1 AUTHOR
917 997
918 Marc Lehmann <schmorp@schmorp.de> 998 Marc Lehmann <schmorp@schmorp.de>
919 http://home.schmorp.de/ 999 http://home.schmorp.de/
… …
922 http://www.ta-sa.org/ 1002 http://www.ta-sa.org/
923 1003
924=cut 1004=cut
925 1005
9261 10061
1007

Diff Legend

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