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

Diff Legend

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