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.93 by root, Sat Mar 3 19:38:06 2007 UTC vs.
Revision 1.145 by root, Sun Nov 11 23:17:18 2012 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.31';
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) {
199 if ($_[0] >= "all") {
200 $_[0] -= $_[1];
201 } else {
171 $_[0] += $_[1]; 202 $_[0] += $_[1];
203 }
172 } elsif ($cur) { 204 } elsif ($cur) {
173 $_[0] -= $_[1]; 205 $_[0] -= $_[1];
174 } else { 206 } else {
175 $_[0] /= $_[1]; 207 $_[0] /= $_[1];
176 } 208 }
… …
178 $_[0] 210 $_[0]
179 }, 211 },
180 'eq' => sub { "$_[0]" eq "$_[1]" }, 212 'eq' => sub { "$_[0]" eq "$_[1]" },
181 'ne' => sub { "$_[0]" ne "$_[1]" }, 213 'ne' => sub { "$_[0]" ne "$_[1]" },
182 ; 214 ;
183}
184 215
185sub Crossfire::MoveType::new { 216 sub TO_JSON {
217 $_[0][0]
218 }
219}
220
221sub Deliantra::MoveType::new {
186 my ($class, $string) = @_; 222 my ($class, $string) = @_;
187 223
188 my $mask; 224 my $mask;
189 my $value; 225 my $value;
190 226
… …
204 } 240 }
205 241
206 (bless [$mask, $value], $class)->normalise 242 (bless [$mask, $value], $class)->normalise
207} 243}
208 244
209sub Crossfire::MoveType::normalise { 245sub Deliantra::MoveType::normalise {
210 my ($self) = @_; 246 my ($self) = @_;
211 247
212 if ($self->[0] & MOVE_ALL) { 248 if ($self->[0] & MOVE_ALL) {
213 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);
214 $self->[0] &= $mask; 250 $self->[0] &= $mask;
… …
218 $self->[1] &= $self->[0]; 254 $self->[1] &= $self->[0];
219 255
220 $self 256 $self
221} 257}
222 258
223sub Crossfire::MoveType::as_string { 259sub Deliantra::MoveType::as_string {
224 my ($self) = @_; 260 my ($self) = @_;
225 261
226 my @res; 262 my @res;
227 263
228 my ($mask, $value) = @$self; 264 my ($mask, $value) = @$self;
229 265
230 for (@Crossfire::MOVE_TYPE) { 266 for (@Deliantra::MOVE_TYPE) {
231 my $bit = $Crossfire::MOVE_TYPE{$_}; 267 my $bit = $Deliantra::MOVE_TYPE{$_};
232 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 268 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
233 $mask &= ~$bit; 269 $mask &= ~$bit;
234 push @res, $value & $bit ? $_ : "-$_"; 270 push @res, $value & $bit ? $_ : "-$_";
235 } 271 }
236 } 272 }
… …
329 365
330# object as in "Object xxx", i.e. archetypes 366# object as in "Object xxx", i.e. archetypes
331sub normalize_object($) { 367sub normalize_object($) {
332 my ($ob) = @_; 368 my ($ob) = @_;
333 369
370 delete $ob->{editable}; # deprecated
371
334 # convert material bitset to materialname, if possible 372 # convert material bitset to materialname, if possible
335 if (exists $ob->{material}) { 373 if (exists $ob->{material}) {
336 if (!$ob->{material}) { 374 if (!$ob->{material}) {
337 delete $ob->{material}; 375 delete $ob->{material};
338 } elsif (exists $ob->{materialname}) { 376 } elsif (exists $ob->{materialname}) {
… …
348 } else { 386 } else {
349 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 387 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
350 } 388 }
351 } 389 }
352 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
402 # color_fg is used as default for magicmap if magicmap does not exist
403 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
404
353 # nuke outdated or never supported fields 405 # nuke outdated or never supported fields
354 delete @$ob{qw( 406 delete @$ob{qw(
355 can_knockback can_parry can_impale can_cut can_dam_armour 407 can_knockback can_parry can_impale can_cut can_dam_armour
356 can_apply pass_thru can_pass_thru 408 can_apply pass_thru can_pass_thru color_bg color_fg
357 )}; 409 )};
358 410
359 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 411 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
360 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 412 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
361 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 413 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
362 414
363 # convert movement strings to bitsets 415 # convert movement strings to bitsets
364 for my $attr (keys %FIELD_MOVEMENT) { 416 for my $attr (keys %FIELD_MOVEMENT) {
365 next unless exists $ob->{$attr}; 417 next unless exists $ob->{$attr};
366 418
367 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 419 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
368 } 420 }
369 421
370 # convert outdated movement flags to new movement sets 422 # convert outdated movement flags to new movement sets
371 if (defined (my $v = delete $ob->{no_pass})) { 423 if (defined (my $v = delete $ob->{no_pass})) {
372 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 424 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
373 } 425 }
374 if (defined (my $v = delete $ob->{slow_move})) { 426 if (defined (my $v = delete $ob->{slow_move})) {
375 $ob->{move_slow} += "walk"; 427 $ob->{move_slow} += "walk";
376 $ob->{move_slow_penalty} = $v; 428 $ob->{move_slow_penalty} = $v;
377 } 429 }
378 if (defined (my $v = delete $ob->{walk_on})) { 430 if (defined (my $v = delete $ob->{walk_on})) {
379 $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" }
380 } 432 }
381 if (defined (my $v = delete $ob->{walk_off})) { 433 if (defined (my $v = delete $ob->{walk_off})) {
382 $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" }
383 } 435 }
384 if (defined (my $v = delete $ob->{fly_on})) { 436 if (defined (my $v = delete $ob->{fly_on})) {
385 $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" }
386 } 438 }
387 if (defined (my $v = delete $ob->{fly_off})) { 439 if (defined (my $v = delete $ob->{fly_off})) {
388 $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" }
389 } 441 }
390 if (defined (my $v = delete $ob->{flying})) { 442 if (defined (my $v = delete $ob->{flying})) {
391 $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" }
392 } 444 }
393 445
394 # convert idiotic event_xxx things into objects 446 # convert idiotic event_xxx things into objects
395 while (my ($event, $subtype) = each %EVENT_TYPE) { 447 while (my ($event, $subtype) = each %EVENT_TYPE) {
396 if (exists $ob->{"event_${event}_plugin"}) { 448 if (exists $ob->{"event_${event}_plugin"}) {
… …
412# arch as in "arch xxx", ie.. objects 464# arch as in "arch xxx", ie.. objects
413sub normalize_arch($) { 465sub normalize_arch($) {
414 my ($ob) = @_; 466 my ($ob) = @_;
415 467
416 normalize_object $ob; 468 normalize_object $ob;
469
470 return if $ob->{_atype} eq "object";
417 471
418 my $arch = $ARCH{$ob->{_name}} 472 my $arch = $ARCH{$ob->{_name}}
419 or (warn "$ob->{_name}: no such archetype", return $ob); 473 or (warn "$ob->{_name}: no such archetype", return $ob);
420 474
421 if ($arch->{type} == 22) { # map 475 if ($arch->{type} == 22) { # map
… …
457} 511}
458 512
459sub attr_thaw($) { 513sub attr_thaw($) {
460 my ($ob) = @_; 514 my ($ob) = @_;
461 515
462 $ob->{attach} = from_json $ob->{attach} 516 $ob->{attach} = decode_json $ob->{attach}
463 if exists $ob->{attach}; 517 if exists $ob->{attach};
464 518
465 $ob 519 $ob
466} 520}
467 521
468sub attr_freeze($) { 522sub attr_freeze($) {
469 my ($ob) = @_; 523 my ($ob) = @_;
470 524
471 $ob->{attach} = Crossfire::to_json $ob->{attach} 525 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
472 if exists $ob->{attach}; 526 if exists $ob->{attach};
473 527
474 $ob 528 $ob
475} 529}
476 530
… …
496 550
497 my %arc; 551 my %arc;
498 my ($more, $prev); 552 my ($more, $prev);
499 my $comment; 553 my $comment;
500 554
501 open my $fh, "<:raw:perlio:utf8", $path 555 open my $fh, "<:utf8", $path
502 or Carp::croak "$path: $!"; 556 or Carp::croak "$path: $!";
503 557
504# binmode $fh; 558# binmode $fh;
505 559
506 my $parse_block; $parse_block = sub { 560 my $parse_block; $parse_block = sub {
… …
606 my $str; 660 my $str;
607 661
608 my $append; $append = sub { 662 my $append; $append = sub {
609 my %a = %{$_[0]}; 663 my %a = %{$_[0]};
610 664
611 Crossfire::attr_freeze \%a; 665 Deliantra::attr_freeze \%a;
612 Crossfire::normalize_arch \%a; 666 Deliantra::normalize_arch \%a;
613 667
614 # undo the bit-split we did before 668 # undo the bit-split we did before
615 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}) {
616 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 670 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
617 | (delete $a{attack_movement_bits_4_7}); 671 | (delete $a{attack_movement_bits_4_7});
… …
635 } 689 }
636 690
637 my @kv; 691 my @kv;
638 692
639 for ($a{_name} eq "map" 693 for ($a{_name} eq "map"
640 ? @Crossfire::FIELD_ORDER_MAP 694 ? @Deliantra::FIELD_ORDER_MAP
641 : @Crossfire::FIELD_ORDER) { 695 : @Deliantra::FIELD_ORDER) {
642 push @kv, [$_, delete $a{$_}] 696 push @kv, [$_, delete $a{$_}]
643 if exists $a{$_}; 697 if exists $a{$_};
644 } 698 }
645 699
646 for (sort keys %a) { 700 for (sort keys %a) {
… …
649 } 703 }
650 704
651 for (@kv) { 705 for (@kv) {
652 my ($k, $v) = @$_; 706 my ($k, $v) = @$_;
653 707
654 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 708 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
655 $v =~ s/\n$//; 709 $v =~ s/\n$//;
656 $str .= "$k\n$v\n$end\n"; 710 $str .= "$k\n$v\n$end\n";
657 } else { 711 } else {
658 $str .= "$k $v\n"; 712 $str .= "$k $v\n";
659 } 713 }
… …
755=cut 809=cut
756 810
757sub arch_attr($) { 811sub arch_attr($) {
758 my ($obj) = @_; 812 my ($obj) = @_;
759 813
760 require Crossfire::Data; 814 require Deliantra::Data;
761 815
762 my $root; 816 my $root;
763 my $attr = { }; 817 my $attr = { };
764 818
765 my $arch = $ARCH{ $obj->{_name} }; 819 my $arch = $ARCH{ $obj->{_name} };
766 my $type = $obj->{type} || $arch->{type}; 820 my $type = $obj->{type} || $arch->{type};
767 821
768 if ($type > 0) { 822 if ($type > 0) {
769 $root = $Crossfire::Data::ATTR{$type}; 823 $root = $Deliantra::Data::ATTR{$type};
770 } else { 824 } else {
771 my %a = (%$arch, %$obj); 825 my %a = (%$arch, %$obj);
772 826
773 if ($a{is_floor} && !$a{alive}) { 827 if ($a{is_floor} && !$a{alive}) {
774 $root = $Crossfire::Data::TYPE{Floor}; 828 $root = $Deliantra::Data::TYPE{Floor};
775 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 829 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
776 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 830 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
777 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 831 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
778 $root = $Crossfire::Data::TYPE{Wall}; 832 $root = $Deliantra::Data::TYPE{Wall};
779 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 833 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
780 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 834 $root = $Deliantra::Data::TYPE{"Weak Wall"};
781 } else { 835 } else {
782 $root = $Crossfire::Data::TYPE{Misc}; 836 $root = $Deliantra::Data::TYPE{Misc};
783 } 837 }
784 } 838 }
785 839
840 my (%ignore);
786 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;
787 857 }
858 (@import) = @new_import;
859
860 # then add defaults to the back of the list, so they are added
861 # as last resort.
788 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 862 push @import, \%Deliantra::Data::DEFAULT_ATTR
789 unless $type == 116; 863 unless $type == 116;
790 864
791 my (%ignore);
792 my (@section_order, %section, @attr_order); 865 my (@section_order, %section, @attr_order);
793 866
867 # @import = root, imported, default
794 while (my $type = shift @import) { 868 while (my $type = pop @import) {
795 push @import, @{$type->{import} || []};
796
797 $attr->{$_} ||= $type->{$_} 869 $attr->{$_} ||= $type->{$_}
798 for qw(name desc use); 870 for qw(name desc use);
799
800 for (@{$type->{ignore} || []}) {
801 $ignore{$_}++ for ref $_ ? @$_ : $_;
802 }
803 871
804 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 872 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
805 my ($name, $attr) = @$_; 873 my ($name, $attr) = @$_;
806 push @section_order, $name; 874 push @section_order, $name;
807 for (@$attr) { 875 for (@$attr) {
808 my ($k, $v) = @$_; 876 my ($k, $v) = @$_;
809 push @attr_order, $k; 877 push @attr_order, $k;
810 $section{$name}{$k} ||= $v; 878 $section{$name}{$k} = $v; # overwrite, so that the root decides
811 }
812 } 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.
813 } 896 }
814 897
815 $attr->{section} = [ 898 $attr->{section} = [
816 map !exists $section{$_} ? () : do { 899 map !exists $section{$_} ? () : do {
817 my $attr = delete $section{$_}; 900 my $attr = delete $section{$_};
… …
821 map exists $attr->{$_} && !$ignore{$_} 904 map exists $attr->{$_} && !$ignore{$_}
822 ? [$_ => delete $attr->{$_}] : (), 905 ? [$_ => delete $attr->{$_}] : (),
823 @attr_order 906 @attr_order
824 ] 907 ]
825 }, 908 },
826
827 exists $section{$_} ? [$_ => delete $section{$_}] : (), 909 exists $section{$_} ? [$_ => delete $section{$_}] : (),
828 @section_order 910 @section_order
829 ]; 911 ];
830 912
831 $attr 913 $attr
832} 914}
… …
886 }, sub { 968 }, sub {
887 read_arch "$LIB/archetypes" 969 read_arch "$LIB/archetypes"
888 }; 970 };
889} 971}
890 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
891=item load_tilecache 1003=item load_tilecache
892 1004
893(Re-)Load %TILE and %FACE. 1005(Re-)Load %TILE and %FACE.
894 1006
895=cut 1007=cut
896 1008
897sub load_tilecache() { 1009sub load_tilecache() {
898 require Gtk2; 1010 require Gtk2;
899 1011
900 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 1012 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
901 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
902 or die "$VARDIR/tilecache.png: $!";
903 *FACE = $_[0];
904 }, sub { 1013 sub {
905 my $tile = read_pak "$LIB/crossfire.0";
906
907 my %cache; 1014 my %cache;
1015 my $facedata = Storable::retrieve "$LIB/faceinfo";
908 1016
1017 open my $fh, "<", "$LIB/facedata"
1018 or die "$LIB/facedata: $!";
1019
1020 $facedata->{version} == 2
1021 or die "$LIB/facedata: version mismatch, cannot proceed.";
1022
1023 my $faces = $facedata->{faceinfo};
909 my $idx = 0; 1024 my $idx = 0;
910 1025
911 for my $name (sort keys %$tile) { 1026 for (sort keys %$faces) {
1027 my ($face, $info) = ($_, $faces->{$_});
1028
912 my $pb = new Gtk2::Gdk::PixbufLoader; 1029 my $pb = new Gtk2::Gdk::PixbufLoader;
913 $pb->write ($tile->{$name});
914 $pb->close;
915 my $pb = $pb->get_pixbuf;
916 1030
917 my $tile = $cache{$name} = { 1031 if (exists $info->{data32}) {
918 pb => $pb, 1032 $pb->write ($info->{data32});
919 idx => $idx, 1033 } else {
920 w => int $pb->get_width / TILESIZE, 1034 sysseek $fh, $info->{fofs32}, 0;
921 h => int $pb->get_height / TILESIZE, 1035 sysread $fh, my $buf, $info->{size32};
922 }; 1036 $pb->write ($buf);
923
924
925 $idx += $tile->{w} * $tile->{h};
926 }
927
928 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
929
930 while (my ($name, $tile) = each %cache) {
931 my $tpb = delete $tile->{pb};
932 my $ofs = $tile->{idx};
933
934 for my $x (0 .. $tile->{w} - 1) {
935 for my $y (0 .. $tile->{h} - 1) {
936 my $idx = $ofs + $x + $y * $tile->{w};
937 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
938 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
939 } 1037 }
1038 $pb->close;
1039 my $pb = $pb->get_pixbuf;
1040
1041 my $tile = $cache{$face} = {
1042 pb => $pb,
1043 idx => $idx,
1044 w => int $pb->get_width / TILESIZE,
1045 h => int $pb->get_height / TILESIZE,
940 } 1046 };
1047
1048 $idx += $tile->{w} * $tile->{h};
1049 }
1050
1051 construct_tilecache_pb $idx, \%cache;
1052
1053 \%cache
941 } 1054 };
942
943 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
944
945 \%cache
946 };
947} 1055}
1056
1057=back
948 1058
949=head1 AUTHOR 1059=head1 AUTHOR
950 1060
951 Marc Lehmann <schmorp@schmorp.de> 1061 Marc Lehmann <schmorp@schmorp.de>
952 http://home.schmorp.de/ 1062 http://home.schmorp.de/
… …
955 http://www.ta-sa.org/ 1065 http://www.ta-sa.org/
956 1066
957=cut 1067=cut
958 1068
9591 10691
1070

Diff Legend

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