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.96 by root, Sun Mar 11 00:14:44 2007 UTC vs.
Revision 1.143 by root, Wed Oct 6 01:53:51 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.97'; 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 glyph 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
… …
132 trigger => 10, 133 trigger => 10,
133 close => 11, 134 close => 11,
134 timer => 12, 135 timer => 12,
135); 136);
136 137
138# 1 up 2 right 4 down 8 left
139our %WALLDIR = (
140 0 => 0,
141 1_2 => 1,
142 1_4 => 2,
143 2_2_1 => 3,
144 1_1 => 4,
145 2_1_1 => 5,
146 2_2_2 => 6,
147 3_2 => 7,
148 1_3 => 8,
149 2_2_4 => 9,
150 2_1_2 => 10,
151 3_1 => 11,
152 2_2_3 => 12,
153 3_4 => 13,
154 3_3 => 14,
155 4 => 15,
156);
157
137sub MOVE_WALK (){ 0x01 } 158sub MOVE_WALK (){ 0x01 }
138sub MOVE_FLY_LOW (){ 0x02 } 159sub MOVE_FLY_LOW (){ 0x02 }
139sub MOVE_FLY_HIGH (){ 0x04 } 160sub MOVE_FLY_HIGH (){ 0x04 }
140sub MOVE_FLYING (){ 0x06 } 161sub MOVE_FLYING (){ 0x06 }
141sub MOVE_SWIM (){ 0x08 } 162sub MOVE_SWIM (){ 0x08 }
142sub MOVE_BOAT (){ 0x10 } 163sub MOVE_BOAT (){ 0x10 }
164sub MOVE_SHIP (){ 0x20 }
143sub MOVE_KNOWN (){ 0x1f } # all of above 165sub MOVE_KNOWN (){ 0x3f } # all of above
144sub MOVE_ALL (){ 0x10000 } # very special value 166sub MOVE_ALL (){ 0x10000 } # very special value
145 167
146our %MOVE_TYPE = ( 168our %MOVE_TYPE = (
147 walk => MOVE_WALK, 169 walk => MOVE_WALK,
148 fly_low => MOVE_FLY_LOW, 170 fly_low => MOVE_FLY_LOW,
149 fly_high => MOVE_FLY_HIGH, 171 fly_high => MOVE_FLY_HIGH,
150 flying => MOVE_FLYING, 172 flying => MOVE_FLYING,
151 swim => MOVE_SWIM, 173 swim => MOVE_SWIM,
152 boat => MOVE_BOAT, 174 boat => MOVE_BOAT,
175 ship => MOVE_SHIP,
153 all => MOVE_ALL, 176 all => MOVE_ALL,
154); 177);
155 178
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); 179our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
157 180
158{ 181{
159 package Crossfire::MoveType; 182 package Deliantra::MoveType;
160 183
161 use overload 184 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 185 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string, 186 '""' => \&as_string,
164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 187 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
188 '<=' => sub {
189 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
190 ? $_[0][1] & $MOVE_TYPE{$_[1]}
191 : undef
192 },
165 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, 193 '+=' => 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 }, 194 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 195 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub { 196 'x=' => sub { # toggle between off, + and -
169 my $cur = $_[0] >= $_[1]; 197 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) { 198 if (!defined $cur) {
171 if ($_[0] >= "all") { 199 if ($_[0] >= "all") {
172 $_[0] -= $_[1]; 200 $_[0] -= $_[1];
173 } else { 201 } else {
… …
182 $_[0] 210 $_[0]
183 }, 211 },
184 'eq' => sub { "$_[0]" eq "$_[1]" }, 212 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" }, 213 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ; 214 ;
187}
188 215
189sub Crossfire::MoveType::new { 216 sub TO_JSON {
217 $_[0][0]
218 }
219}
220
221sub Deliantra::MoveType::new {
190 my ($class, $string) = @_; 222 my ($class, $string) = @_;
191 223
192 my $mask; 224 my $mask;
193 my $value; 225 my $value;
194 226
… …
208 } 240 }
209 241
210 (bless [$mask, $value], $class)->normalise 242 (bless [$mask, $value], $class)->normalise
211} 243}
212 244
213sub Crossfire::MoveType::normalise { 245sub Deliantra::MoveType::normalise {
214 my ($self) = @_; 246 my ($self) = @_;
215 247
216 if ($self->[0] & MOVE_ALL) { 248 if ($self->[0] & MOVE_ALL) {
217 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 249 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
218 $self->[0] &= $mask; 250 $self->[0] &= $mask;
… …
222 $self->[1] &= $self->[0]; 254 $self->[1] &= $self->[0];
223 255
224 $self 256 $self
225} 257}
226 258
227sub Crossfire::MoveType::as_string { 259sub Deliantra::MoveType::as_string {
228 my ($self) = @_; 260 my ($self) = @_;
229 261
230 my @res; 262 my @res;
231 263
232 my ($mask, $value) = @$self; 264 my ($mask, $value) = @$self;
233 265
234 for (@Crossfire::MOVE_TYPE) { 266 for (@Deliantra::MOVE_TYPE) {
235 my $bit = $Crossfire::MOVE_TYPE{$_}; 267 my $bit = $Deliantra::MOVE_TYPE{$_};
236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 268 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
237 $mask &= ~$bit; 269 $mask &= ~$bit;
238 push @res, $value & $bit ? $_ : "-$_"; 270 push @res, $value & $bit ? $_ : "-$_";
239 } 271 }
240 } 272 }
… …
333 365
334# object as in "Object xxx", i.e. archetypes 366# object as in "Object xxx", i.e. archetypes
335sub normalize_object($) { 367sub normalize_object($) {
336 my ($ob) = @_; 368 my ($ob) = @_;
337 369
370 delete $ob->{editable}; # deprecated
371
338 # convert material bitset to materialname, if possible 372 # convert material bitset to materialname, if possible
339 if (exists $ob->{material}) { 373 if (exists $ob->{material}) {
340 if (!$ob->{material}) { 374 if (!$ob->{material}) {
341 delete $ob->{material}; 375 delete $ob->{material};
342 } elsif (exists $ob->{materialname}) { 376 } elsif (exists $ob->{materialname}) {
… …
352 } else { 386 } else {
353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 387 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
354 } 388 }
355 } 389 }
356 390
391 # check whether attachment is the same as in the archetype
392 if (exists $ob->{attach}) {
393 my $arch = $ARCH{$ob->{_name}};
394 my $js = JSON::XS->new->utf8->canonical (1);
395
396 if (defined $arch->{attach}
397 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
398 delete $ob->{attach}
399 }
400 }
401
357 # color_fg is used as default for magicmap if magicmap does not exist 402 # color_fg is used as default for magicmap if magicmap does not exist
358 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; 403 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
359 404
360 # nuke outdated or never supported fields 405 # nuke outdated or never supported fields
361 delete @$ob{qw( 406 delete @$ob{qw(
362 can_knockback can_parry can_impale can_cut can_dam_armour 407 can_knockback can_parry can_impale can_cut can_dam_armour
363 can_apply pass_thru can_pass_thru 408 can_apply pass_thru can_pass_thru color_bg color_fg
364 )}; 409 )};
365 410
366 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 411 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
367 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 412 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
368 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 413 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
369 414
370 # convert movement strings to bitsets 415 # convert movement strings to bitsets
371 for my $attr (keys %FIELD_MOVEMENT) { 416 for my $attr (keys %FIELD_MOVEMENT) {
372 next unless exists $ob->{$attr}; 417 next unless exists $ob->{$attr};
373 418
374 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 419 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
375 } 420 }
376 421
377 # convert outdated movement flags to new movement sets 422 # convert outdated movement flags to new movement sets
378 if (defined (my $v = delete $ob->{no_pass})) { 423 if (defined (my $v = delete $ob->{no_pass})) {
379 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 424 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
380 } 425 }
381 if (defined (my $v = delete $ob->{slow_move})) { 426 if (defined (my $v = delete $ob->{slow_move})) {
382 $ob->{move_slow} += "walk"; 427 $ob->{move_slow} += "walk";
383 $ob->{move_slow_penalty} = $v; 428 $ob->{move_slow_penalty} = $v;
384 } 429 }
385 if (defined (my $v = delete $ob->{walk_on})) { 430 if (defined (my $v = delete $ob->{walk_on})) {
386 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } 431 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
387 } 432 }
388 if (defined (my $v = delete $ob->{walk_off})) { 433 if (defined (my $v = delete $ob->{walk_off})) {
389 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } 434 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
390 } 435 }
391 if (defined (my $v = delete $ob->{fly_on})) { 436 if (defined (my $v = delete $ob->{fly_on})) {
392 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } 437 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
393 } 438 }
394 if (defined (my $v = delete $ob->{fly_off})) { 439 if (defined (my $v = delete $ob->{fly_off})) {
395 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } 440 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
396 } 441 }
397 if (defined (my $v = delete $ob->{flying})) { 442 if (defined (my $v = delete $ob->{flying})) {
398 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } 443 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
399 } 444 }
400 445
401 # convert idiotic event_xxx things into objects 446 # convert idiotic event_xxx things into objects
402 while (my ($event, $subtype) = each %EVENT_TYPE) { 447 while (my ($event, $subtype) = each %EVENT_TYPE) {
403 if (exists $ob->{"event_${event}_plugin"}) { 448 if (exists $ob->{"event_${event}_plugin"}) {
… …
419# arch as in "arch xxx", ie.. objects 464# arch as in "arch xxx", ie.. objects
420sub normalize_arch($) { 465sub normalize_arch($) {
421 my ($ob) = @_; 466 my ($ob) = @_;
422 467
423 normalize_object $ob; 468 normalize_object $ob;
469
470 return if $ob->{_atype} eq "object";
424 471
425 my $arch = $ARCH{$ob->{_name}} 472 my $arch = $ARCH{$ob->{_name}}
426 or (warn "$ob->{_name}: no such archetype", return $ob); 473 or (warn "$ob->{_name}: no such archetype", return $ob);
427 474
428 if ($arch->{type} == 22) { # map 475 if ($arch->{type} == 22) { # map
… …
464} 511}
465 512
466sub attr_thaw($) { 513sub attr_thaw($) {
467 my ($ob) = @_; 514 my ($ob) = @_;
468 515
469 $ob->{attach} = from_json $ob->{attach} 516 $ob->{attach} = decode_json $ob->{attach}
470 if exists $ob->{attach}; 517 if exists $ob->{attach};
471 518
472 $ob 519 $ob
473} 520}
474 521
475sub attr_freeze($) { 522sub attr_freeze($) {
476 my ($ob) = @_; 523 my ($ob) = @_;
477 524
478 $ob->{attach} = Crossfire::to_json $ob->{attach} 525 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
479 if exists $ob->{attach}; 526 if exists $ob->{attach};
480 527
481 $ob 528 $ob
482} 529}
483 530
… …
503 550
504 my %arc; 551 my %arc;
505 my ($more, $prev); 552 my ($more, $prev);
506 my $comment; 553 my $comment;
507 554
508 open my $fh, "<:raw:perlio:utf8", $path 555 open my $fh, "<:utf8", $path
509 or Carp::croak "$path: $!"; 556 or Carp::croak "$path: $!";
510 557
511# binmode $fh; 558# binmode $fh;
512 559
513 my $parse_block; $parse_block = sub { 560 my $parse_block; $parse_block = sub {
… …
613 my $str; 660 my $str;
614 661
615 my $append; $append = sub { 662 my $append; $append = sub {
616 my %a = %{$_[0]}; 663 my %a = %{$_[0]};
617 664
618 Crossfire::attr_freeze \%a; 665 Deliantra::attr_freeze \%a;
619 Crossfire::normalize_arch \%a; 666 Deliantra::normalize_arch \%a;
620 667
621 # undo the bit-split we did before 668 # undo the bit-split we did before
622 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 669 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
623 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 670 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
624 | (delete $a{attack_movement_bits_4_7}); 671 | (delete $a{attack_movement_bits_4_7});
… …
642 } 689 }
643 690
644 my @kv; 691 my @kv;
645 692
646 for ($a{_name} eq "map" 693 for ($a{_name} eq "map"
647 ? @Crossfire::FIELD_ORDER_MAP 694 ? @Deliantra::FIELD_ORDER_MAP
648 : @Crossfire::FIELD_ORDER) { 695 : @Deliantra::FIELD_ORDER) {
649 push @kv, [$_, delete $a{$_}] 696 push @kv, [$_, delete $a{$_}]
650 if exists $a{$_}; 697 if exists $a{$_};
651 } 698 }
652 699
653 for (sort keys %a) { 700 for (sort keys %a) {
… …
656 } 703 }
657 704
658 for (@kv) { 705 for (@kv) {
659 my ($k, $v) = @$_; 706 my ($k, $v) = @$_;
660 707
661 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 708 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
662 $v =~ s/\n$//; 709 $v =~ s/\n$//;
663 $str .= "$k\n$v\n$end\n"; 710 $str .= "$k\n$v\n$end\n";
664 } else { 711 } else {
665 $str .= "$k $v\n"; 712 $str .= "$k $v\n";
666 } 713 }
… …
762=cut 809=cut
763 810
764sub arch_attr($) { 811sub arch_attr($) {
765 my ($obj) = @_; 812 my ($obj) = @_;
766 813
767 require Crossfire::Data; 814 require Deliantra::Data;
768 815
769 my $root; 816 my $root;
770 my $attr = { }; 817 my $attr = { };
771 818
772 my $arch = $ARCH{ $obj->{_name} }; 819 my $arch = $ARCH{ $obj->{_name} };
773 my $type = $obj->{type} || $arch->{type}; 820 my $type = $obj->{type} || $arch->{type};
774 821
775 if ($type > 0) { 822 if ($type > 0) {
776 $root = $Crossfire::Data::ATTR{$type}; 823 $root = $Deliantra::Data::ATTR{$type};
777 } else { 824 } else {
778 my %a = (%$arch, %$obj); 825 my %a = (%$arch, %$obj);
779 826
780 if ($a{is_floor} && !$a{alive}) { 827 if ($a{is_floor} && !$a{alive}) {
781 $root = $Crossfire::Data::TYPE{Floor}; 828 $root = $Deliantra::Data::TYPE{Floor};
782 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 829 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
783 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 830 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
784 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 831 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
785 $root = $Crossfire::Data::TYPE{Wall}; 832 $root = $Deliantra::Data::TYPE{Wall};
786 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 833 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
787 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 834 $root = $Deliantra::Data::TYPE{"Weak Wall"};
788 } else { 835 } else {
789 $root = $Crossfire::Data::TYPE{Misc}; 836 $root = $Deliantra::Data::TYPE{Misc};
790 } 837 }
791 } 838 }
792 839
840 my (%ignore);
793 my @import = ($root); 841 my @import = ($root);
842
843 my @new_import;
844 while (my $type = shift @import) {
845 # first import everything we will need:
846 push @import,
847 grep $_,
848 map $Deliantra::Data::TYPE{$_},
849 @{$type->{import} || []};
850
851 # and compute the ignored attributes
852 for (@{$type->{ignore} || []}) {
853 $ignore{$_}++ for ref $_ ? @$_ : $_;
854 }
855
856 push @new_import, $type;
794 857 }
858 (@import) = @new_import;
859
860 # then add defaults to the back of the list, so they are added
861 # as last resort.
795 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 862 push @import, \%Deliantra::Data::DEFAULT_ATTR
796 unless $type == 116; 863 unless $type == 116;
797 864
798 my (%ignore);
799 my (@section_order, %section, @attr_order); 865 my (@section_order, %section, @attr_order);
800 866
867 # @import = root, imported, default
801 while (my $type = shift @import) { 868 while (my $type = pop @import) {
802 push @import, @{$type->{import} || []};
803
804 $attr->{$_} ||= $type->{$_} 869 $attr->{$_} ||= $type->{$_}
805 for qw(name desc use); 870 for qw(name desc use);
806
807 for (@{$type->{ignore} || []}) {
808 $ignore{$_}++ for ref $_ ? @$_ : $_;
809 }
810 871
811 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 872 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
812 my ($name, $attr) = @$_; 873 my ($name, $attr) = @$_;
813 push @section_order, $name; 874 push @section_order, $name;
814 for (@$attr) { 875 for (@$attr) {
815 my ($k, $v) = @$_; 876 my ($k, $v) = @$_;
816 push @attr_order, $k; 877 push @attr_order, $k;
817 $section{$name}{$k} ||= $v; 878 $section{$name}{$k} = $v; # overwrite, so that the root decides
818 }
819 } 879 }
880 }
881 }
882
883 # remove ignores for "root" type
884 for (
885 map @{$_->[1]}, # section attributes
886 [general => ($root->{attr} || [])],
887 @{$root->{section} || []}
888 ) {
889 my ($k, $v) = @$_;
890 # skip fixed attributes, if they are ignored thats fine
891 next if $v->{type} eq 'fixed';
892
893 delete $ignore{$k}; # if the attributes are defined explicitly they
894 # should NOT be ignored. ignore should mainly
895 # hit imported/inherited attributes.
820 } 896 }
821 897
822 $attr->{section} = [ 898 $attr->{section} = [
823 map !exists $section{$_} ? () : do { 899 map !exists $section{$_} ? () : do {
824 my $attr = delete $section{$_}; 900 my $attr = delete $section{$_};
… …
828 map exists $attr->{$_} && !$ignore{$_} 904 map exists $attr->{$_} && !$ignore{$_}
829 ? [$_ => delete $attr->{$_}] : (), 905 ? [$_ => delete $attr->{$_}] : (),
830 @attr_order 906 @attr_order
831 ] 907 ]
832 }, 908 },
833
834 exists $section{$_} ? [$_ => delete $section{$_}] : (), 909 exists $section{$_} ? [$_ => delete $section{$_}] : (),
835 @section_order 910 @section_order
836 ]; 911 ];
837 912
838 $attr 913 $attr
839} 914}
… …
893 }, sub { 968 }, sub {
894 read_arch "$LIB/archetypes" 969 read_arch "$LIB/archetypes"
895 }; 970 };
896} 971}
897 972
973sub construct_tilecache_pb {
974 my ($idx, $cache) = @_;
975
976 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
977
978 while (my ($name, $tile) = each %$cache) {
979 my $tpb = delete $tile->{pb};
980 my $ofs = $tile->{idx};
981
982 for my $x (0 .. $tile->{w} - 1) {
983 for my $y (0 .. $tile->{h} - 1) {
984 my $idx = $ofs + $x + $y * $tile->{w};
985 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
986 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
987 }
988 }
989 }
990
991 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
992
993 $cache
994}
995
996sub use_tilecache {
997 my ($face) = @_;
998 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
999 or die "$VARDIR/tilecache.png: $!";
1000 *FACE = $_[0];
1001}
1002
898=item load_tilecache 1003=item load_tilecache
899 1004
900(Re-)Load %TILE and %FACE. 1005(Re-)Load %TILE and %FACE.
901 1006
902=cut 1007=cut
903 1008
904sub load_tilecache() { 1009sub load_tilecache() {
905 require Gtk2; 1010 require Gtk2;
906 1011
907 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 1012 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
908 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
909 or die "$VARDIR/tilecache.png: $!";
910 *FACE = $_[0];
911 }, sub { 1013 sub {
912 my $tile = read_pak "$LIB/crossfire.0";
913
914 my %cache; 1014 my %cache;
1015 my $facedata = Storable::retrieve "$LIB/facedata";
915 1016
1017 $facedata->{version} == 2
1018 or die "$LIB/facedata: version mismatch, cannot proceed.";
1019
1020 my $faces = $facedata->{faceinfo};
916 my $idx = 0; 1021 my $idx = 0;
917 1022
918 for my $name (sort keys %$tile) { 1023 for (sort keys %$faces) {
1024 my ($face, $info) = ($_, $faces->{$_});
1025
919 my $pb = new Gtk2::Gdk::PixbufLoader; 1026 my $pb = new Gtk2::Gdk::PixbufLoader;
920 $pb->write ($tile->{$name}); 1027 $pb->write ($info->{data32});
921 $pb->close; 1028 $pb->close;
922 my $pb = $pb->get_pixbuf; 1029 my $pb = $pb->get_pixbuf;
923 1030
924 my $tile = $cache{$name} = { 1031 my $tile = $cache{$face} = {
925 pb => $pb, 1032 pb => $pb,
926 idx => $idx, 1033 idx => $idx,
927 w => int $pb->get_width / TILESIZE, 1034 w => int $pb->get_width / TILESIZE,
928 h => int $pb->get_height / TILESIZE, 1035 h => int $pb->get_height / TILESIZE,
929 }; 1036 };
930
931 1037
932 $idx += $tile->{w} * $tile->{h}; 1038 $idx += $tile->{w} * $tile->{h};
1039 }
1040
1041 construct_tilecache_pb $idx, \%cache;
1042
1043 \%cache
933 } 1044 };
934
935 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
936
937 while (my ($name, $tile) = each %cache) {
938 my $tpb = delete $tile->{pb};
939 my $ofs = $tile->{idx};
940
941 for my $x (0 .. $tile->{w} - 1) {
942 for my $y (0 .. $tile->{h} - 1) {
943 my $idx = $ofs + $x + $y * $tile->{w};
944 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
945 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
946 }
947 }
948 }
949
950 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
951
952 \%cache
953 };
954} 1045}
1046
1047=back
955 1048
956=head1 AUTHOR 1049=head1 AUTHOR
957 1050
958 Marc Lehmann <schmorp@schmorp.de> 1051 Marc Lehmann <schmorp@schmorp.de>
959 http://home.schmorp.de/ 1052 http://home.schmorp.de/
… …
962 http://www.ta-sa.org/ 1055 http://www.ta-sa.org/
963 1056
964=cut 1057=cut
965 1058
9661 10591
1060

Diff Legend

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