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.87 by root, Fri Feb 9 01:49:35 2007 UTC vs.
Revision 1.128 by root, Sun Sep 28 05:58:01 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.222';
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($) {
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}; 29our $LIB = $ENV{DELIANTRA_LIBDIR};
37 30
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
40 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/deliantra";
41 34
42mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
43 36
44sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
45 39
46our %ARCH; 40our %ARCH;
41our %FACE; # face32
47our %FACE; 42our %FACEDATA;
48our $TILE; 43our $TILE;
49 44
50our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
51 msg => "endmsg", 46 msg => "endmsg",
52 lore => "endlore", 47 lore => "endlore",
… …
68 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
69 tile_path_1 tile_path_2 tile_path_3 tile_path_4 64 tile_path_1 tile_path_2 tile_path_3 tile_path_4
70)); 65));
71 66
72our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
73 elevation 70 elevation
74 71
75 name name_pl custom_name attach title race 72 name name_pl custom_name attach title race
76 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
77 #todo-events 74 sound sound_destroy face animation is_animated
78 animation is_animated 75 magicmap smoothlevel smoothface
79 str dex con wis pow cha int 76 str dex con wis pow cha int
80 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
81 exp perm_exp expmul 78 exp perm_exp expmul
82 food dam luck wc ac x y speed speed_left move_state attack_movement 79 food dam luck wc ac x y speed speed_left move_state attack_movement
83 nrof level direction type subtype attacktype 80 nrof level direction type subtype attacktype
… …
91 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
92 89
93 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
94 value carrying weight invisible state magic 91 value carrying weight invisible state magic
95 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
96 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
97 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
98 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
99 item_power duration range 96 item_power duration range
100 range_modifier duration_modifier dam_modifier gen_sp_armour 97 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 98 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 109 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 110 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 111 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 112 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 113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
114 precious
117 115
118 body_range body_arm body_torso body_head body_neck body_skill 116 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 117 body_finger body_shoulder body_foot body_hand body_wrist body_waist
120)); 118));
121 119
… …
138sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
139sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
140sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
141sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
142sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
143sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
144sub MOVE_ALLBIT (){ 0x10000 }
145sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 143sub MOVE_ALL (){ 0x10000 } # very special value
144
145our %MOVE_TYPE = (
146 walk => MOVE_WALK,
147 fly_low => MOVE_FLY_LOW,
148 fly_high => MOVE_FLY_HIGH,
149 flying => MOVE_FLYING,
150 swim => MOVE_SWIM,
151 boat => MOVE_BOAT,
152 ship => MOVE_SHIP,
153 all => MOVE_ALL,
154);
155
156our @MOVE_TYPE = keys %MOVE_TYPE;
157
158{
159 package Deliantra::MoveType;
160
161 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string,
164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
165 '+=' => 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 },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub {
169 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) {
171 if ($_[0] >= "all") {
172 $_[0] -= $_[1];
173 } else {
174 $_[0] += $_[1];
175 }
176 } elsif ($cur) {
177 $_[0] -= $_[1];
178 } else {
179 $_[0] /= $_[1];
180 }
181
182 $_[0]
183 },
184 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ;
187}
188
189sub Deliantra::MoveType::new {
190 my ($class, $string) = @_;
191
192 my $mask;
193 my $value;
194
195 if ($string =~ /^\s*\d+\s*$/) {
196 $mask = MOVE_ALL;
197 $value = $string+0;
198 } else {
199 for (split /\s+/, lc $string) {
200 if (s/^-//) {
201 $mask |= $MOVE_TYPE{$_};
202 $value &= ~$MOVE_TYPE{$_};
203 } else {
204 $mask |= $MOVE_TYPE{$_};
205 $value |= $MOVE_TYPE{$_};
206 }
207 }
208 }
209
210 (bless [$mask, $value], $class)->normalise
211}
212
213sub Deliantra::MoveType::normalise {
214 my ($self) = @_;
215
216 if ($self->[0] & MOVE_ALL) {
217 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
218 $self->[0] &= $mask;
219 $self->[1] &= $mask;
220 }
221
222 $self->[1] &= $self->[0];
223
224 $self
225}
226
227sub Deliantra::MoveType::as_string {
228 my ($self) = @_;
229
230 my @res;
231
232 my ($mask, $value) = @$self;
233
234 for (@Deliantra::MOVE_TYPE) {
235 my $bit = $Deliantra::MOVE_TYPE{$_};
236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
237 $mask &= ~$bit;
238 push @res, $value & $bit ? $_ : "-$_";
239 }
240 }
241
242 join " ", @res
243}
146 244
147sub load_ref($) { 245sub load_ref($) {
148 my ($path) = @_; 246 my ($path) = @_;
149 247
150 open my $fh, "<:raw:perlio", $path 248 open my $fh, "<:raw:perlio", $path
… …
254 } else { 352 } else {
255 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
256 } 354 }
257 } 355 }
258 356
357 # check whether attachment is the same as in the archetype
358 if (exists $ob->{attach}) {
359 my $arch = $ARCH{$ob->{_name}};
360 my $js = JSON::XS->new->utf8->canonical (1);
361
362 if (defined $arch->{attach}
363 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
364 delete $ob->{attach}
365 }
366 }
367
368 # color_fg is used as default for magicmap if magicmap does not exist
369 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
370
259 # nuke outdated or never supported fields 371 # nuke outdated or never supported fields
260 delete @$ob{qw( 372 delete @$ob{qw(
261 can_knockback can_parry can_impale can_cut can_dam_armour 373 can_knockback can_parry can_impale can_cut can_dam_armour
262 can_apply pass_thru can_pass_thru 374 can_apply pass_thru can_pass_thru color_bg color_fg
263 )}; 375 )};
264 376
265 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 377 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
266 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 378 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
267 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 379 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
268 380
269 # convert movement strings to bitsets 381 # convert movement strings to bitsets
270 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
271 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
272 384
273 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 385 $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 } 386 }
300 387
301 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
302 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
303 $ob->{move_block} = $v ? MOVE_ALL : 0; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
304 } 391 }
305 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
306 $ob->{move_slow} |= MOVE_WALK; 393 $ob->{move_slow} += "walk";
307 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
308 } 395 }
309 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
310 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 397 $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 } 398 }
314 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
315 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 400 $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 } 401 }
319 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
320 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 403 $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 } 404 }
324 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
325 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 406 $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 } 407 }
329 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
330 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 409 $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 } 410 }
334 411
335 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
336 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
337 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
… …
353# arch as in "arch xxx", ie.. objects 430# arch as in "arch xxx", ie.. objects
354sub normalize_arch($) { 431sub normalize_arch($) {
355 my ($ob) = @_; 432 my ($ob) = @_;
356 433
357 normalize_object $ob; 434 normalize_object $ob;
435
436 return if $ob->{_atype} eq "object";
358 437
359 my $arch = $ARCH{$ob->{_name}} 438 my $arch = $ARCH{$ob->{_name}}
360 or (warn "$ob->{_name}: no such archetype", return $ob); 439 or (warn "$ob->{_name}: no such archetype", return $ob);
361 440
362 if ($arch->{type} == 22) { # map 441 if ($arch->{type} == 22) { # map
… …
398} 477}
399 478
400sub attr_thaw($) { 479sub attr_thaw($) {
401 my ($ob) = @_; 480 my ($ob) = @_;
402 481
403 $ob->{attach} = from_json $ob->{attach} 482 $ob->{attach} = decode_json $ob->{attach}
404 if exists $ob->{attach}; 483 if exists $ob->{attach};
405 484
406 $ob 485 $ob
407} 486}
408 487
409sub attr_freeze($) { 488sub attr_freeze($) {
410 my ($ob) = @_; 489 my ($ob) = @_;
411 490
412 $ob->{attach} = Crossfire::to_json $ob->{attach} 491 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
413 if exists $ob->{attach}; 492 if exists $ob->{attach};
414 493
415 $ob 494 $ob
416} 495}
417 496
… …
437 516
438 my %arc; 517 my %arc;
439 my ($more, $prev); 518 my ($more, $prev);
440 my $comment; 519 my $comment;
441 520
442 open my $fh, "<:raw:perlio:utf8", $path 521 open my $fh, "<:utf8", $path
443 or Carp::croak "$path: $!"; 522 or Carp::croak "$path: $!";
444 523
445# binmode $fh; 524# binmode $fh;
446 525
447 my $parse_block; $parse_block = sub { 526 my $parse_block; $parse_block = sub {
… …
547 my $str; 626 my $str;
548 627
549 my $append; $append = sub { 628 my $append; $append = sub {
550 my %a = %{$_[0]}; 629 my %a = %{$_[0]};
551 630
552 Crossfire::attr_freeze \%a; 631 Deliantra::attr_freeze \%a;
553 Crossfire::normalize_arch \%a; 632 Deliantra::normalize_arch \%a;
554 633
555 # undo the bit-split we did before 634 # undo the bit-split we did before
556 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 635 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}) 636 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
558 | (delete $a{attack_movement_bits_4_7}); 637 | (delete $a{attack_movement_bits_4_7});
… …
576 } 655 }
577 656
578 my @kv; 657 my @kv;
579 658
580 for ($a{_name} eq "map" 659 for ($a{_name} eq "map"
581 ? @Crossfire::FIELD_ORDER_MAP 660 ? @Deliantra::FIELD_ORDER_MAP
582 : @Crossfire::FIELD_ORDER) { 661 : @Deliantra::FIELD_ORDER) {
583 push @kv, [$_, delete $a{$_}] 662 push @kv, [$_, delete $a{$_}]
584 if exists $a{$_}; 663 if exists $a{$_};
585 } 664 }
586 665
587 for (sort keys %a) { 666 for (sort keys %a) {
… …
590 } 669 }
591 670
592 for (@kv) { 671 for (@kv) {
593 my ($k, $v) = @$_; 672 my ($k, $v) = @$_;
594 673
595 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 674 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
596 $v =~ s/\n$//; 675 $v =~ s/\n$//;
597 $str .= "$k\n$v\n$end\n"; 676 $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 { 677 } else {
625 $str .= "$k $v\n"; 678 $str .= "$k $v\n";
626 } 679 }
627 } 680 }
628 681
… …
722=cut 775=cut
723 776
724sub arch_attr($) { 777sub arch_attr($) {
725 my ($obj) = @_; 778 my ($obj) = @_;
726 779
727 require Crossfire::Data; 780 require Deliantra::Data;
728 781
729 my $root; 782 my $root;
730 my $attr = { }; 783 my $attr = { };
731 784
732 my $arch = $ARCH{ $obj->{_name} }; 785 my $arch = $ARCH{ $obj->{_name} };
733 my $type = $obj->{type} || $arch->{type}; 786 my $type = $obj->{type} || $arch->{type};
734 787
735 if ($type > 0) { 788 if ($type > 0) {
736 $root = $Crossfire::Data::ATTR{$type}; 789 $root = $Deliantra::Data::ATTR{$type};
737 } else { 790 } else {
738 my %a = (%$arch, %$obj); 791 my %a = (%$arch, %$obj);
739 792
740 if ($a{is_floor} && !$a{alive}) { 793 if ($a{is_floor} && !$a{alive}) {
741 $root = $Crossfire::Data::TYPE{Floor}; 794 $root = $Deliantra::Data::TYPE{Floor};
742 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 795 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
743 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 796 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
744 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 797 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
745 $root = $Crossfire::Data::TYPE{Wall}; 798 $root = $Deliantra::Data::TYPE{Wall};
746 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
747 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 800 $root = $Deliantra::Data::TYPE{"Weak Wall"};
748 } else { 801 } else {
749 $root = $Crossfire::Data::TYPE{Misc}; 802 $root = $Deliantra::Data::TYPE{Misc};
750 } 803 }
751 } 804 }
752 805
753 my @import = ($root); 806 my @import = ($root);
754 807
755 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 808 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
756 unless $type == 116; 809 unless $type == 116;
757 810
758 my (%ignore); 811 my (%ignore);
759 my (@section_order, %section, @attr_order); 812 my (@section_order, %section, @attr_order);
760 813
761 while (my $type = shift @import) { 814 while (my $type = shift @import) {
815 push @import,
816 grep $_,
817 map $Deliantra::Data::TYPE{$_},
762 push @import, @{$type->{import} || []}; 818 @{$type->{import} || []};
763 819
764 $attr->{$_} ||= $type->{$_} 820 $attr->{$_} ||= $type->{$_}
765 for qw(name desc use); 821 for qw(name desc use);
766 822
767 for (@{$type->{ignore} || []}) { 823 for (@{$type->{ignore} || []}) {
… …
796 ]; 852 ];
797 853
798 $attr 854 $attr
799} 855}
800 856
801sub arch_edit_sections {
802# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
803# edit_type = 0;
804# else if (edit_type != 0) {
805# // all flags from 'check_type' must be unset in this arch because they get recalculated now
806# edit_type &= ~check_type;
807# }
808#
809# }
810# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
811# getAttributeValue("alive", defarch) == 1 &&
812# (getAttributeValue("monster", defarch) == 1 ||
813# getAttributeValue("generator", defarch) == 1)) {
814# // Monster: monsters/npcs/generators
815# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
816# }
817# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
818# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
819# // Walls
820# edit_type |= IGUIConstants.TILE_EDIT_WALL;
821# }
822# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
823# getAttributeValue("connected", defarch) != 0) {
824# // Connected Objects
825# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
826# }
827# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
828# arch_type == 66 || arch_type == 41 || arch_type == 95) {
829# // Exit: teleporter/exit/trapdoors
830# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
831# }
832# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
833# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
834# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
835# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
836# arch_type == 124 || arch_type == 130)) {
837# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
838# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
839# }
840# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
841# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
842# arch_type == 91 || arch_type == 21 || arch_type == 24) {
843# // Door: door/special door/gates + keys
844# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
845# }
846# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
847# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
848# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
849# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
850# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
851# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
852# arch_type == 122 || arch_type == 3)) {
853# // Equipment: weapons/armour/wands/rods
854# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
855# }
856#
857# return(edit_type);
858#
859#
860}
861
862sub cache_file($$&&) { 857sub cache_file($$&&) {
863 my ($src, $cache, $load, $create) = @_; 858 my ($src, $cache, $load, $create) = @_;
864 859
865 my ($size, $mtime) = (stat $src)[7,9] 860 my ($size, $mtime) = (stat $src)[7,9]
866 or Carp::croak "$src: $!"; 861 or Carp::croak "$src: $!";
… …
914 }, sub { 909 }, sub {
915 read_arch "$LIB/archetypes" 910 read_arch "$LIB/archetypes"
916 }; 911 };
917} 912}
918 913
914sub construct_tilecache_pb {
915 my ($idx, $cache) = @_;
916
917 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
918
919 while (my ($name, $tile) = each %$cache) {
920 my $tpb = delete $tile->{pb};
921 my $ofs = $tile->{idx};
922
923 for my $x (0 .. $tile->{w} - 1) {
924 for my $y (0 .. $tile->{h} - 1) {
925 my $idx = $ofs + $x + $y * $tile->{w};
926 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
927 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
928 }
929 }
930 }
931
932 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
933
934 $cache
935}
936
937sub use_tilecache {
938 my ($face) = @_;
939 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
940 or die "$VARDIR/tilecache.png: $!";
941 *FACE = $_[0];
942}
943
919=item load_tilecache 944=item load_tilecache
920 945
921(Re-)Load %TILE and %FACE. 946(Re-)Load %TILE and %FACE.
922 947
923=cut 948=cut
924 949
925sub load_tilecache() { 950sub load_tilecache() {
926 require Gtk2; 951 require Gtk2;
927 952
928 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 953 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
929 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
930 or die "$VARDIR/tilecache.png: $!";
931 *FACE = $_[0];
932 }, sub { 954 sub {
933 my $tile = read_pak "$LIB/crossfire.0";
934
935 my %cache; 955 my %cache;
956 my $facedata = Storable::retrieve "$LIB/facedata";
936 957
958 $facedata->{version} == 2
959 or die "$LIB/facedata: version mismatch, cannot proceed.";
960
961 my $faces = $facedata->{faceinfo};
937 my $idx = 0; 962 my $idx = 0;
938 963
939 for my $name (sort keys %$tile) { 964 for (sort keys %$faces) {
965 my ($face, $info) = ($_, $faces->{$_});
966
940 my $pb = new Gtk2::Gdk::PixbufLoader; 967 my $pb = new Gtk2::Gdk::PixbufLoader;
941 $pb->write ($tile->{$name}); 968 $pb->write ($info->{data32});
942 $pb->close; 969 $pb->close;
943 my $pb = $pb->get_pixbuf; 970 my $pb = $pb->get_pixbuf;
944 971
945 my $tile = $cache{$name} = { 972 my $tile = $cache{$face} = {
946 pb => $pb, 973 pb => $pb,
947 idx => $idx, 974 idx => $idx,
948 w => int $pb->get_width / TILESIZE, 975 w => int $pb->get_width / TILESIZE,
949 h => int $pb->get_height / TILESIZE, 976 h => int $pb->get_height / TILESIZE,
950 }; 977 };
951
952 978
953 $idx += $tile->{w} * $tile->{h}; 979 $idx += $tile->{w} * $tile->{h};
980 }
981
982 construct_tilecache_pb $idx, \%cache;
983
984 \%cache
954 } 985 };
955
956 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
957
958 while (my ($name, $tile) = each %cache) {
959 my $tpb = delete $tile->{pb};
960 my $ofs = $tile->{idx};
961
962 for my $x (0 .. $tile->{w} - 1) {
963 for my $y (0 .. $tile->{h} - 1) {
964 my $idx = $ofs + $x + $y * $tile->{w};
965 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
966 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
967 }
968 }
969 }
970
971 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
972
973 \%cache
974 };
975} 986}
976 987
977=head1 AUTHOR 988=head1 AUTHOR
978 989
979 Marc Lehmann <schmorp@schmorp.de> 990 Marc Lehmann <schmorp@schmorp.de>
… …
983 http://www.ta-sa.org/ 994 http://www.ta-sa.org/
984 995
985=cut 996=cut
986 997
9871 9981
999

Diff Legend

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