1 | =head1 NAME |
1 | =head1 NAME |
2 | |
2 | |
3 | Crossfire - Crossfire maphandling |
3 | Deliantra - Deliantra suppport module to read/write archetypes, maps etc. |
|
|
4 | |
|
|
5 | =over 4 |
4 | |
6 | |
5 | =cut |
7 | =cut |
6 | |
8 | |
7 | package Crossfire; |
9 | package Deliantra; |
8 | |
10 | |
9 | our $VERSION = '0.98'; |
11 | our $VERSION = '1.30'; |
10 | |
12 | |
11 | use strict; |
13 | use common::sense; |
12 | |
14 | |
13 | use base 'Exporter'; |
15 | use base 'Exporter'; |
14 | |
16 | |
15 | use Carp (); |
17 | use Carp (); |
16 | use File::Spec; |
18 | use File::Spec; |
17 | use List::Util qw(min max); |
19 | use List::Util qw(min max); |
18 | use Storable qw(freeze thaw); |
20 | use Storable qw(freeze thaw); |
19 | |
21 | |
20 | our @EXPORT = qw( |
22 | our @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 | |
24 | use JSON::XS qw(from_json to_json); |
29 | use JSON::XS qw(decode_json encode_json); |
25 | |
30 | |
26 | our $LIB = $ENV{CROSSFIRE_LIBDIR}; |
31 | our $LIB = $ENV{DELIANTRA_LIBDIR}; |
27 | |
32 | |
28 | our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" |
33 | our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra" |
29 | : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" |
34 | : $ENV{AppData} ? "$ENV{APPDATA}/deliantra" |
30 | : File::Spec->tmpdir . "/crossfire"; |
35 | : File::Spec->tmpdir . "/deliantra"; |
31 | |
36 | |
32 | mkdir $VARDIR, 0777; |
37 | mkdir $VARDIR, 0777; |
33 | |
38 | |
34 | sub TILESIZE (){ 32 } |
39 | sub TILESIZE (){ 32 } |
|
|
40 | sub CACHESTRIDE (){ 64 } |
35 | |
41 | |
36 | our %ARCH; |
42 | our %ARCH; |
|
|
43 | our %FACE; # face32 |
37 | our %FACE; |
44 | our %FACEDATA; |
38 | our $TILE; |
45 | our $TILE; |
39 | |
46 | |
40 | our %FIELD_MULTILINE = ( |
47 | our %FIELD_MULTILINE = ( |
41 | msg => "endmsg", |
48 | msg => "endmsg", |
42 | lore => "endlore", |
49 | lore => "endlore", |
… | |
… | |
64 | |
71 | |
65 | elevation |
72 | elevation |
66 | |
73 | |
67 | name name_pl custom_name attach title race |
74 | name name_pl custom_name attach title race |
68 | slaying skill msg lore other_arch |
75 | slaying skill msg lore other_arch |
69 | face animation is_animated |
76 | sound sound_destroy face animation is_animated |
70 | magicmap smoothlevel smoothface |
77 | magicmap smoothlevel smoothface |
71 | str dex con wis pow cha int |
78 | str dex con wis pow cha int |
72 | hp maxhp sp maxsp grace maxgrace |
79 | hp maxhp sp maxsp grace maxgrace |
73 | exp perm_exp expmul |
80 | exp perm_exp expmul |
74 | 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 | resist_life_stealing resist_disease |
90 | resist_life_stealing resist_disease |
84 | |
91 | |
85 | path_attuned path_repelled path_denied material materialname |
92 | path_attuned path_repelled path_denied material materialname |
86 | value carrying weight invisible state magic |
93 | value carrying weight invisible state magic |
87 | last_heal last_sp last_grace last_eat |
94 | last_heal last_sp last_grace last_eat |
88 | connected glow_radius randomitems npx_status npc_program |
95 | connected glow_radius randomitems tresure_env npx_status npc_program |
89 | run_away pick_up container will_apply smoothlevel |
96 | run_away pick_up container will_apply smoothlevel |
90 | current_weapon_script weapontype tooltype elevation client_type |
97 | current_weapon_script weapontype tooltype elevation client_type |
91 | item_power duration range |
98 | item_power duration range |
92 | range_modifier duration_modifier dam_modifier gen_sp_armour |
99 | range_modifier duration_modifier dam_modifier gen_sp_armour |
93 | 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 |
… | |
… | |
104 | 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 |
105 | 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 |
106 | 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 |
107 | 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 |
108 | 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 |
109 | |
117 | |
110 | 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 |
111 | 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 |
112 | )); |
120 | )); |
113 | |
121 | |
… | |
… | |
130 | sub MOVE_FLY_LOW (){ 0x02 } |
138 | sub MOVE_FLY_LOW (){ 0x02 } |
131 | sub MOVE_FLY_HIGH (){ 0x04 } |
139 | sub MOVE_FLY_HIGH (){ 0x04 } |
132 | sub MOVE_FLYING (){ 0x06 } |
140 | sub MOVE_FLYING (){ 0x06 } |
133 | sub MOVE_SWIM (){ 0x08 } |
141 | sub MOVE_SWIM (){ 0x08 } |
134 | sub MOVE_BOAT (){ 0x10 } |
142 | sub MOVE_BOAT (){ 0x10 } |
|
|
143 | sub MOVE_SHIP (){ 0x20 } |
135 | sub MOVE_KNOWN (){ 0x1f } # all of above |
144 | sub MOVE_KNOWN (){ 0x3f } # all of above |
136 | sub MOVE_ALL (){ 0x10000 } # very special value |
145 | sub MOVE_ALL (){ 0x10000 } # very special value |
137 | |
146 | |
138 | our %MOVE_TYPE = ( |
147 | our %MOVE_TYPE = ( |
139 | walk => MOVE_WALK, |
148 | walk => MOVE_WALK, |
140 | fly_low => MOVE_FLY_LOW, |
149 | fly_low => MOVE_FLY_LOW, |
141 | fly_high => MOVE_FLY_HIGH, |
150 | fly_high => MOVE_FLY_HIGH, |
142 | flying => MOVE_FLYING, |
151 | flying => MOVE_FLYING, |
143 | swim => MOVE_SWIM, |
152 | swim => MOVE_SWIM, |
144 | boat => MOVE_BOAT, |
153 | boat => MOVE_BOAT, |
|
|
154 | ship => MOVE_SHIP, |
145 | all => MOVE_ALL, |
155 | all => MOVE_ALL, |
146 | ); |
156 | ); |
147 | |
157 | |
148 | our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); |
158 | our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship); |
149 | |
159 | |
150 | { |
160 | { |
151 | package Crossfire::MoveType; |
161 | package Deliantra::MoveType; |
152 | |
162 | |
153 | use overload |
163 | use overload |
154 | '=' => sub { bless [@{$_[0]}], ref $_[0] }, |
164 | '=' => sub { bless [@{$_[0]}], ref $_[0] }, |
155 | '""' => \&as_string, |
165 | '""' => \&as_string, |
156 | '>=' => 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 | }, |
157 | '+=' => 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 }, |
158 | '-=' => 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 }, |
159 | '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, |
174 | '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, |
160 | 'x=' => sub { |
175 | 'x=' => sub { # toggle between off, + and - |
161 | my $cur = $_[0] >= $_[1]; |
176 | my $cur = $_[0] >= $_[1]; |
162 | if (!defined $cur) { |
177 | if (!defined $cur) { |
163 | if ($_[0] >= "all") { |
178 | if ($_[0] >= "all") { |
164 | $_[0] -= $_[1]; |
179 | $_[0] -= $_[1]; |
165 | } else { |
180 | } else { |
… | |
… | |
174 | $_[0] |
189 | $_[0] |
175 | }, |
190 | }, |
176 | 'eq' => sub { "$_[0]" eq "$_[1]" }, |
191 | 'eq' => sub { "$_[0]" eq "$_[1]" }, |
177 | 'ne' => sub { "$_[0]" ne "$_[1]" }, |
192 | 'ne' => sub { "$_[0]" ne "$_[1]" }, |
178 | ; |
193 | ; |
179 | } |
|
|
180 | |
194 | |
181 | sub Crossfire::MoveType::new { |
195 | sub TO_JSON { |
|
|
196 | $_[0][0] |
|
|
197 | } |
|
|
198 | } |
|
|
199 | |
|
|
200 | sub Deliantra::MoveType::new { |
182 | my ($class, $string) = @_; |
201 | my ($class, $string) = @_; |
183 | |
202 | |
184 | my $mask; |
203 | my $mask; |
185 | my $value; |
204 | my $value; |
186 | |
205 | |
… | |
… | |
200 | } |
219 | } |
201 | |
220 | |
202 | (bless [$mask, $value], $class)->normalise |
221 | (bless [$mask, $value], $class)->normalise |
203 | } |
222 | } |
204 | |
223 | |
205 | sub Crossfire::MoveType::normalise { |
224 | sub Deliantra::MoveType::normalise { |
206 | my ($self) = @_; |
225 | my ($self) = @_; |
207 | |
226 | |
208 | if ($self->[0] & MOVE_ALL) { |
227 | if ($self->[0] & MOVE_ALL) { |
209 | 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); |
210 | $self->[0] &= $mask; |
229 | $self->[0] &= $mask; |
… | |
… | |
214 | $self->[1] &= $self->[0]; |
233 | $self->[1] &= $self->[0]; |
215 | |
234 | |
216 | $self |
235 | $self |
217 | } |
236 | } |
218 | |
237 | |
219 | sub Crossfire::MoveType::as_string { |
238 | sub Deliantra::MoveType::as_string { |
220 | my ($self) = @_; |
239 | my ($self) = @_; |
221 | |
240 | |
222 | my @res; |
241 | my @res; |
223 | |
242 | |
224 | my ($mask, $value) = @$self; |
243 | my ($mask, $value) = @$self; |
225 | |
244 | |
226 | for (@Crossfire::MOVE_TYPE) { |
245 | for (@Deliantra::MOVE_TYPE) { |
227 | my $bit = $Crossfire::MOVE_TYPE{$_}; |
246 | my $bit = $Deliantra::MOVE_TYPE{$_}; |
228 | if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { |
247 | if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { |
229 | $mask &= ~$bit; |
248 | $mask &= ~$bit; |
230 | push @res, $value & $bit ? $_ : "-$_"; |
249 | push @res, $value & $bit ? $_ : "-$_"; |
231 | } |
250 | } |
232 | } |
251 | } |
… | |
… | |
325 | |
344 | |
326 | # object as in "Object xxx", i.e. archetypes |
345 | # object as in "Object xxx", i.e. archetypes |
327 | sub normalize_object($) { |
346 | sub normalize_object($) { |
328 | my ($ob) = @_; |
347 | my ($ob) = @_; |
329 | |
348 | |
|
|
349 | delete $ob->{editable}; # deprecated |
|
|
350 | |
330 | # convert material bitset to materialname, if possible |
351 | # convert material bitset to materialname, if possible |
331 | if (exists $ob->{material}) { |
352 | if (exists $ob->{material}) { |
332 | if (!$ob->{material}) { |
353 | if (!$ob->{material}) { |
333 | delete $ob->{material}; |
354 | delete $ob->{material}; |
334 | } elsif (exists $ob->{materialname}) { |
355 | } elsif (exists $ob->{materialname}) { |
… | |
… | |
344 | } else { |
365 | } else { |
345 | warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; |
366 | warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; |
346 | } |
367 | } |
347 | } |
368 | } |
348 | |
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 | |
349 | # color_fg is used as default for magicmap if magicmap does not exist |
381 | # color_fg is used as default for magicmap if magicmap does not exist |
350 | $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; |
382 | $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; |
351 | |
383 | |
352 | # nuke outdated or never supported fields |
384 | # nuke outdated or never supported fields |
353 | delete @$ob{qw( |
385 | delete @$ob{qw( |
… | |
… | |
361 | |
393 | |
362 | # convert movement strings to bitsets |
394 | # convert movement strings to bitsets |
363 | for my $attr (keys %FIELD_MOVEMENT) { |
395 | for my $attr (keys %FIELD_MOVEMENT) { |
364 | next unless exists $ob->{$attr}; |
396 | next unless exists $ob->{$attr}; |
365 | |
397 | |
366 | $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; |
398 | $ob->{$attr} = new Deliantra::MoveType $ob->{$attr}; |
367 | } |
399 | } |
368 | |
400 | |
369 | # convert outdated movement flags to new movement sets |
401 | # convert outdated movement flags to new movement sets |
370 | if (defined (my $v = delete $ob->{no_pass})) { |
402 | if (defined (my $v = delete $ob->{no_pass})) { |
371 | $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; |
403 | $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0"; |
372 | } |
404 | } |
373 | if (defined (my $v = delete $ob->{slow_move})) { |
405 | if (defined (my $v = delete $ob->{slow_move})) { |
374 | $ob->{move_slow} += "walk"; |
406 | $ob->{move_slow} += "walk"; |
375 | $ob->{move_slow_penalty} = $v; |
407 | $ob->{move_slow_penalty} = $v; |
376 | } |
408 | } |
377 | if (defined (my $v = delete $ob->{walk_on})) { |
409 | if (defined (my $v = delete $ob->{walk_on})) { |
378 | $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" } |
379 | } |
411 | } |
380 | if (defined (my $v = delete $ob->{walk_off})) { |
412 | if (defined (my $v = delete $ob->{walk_off})) { |
381 | $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" } |
382 | } |
414 | } |
383 | if (defined (my $v = delete $ob->{fly_on})) { |
415 | if (defined (my $v = delete $ob->{fly_on})) { |
384 | $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" } |
385 | } |
417 | } |
386 | if (defined (my $v = delete $ob->{fly_off})) { |
418 | if (defined (my $v = delete $ob->{fly_off})) { |
387 | $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" } |
388 | } |
420 | } |
389 | if (defined (my $v = delete $ob->{flying})) { |
421 | if (defined (my $v = delete $ob->{flying})) { |
390 | $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" } |
391 | } |
423 | } |
392 | |
424 | |
393 | # convert idiotic event_xxx things into objects |
425 | # convert idiotic event_xxx things into objects |
394 | while (my ($event, $subtype) = each %EVENT_TYPE) { |
426 | while (my ($event, $subtype) = each %EVENT_TYPE) { |
395 | if (exists $ob->{"event_${event}_plugin"}) { |
427 | if (exists $ob->{"event_${event}_plugin"}) { |
… | |
… | |
411 | # arch as in "arch xxx", ie.. objects |
443 | # arch as in "arch xxx", ie.. objects |
412 | sub normalize_arch($) { |
444 | sub normalize_arch($) { |
413 | my ($ob) = @_; |
445 | my ($ob) = @_; |
414 | |
446 | |
415 | normalize_object $ob; |
447 | normalize_object $ob; |
|
|
448 | |
|
|
449 | return if $ob->{_atype} eq "object"; |
416 | |
450 | |
417 | my $arch = $ARCH{$ob->{_name}} |
451 | my $arch = $ARCH{$ob->{_name}} |
418 | or (warn "$ob->{_name}: no such archetype", return $ob); |
452 | or (warn "$ob->{_name}: no such archetype", return $ob); |
419 | |
453 | |
420 | if ($arch->{type} == 22) { # map |
454 | if ($arch->{type} == 22) { # map |
… | |
… | |
456 | } |
490 | } |
457 | |
491 | |
458 | sub attr_thaw($) { |
492 | sub attr_thaw($) { |
459 | my ($ob) = @_; |
493 | my ($ob) = @_; |
460 | |
494 | |
461 | $ob->{attach} = from_json $ob->{attach} |
495 | $ob->{attach} = decode_json $ob->{attach} |
462 | if exists $ob->{attach}; |
496 | if exists $ob->{attach}; |
463 | |
497 | |
464 | $ob |
498 | $ob |
465 | } |
499 | } |
466 | |
500 | |
467 | sub attr_freeze($) { |
501 | sub attr_freeze($) { |
468 | my ($ob) = @_; |
502 | my ($ob) = @_; |
469 | |
503 | |
470 | $ob->{attach} = Crossfire::to_json $ob->{attach} |
504 | $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach}) |
471 | if exists $ob->{attach}; |
505 | if exists $ob->{attach}; |
472 | |
506 | |
473 | $ob |
507 | $ob |
474 | } |
508 | } |
475 | |
509 | |
… | |
… | |
495 | |
529 | |
496 | my %arc; |
530 | my %arc; |
497 | my ($more, $prev); |
531 | my ($more, $prev); |
498 | my $comment; |
532 | my $comment; |
499 | |
533 | |
500 | open my $fh, "<:raw:perlio:utf8", $path |
534 | open my $fh, "<:utf8", $path |
501 | or Carp::croak "$path: $!"; |
535 | or Carp::croak "$path: $!"; |
502 | |
536 | |
503 | # binmode $fh; |
537 | # binmode $fh; |
504 | |
538 | |
505 | my $parse_block; $parse_block = sub { |
539 | my $parse_block; $parse_block = sub { |
… | |
… | |
605 | my $str; |
639 | my $str; |
606 | |
640 | |
607 | my $append; $append = sub { |
641 | my $append; $append = sub { |
608 | my %a = %{$_[0]}; |
642 | my %a = %{$_[0]}; |
609 | |
643 | |
610 | Crossfire::attr_freeze \%a; |
644 | Deliantra::attr_freeze \%a; |
611 | Crossfire::normalize_arch \%a; |
645 | Deliantra::normalize_arch \%a; |
612 | |
646 | |
613 | # undo the bit-split we did before |
647 | # undo the bit-split we did before |
614 | 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}) { |
615 | $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) |
649 | $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) |
616 | | (delete $a{attack_movement_bits_4_7}); |
650 | | (delete $a{attack_movement_bits_4_7}); |
… | |
… | |
634 | } |
668 | } |
635 | |
669 | |
636 | my @kv; |
670 | my @kv; |
637 | |
671 | |
638 | for ($a{_name} eq "map" |
672 | for ($a{_name} eq "map" |
639 | ? @Crossfire::FIELD_ORDER_MAP |
673 | ? @Deliantra::FIELD_ORDER_MAP |
640 | : @Crossfire::FIELD_ORDER) { |
674 | : @Deliantra::FIELD_ORDER) { |
641 | push @kv, [$_, delete $a{$_}] |
675 | push @kv, [$_, delete $a{$_}] |
642 | if exists $a{$_}; |
676 | if exists $a{$_}; |
643 | } |
677 | } |
644 | |
678 | |
645 | for (sort keys %a) { |
679 | for (sort keys %a) { |
… | |
… | |
648 | } |
682 | } |
649 | |
683 | |
650 | for (@kv) { |
684 | for (@kv) { |
651 | my ($k, $v) = @$_; |
685 | my ($k, $v) = @$_; |
652 | |
686 | |
653 | if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { |
687 | if (my $end = $Deliantra::FIELD_MULTILINE{$k}) { |
654 | $v =~ s/\n$//; |
688 | $v =~ s/\n$//; |
655 | $str .= "$k\n$v\n$end\n"; |
689 | $str .= "$k\n$v\n$end\n"; |
656 | } else { |
690 | } else { |
657 | $str .= "$k $v\n"; |
691 | $str .= "$k $v\n"; |
658 | } |
692 | } |
… | |
… | |
754 | =cut |
788 | =cut |
755 | |
789 | |
756 | sub arch_attr($) { |
790 | sub arch_attr($) { |
757 | my ($obj) = @_; |
791 | my ($obj) = @_; |
758 | |
792 | |
759 | require Crossfire::Data; |
793 | require Deliantra::Data; |
760 | |
794 | |
761 | my $root; |
795 | my $root; |
762 | my $attr = { }; |
796 | my $attr = { }; |
763 | |
797 | |
764 | my $arch = $ARCH{ $obj->{_name} }; |
798 | my $arch = $ARCH{ $obj->{_name} }; |
765 | my $type = $obj->{type} || $arch->{type}; |
799 | my $type = $obj->{type} || $arch->{type}; |
766 | |
800 | |
767 | if ($type > 0) { |
801 | if ($type > 0) { |
768 | $root = $Crossfire::Data::ATTR{$type}; |
802 | $root = $Deliantra::Data::ATTR{$type}; |
769 | } else { |
803 | } else { |
770 | my %a = (%$arch, %$obj); |
804 | my %a = (%$arch, %$obj); |
771 | |
805 | |
772 | if ($a{is_floor} && !$a{alive}) { |
806 | if ($a{is_floor} && !$a{alive}) { |
773 | $root = $Crossfire::Data::TYPE{Floor}; |
807 | $root = $Deliantra::Data::TYPE{Floor}; |
774 | } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { |
808 | } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { |
775 | $root = $Crossfire::Data::TYPE{"Monster & NPC"}; |
809 | $root = $Deliantra::Data::TYPE{"Monster & NPC"}; |
776 | } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { |
810 | } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { |
777 | $root = $Crossfire::Data::TYPE{Wall}; |
811 | $root = $Deliantra::Data::TYPE{Wall}; |
778 | } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { |
812 | } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { |
779 | $root = $Crossfire::Data::TYPE{"Weak Wall"}; |
813 | $root = $Deliantra::Data::TYPE{"Weak Wall"}; |
780 | } else { |
814 | } else { |
781 | $root = $Crossfire::Data::TYPE{Misc}; |
815 | $root = $Deliantra::Data::TYPE{Misc}; |
782 | } |
816 | } |
783 | } |
817 | } |
784 | |
818 | |
|
|
819 | my (%ignore); |
785 | 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; |
786 | |
836 | } |
|
|
837 | (@import) = @new_import; |
|
|
838 | |
|
|
839 | # then add defaults to the back of the list, so they are added |
|
|
840 | # as last resort. |
787 | unshift @import, \%Crossfire::Data::DEFAULT_ATTR |
841 | push @import, \%Deliantra::Data::DEFAULT_ATTR |
788 | unless $type == 116; |
842 | unless $type == 116; |
789 | |
843 | |
790 | my (%ignore); |
|
|
791 | my (@section_order, %section, @attr_order); |
844 | my (@section_order, %section, @attr_order); |
792 | |
845 | |
|
|
846 | # @import = root, imported, default |
793 | while (my $type = shift @import) { |
847 | while (my $type = pop @import) { |
794 | push @import, @{$type->{import} || []}; |
|
|
795 | |
|
|
796 | $attr->{$_} ||= $type->{$_} |
848 | $attr->{$_} ||= $type->{$_} |
797 | for qw(name desc use); |
849 | for qw(name desc use); |
798 | |
|
|
799 | for (@{$type->{ignore} || []}) { |
|
|
800 | $ignore{$_}++ for ref $_ ? @$_ : $_; |
|
|
801 | } |
|
|
802 | |
850 | |
803 | for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { |
851 | for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { |
804 | my ($name, $attr) = @$_; |
852 | my ($name, $attr) = @$_; |
805 | push @section_order, $name; |
853 | push @section_order, $name; |
806 | for (@$attr) { |
854 | for (@$attr) { |
807 | my ($k, $v) = @$_; |
855 | my ($k, $v) = @$_; |
808 | push @attr_order, $k; |
856 | push @attr_order, $k; |
809 | $section{$name}{$k} ||= $v; |
857 | $section{$name}{$k} = $v; # overwrite, so that the root decides |
810 | } |
|
|
811 | } |
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. |
812 | } |
875 | } |
813 | |
876 | |
814 | $attr->{section} = [ |
877 | $attr->{section} = [ |
815 | map !exists $section{$_} ? () : do { |
878 | map !exists $section{$_} ? () : do { |
816 | my $attr = delete $section{$_}; |
879 | my $attr = delete $section{$_}; |
… | |
… | |
820 | map exists $attr->{$_} && !$ignore{$_} |
883 | map exists $attr->{$_} && !$ignore{$_} |
821 | ? [$_ => delete $attr->{$_}] : (), |
884 | ? [$_ => delete $attr->{$_}] : (), |
822 | @attr_order |
885 | @attr_order |
823 | ] |
886 | ] |
824 | }, |
887 | }, |
825 | |
|
|
826 | exists $section{$_} ? [$_ => delete $section{$_}] : (), |
888 | exists $section{$_} ? [$_ => delete $section{$_}] : (), |
827 | @section_order |
889 | @section_order |
828 | ]; |
890 | ]; |
829 | |
891 | |
830 | $attr |
892 | $attr |
831 | } |
893 | } |
… | |
… | |
888 | } |
950 | } |
889 | |
951 | |
890 | sub construct_tilecache_pb { |
952 | sub construct_tilecache_pb { |
891 | my ($idx, $cache) = @_; |
953 | my ($idx, $cache) = @_; |
892 | |
954 | |
893 | my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; |
955 | my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE; |
894 | |
956 | |
895 | while (my ($name, $tile) = each %$cache) { |
957 | while (my ($name, $tile) = each %$cache) { |
896 | my $tpb = delete $tile->{pb}; |
958 | my $tpb = delete $tile->{pb}; |
897 | my $ofs = $tile->{idx}; |
959 | my $ofs = $tile->{idx}; |
898 | |
960 | |
899 | for my $x (0 .. $tile->{w} - 1) { |
961 | for my $x (0 .. $tile->{w} - 1) { |
900 | for my $y (0 .. $tile->{h} - 1) { |
962 | for my $y (0 .. $tile->{h} - 1) { |
901 | my $idx = $ofs + $x + $y * $tile->{w}; |
963 | my $idx = $ofs + $x + $y * $tile->{w}; |
902 | $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, |
964 | $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, |
903 | $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); |
965 | $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE); |
904 | } |
966 | } |
905 | } |
967 | } |
906 | } |
968 | } |
907 | |
969 | |
908 | $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); |
970 | $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); |
… | |
… | |
924 | =cut |
986 | =cut |
925 | |
987 | |
926 | sub load_tilecache() { |
988 | sub load_tilecache() { |
927 | require Gtk2; |
989 | require Gtk2; |
928 | |
990 | |
929 | if (-e "$LIB/crossfire.0") { # Crossfire1 version |
|
|
930 | cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache, |
|
|
931 | sub { |
|
|
932 | my $tile = read_pak "$LIB/crossfire.0"; |
|
|
933 | |
|
|
934 | my %cache; |
|
|
935 | |
|
|
936 | my $idx = 0; |
|
|
937 | |
|
|
938 | for my $name (sort keys %$tile) { |
|
|
939 | my $pb = new Gtk2::Gdk::PixbufLoader; |
|
|
940 | $pb->write ($tile->{$name}); |
|
|
941 | $pb->close; |
|
|
942 | my $pb = $pb->get_pixbuf; |
|
|
943 | |
|
|
944 | my $tile = $cache{$name} = { |
|
|
945 | pb => $pb, |
|
|
946 | idx => $idx, |
|
|
947 | w => int $pb->get_width / TILESIZE, |
|
|
948 | h => int $pb->get_height / TILESIZE, |
|
|
949 | }; |
|
|
950 | |
|
|
951 | $idx += $tile->{w} * $tile->{h}; |
|
|
952 | } |
|
|
953 | |
|
|
954 | construct_tilecache_pb $idx, \%cache; |
|
|
955 | |
|
|
956 | \%cache |
|
|
957 | }; |
|
|
958 | |
|
|
959 | } else { # Crossfire+ version |
|
|
960 | cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, |
991 | cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, |
961 | sub { |
992 | sub { |
962 | my %cache; |
993 | my %cache; |
963 | my $facedata = Storable::retrieve "$LIB/facedata"; |
994 | my $facedata = Storable::retrieve "$LIB/facedata"; |
964 | |
995 | |
965 | $facedata->{version} == 2 |
996 | $facedata->{version} == 2 |
966 | or die "$LIB/facedata: version mismatch, cannot proceed."; |
997 | or die "$LIB/facedata: version mismatch, cannot proceed."; |
967 | |
998 | |
968 | my $faces = $facedata->{faceinfo}; |
999 | my $faces = $facedata->{faceinfo}; |
969 | my $idx = 0; |
1000 | my $idx = 0; |
970 | |
1001 | |
971 | for (sort keys %$faces) { |
1002 | for (sort keys %$faces) { |
972 | my ($face, $info) = ($_, $faces->{$_}); |
1003 | my ($face, $info) = ($_, $faces->{$_}); |
973 | |
1004 | |
974 | my $pb = new Gtk2::Gdk::PixbufLoader; |
1005 | my $pb = new Gtk2::Gdk::PixbufLoader; |
975 | $pb->write ($info->{data32}); |
1006 | $pb->write ($info->{data32}); |
976 | $pb->close; |
1007 | $pb->close; |
977 | my $pb = $pb->get_pixbuf; |
1008 | my $pb = $pb->get_pixbuf; |
978 | |
1009 | |
979 | my $tile = $cache{$face} = { |
1010 | my $tile = $cache{$face} = { |
980 | pb => $pb, |
1011 | pb => $pb, |
981 | idx => $idx, |
1012 | idx => $idx, |
982 | w => int $pb->get_width / TILESIZE, |
1013 | w => int $pb->get_width / TILESIZE, |
983 | h => int $pb->get_height / TILESIZE, |
1014 | h => int $pb->get_height / TILESIZE, |
984 | }; |
1015 | }; |
985 | |
1016 | |
986 | $idx += $tile->{w} * $tile->{h}; |
1017 | $idx += $tile->{w} * $tile->{h}; |
987 | } |
1018 | } |
988 | |
1019 | |
989 | construct_tilecache_pb $idx, \%cache; |
1020 | construct_tilecache_pb $idx, \%cache; |
990 | |
1021 | |
991 | \%cache |
1022 | \%cache |
992 | }; |
1023 | }; |
993 | } |
|
|
994 | } |
1024 | } |
|
|
1025 | |
|
|
1026 | =back |
995 | |
1027 | |
996 | =head1 AUTHOR |
1028 | =head1 AUTHOR |
997 | |
1029 | |
998 | Marc Lehmann <schmorp@schmorp.de> |
1030 | Marc Lehmann <schmorp@schmorp.de> |
999 | http://home.schmorp.de/ |
1031 | http://home.schmorp.de/ |
… | |
… | |
1002 | http://www.ta-sa.org/ |
1034 | http://www.ta-sa.org/ |
1003 | |
1035 | |
1004 | =cut |
1036 | =cut |
1005 | |
1037 | |
1006 | 1 |
1038 | 1 |
|
|
1039 | |