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.94 by root, Sat Mar 3 20:07:04 2007 UTC vs.
Revision 1.142 by root, Sat May 15 00:30:53 2010 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.30';
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",
… …
59 56
60# same as in server save routine, to (hopefully) be compatible 57# same as in server save routine, to (hopefully) be compatible
61# to the other editors. 58# to the other editors.
62our @FIELD_ORDER_MAP = (qw( 59our @FIELD_ORDER_MAP = (qw(
63 file_format_version 60 file_format_version
64 name attach swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty
62 region music
65 shopitems shopgreed shopmin shopmax shoprace 63 shopitems shopgreed shopmin shopmax shoprace
66 darkness width height enter_x enter_y msg maplore 64 darkness width height enter_x enter_y msg maplore
67 unique template 65 unique template
68 outdoor temp pressure humid windspeed winddir sky nosmooth 66 outdoor temp pressure humid windspeed winddir sky nosmooth
69 tile_path_1 tile_path_2 tile_path_3 tile_path_4 67 tile_path_1 tile_path_2 tile_path_3 tile_path_4
70)); 68));
71 69
72our @FIELD_ORDER = (qw( 70our @FIELD_ORDER = (qw(
71 inherit
72
73 elevation 73 elevation
74 74
75 name name_pl custom_name attach title race 75 name name_pl custom_name attach title race
76 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch
77 #todo-events 77 sound sound_destroy face animation is_animated
78 animation is_animated 78 magicmap smoothlevel smoothface
79 str dex con wis pow cha int 79 str dex con wis pow cha int
80 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
81 exp perm_exp expmul 81 exp perm_exp expmul
82 food dam luck wc ac x y speed speed_left move_state attack_movement 82 food dam luck wc ac x y speed speed_left move_state attack_movement
83 nrof level direction type subtype attacktype 83 nrof level direction type subtype attacktype
… …
91 resist_life_stealing resist_disease 91 resist_life_stealing resist_disease
92 92
93 path_attuned path_repelled path_denied material materialname 93 path_attuned path_repelled path_denied material materialname
94 value carrying weight invisible state magic 94 value carrying weight invisible state magic
95 last_heal last_sp last_grace last_eat 95 last_heal last_sp last_grace last_eat
96 connected glow_radius randomitems npx_status npc_program 96 connected glow_radius randomitems tresure_env npx_status npc_program
97 run_away pick_up container will_apply smoothlevel 97 run_away pick_up container will_apply smoothlevel
98 current_weapon_script weapontype tooltype elevation client_type 98 current_weapon_script weapontype tooltype elevation client_type
99 item_power duration range 99 item_power duration range
100 range_modifier duration_modifier dam_modifier gen_sp_armour 100 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 101 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 112 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 113 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 114 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 115 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 116 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
117 precious
117 118
118 body_range body_arm body_torso body_head body_neck body_skill 119 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 120 body_finger body_shoulder body_foot body_hand body_wrist body_waist
120)); 121));
121 122
… …
138sub MOVE_FLY_LOW (){ 0x02 } 139sub MOVE_FLY_LOW (){ 0x02 }
139sub MOVE_FLY_HIGH (){ 0x04 } 140sub MOVE_FLY_HIGH (){ 0x04 }
140sub MOVE_FLYING (){ 0x06 } 141sub MOVE_FLYING (){ 0x06 }
141sub MOVE_SWIM (){ 0x08 } 142sub MOVE_SWIM (){ 0x08 }
142sub MOVE_BOAT (){ 0x10 } 143sub MOVE_BOAT (){ 0x10 }
144sub MOVE_SHIP (){ 0x20 }
143sub MOVE_KNOWN (){ 0x1f } # all of above 145sub MOVE_KNOWN (){ 0x3f } # all of above
144sub MOVE_ALL (){ 0x10000 } # very special value 146sub MOVE_ALL (){ 0x10000 } # very special value
145 147
146our %MOVE_TYPE = ( 148our %MOVE_TYPE = (
147 walk => MOVE_WALK, 149 walk => MOVE_WALK,
148 fly_low => MOVE_FLY_LOW, 150 fly_low => MOVE_FLY_LOW,
149 fly_high => MOVE_FLY_HIGH, 151 fly_high => MOVE_FLY_HIGH,
150 flying => MOVE_FLYING, 152 flying => MOVE_FLYING,
151 swim => MOVE_SWIM, 153 swim => MOVE_SWIM,
152 boat => MOVE_BOAT, 154 boat => MOVE_BOAT,
155 ship => MOVE_SHIP,
153 all => MOVE_ALL, 156 all => MOVE_ALL,
154); 157);
155 158
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); 159our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
157 160
158{ 161{
159 package Crossfire::MoveType; 162 package Deliantra::MoveType;
160 163
161 use overload 164 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 165 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string, 166 '""' => \&as_string,
164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 167 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
168 '<=' => sub {
169 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
170 ? $_[0][1] & $MOVE_TYPE{$_[1]}
171 : undef
172 },
165 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, 173 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
166 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 174 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 175 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub { 176 'x=' => sub { # toggle between off, + and -
169 my $cur = $_[0] >= $_[1]; 177 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) { 178 if (!defined $cur) {
171 if ($_[0] >= "all") { 179 if ($_[0] >= "all") {
172 $_[0] -= $_[1]; 180 $_[0] -= $_[1];
173 } else { 181 } else {
… …
182 $_[0] 190 $_[0]
183 }, 191 },
184 'eq' => sub { "$_[0]" eq "$_[1]" }, 192 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" }, 193 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ; 194 ;
187}
188 195
189sub Crossfire::MoveType::new { 196 sub TO_JSON {
197 $_[0][0]
198 }
199}
200
201sub Deliantra::MoveType::new {
190 my ($class, $string) = @_; 202 my ($class, $string) = @_;
191 203
192 my $mask; 204 my $mask;
193 my $value; 205 my $value;
194 206
… …
208 } 220 }
209 221
210 (bless [$mask, $value], $class)->normalise 222 (bless [$mask, $value], $class)->normalise
211} 223}
212 224
213sub Crossfire::MoveType::normalise { 225sub Deliantra::MoveType::normalise {
214 my ($self) = @_; 226 my ($self) = @_;
215 227
216 if ($self->[0] & MOVE_ALL) { 228 if ($self->[0] & MOVE_ALL) {
217 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 229 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
218 $self->[0] &= $mask; 230 $self->[0] &= $mask;
… …
222 $self->[1] &= $self->[0]; 234 $self->[1] &= $self->[0];
223 235
224 $self 236 $self
225} 237}
226 238
227sub Crossfire::MoveType::as_string { 239sub Deliantra::MoveType::as_string {
228 my ($self) = @_; 240 my ($self) = @_;
229 241
230 my @res; 242 my @res;
231 243
232 my ($mask, $value) = @$self; 244 my ($mask, $value) = @$self;
233 245
234 for (@Crossfire::MOVE_TYPE) { 246 for (@Deliantra::MOVE_TYPE) {
235 my $bit = $Crossfire::MOVE_TYPE{$_}; 247 my $bit = $Deliantra::MOVE_TYPE{$_};
236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 248 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
237 $mask &= ~$bit; 249 $mask &= ~$bit;
238 push @res, $value & $bit ? $_ : "-$_"; 250 push @res, $value & $bit ? $_ : "-$_";
239 } 251 }
240 } 252 }
… …
333 345
334# object as in "Object xxx", i.e. archetypes 346# object as in "Object xxx", i.e. archetypes
335sub normalize_object($) { 347sub normalize_object($) {
336 my ($ob) = @_; 348 my ($ob) = @_;
337 349
350 delete $ob->{editable}; # deprecated
351
338 # convert material bitset to materialname, if possible 352 # convert material bitset to materialname, if possible
339 if (exists $ob->{material}) { 353 if (exists $ob->{material}) {
340 if (!$ob->{material}) { 354 if (!$ob->{material}) {
341 delete $ob->{material}; 355 delete $ob->{material};
342 } elsif (exists $ob->{materialname}) { 356 } elsif (exists $ob->{materialname}) {
… …
352 } else { 366 } else {
353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 367 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
354 } 368 }
355 } 369 }
356 370
371 # check whether attachment is the same as in the archetype
372 if (exists $ob->{attach}) {
373 my $arch = $ARCH{$ob->{_name}};
374 my $js = JSON::XS->new->utf8->canonical (1);
375
376 if (defined $arch->{attach}
377 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
378 delete $ob->{attach}
379 }
380 }
381
382 # color_fg is used as default for magicmap if magicmap does not exist
383 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
384
357 # nuke outdated or never supported fields 385 # nuke outdated or never supported fields
358 delete @$ob{qw( 386 delete @$ob{qw(
359 can_knockback can_parry can_impale can_cut can_dam_armour 387 can_knockback can_parry can_impale can_cut can_dam_armour
360 can_apply pass_thru can_pass_thru 388 can_apply pass_thru can_pass_thru color_bg color_fg
361 )}; 389 )};
362 390
363 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 391 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
364 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 392 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
365 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 393 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
366 394
367 # convert movement strings to bitsets 395 # convert movement strings to bitsets
368 for my $attr (keys %FIELD_MOVEMENT) { 396 for my $attr (keys %FIELD_MOVEMENT) {
369 next unless exists $ob->{$attr}; 397 next unless exists $ob->{$attr};
370 398
371 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 399 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
372 } 400 }
373 401
374 # convert outdated movement flags to new movement sets 402 # convert outdated movement flags to new movement sets
375 if (defined (my $v = delete $ob->{no_pass})) { 403 if (defined (my $v = delete $ob->{no_pass})) {
376 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 404 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
377 } 405 }
378 if (defined (my $v = delete $ob->{slow_move})) { 406 if (defined (my $v = delete $ob->{slow_move})) {
379 $ob->{move_slow} += "walk"; 407 $ob->{move_slow} += "walk";
380 $ob->{move_slow_penalty} = $v; 408 $ob->{move_slow_penalty} = $v;
381 } 409 }
382 if (defined (my $v = delete $ob->{walk_on})) { 410 if (defined (my $v = delete $ob->{walk_on})) {
383 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } 411 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
384 } 412 }
385 if (defined (my $v = delete $ob->{walk_off})) { 413 if (defined (my $v = delete $ob->{walk_off})) {
386 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } 414 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
387 } 415 }
388 if (defined (my $v = delete $ob->{fly_on})) { 416 if (defined (my $v = delete $ob->{fly_on})) {
389 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } 417 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
390 } 418 }
391 if (defined (my $v = delete $ob->{fly_off})) { 419 if (defined (my $v = delete $ob->{fly_off})) {
392 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } 420 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
393 } 421 }
394 if (defined (my $v = delete $ob->{flying})) { 422 if (defined (my $v = delete $ob->{flying})) {
395 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } 423 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
396 } 424 }
397 425
398 # convert idiotic event_xxx things into objects 426 # convert idiotic event_xxx things into objects
399 while (my ($event, $subtype) = each %EVENT_TYPE) { 427 while (my ($event, $subtype) = each %EVENT_TYPE) {
400 if (exists $ob->{"event_${event}_plugin"}) { 428 if (exists $ob->{"event_${event}_plugin"}) {
… …
416# arch as in "arch xxx", ie.. objects 444# arch as in "arch xxx", ie.. objects
417sub normalize_arch($) { 445sub normalize_arch($) {
418 my ($ob) = @_; 446 my ($ob) = @_;
419 447
420 normalize_object $ob; 448 normalize_object $ob;
449
450 return if $ob->{_atype} eq "object";
421 451
422 my $arch = $ARCH{$ob->{_name}} 452 my $arch = $ARCH{$ob->{_name}}
423 or (warn "$ob->{_name}: no such archetype", return $ob); 453 or (warn "$ob->{_name}: no such archetype", return $ob);
424 454
425 if ($arch->{type} == 22) { # map 455 if ($arch->{type} == 22) { # map
… …
461} 491}
462 492
463sub attr_thaw($) { 493sub attr_thaw($) {
464 my ($ob) = @_; 494 my ($ob) = @_;
465 495
466 $ob->{attach} = from_json $ob->{attach} 496 $ob->{attach} = decode_json $ob->{attach}
467 if exists $ob->{attach}; 497 if exists $ob->{attach};
468 498
469 $ob 499 $ob
470} 500}
471 501
472sub attr_freeze($) { 502sub attr_freeze($) {
473 my ($ob) = @_; 503 my ($ob) = @_;
474 504
475 $ob->{attach} = Crossfire::to_json $ob->{attach} 505 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
476 if exists $ob->{attach}; 506 if exists $ob->{attach};
477 507
478 $ob 508 $ob
479} 509}
480 510
… …
500 530
501 my %arc; 531 my %arc;
502 my ($more, $prev); 532 my ($more, $prev);
503 my $comment; 533 my $comment;
504 534
505 open my $fh, "<:raw:perlio:utf8", $path 535 open my $fh, "<:utf8", $path
506 or Carp::croak "$path: $!"; 536 or Carp::croak "$path: $!";
507 537
508# binmode $fh; 538# binmode $fh;
509 539
510 my $parse_block; $parse_block = sub { 540 my $parse_block; $parse_block = sub {
… …
610 my $str; 640 my $str;
611 641
612 my $append; $append = sub { 642 my $append; $append = sub {
613 my %a = %{$_[0]}; 643 my %a = %{$_[0]};
614 644
615 Crossfire::attr_freeze \%a; 645 Deliantra::attr_freeze \%a;
616 Crossfire::normalize_arch \%a; 646 Deliantra::normalize_arch \%a;
617 647
618 # undo the bit-split we did before 648 # undo the bit-split we did before
619 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 649 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
620 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 650 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
621 | (delete $a{attack_movement_bits_4_7}); 651 | (delete $a{attack_movement_bits_4_7});
… …
639 } 669 }
640 670
641 my @kv; 671 my @kv;
642 672
643 for ($a{_name} eq "map" 673 for ($a{_name} eq "map"
644 ? @Crossfire::FIELD_ORDER_MAP 674 ? @Deliantra::FIELD_ORDER_MAP
645 : @Crossfire::FIELD_ORDER) { 675 : @Deliantra::FIELD_ORDER) {
646 push @kv, [$_, delete $a{$_}] 676 push @kv, [$_, delete $a{$_}]
647 if exists $a{$_}; 677 if exists $a{$_};
648 } 678 }
649 679
650 for (sort keys %a) { 680 for (sort keys %a) {
… …
653 } 683 }
654 684
655 for (@kv) { 685 for (@kv) {
656 my ($k, $v) = @$_; 686 my ($k, $v) = @$_;
657 687
658 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 688 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
659 $v =~ s/\n$//; 689 $v =~ s/\n$//;
660 $str .= "$k\n$v\n$end\n"; 690 $str .= "$k\n$v\n$end\n";
661 } else { 691 } else {
662 $str .= "$k $v\n"; 692 $str .= "$k $v\n";
663 } 693 }
… …
759=cut 789=cut
760 790
761sub arch_attr($) { 791sub arch_attr($) {
762 my ($obj) = @_; 792 my ($obj) = @_;
763 793
764 require Crossfire::Data; 794 require Deliantra::Data;
765 795
766 my $root; 796 my $root;
767 my $attr = { }; 797 my $attr = { };
768 798
769 my $arch = $ARCH{ $obj->{_name} }; 799 my $arch = $ARCH{ $obj->{_name} };
770 my $type = $obj->{type} || $arch->{type}; 800 my $type = $obj->{type} || $arch->{type};
771 801
772 if ($type > 0) { 802 if ($type > 0) {
773 $root = $Crossfire::Data::ATTR{$type}; 803 $root = $Deliantra::Data::ATTR{$type};
774 } else { 804 } else {
775 my %a = (%$arch, %$obj); 805 my %a = (%$arch, %$obj);
776 806
777 if ($a{is_floor} && !$a{alive}) { 807 if ($a{is_floor} && !$a{alive}) {
778 $root = $Crossfire::Data::TYPE{Floor}; 808 $root = $Deliantra::Data::TYPE{Floor};
779 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 809 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
780 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 810 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
781 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 811 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
782 $root = $Crossfire::Data::TYPE{Wall}; 812 $root = $Deliantra::Data::TYPE{Wall};
783 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 813 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
784 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 814 $root = $Deliantra::Data::TYPE{"Weak Wall"};
785 } else { 815 } else {
786 $root = $Crossfire::Data::TYPE{Misc}; 816 $root = $Deliantra::Data::TYPE{Misc};
787 } 817 }
788 } 818 }
789 819
820 my (%ignore);
790 my @import = ($root); 821 my @import = ($root);
822
823 my @new_import;
824 while (my $type = shift @import) {
825 # first import everything we will need:
826 push @import,
827 grep $_,
828 map $Deliantra::Data::TYPE{$_},
829 @{$type->{import} || []};
830
831 # and compute the ignored attributes
832 for (@{$type->{ignore} || []}) {
833 $ignore{$_}++ for ref $_ ? @$_ : $_;
834 }
835
836 push @new_import, $type;
791 837 }
838 (@import) = @new_import;
839
840 # then add defaults to the back of the list, so they are added
841 # as last resort.
792 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 842 push @import, \%Deliantra::Data::DEFAULT_ATTR
793 unless $type == 116; 843 unless $type == 116;
794 844
795 my (%ignore);
796 my (@section_order, %section, @attr_order); 845 my (@section_order, %section, @attr_order);
797 846
847 # @import = root, imported, default
798 while (my $type = shift @import) { 848 while (my $type = pop @import) {
799 push @import, @{$type->{import} || []};
800
801 $attr->{$_} ||= $type->{$_} 849 $attr->{$_} ||= $type->{$_}
802 for qw(name desc use); 850 for qw(name desc use);
803
804 for (@{$type->{ignore} || []}) {
805 $ignore{$_}++ for ref $_ ? @$_ : $_;
806 }
807 851
808 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 852 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
809 my ($name, $attr) = @$_; 853 my ($name, $attr) = @$_;
810 push @section_order, $name; 854 push @section_order, $name;
811 for (@$attr) { 855 for (@$attr) {
812 my ($k, $v) = @$_; 856 my ($k, $v) = @$_;
813 push @attr_order, $k; 857 push @attr_order, $k;
814 $section{$name}{$k} ||= $v; 858 $section{$name}{$k} = $v; # overwrite, so that the root decides
815 }
816 } 859 }
860 }
861 }
862
863 # remove ignores for "root" type
864 for (
865 map @{$_->[1]}, # section attributes
866 [general => ($root->{attr} || [])],
867 @{$root->{section} || []}
868 ) {
869 my ($k, $v) = @$_;
870 # skip fixed attributes, if they are ignored thats fine
871 next if $v->{type} eq 'fixed';
872
873 delete $ignore{$k}; # if the attributes are defined explicitly they
874 # should NOT be ignored. ignore should mainly
875 # hit imported/inherited attributes.
817 } 876 }
818 877
819 $attr->{section} = [ 878 $attr->{section} = [
820 map !exists $section{$_} ? () : do { 879 map !exists $section{$_} ? () : do {
821 my $attr = delete $section{$_}; 880 my $attr = delete $section{$_};
… …
825 map exists $attr->{$_} && !$ignore{$_} 884 map exists $attr->{$_} && !$ignore{$_}
826 ? [$_ => delete $attr->{$_}] : (), 885 ? [$_ => delete $attr->{$_}] : (),
827 @attr_order 886 @attr_order
828 ] 887 ]
829 }, 888 },
830
831 exists $section{$_} ? [$_ => delete $section{$_}] : (), 889 exists $section{$_} ? [$_ => delete $section{$_}] : (),
832 @section_order 890 @section_order
833 ]; 891 ];
834 892
835 $attr 893 $attr
836} 894}
… …
890 }, sub { 948 }, sub {
891 read_arch "$LIB/archetypes" 949 read_arch "$LIB/archetypes"
892 }; 950 };
893} 951}
894 952
953sub construct_tilecache_pb {
954 my ($idx, $cache) = @_;
955
956 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
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 % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
967 }
968 }
969 }
970
971 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
972
973 $cache
974}
975
976sub use_tilecache {
977 my ($face) = @_;
978 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
979 or die "$VARDIR/tilecache.png: $!";
980 *FACE = $_[0];
981}
982
895=item load_tilecache 983=item load_tilecache
896 984
897(Re-)Load %TILE and %FACE. 985(Re-)Load %TILE and %FACE.
898 986
899=cut 987=cut
900 988
901sub load_tilecache() { 989sub load_tilecache() {
902 require Gtk2; 990 require Gtk2;
903 991
904 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 992 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
905 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
906 or die "$VARDIR/tilecache.png: $!";
907 *FACE = $_[0];
908 }, sub { 993 sub {
909 my $tile = read_pak "$LIB/crossfire.0";
910
911 my %cache; 994 my %cache;
995 my $facedata = Storable::retrieve "$LIB/facedata";
912 996
997 $facedata->{version} == 2
998 or die "$LIB/facedata: version mismatch, cannot proceed.";
999
1000 my $faces = $facedata->{faceinfo};
913 my $idx = 0; 1001 my $idx = 0;
914 1002
915 for my $name (sort keys %$tile) { 1003 for (sort keys %$faces) {
1004 my ($face, $info) = ($_, $faces->{$_});
1005
916 my $pb = new Gtk2::Gdk::PixbufLoader; 1006 my $pb = new Gtk2::Gdk::PixbufLoader;
917 $pb->write ($tile->{$name}); 1007 $pb->write ($info->{data32});
918 $pb->close; 1008 $pb->close;
919 my $pb = $pb->get_pixbuf; 1009 my $pb = $pb->get_pixbuf;
920 1010
921 my $tile = $cache{$name} = { 1011 my $tile = $cache{$face} = {
922 pb => $pb, 1012 pb => $pb,
923 idx => $idx, 1013 idx => $idx,
924 w => int $pb->get_width / TILESIZE, 1014 w => int $pb->get_width / TILESIZE,
925 h => int $pb->get_height / TILESIZE, 1015 h => int $pb->get_height / TILESIZE,
926 }; 1016 };
927
928 1017
929 $idx += $tile->{w} * $tile->{h}; 1018 $idx += $tile->{w} * $tile->{h};
1019 }
1020
1021 construct_tilecache_pb $idx, \%cache;
1022
1023 \%cache
930 } 1024 };
931
932 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
933
934 while (my ($name, $tile) = each %cache) {
935 my $tpb = delete $tile->{pb};
936 my $ofs = $tile->{idx};
937
938 for my $x (0 .. $tile->{w} - 1) {
939 for my $y (0 .. $tile->{h} - 1) {
940 my $idx = $ofs + $x + $y * $tile->{w};
941 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
942 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
943 }
944 }
945 }
946
947 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
948
949 \%cache
950 };
951} 1025}
1026
1027=back
952 1028
953=head1 AUTHOR 1029=head1 AUTHOR
954 1030
955 Marc Lehmann <schmorp@schmorp.de> 1031 Marc Lehmann <schmorp@schmorp.de>
956 http://home.schmorp.de/ 1032 http://home.schmorp.de/
… …
959 http://www.ta-sa.org/ 1035 http://www.ta-sa.org/
960 1036
961=cut 1037=cut
962 1038
9631 10391
1040

Diff Legend

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