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.68 by elmex, Sun Jul 30 17:29:29 2006 UTC vs.
Revision 1.97 by root, Sun Mar 11 00:18:45 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.8'; 9our $VERSION = '0.97';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
19 19
20our @EXPORT = qw( 20our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents
22); 22);
23 23
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working
25
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
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 36our $LIB = $ENV{CROSSFIRE_LIBDIR};
25 37
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
40 : File::Spec->tmpdir . "/crossfire";
27 41
28mkdir $VARDIR, 0777; 42mkdir $VARDIR, 0777;
29 43
30sub TILESIZE (){ 32 } 44sub TILESIZE (){ 32 }
31 45
… …
44 qw(move_type move_block move_allow move_on move_off move_slow); 58 qw(move_type move_block move_allow move_on move_off move_slow);
45 59
46# same as in server save routine, to (hopefully) be compatible 60# same as in server save routine, to (hopefully) be compatible
47# to the other editors. 61# to the other editors.
48our @FIELD_ORDER_MAP = (qw( 62our @FIELD_ORDER_MAP = (qw(
63 file_format_version
49 name swap_time reset_timeout fixed_resettime difficulty region 64 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 65 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 66 darkness width height enter_x enter_y msg maplore
52 unique template 67 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 68 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4 69 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55)); 70));
56 71
57our @FIELD_ORDER = (qw( 72our @FIELD_ORDER = (qw(
58 elevation 73 elevation
59 74
60 name name_pl custom_name title race 75 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 76 slaying skill msg lore other_arch face
62 #todo-events 77 #todo-events
63 animation is_animated 78 animation is_animated
64 str dex con wis pow cha int 79 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
… …
124sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
125sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
126sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
127sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
128sub MOVE_KNOWN (){ 0x1f } # all of above 143sub MOVE_KNOWN (){ 0x1f } # all of above
129sub MOVE_ALLBIT (){ 0x10000 }
130sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 144sub MOVE_ALL (){ 0x10000 } # very special value
145
146our %MOVE_TYPE = (
147 walk => MOVE_WALK,
148 fly_low => MOVE_FLY_LOW,
149 fly_high => MOVE_FLY_HIGH,
150 flying => MOVE_FLYING,
151 swim => MOVE_SWIM,
152 boat => MOVE_BOAT,
153 all => MOVE_ALL,
154);
155
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat);
157
158{
159 package Crossfire::MoveType;
160
161 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string,
164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
165 '+=' => 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 },
167 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
168 'x=' => sub {
169 my $cur = $_[0] >= $_[1];
170 if (!defined $cur) {
171 if ($_[0] >= "all") {
172 $_[0] -= $_[1];
173 } else {
174 $_[0] += $_[1];
175 }
176 } elsif ($cur) {
177 $_[0] -= $_[1];
178 } else {
179 $_[0] /= $_[1];
180 }
181
182 $_[0]
183 },
184 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ;
187}
188
189sub Crossfire::MoveType::new {
190 my ($class, $string) = @_;
191
192 my $mask;
193 my $value;
194
195 if ($string =~ /^\s*\d+\s*$/) {
196 $mask = MOVE_ALL;
197 $value = $string+0;
198 } else {
199 for (split /\s+/, lc $string) {
200 if (s/^-//) {
201 $mask |= $MOVE_TYPE{$_};
202 $value &= ~$MOVE_TYPE{$_};
203 } else {
204 $mask |= $MOVE_TYPE{$_};
205 $value |= $MOVE_TYPE{$_};
206 }
207 }
208 }
209
210 (bless [$mask, $value], $class)->normalise
211}
212
213sub Crossfire::MoveType::normalise {
214 my ($self) = @_;
215
216 if ($self->[0] & MOVE_ALL) {
217 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
218 $self->[0] &= $mask;
219 $self->[1] &= $mask;
220 }
221
222 $self->[1] &= $self->[0];
223
224 $self
225}
226
227sub Crossfire::MoveType::as_string {
228 my ($self) = @_;
229
230 my @res;
231
232 my ($mask, $value) = @$self;
233
234 for (@Crossfire::MOVE_TYPE) {
235 my $bit = $Crossfire::MOVE_TYPE{$_};
236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
237 $mask &= ~$bit;
238 push @res, $value & $bit ? $_ : "-$_";
239 }
240 }
241
242 join " ", @res
243}
131 244
132sub load_ref($) { 245sub load_ref($) {
133 my ($path) = @_; 246 my ($path) = @_;
134 247
135 open my $fh, "<:raw:perlio", $path 248 open my $fh, "<:raw:perlio", $path
… …
148 close $fh; 261 close $fh;
149 rename "$path~", $path 262 rename "$path~", $path
150 or die "$path: $!"; 263 or die "$path: $!";
151} 264}
152 265
266my %attack_mask = (
267 physical => 0x00000001,
268 magic => 0x00000002,
269 fire => 0x00000004,
270 electricity => 0x00000008,
271 cold => 0x00000010,
272 confusion => 0x00000020,
273 acid => 0x00000040,
274 drain => 0x00000080,
275 weaponmagic => 0x00000100,
276 ghosthit => 0x00000200,
277 poison => 0x00000400,
278 slow => 0x00000800,
279 paralyze => 0x00001000,
280 turn_undead => 0x00002000,
281 fear => 0x00004000,
282 cancellation => 0x00008000,
283 deplete => 0x00010000,
284 death => 0x00020000,
285 chaos => 0x00040000,
286 counterspell => 0x00080000,
287 godpower => 0x00100000,
288 holyword => 0x00200000,
289 blind => 0x00400000,
290 internal => 0x00800000,
291 life_stealing => 0x01000000,
292 disease => 0x02000000,
293);
294
295sub _add_resist($$$) {
296 my ($ob, $mask, $value) = @_;
297
298 while (my ($k, $v) = each %attack_mask) {
299 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
300 }
301}
302
303my %MATERIAL = reverse
304 paper => 1,
305 iron => 2,
306 glass => 4,
307 leather => 8,
308 wood => 16,
309 organic => 32,
310 stone => 64,
311 cloth => 128,
312 adamant => 256,
313 liquid => 512,
314 tin => 1024,
315 bone => 2048,
316 ice => 4096,
317
318 # guesses
319 runestone => 12,
320 bronze => 18,
321 "ancient wood" => 20,
322 glass => 36,
323 marble => 66,
324 ice => 68,
325 stone => 70,
326 stone => 80,
327 cloth => 136,
328 ironwood => 144,
329 adamantium => 258,
330 glacium => 260,
331 blood => 544,
332;
333
153# object as in "Object xxx", i.e. archetypes 334# object as in "Object xxx", i.e. archetypes
154sub normalize_object($) { 335sub normalize_object($) {
155 my ($ob) = @_; 336 my ($ob) = @_;
156 337
338 # convert material bitset to materialname, if possible
339 if (exists $ob->{material}) {
340 if (!$ob->{material}) {
341 delete $ob->{material};
342 } elsif (exists $ob->{materialname}) {
343 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
344 delete $ob->{material};
345 } else {
346 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
347 delete $ob->{material}; # assume materilname is more specific and nuke material
348 }
349 } elsif (my $name = $MATERIAL{$ob->{material}}) {
350 delete $ob->{material};
351 $ob->{materialname} = $name;
352 } else {
353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
354 }
355 }
356
357 # 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};
359
157 # nuke outdated or never supported fields 360 # nuke outdated or never supported fields
158 delete $ob->{$_} for qw( 361 delete @$ob{qw(
159 can_knockback can_parry can_impale can_cut can_dam_armour 362 can_knockback can_parry can_impale can_cut can_dam_armour
160 can_apply pass_thru can_pass_thru 363 can_apply pass_thru can_pass_thru color_bg
161 ); 364 )};
365
366 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
367 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
368 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
162 369
163 # convert movement strings to bitsets 370 # convert movement strings to bitsets
164 for my $attr (keys %FIELD_MOVEMENT) { 371 for my $attr (keys %FIELD_MOVEMENT) {
165 next unless exists $ob->{$attr}; 372 next unless exists $ob->{$attr};
166 373
167 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 374 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
168
169 next if $ob->{$attr} =~ /^\d+$/;
170
171 my $flags = 0;
172
173 # assume list
174 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
175 $flags |= MOVE_WALK if $flag eq "walk";
176 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
177 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
178 $flags |= MOVE_FLYING if $flag eq "flying";
179 $flags |= MOVE_SWIM if $flag eq "swim";
180 $flags |= MOVE_BOAT if $flag eq "boat";
181 $flags |= MOVE_ALL if $flag eq "all";
182
183 $flags &= ~MOVE_WALK if $flag eq "-walk";
184 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
185 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
186 $flags &= ~MOVE_FLYING if $flag eq "-flying";
187 $flags &= ~MOVE_SWIM if $flag eq "-swim";
188 $flags &= ~MOVE_BOAT if $flag eq "-boat";
189 $flags &= ~MOVE_ALL if $flag eq "-all";
190 }
191
192 $ob->{$attr} = $flags;
193 } 375 }
194 376
195 # convert outdated movement flags to new movement sets 377 # convert outdated movement flags to new movement sets
196 if (defined (my $v = delete $ob->{no_pass})) { 378 if (defined (my $v = delete $ob->{no_pass})) {
197 $ob->{move_block} = $v ? MOVE_ALL : 0; 379 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
198 } 380 }
199 if (defined (my $v = delete $ob->{slow_move})) { 381 if (defined (my $v = delete $ob->{slow_move})) {
200 $ob->{move_slow} |= MOVE_WALK; 382 $ob->{move_slow} += "walk";
201 $ob->{move_slow_penalty} = $v; 383 $ob->{move_slow_penalty} = $v;
202 } 384 }
203 if (defined (my $v = delete $ob->{walk_on})) { 385 if (defined (my $v = delete $ob->{walk_on})) {
204 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 386 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
205 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
206 : $ob->{move_on} & ~MOVE_WALK;
207 } 387 }
208 if (defined (my $v = delete $ob->{walk_off})) { 388 if (defined (my $v = delete $ob->{walk_off})) {
209 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 389 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
210 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
211 : $ob->{move_off} & ~MOVE_WALK;
212 } 390 }
213 if (defined (my $v = delete $ob->{fly_on})) { 391 if (defined (my $v = delete $ob->{fly_on})) {
214 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 392 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
215 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
216 : $ob->{move_on} & ~MOVE_FLY_LOW;
217 } 393 }
218 if (defined (my $v = delete $ob->{fly_off})) { 394 if (defined (my $v = delete $ob->{fly_off})) {
219 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 395 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
220 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
221 : $ob->{move_off} & ~MOVE_FLY_LOW;
222 } 396 }
223 if (defined (my $v = delete $ob->{flying})) { 397 if (defined (my $v = delete $ob->{flying})) {
224 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 398 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
225 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
226 : $ob->{move_type} & ~MOVE_FLY_LOW;
227 } 399 }
228 400
229 # convert idiotic event_xxx things into objects 401 # convert idiotic event_xxx things into objects
230 while (my ($event, $subtype) = each %EVENT_TYPE) { 402 while (my ($event, $subtype) = each %EVENT_TYPE) {
231 if (exists $ob->{"event_${event}_plugin"}) { 403 if (exists $ob->{"event_${event}_plugin"}) {
… …
235 slaying => delete $ob->{"event_${event}"}, 407 slaying => delete $ob->{"event_${event}"},
236 name => delete $ob->{"event_${event}_options"}, 408 name => delete $ob->{"event_${event}_options"},
237 }; 409 };
238 } 410 }
239 } 411 }
412
413 # some archetypes had "+3" instead of the canonical "3", so fix
414 $ob->{dam} *= 1 if exists $ob->{dam};
240 415
241 $ob 416 $ob
242} 417}
243 418
244# arch as in "arch xxx", ie.. objects 419# arch as in "arch xxx", ie.. objects
… …
286 } 461 }
287 462
288 $ob 463 $ob
289} 464}
290 465
466sub attr_thaw($) {
467 my ($ob) = @_;
468
469 $ob->{attach} = from_json $ob->{attach}
470 if exists $ob->{attach};
471
472 $ob
473}
474
475sub attr_freeze($) {
476 my ($ob) = @_;
477
478 $ob->{attach} = Crossfire::to_json $ob->{attach}
479 if exists $ob->{attach};
480
481 $ob
482}
483
291sub read_pak($) { 484sub read_pak($) {
292 my ($path) = @_; 485 my ($path) = @_;
293 486
294 my %pak; 487 my %pak;
295 488
… …
308sub read_arch($;$) { 501sub read_arch($;$) {
309 my ($path, $toplevel) = @_; 502 my ($path, $toplevel) = @_;
310 503
311 my %arc; 504 my %arc;
312 my ($more, $prev); 505 my ($more, $prev);
506 my $comment;
313 507
314 open my $fh, "<:raw:perlio:utf8", $path 508 open my $fh, "<:raw:perlio:utf8", $path
315 or Carp::croak "$path: $!"; 509 or Carp::croak "$path: $!";
316 510
317# binmode $fh; 511# binmode $fh;
… …
321 515
322 while (<$fh>) { 516 while (<$fh>) {
323 s/\s+$//; 517 s/\s+$//;
324 if (/^end$/i) { 518 if (/^end$/i) {
325 last; 519 last;
520
326 } elsif (/^arch (\S+)$/i) { 521 } elsif (/^arch (\S+)$/i) {
327 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 522 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
523
328 } elsif (/^lore$/i) { 524 } elsif (/^lore$/i) {
329 while (<$fh>) { 525 while (<$fh>) {
330 last if /^endlore\s*$/i; 526 last if /^endlore\s*$/i;
331 $arc{lore} .= $_; 527 $arc{lore} .= $_;
332 } 528 }
… …
341 chomp; 537 chomp;
342 push @{ $arc{anim} }, $_; 538 push @{ $arc{anim} }, $_;
343 } 539 }
344 } elsif (/^(\S+)\s*(.*)$/) { 540 } elsif (/^(\S+)\s*(.*)$/) {
345 $arc{lc $1} = $2; 541 $arc{lc $1} = $2;
346 } elsif (/^\s*($|#)/) { 542 } elsif (/^\s*#/) {
543 $arc{_comment} .= "$_\n";
544
545 } elsif (/^\s*$/) {
347 # 546 #
348 } else { 547 } else {
349 warn "$path: unparsable line '$_' in arch $arc{_name}"; 548 warn "$path: unparsable line '$_' in arch $arc{_name}";
350 } 549 }
351 } 550 }
… …
357 s/\s+$//; 556 s/\s+$//;
358 if (/^more$/i) { 557 if (/^more$/i) {
359 $more = $prev; 558 $more = $prev;
360 } elsif (/^object (\S+)$/i) { 559 } elsif (/^object (\S+)$/i) {
361 my $name = $1; 560 my $name = $1;
362 my $arc = normalize_object $parse_block->(_name => $name); 561 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
562 undef $comment;
563 delete $arc{_comment} unless length $arc{_comment};
564 $arc->{_atype} = 'object';
363 565
364 if ($more) { 566 if ($more) {
365 $more->{more} = $arc; 567 $more->{more} = $arc;
366 } else { 568 } else {
367 $arc{$name} = $arc; 569 $arc{$name} = $arc;
368 } 570 }
369 $prev = $arc; 571 $prev = $arc;
370 $more = undef; 572 $more = undef;
371 } elsif (/^arch (\S+)$/i) { 573 } elsif (/^arch (\S+)$/i) {
372 my $name = $1; 574 my $name = $1;
373 my $arc = normalize_arch $parse_block->(_name => $name); 575 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
576 undef $comment;
577 delete $arc{_comment} unless length $arc{_comment};
578 $arc->{_atype} = 'arch';
374 579
375 if ($more) { 580 if ($more) {
376 $more->{more} = $arc; 581 $more->{more} = $arc;
377 } else { 582 } else {
378 push @{ $arc{arch} }, $arc; 583 push @{ $arc{arch} }, $arc;
… …
386 push @{$toplevel->{lev_array}}, $_+0; 591 push @{$toplevel->{lev_array}}, $_+0;
387 } 592 }
388 } else { 593 } else {
389 $toplevel->{$1} = $2; 594 $toplevel->{$1} = $2;
390 } 595 }
596 } elsif (/^\s*#/) {
597 $comment .= "$_\n";
391 } elsif (/^\s*($|#)/) { 598 } elsif (/^\s*($|#)/) {
392 # 599 #
393 } else { 600 } else {
394 die "$path: unparseable top-level line '$_'"; 601 die "$path: unparseable top-level line '$_'";
395 } 602 }
396 } 603 }
397 604
398 undef $parse_block; # work around bug in perl not freeing $fh etc. 605 undef $parse_block; # work around bug in perl not freeing $fh etc.
399 606
400 \%arc 607 \%arc
608}
609
610sub archlist_to_string {
611 my ($arch) = @_;
612
613 my $str;
614
615 my $append; $append = sub {
616 my %a = %{$_[0]};
617
618 Crossfire::attr_freeze \%a;
619 Crossfire::normalize_arch \%a;
620
621 # undo the bit-split we did before
622 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})
624 | (delete $a{attack_movement_bits_4_7});
625 }
626
627 if (my $comment = delete $a{_comment}) {
628 if ($comment =~ /[^\n\s#]/) {
629 $str .= $comment;
630 }
631 }
632
633 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
634
635 my $inv = delete $a{inventory};
636 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
637 my $anim = delete $a{anim};
638
639 if ($a{_atype} eq 'object') {
640 $str .= join "\n", "anim", @$anim, "mina\n"
641 if $anim;
642 }
643
644 my @kv;
645
646 for ($a{_name} eq "map"
647 ? @Crossfire::FIELD_ORDER_MAP
648 : @Crossfire::FIELD_ORDER) {
649 push @kv, [$_, delete $a{$_}]
650 if exists $a{$_};
651 }
652
653 for (sort keys %a) {
654 next if /^_/; # ignore our _-keys
655 push @kv, [$_, delete $a{$_}];
656 }
657
658 for (@kv) {
659 my ($k, $v) = @$_;
660
661 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
662 $v =~ s/\n$//;
663 $str .= "$k\n$v\n$end\n";
664 } else {
665 $str .= "$k $v\n";
666 }
667 }
668
669 if ($inv) {
670 $append->($_) for @$inv;
671 }
672
673 $str .= "end\n";
674
675 if ($a{_atype} eq 'object') {
676 if ($more) {
677 $str .= "more\n";
678 $append->($more) if $more;
679 } else {
680 $str .= "\n";
681 }
682 }
683 };
684
685 for (@$arch) {
686 $append->($_);
687 }
688
689 $str
401} 690}
402 691
403# put all archs into a hash with editor_face as it's key 692# put all archs into a hash with editor_face as it's key
404# NOTE: the arrays in the hash values are references to 693# NOTE: the arrays in the hash values are references to
405# the archs from $ARCH 694# the archs from $ARCH
… …
426 my ($a) = @_; 715 my ($a) = @_;
427 716
428 my $o = $ARCH{$a->{_name}} 717 my $o = $ARCH{$a->{_name}}
429 or return; 718 or return;
430 719
431 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 720 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
721 unless ($face) {
722 $face = $FACE{"blank.x11"}
432 or (warn "no face data found for arch '$a->{_name}'"), return; 723 or (warn "no face data found for arch '$a->{_name}'"), return;
724 }
433 725
434 if ($face->{w} > 1 || $face->{h} > 1) { 726 if ($face->{w} > 1 || $face->{h} > 1) {
435 # bigface 727 # bigface
436 return (0, 0, $face->{w} - 1, $face->{h} - 1); 728 return (0, 0, $face->{w} - 1, $face->{h} - 1);
437 729
… …
544 ]; 836 ];
545 837
546 $attr 838 $attr
547} 839}
548 840
549sub arch_edit_sections {
550# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
551# edit_type = 0;
552# else if (edit_type != 0) {
553# // all flags from 'check_type' must be unset in this arch because they get recalculated now
554# edit_type &= ~check_type;
555# }
556#
557# }
558# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
559# getAttributeValue("alive", defarch) == 1 &&
560# (getAttributeValue("monster", defarch) == 1 ||
561# getAttributeValue("generator", defarch) == 1)) {
562# // Monster: monsters/npcs/generators
563# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
564# }
565# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
566# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
567# // Walls
568# edit_type |= IGUIConstants.TILE_EDIT_WALL;
569# }
570# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
571# getAttributeValue("connected", defarch) != 0) {
572# // Connected Objects
573# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
574# }
575# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
576# arch_type == 66 || arch_type == 41 || arch_type == 95) {
577# // Exit: teleporter/exit/trapdoors
578# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
579# }
580# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
581# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
582# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
583# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
584# arch_type == 124 || arch_type == 130)) {
585# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
586# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
587# }
588# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
589# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
590# arch_type == 91 || arch_type == 21 || arch_type == 24) {
591# // Door: door/special door/gates + keys
592# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
593# }
594# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
595# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
596# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
597# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
598# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
599# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
600# arch_type == 122 || arch_type == 3)) {
601# // Equipment: weapons/armour/wands/rods
602# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
603# }
604#
605# return(edit_type);
606#
607#
608}
609
610sub cache_file($$&&) { 841sub cache_file($$&&) {
611 my ($src, $cache, $load, $create) = @_; 842 my ($src, $cache, $load, $create) = @_;
612 843
613 my ($size, $mtime) = (stat $src)[7,9] 844 my ($size, $mtime) = (stat $src)[7,9]
614 or Carp::croak "$src: $!"; 845 or Carp::croak "$src: $!";

Diff Legend

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