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.85 by root, Wed Feb 7 00:44:18 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",
… …
58 qw(move_type move_block move_allow move_on move_off move_slow); 55 qw(move_type move_block move_allow move_on move_off move_slow);
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(
60 file_format_version
63 name attach swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty
62 region music
64 shopitems shopgreed shopmin shopmax shoprace 63 shopitems shopgreed shopmin shopmax shoprace
65 darkness width height enter_x enter_y msg maplore 64 darkness width height enter_x enter_y msg maplore
66 unique template 65 unique template
67 outdoor temp pressure humid windspeed winddir sky nosmooth 66 outdoor temp pressure humid windspeed winddir sky nosmooth
68 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
69)); 68));
70 69
71our @FIELD_ORDER = (qw( 70our @FIELD_ORDER = (qw(
71 inherit
72
72 elevation 73 elevation
73 74
74 name name_pl custom_name attach title race 75 name name_pl custom_name attach title race
75 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch
76 #todo-events 77 sound sound_destroy face animation is_animated
77 animation is_animated 78 magicmap smoothlevel smoothface
78 str dex con wis pow cha int 79 str dex con wis pow cha int
79 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
80 exp perm_exp expmul 81 exp perm_exp expmul
81 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
82 nrof level direction type subtype attacktype 83 nrof level direction type subtype attacktype
… …
90 resist_life_stealing resist_disease 91 resist_life_stealing resist_disease
91 92
92 path_attuned path_repelled path_denied material materialname 93 path_attuned path_repelled path_denied material materialname
93 value carrying weight invisible state magic 94 value carrying weight invisible state magic
94 last_heal last_sp last_grace last_eat 95 last_heal last_sp last_grace last_eat
95 connected glow_radius randomitems npx_status npc_program 96 connected glow_radius randomitems tresure_env npx_status npc_program
96 run_away pick_up container will_apply smoothlevel 97 run_away pick_up container will_apply smoothlevel
97 current_weapon_script weapontype tooltype elevation client_type 98 current_weapon_script weapontype tooltype elevation client_type
98 item_power duration range 99 item_power duration range
99 range_modifier duration_modifier dam_modifier gen_sp_armour 100 range_modifier duration_modifier dam_modifier gen_sp_armour
100 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
… …
111 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
112 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
113 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
114 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
115 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
116 118
117 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
118 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
119)); 121));
120 122
… …
137sub MOVE_FLY_LOW (){ 0x02 } 139sub MOVE_FLY_LOW (){ 0x02 }
138sub MOVE_FLY_HIGH (){ 0x04 } 140sub MOVE_FLY_HIGH (){ 0x04 }
139sub MOVE_FLYING (){ 0x06 } 141sub MOVE_FLYING (){ 0x06 }
140sub MOVE_SWIM (){ 0x08 } 142sub MOVE_SWIM (){ 0x08 }
141sub MOVE_BOAT (){ 0x10 } 143sub MOVE_BOAT (){ 0x10 }
144sub MOVE_SHIP (){ 0x20 }
142sub MOVE_KNOWN (){ 0x1f } # all of above 145sub MOVE_KNOWN (){ 0x3f } # all of above
143sub MOVE_ALLBIT (){ 0x10000 }
144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 146sub MOVE_ALL (){ 0x10000 } # very special value
147
148our %MOVE_TYPE = (
149 walk => MOVE_WALK,
150 fly_low => MOVE_FLY_LOW,
151 fly_high => MOVE_FLY_HIGH,
152 flying => MOVE_FLYING,
153 swim => MOVE_SWIM,
154 boat => MOVE_BOAT,
155 ship => MOVE_SHIP,
156 all => MOVE_ALL,
157);
158
159our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
160
161{
162 package Deliantra::MoveType;
163
164 use overload
165 '=' => sub { bless [@{$_[0]}], ref $_[0] },
166 '""' => \&as_string,
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 },
173 '+=' => 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 },
175 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
176 'x=' => sub { # toggle between off, + and -
177 my $cur = $_[0] >= $_[1];
178 if (!defined $cur) {
179 if ($_[0] >= "all") {
180 $_[0] -= $_[1];
181 } else {
182 $_[0] += $_[1];
183 }
184 } elsif ($cur) {
185 $_[0] -= $_[1];
186 } else {
187 $_[0] /= $_[1];
188 }
189
190 $_[0]
191 },
192 'eq' => sub { "$_[0]" eq "$_[1]" },
193 'ne' => sub { "$_[0]" ne "$_[1]" },
194 ;
195
196 sub TO_JSON {
197 $_[0][0]
198 }
199}
200
201sub Deliantra::MoveType::new {
202 my ($class, $string) = @_;
203
204 my $mask;
205 my $value;
206
207 if ($string =~ /^\s*\d+\s*$/) {
208 $mask = MOVE_ALL;
209 $value = $string+0;
210 } else {
211 for (split /\s+/, lc $string) {
212 if (s/^-//) {
213 $mask |= $MOVE_TYPE{$_};
214 $value &= ~$MOVE_TYPE{$_};
215 } else {
216 $mask |= $MOVE_TYPE{$_};
217 $value |= $MOVE_TYPE{$_};
218 }
219 }
220 }
221
222 (bless [$mask, $value], $class)->normalise
223}
224
225sub Deliantra::MoveType::normalise {
226 my ($self) = @_;
227
228 if ($self->[0] & MOVE_ALL) {
229 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
230 $self->[0] &= $mask;
231 $self->[1] &= $mask;
232 }
233
234 $self->[1] &= $self->[0];
235
236 $self
237}
238
239sub Deliantra::MoveType::as_string {
240 my ($self) = @_;
241
242 my @res;
243
244 my ($mask, $value) = @$self;
245
246 for (@Deliantra::MOVE_TYPE) {
247 my $bit = $Deliantra::MOVE_TYPE{$_};
248 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
249 $mask &= ~$bit;
250 push @res, $value & $bit ? $_ : "-$_";
251 }
252 }
253
254 join " ", @res
255}
145 256
146sub load_ref($) { 257sub load_ref($) {
147 my ($path) = @_; 258 my ($path) = @_;
148 259
149 open my $fh, "<:raw:perlio", $path 260 open my $fh, "<:raw:perlio", $path
… …
234 345
235# object as in "Object xxx", i.e. archetypes 346# object as in "Object xxx", i.e. archetypes
236sub normalize_object($) { 347sub normalize_object($) {
237 my ($ob) = @_; 348 my ($ob) = @_;
238 349
350 delete $ob->{editable}; # deprecated
351
239 # convert material bitset to materialname, if possible 352 # convert material bitset to materialname, if possible
240 if (exists $ob->{material}) { 353 if (exists $ob->{material}) {
241 if (!$ob->{material}) { 354 if (!$ob->{material}) {
242 delete $ob->{material}; 355 delete $ob->{material};
243 } elsif (exists $ob->{materialname}) { 356 } elsif (exists $ob->{materialname}) {
… …
253 } else { 366 } else {
254 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 367 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
255 } 368 }
256 } 369 }
257 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
258 # nuke outdated or never supported fields 385 # nuke outdated or never supported fields
259 delete @$ob{qw( 386 delete @$ob{qw(
260 can_knockback can_parry can_impale can_cut can_dam_armour 387 can_knockback can_parry can_impale can_cut can_dam_armour
261 can_apply pass_thru can_pass_thru 388 can_apply pass_thru can_pass_thru color_bg color_fg
262 )}; 389 )};
263 390
264 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 391 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
265 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 392 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
266 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 393 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
267 394
268 # convert movement strings to bitsets 395 # convert movement strings to bitsets
269 for my $attr (keys %FIELD_MOVEMENT) { 396 for my $attr (keys %FIELD_MOVEMENT) {
270 next unless exists $ob->{$attr}; 397 next unless exists $ob->{$attr};
271 398
272 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 399 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
273
274 next if $ob->{$attr} =~ /^\d+$/;
275
276 my $flags = 0;
277
278 # assume list
279 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
280 $flags |= MOVE_WALK if $flag eq "walk";
281 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
282 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
283 $flags |= MOVE_FLYING if $flag eq "flying";
284 $flags |= MOVE_SWIM if $flag eq "swim";
285 $flags |= MOVE_BOAT if $flag eq "boat";
286 $flags |= MOVE_ALL if $flag eq "all";
287
288 $flags &= ~MOVE_WALK if $flag eq "-walk";
289 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
290 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
291 $flags &= ~MOVE_FLYING if $flag eq "-flying";
292 $flags &= ~MOVE_SWIM if $flag eq "-swim";
293 $flags &= ~MOVE_BOAT if $flag eq "-boat";
294 $flags &= ~MOVE_ALL if $flag eq "-all";
295 }
296
297 $ob->{$attr} = $flags;
298 } 400 }
299 401
300 # convert outdated movement flags to new movement sets 402 # convert outdated movement flags to new movement sets
301 if (defined (my $v = delete $ob->{no_pass})) { 403 if (defined (my $v = delete $ob->{no_pass})) {
302 $ob->{move_block} = $v ? MOVE_ALL : 0; 404 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
303 } 405 }
304 if (defined (my $v = delete $ob->{slow_move})) { 406 if (defined (my $v = delete $ob->{slow_move})) {
305 $ob->{move_slow} |= MOVE_WALK; 407 $ob->{move_slow} += "walk";
306 $ob->{move_slow_penalty} = $v; 408 $ob->{move_slow_penalty} = $v;
307 } 409 }
308 if (defined (my $v = delete $ob->{walk_on})) { 410 if (defined (my $v = delete $ob->{walk_on})) {
309 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 411 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
310 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
311 : $ob->{move_on} & ~MOVE_WALK;
312 } 412 }
313 if (defined (my $v = delete $ob->{walk_off})) { 413 if (defined (my $v = delete $ob->{walk_off})) {
314 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 414 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
315 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
316 : $ob->{move_off} & ~MOVE_WALK;
317 } 415 }
318 if (defined (my $v = delete $ob->{fly_on})) { 416 if (defined (my $v = delete $ob->{fly_on})) {
319 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 417 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
320 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
321 : $ob->{move_on} & ~MOVE_FLY_LOW;
322 } 418 }
323 if (defined (my $v = delete $ob->{fly_off})) { 419 if (defined (my $v = delete $ob->{fly_off})) {
324 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 420 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
325 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
326 : $ob->{move_off} & ~MOVE_FLY_LOW;
327 } 421 }
328 if (defined (my $v = delete $ob->{flying})) { 422 if (defined (my $v = delete $ob->{flying})) {
329 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 423 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
330 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
331 : $ob->{move_type} & ~MOVE_FLY_LOW;
332 } 424 }
333 425
334 # convert idiotic event_xxx things into objects 426 # convert idiotic event_xxx things into objects
335 while (my ($event, $subtype) = each %EVENT_TYPE) { 427 while (my ($event, $subtype) = each %EVENT_TYPE) {
336 if (exists $ob->{"event_${event}_plugin"}) { 428 if (exists $ob->{"event_${event}_plugin"}) {
… …
352# arch as in "arch xxx", ie.. objects 444# arch as in "arch xxx", ie.. objects
353sub normalize_arch($) { 445sub normalize_arch($) {
354 my ($ob) = @_; 446 my ($ob) = @_;
355 447
356 normalize_object $ob; 448 normalize_object $ob;
449
450 return if $ob->{_atype} eq "object";
357 451
358 my $arch = $ARCH{$ob->{_name}} 452 my $arch = $ARCH{$ob->{_name}}
359 or (warn "$ob->{_name}: no such archetype", return $ob); 453 or (warn "$ob->{_name}: no such archetype", return $ob);
360 454
361 if ($arch->{type} == 22) { # map 455 if ($arch->{type} == 22) { # map
… …
397} 491}
398 492
399sub attr_thaw($) { 493sub attr_thaw($) {
400 my ($ob) = @_; 494 my ($ob) = @_;
401 495
402 $ob->{attach} = from_json $ob->{attach} 496 $ob->{attach} = decode_json $ob->{attach}
403 if exists $ob->{attach}; 497 if exists $ob->{attach};
404 498
405 $ob 499 $ob
406} 500}
407 501
408sub attr_freeze($) { 502sub attr_freeze($) {
409 my ($ob) = @_; 503 my ($ob) = @_;
410 504
411 $ob->{attach} = Crossfire::to_json $ob->{attach} 505 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
412 if exists $ob->{attach}; 506 if exists $ob->{attach};
413 507
414 $ob 508 $ob
415} 509}
416 510
… …
436 530
437 my %arc; 531 my %arc;
438 my ($more, $prev); 532 my ($more, $prev);
439 my $comment; 533 my $comment;
440 534
441 open my $fh, "<:raw:perlio:utf8", $path 535 open my $fh, "<:utf8", $path
442 or Carp::croak "$path: $!"; 536 or Carp::croak "$path: $!";
443 537
444# binmode $fh; 538# binmode $fh;
445 539
446 my $parse_block; $parse_block = sub { 540 my $parse_block; $parse_block = sub {
… …
546 my $str; 640 my $str;
547 641
548 my $append; $append = sub { 642 my $append; $append = sub {
549 my %a = %{$_[0]}; 643 my %a = %{$_[0]};
550 644
551 Crossfire::attr_freeze \%a; 645 Deliantra::attr_freeze \%a;
552 Crossfire::normalize_arch \%a; 646 Deliantra::normalize_arch \%a;
553 647
554 # undo the bit-split we did before 648 # undo the bit-split we did before
555 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}) {
556 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 650 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
557 | (delete $a{attack_movement_bits_4_7}); 651 | (delete $a{attack_movement_bits_4_7});
… …
567 661
568 my $inv = delete $a{inventory}; 662 my $inv = delete $a{inventory};
569 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 663 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
570 my $anim = delete $a{anim}; 664 my $anim = delete $a{anim};
571 665
666 if ($a{_atype} eq 'object') {
667 $str .= join "\n", "anim", @$anim, "mina\n"
668 if $anim;
669 }
670
572 my @kv; 671 my @kv;
573 672
574 for ($a{_name} eq "map" 673 for ($a{_name} eq "map"
575 ? @Crossfire::FIELD_ORDER_MAP 674 ? @Deliantra::FIELD_ORDER_MAP
576 : @Crossfire::FIELD_ORDER) { 675 : @Deliantra::FIELD_ORDER) {
577 push @kv, [$_, delete $a{$_}] 676 push @kv, [$_, delete $a{$_}]
578 if exists $a{$_}; 677 if exists $a{$_};
579 } 678 }
580 679
581 for (sort keys %a) { 680 for (sort keys %a) {
… …
584 } 683 }
585 684
586 for (@kv) { 685 for (@kv) {
587 my ($k, $v) = @$_; 686 my ($k, $v) = @$_;
588 687
589 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 688 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
590 $v =~ s/\n$//; 689 $v =~ s/\n$//;
591 $str .= "$k\n$v\n$end\n"; 690 $str .= "$k\n$v\n$end\n";
592 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
593 if ($v & ~Crossfire::MOVE_ALL or !$v) {
594 $str .= "$k $v\n";
595
596 } elsif ($v & Crossfire::MOVE_ALLBIT) {
597 $str .= "$k all";
598
599 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
600 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
601 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
602 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
603 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
604
605 $str .= "\n";
606
607 } else {
608 $str .= $k;
609
610 $str .= " walk" if $v & Crossfire::MOVE_WALK;
611 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
612 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
613 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
614 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
615
616 $str .= "\n";
617 }
618 } else { 691 } else {
619 $str .= "$k $v\n"; 692 $str .= "$k $v\n";
620 } 693 }
621 } 694 }
622 695
623 if ($inv) { 696 if ($inv) {
624 $append->($_) for @$inv; 697 $append->($_) for @$inv;
625 }
626
627 if ($a{_atype} eq 'object') {
628 $str .= join "\n", "anim", @$anim, "mina\n"
629 if $anim;
630 } 698 }
631 699
632 $str .= "end\n"; 700 $str .= "end\n";
633 701
634 if ($a{_atype} eq 'object') { 702 if ($a{_atype} eq 'object') {
… …
721=cut 789=cut
722 790
723sub arch_attr($) { 791sub arch_attr($) {
724 my ($obj) = @_; 792 my ($obj) = @_;
725 793
726 require Crossfire::Data; 794 require Deliantra::Data;
727 795
728 my $root; 796 my $root;
729 my $attr = { }; 797 my $attr = { };
730 798
731 my $arch = $ARCH{ $obj->{_name} }; 799 my $arch = $ARCH{ $obj->{_name} };
732 my $type = $obj->{type} || $arch->{type}; 800 my $type = $obj->{type} || $arch->{type};
733 801
734 if ($type > 0) { 802 if ($type > 0) {
735 $root = $Crossfire::Data::ATTR{$type}; 803 $root = $Deliantra::Data::ATTR{$type};
736 } else { 804 } else {
737 my %a = (%$arch, %$obj); 805 my %a = (%$arch, %$obj);
738 806
739 if ($a{is_floor} && !$a{alive}) { 807 if ($a{is_floor} && !$a{alive}) {
740 $root = $Crossfire::Data::TYPE{Floor}; 808 $root = $Deliantra::Data::TYPE{Floor};
741 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 809 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
742 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 810 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
743 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 811 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
744 $root = $Crossfire::Data::TYPE{Wall}; 812 $root = $Deliantra::Data::TYPE{Wall};
745 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 813 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
746 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 814 $root = $Deliantra::Data::TYPE{"Weak Wall"};
747 } else { 815 } else {
748 $root = $Crossfire::Data::TYPE{Misc}; 816 $root = $Deliantra::Data::TYPE{Misc};
749 } 817 }
750 } 818 }
751 819
820 my (%ignore);
752 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;
753 837 }
838 (@import) = @new_import;
839
840 # then add defaults to the back of the list, so they are added
841 # as last resort.
754 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 842 push @import, \%Deliantra::Data::DEFAULT_ATTR
755 unless $type == 116; 843 unless $type == 116;
756 844
757 my (%ignore);
758 my (@section_order, %section, @attr_order); 845 my (@section_order, %section, @attr_order);
759 846
847 # @import = root, imported, default
760 while (my $type = shift @import) { 848 while (my $type = pop @import) {
761 push @import, @{$type->{import} || []};
762
763 $attr->{$_} ||= $type->{$_} 849 $attr->{$_} ||= $type->{$_}
764 for qw(name desc use); 850 for qw(name desc use);
765
766 for (@{$type->{ignore} || []}) {
767 $ignore{$_}++ for ref $_ ? @$_ : $_;
768 }
769 851
770 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 852 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
771 my ($name, $attr) = @$_; 853 my ($name, $attr) = @$_;
772 push @section_order, $name; 854 push @section_order, $name;
773 for (@$attr) { 855 for (@$attr) {
774 my ($k, $v) = @$_; 856 my ($k, $v) = @$_;
775 push @attr_order, $k; 857 push @attr_order, $k;
776 $section{$name}{$k} ||= $v; 858 $section{$name}{$k} = $v; # overwrite, so that the root decides
777 }
778 } 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.
779 } 876 }
780 877
781 $attr->{section} = [ 878 $attr->{section} = [
782 map !exists $section{$_} ? () : do { 879 map !exists $section{$_} ? () : do {
783 my $attr = delete $section{$_}; 880 my $attr = delete $section{$_};
… …
787 map exists $attr->{$_} && !$ignore{$_} 884 map exists $attr->{$_} && !$ignore{$_}
788 ? [$_ => delete $attr->{$_}] : (), 885 ? [$_ => delete $attr->{$_}] : (),
789 @attr_order 886 @attr_order
790 ] 887 ]
791 }, 888 },
792
793 exists $section{$_} ? [$_ => delete $section{$_}] : (), 889 exists $section{$_} ? [$_ => delete $section{$_}] : (),
794 @section_order 890 @section_order
795 ]; 891 ];
796 892
797 $attr 893 $attr
798}
799
800sub arch_edit_sections {
801# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
802# edit_type = 0;
803# else if (edit_type != 0) {
804# // all flags from 'check_type' must be unset in this arch because they get recalculated now
805# edit_type &= ~check_type;
806# }
807#
808# }
809# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
810# getAttributeValue("alive", defarch) == 1 &&
811# (getAttributeValue("monster", defarch) == 1 ||
812# getAttributeValue("generator", defarch) == 1)) {
813# // Monster: monsters/npcs/generators
814# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
815# }
816# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
817# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
818# // Walls
819# edit_type |= IGUIConstants.TILE_EDIT_WALL;
820# }
821# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
822# getAttributeValue("connected", defarch) != 0) {
823# // Connected Objects
824# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
825# }
826# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
827# arch_type == 66 || arch_type == 41 || arch_type == 95) {
828# // Exit: teleporter/exit/trapdoors
829# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
830# }
831# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
832# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
833# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
834# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
835# arch_type == 124 || arch_type == 130)) {
836# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
837# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
838# }
839# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
840# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
841# arch_type == 91 || arch_type == 21 || arch_type == 24) {
842# // Door: door/special door/gates + keys
843# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
844# }
845# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
846# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
847# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
848# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
849# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
850# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
851# arch_type == 122 || arch_type == 3)) {
852# // Equipment: weapons/armour/wands/rods
853# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
854# }
855#
856# return(edit_type);
857#
858#
859} 894}
860 895
861sub cache_file($$&&) { 896sub cache_file($$&&) {
862 my ($src, $cache, $load, $create) = @_; 897 my ($src, $cache, $load, $create) = @_;
863 898
… …
913 }, sub { 948 }, sub {
914 read_arch "$LIB/archetypes" 949 read_arch "$LIB/archetypes"
915 }; 950 };
916} 951}
917 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
918=item load_tilecache 983=item load_tilecache
919 984
920(Re-)Load %TILE and %FACE. 985(Re-)Load %TILE and %FACE.
921 986
922=cut 987=cut
923 988
924sub load_tilecache() { 989sub load_tilecache() {
925 require Gtk2; 990 require Gtk2;
926 991
927 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 992 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
928 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
929 or die "$VARDIR/tilecache.png: $!";
930 *FACE = $_[0];
931 }, sub { 993 sub {
932 my $tile = read_pak "$LIB/crossfire.0";
933
934 my %cache; 994 my %cache;
995 my $facedata = Storable::retrieve "$LIB/facedata";
935 996
997 $facedata->{version} == 2
998 or die "$LIB/facedata: version mismatch, cannot proceed.";
999
1000 my $faces = $facedata->{faceinfo};
936 my $idx = 0; 1001 my $idx = 0;
937 1002
938 for my $name (sort keys %$tile) { 1003 for (sort keys %$faces) {
1004 my ($face, $info) = ($_, $faces->{$_});
1005
939 my $pb = new Gtk2::Gdk::PixbufLoader; 1006 my $pb = new Gtk2::Gdk::PixbufLoader;
940 $pb->write ($tile->{$name}); 1007 $pb->write ($info->{data32});
941 $pb->close; 1008 $pb->close;
942 my $pb = $pb->get_pixbuf; 1009 my $pb = $pb->get_pixbuf;
943 1010
944 my $tile = $cache{$name} = { 1011 my $tile = $cache{$face} = {
945 pb => $pb, 1012 pb => $pb,
946 idx => $idx, 1013 idx => $idx,
947 w => int $pb->get_width / TILESIZE, 1014 w => int $pb->get_width / TILESIZE,
948 h => int $pb->get_height / TILESIZE, 1015 h => int $pb->get_height / TILESIZE,
949 }; 1016 };
950
951 1017
952 $idx += $tile->{w} * $tile->{h}; 1018 $idx += $tile->{w} * $tile->{h};
1019 }
1020
1021 construct_tilecache_pb $idx, \%cache;
1022
1023 \%cache
953 } 1024 };
954
955 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
956
957 while (my ($name, $tile) = each %cache) {
958 my $tpb = delete $tile->{pb};
959 my $ofs = $tile->{idx};
960
961 for my $x (0 .. $tile->{w} - 1) {
962 for my $y (0 .. $tile->{h} - 1) {
963 my $idx = $ofs + $x + $y * $tile->{w};
964 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
965 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
966 }
967 }
968 }
969
970 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
971
972 \%cache
973 };
974} 1025}
1026
1027=back
975 1028
976=head1 AUTHOR 1029=head1 AUTHOR
977 1030
978 Marc Lehmann <schmorp@schmorp.de> 1031 Marc Lehmann <schmorp@schmorp.de>
979 http://home.schmorp.de/ 1032 http://home.schmorp.de/
… …
982 http://www.ta-sa.org/ 1035 http://www.ta-sa.org/
983 1036
984=cut 1037=cut
985 1038
9861 10391
1040

Diff Legend

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