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.141 by root, Mon Mar 22 00:58:17 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",
… …
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 },
167 '<=' => sub {
168 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
169 ? $_[0][1] & $MOVE_TYPE{$_[1]}
170 : undef
171 },
164 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, 172 '+=' => 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 }, 173 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
166 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 174 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 'x=' => sub { 175 'x=' => sub { # toggle between off, + and -
168 my $cur = $_[0] >= $_[1]; 176 my $cur = $_[0] >= $_[1];
169 if (!defined $cur) { 177 if (!defined $cur) {
178 if ($_[0] >= "all") {
179 $_[0] -= $_[1];
180 } else {
170 $_[0] += $_[1]; 181 $_[0] += $_[1];
182 }
171 } elsif ($cur) { 183 } elsif ($cur) {
172 $_[0] -= $_[1]; 184 $_[0] -= $_[1];
173 } else { 185 } else {
174 $_[0] /= $_[1]; 186 $_[0] /= $_[1];
175 } 187 }
176 188
177 $_[0] 189 $_[0]
178 }, 190 },
191 'eq' => sub { "$_[0]" eq "$_[1]" },
192 'ne' => sub { "$_[0]" ne "$_[1]" },
179 ; 193 ;
180}
181 194
182sub Crossfire::MoveType::new { 195 sub TO_JSON {
196 $_[0][0]
197 }
198}
199
200sub Deliantra::MoveType::new {
183 my ($class, $string) = @_; 201 my ($class, $string) = @_;
184 202
185 my $mask; 203 my $mask;
186 my $value; 204 my $value;
187 205
206 if ($string =~ /^\s*\d+\s*$/) {
207 $mask = MOVE_ALL;
208 $value = $string+0;
209 } else {
188 for (split /\s+/, lc $string) { 210 for (split /\s+/, lc $string) {
189 if (s/^-//) { 211 if (s/^-//) {
190 $mask |= $MOVE_TYPE{$_}; 212 $mask |= $MOVE_TYPE{$_};
191 $value &= ~$MOVE_TYPE{$_}; 213 $value &= ~$MOVE_TYPE{$_};
192 } else { 214 } else {
193 $mask |= $MOVE_TYPE{$_}; 215 $mask |= $MOVE_TYPE{$_};
194 $value |= $MOVE_TYPE{$_}; 216 $value |= $MOVE_TYPE{$_};
217 }
195 } 218 }
196 } 219 }
197 220
198 (bless [$mask, $value], $class)->normalise 221 (bless [$mask, $value], $class)->normalise
199} 222}
200 223
201sub Crossfire::MoveType::normalise { 224sub Deliantra::MoveType::normalise {
202 my ($self) = @_; 225 my ($self) = @_;
203 226
204 if ($self->[0] & MOVE_ALL) { 227 if ($self->[0] & MOVE_ALL) {
205 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 228 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
206 $self->[0] &= $mask; 229 $self->[0] &= $mask;
… …
210 $self->[1] &= $self->[0]; 233 $self->[1] &= $self->[0];
211 234
212 $self 235 $self
213} 236}
214 237
215sub Crossfire::MoveType::as_string { 238sub Deliantra::MoveType::as_string {
216 my ($self) = @_; 239 my ($self) = @_;
217 240
218 my @res; 241 my @res;
219 242
220 my ($mask, $value) = @$self; 243 my ($mask, $value) = @$self;
221 244
222 for (@Crossfire::MOVE_TYPE) { 245 for (@Deliantra::MOVE_TYPE) {
223 my $bit = $Crossfire::MOVE_TYPE{$_}; 246 my $bit = $Deliantra::MOVE_TYPE{$_};
224 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 247 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
225 $mask &= ~$bit; 248 $mask &= ~$bit;
226 push @res, $value & $bit ? $_ : "-$_"; 249 push @res, $value & $bit ? $_ : "-$_";
227 } 250 }
228 } 251 }
… …
321 344
322# object as in "Object xxx", i.e. archetypes 345# object as in "Object xxx", i.e. archetypes
323sub normalize_object($) { 346sub normalize_object($) {
324 my ($ob) = @_; 347 my ($ob) = @_;
325 348
349 delete $ob->{editable}; # deprecated
350
326 # convert material bitset to materialname, if possible 351 # convert material bitset to materialname, if possible
327 if (exists $ob->{material}) { 352 if (exists $ob->{material}) {
328 if (!$ob->{material}) { 353 if (!$ob->{material}) {
329 delete $ob->{material}; 354 delete $ob->{material};
330 } elsif (exists $ob->{materialname}) { 355 } elsif (exists $ob->{materialname}) {
… …
340 } else { 365 } else {
341 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 366 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
342 } 367 }
343 } 368 }
344 369
370 # check whether attachment is the same as in the archetype
371 if (exists $ob->{attach}) {
372 my $arch = $ARCH{$ob->{_name}};
373 my $js = JSON::XS->new->utf8->canonical (1);
374
375 if (defined $arch->{attach}
376 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
377 delete $ob->{attach}
378 }
379 }
380
381 # color_fg is used as default for magicmap if magicmap does not exist
382 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
383
345 # nuke outdated or never supported fields 384 # nuke outdated or never supported fields
346 delete @$ob{qw( 385 delete @$ob{qw(
347 can_knockback can_parry can_impale can_cut can_dam_armour 386 can_knockback can_parry can_impale can_cut can_dam_armour
348 can_apply pass_thru can_pass_thru 387 can_apply pass_thru can_pass_thru color_bg color_fg
349 )}; 388 )};
350 389
351 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 390 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
352 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 391 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
353 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 392 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
354 393
355 # convert movement strings to bitsets 394 # convert movement strings to bitsets
356 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
357 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
358 397
359 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
360 } 399 }
361 400
362 # convert outdated movement flags to new movement sets 401 # convert outdated movement flags to new movement sets
363 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
364 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
365 } 404 }
366 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
367 $ob->{move_slow} += "walk"; 406 $ob->{move_slow} += "walk";
368 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
369 } 408 }
370 if (defined (my $v = delete $ob->{walk_on})) { 409 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" } 410 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
372 } 411 }
373 if (defined (my $v = delete $ob->{walk_off})) { 412 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" } 413 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
375 } 414 }
376 if (defined (my $v = delete $ob->{fly_on})) { 415 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" } 416 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
378 } 417 }
379 if (defined (my $v = delete $ob->{fly_off})) { 418 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" } 419 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
381 } 420 }
382 if (defined (my $v = delete $ob->{flying})) { 421 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" } 422 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
384 } 423 }
385 424
386 # convert idiotic event_xxx things into objects 425 # convert idiotic event_xxx things into objects
387 while (my ($event, $subtype) = each %EVENT_TYPE) { 426 while (my ($event, $subtype) = each %EVENT_TYPE) {
388 if (exists $ob->{"event_${event}_plugin"}) { 427 if (exists $ob->{"event_${event}_plugin"}) {
… …
404# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
405sub normalize_arch($) { 444sub normalize_arch($) {
406 my ($ob) = @_; 445 my ($ob) = @_;
407 446
408 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
409 450
410 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
411 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
412 453
413 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
449} 490}
450 491
451sub attr_thaw($) { 492sub attr_thaw($) {
452 my ($ob) = @_; 493 my ($ob) = @_;
453 494
454 $ob->{attach} = from_json $ob->{attach} 495 $ob->{attach} = decode_json $ob->{attach}
455 if exists $ob->{attach}; 496 if exists $ob->{attach};
456 497
457 $ob 498 $ob
458} 499}
459 500
460sub attr_freeze($) { 501sub attr_freeze($) {
461 my ($ob) = @_; 502 my ($ob) = @_;
462 503
463 $ob->{attach} = Crossfire::to_json $ob->{attach} 504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
464 if exists $ob->{attach}; 505 if exists $ob->{attach};
465 506
466 $ob 507 $ob
467} 508}
468 509
… …
488 529
489 my %arc; 530 my %arc;
490 my ($more, $prev); 531 my ($more, $prev);
491 my $comment; 532 my $comment;
492 533
493 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
494 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
495 536
496# binmode $fh; 537# binmode $fh;
497 538
498 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
… …
598 my $str; 639 my $str;
599 640
600 my $append; $append = sub { 641 my $append; $append = sub {
601 my %a = %{$_[0]}; 642 my %a = %{$_[0]};
602 643
603 Crossfire::attr_freeze \%a; 644 Deliantra::attr_freeze \%a;
604 Crossfire::normalize_arch \%a; 645 Deliantra::normalize_arch \%a;
605 646
606 # undo the bit-split we did before 647 # undo the bit-split we did before
607 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 648 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}) 649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
609 | (delete $a{attack_movement_bits_4_7}); 650 | (delete $a{attack_movement_bits_4_7});
… …
627 } 668 }
628 669
629 my @kv; 670 my @kv;
630 671
631 for ($a{_name} eq "map" 672 for ($a{_name} eq "map"
632 ? @Crossfire::FIELD_ORDER_MAP 673 ? @Deliantra::FIELD_ORDER_MAP
633 : @Crossfire::FIELD_ORDER) { 674 : @Deliantra::FIELD_ORDER) {
634 push @kv, [$_, delete $a{$_}] 675 push @kv, [$_, delete $a{$_}]
635 if exists $a{$_}; 676 if exists $a{$_};
636 } 677 }
637 678
638 for (sort keys %a) { 679 for (sort keys %a) {
… …
641 } 682 }
642 683
643 for (@kv) { 684 for (@kv) {
644 my ($k, $v) = @$_; 685 my ($k, $v) = @$_;
645 686
646 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
647 $v =~ s/\n$//; 688 $v =~ s/\n$//;
648 $str .= "$k\n$v\n$end\n"; 689 $str .= "$k\n$v\n$end\n";
649 } else { 690 } else {
650 $str .= "$k $v\n"; 691 $str .= "$k $v\n";
651 } 692 }
… …
747=cut 788=cut
748 789
749sub arch_attr($) { 790sub arch_attr($) {
750 my ($obj) = @_; 791 my ($obj) = @_;
751 792
752 require Crossfire::Data; 793 require Deliantra::Data;
753 794
754 my $root; 795 my $root;
755 my $attr = { }; 796 my $attr = { };
756 797
757 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
758 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
759 800
760 if ($type > 0) { 801 if ($type > 0) {
761 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
762 } else { 803 } else {
763 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
764 805
765 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
766 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
767 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
768 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
769 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
770 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
771 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
772 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
773 } else { 814 } else {
774 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
775 } 816 }
776 } 817 }
777 818
819 my (%ignore);
778 my @import = ($root); 820 my @import = ($root);
821
822 my @new_import;
823 while (my $type = shift @import) {
824 # first import everything we will need:
825 push @import,
826 grep $_,
827 map $Deliantra::Data::TYPE{$_},
828 @{$type->{import} || []};
829
830 # and compute the ignored attributes
831 for (@{$type->{ignore} || []}) {
832 $ignore{$_}++ for ref $_ ? @$_ : $_;
833 }
834
835 push @new_import, $type;
779 836 }
837 (@import) = @new_import;
838
839 # then add defaults to the back of the list, so they are added
840 # as last resort.
780 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 841 push @import, \%Deliantra::Data::DEFAULT_ATTR
781 unless $type == 116; 842 unless $type == 116;
782 843
783 my (%ignore);
784 my (@section_order, %section, @attr_order); 844 my (@section_order, %section, @attr_order);
785 845
846 # @import = root, imported, default
786 while (my $type = shift @import) { 847 while (my $type = pop @import) {
787 push @import, @{$type->{import} || []};
788
789 $attr->{$_} ||= $type->{$_} 848 $attr->{$_} ||= $type->{$_}
790 for qw(name desc use); 849 for qw(name desc use);
791
792 for (@{$type->{ignore} || []}) {
793 $ignore{$_}++ for ref $_ ? @$_ : $_;
794 }
795 850
796 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 851 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
797 my ($name, $attr) = @$_; 852 my ($name, $attr) = @$_;
798 push @section_order, $name; 853 push @section_order, $name;
799 for (@$attr) { 854 for (@$attr) {
800 my ($k, $v) = @$_; 855 my ($k, $v) = @$_;
801 push @attr_order, $k; 856 push @attr_order, $k;
802 $section{$name}{$k} ||= $v; 857 $section{$name}{$k} = $v; # overwrite, so that the root decides
803 }
804 } 858 }
859 }
860 }
861
862 # remove ignores for "root" type
863 for (
864 map @{$_->[1]}, # section attributes
865 [general => ($root->{attr} || [])],
866 @{$root->{section} || []}
867 ) {
868 my ($k, $v) = @$_;
869 # skip fixed attributes, if they are ignored thats fine
870 next if $v->{type} eq 'fixed';
871
872 delete $ignore{$k}; # if the attributes are defined explicitly they
873 # should NOT be ignored. ignore should mainly
874 # hit imported/inherited attributes.
805 } 875 }
806 876
807 $attr->{section} = [ 877 $attr->{section} = [
808 map !exists $section{$_} ? () : do { 878 map !exists $section{$_} ? () : do {
809 my $attr = delete $section{$_}; 879 my $attr = delete $section{$_};
… …
813 map exists $attr->{$_} && !$ignore{$_} 883 map exists $attr->{$_} && !$ignore{$_}
814 ? [$_ => delete $attr->{$_}] : (), 884 ? [$_ => delete $attr->{$_}] : (),
815 @attr_order 885 @attr_order
816 ] 886 ]
817 }, 887 },
818
819 exists $section{$_} ? [$_ => delete $section{$_}] : (), 888 exists $section{$_} ? [$_ => delete $section{$_}] : (),
820 @section_order 889 @section_order
821 ]; 890 ];
822 891
823 $attr 892 $attr
824} 893}
… …
878 }, sub { 947 }, sub {
879 read_arch "$LIB/archetypes" 948 read_arch "$LIB/archetypes"
880 }; 949 };
881} 950}
882 951
952sub construct_tilecache_pb {
953 my ($idx, $cache) = @_;
954
955 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
956
957 while (my ($name, $tile) = each %$cache) {
958 my $tpb = delete $tile->{pb};
959 my $ofs = $tile->{idx};
960
961 for my $x (0 .. $tile->{w} - 1) {
962 for my $y (0 .. $tile->{h} - 1) {
963 my $idx = $ofs + $x + $y * $tile->{w};
964 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
965 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
966 }
967 }
968 }
969
970 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
971
972 $cache
973}
974
975sub use_tilecache {
976 my ($face) = @_;
977 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
978 or die "$VARDIR/tilecache.png: $!";
979 *FACE = $_[0];
980}
981
883=item load_tilecache 982=item load_tilecache
884 983
885(Re-)Load %TILE and %FACE. 984(Re-)Load %TILE and %FACE.
886 985
887=cut 986=cut
888 987
889sub load_tilecache() { 988sub load_tilecache() {
890 require Gtk2; 989 require Gtk2;
891 990
892 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 991 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 { 992 sub {
897 my $tile = read_pak "$LIB/crossfire.0";
898
899 my %cache; 993 my %cache;
994 my $facedata = Storable::retrieve "$LIB/facedata";
900 995
996 $facedata->{version} == 2
997 or die "$LIB/facedata: version mismatch, cannot proceed.";
998
999 my $faces = $facedata->{faceinfo};
901 my $idx = 0; 1000 my $idx = 0;
902 1001
903 for my $name (sort keys %$tile) { 1002 for (sort keys %$faces) {
1003 my ($face, $info) = ($_, $faces->{$_});
1004
904 my $pb = new Gtk2::Gdk::PixbufLoader; 1005 my $pb = new Gtk2::Gdk::PixbufLoader;
905 $pb->write ($tile->{$name}); 1006 $pb->write ($info->{data32});
906 $pb->close; 1007 $pb->close;
907 my $pb = $pb->get_pixbuf; 1008 my $pb = $pb->get_pixbuf;
908 1009
909 my $tile = $cache{$name} = { 1010 my $tile = $cache{$face} = {
910 pb => $pb, 1011 pb => $pb,
911 idx => $idx, 1012 idx => $idx,
912 w => int $pb->get_width / TILESIZE, 1013 w => int $pb->get_width / TILESIZE,
913 h => int $pb->get_height / TILESIZE, 1014 h => int $pb->get_height / TILESIZE,
914 }; 1015 };
915
916 1016
917 $idx += $tile->{w} * $tile->{h}; 1017 $idx += $tile->{w} * $tile->{h};
1018 }
1019
1020 construct_tilecache_pb $idx, \%cache;
1021
1022 \%cache
918 } 1023 };
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} 1024}
1025
1026=back
940 1027
941=head1 AUTHOR 1028=head1 AUTHOR
942 1029
943 Marc Lehmann <schmorp@schmorp.de> 1030 Marc Lehmann <schmorp@schmorp.de>
944 http://home.schmorp.de/ 1031 http://home.schmorp.de/
… …
947 http://www.ta-sa.org/ 1034 http://www.ta-sa.org/
948 1035
949=cut 1036=cut
950 1037
9511 10381
1039

Diff Legend

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