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.73 by root, Tue Sep 12 02:18:06 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.9'; 9our $VERSION = '0.97';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
33 JSON::Syck::Dump $_[0] 33 JSON::Syck::Dump $_[0]
34} 34}
35 35
36our $LIB = $ENV{CROSSFIRE_LIBDIR}; 36our $LIB = $ENV{CROSSFIRE_LIBDIR};
37 37
38our $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";
39 41
40mkdir $VARDIR, 0777; 42mkdir $VARDIR, 0777;
41 43
42sub TILESIZE (){ 32 } 44sub TILESIZE (){ 32 }
43 45
… …
56 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);
57 59
58# same as in server save routine, to (hopefully) be compatible 60# same as in server save routine, to (hopefully) be compatible
59# to the other editors. 61# to the other editors.
60our @FIELD_ORDER_MAP = (qw( 62our @FIELD_ORDER_MAP = (qw(
63 file_format_version
61 name attach swap_time reset_timeout fixed_resettime difficulty region 64 name attach swap_time reset_timeout fixed_resettime difficulty region
62 shopitems shopgreed shopmin shopmax shoprace 65 shopitems shopgreed shopmin shopmax shoprace
63 darkness width height enter_x enter_y msg maplore 66 darkness width height enter_x enter_y msg maplore
64 unique template 67 unique template
65 outdoor temp pressure humid windspeed winddir sky nosmooth 68 outdoor temp pressure humid windspeed winddir sky nosmooth
… …
136sub MOVE_FLY_HIGH (){ 0x04 } 139sub MOVE_FLY_HIGH (){ 0x04 }
137sub MOVE_FLYING (){ 0x06 } 140sub MOVE_FLYING (){ 0x06 }
138sub MOVE_SWIM (){ 0x08 } 141sub MOVE_SWIM (){ 0x08 }
139sub MOVE_BOAT (){ 0x10 } 142sub MOVE_BOAT (){ 0x10 }
140sub MOVE_KNOWN (){ 0x1f } # all of above 143sub MOVE_KNOWN (){ 0x1f } # all of above
141sub MOVE_ALLBIT (){ 0x10000 }
142sub 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}
143 244
144sub load_ref($) { 245sub load_ref($) {
145 my ($path) = @_; 246 my ($path) = @_;
146 247
147 open my $fh, "<:raw:perlio", $path 248 open my $fh, "<:raw:perlio", $path
… …
197 while (my ($k, $v) = each %attack_mask) { 298 while (my ($k, $v) = each %attack_mask) {
198 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v; 299 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
199 } 300 }
200} 301}
201 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
202# object as in "Object xxx", i.e. archetypes 334# object as in "Object xxx", i.e. archetypes
203sub normalize_object($) { 335sub normalize_object($) {
204 my ($ob) = @_; 336 my ($ob) = @_;
205 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
206 # nuke outdated or never supported fields 360 # nuke outdated or never supported fields
207 delete @$ob{qw( 361 delete @$ob{qw(
208 can_knockback can_parry can_impale can_cut can_dam_armour 362 can_knockback can_parry can_impale can_cut can_dam_armour
209 can_apply pass_thru can_pass_thru 363 can_apply pass_thru can_pass_thru color_bg
210 )}; 364 )};
211 365
212 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } 366 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
213 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } 367 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
214 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } 368 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
215 369
216 # convert movement strings to bitsets 370 # convert movement strings to bitsets
217 for my $attr (keys %FIELD_MOVEMENT) { 371 for my $attr (keys %FIELD_MOVEMENT) {
218 next unless exists $ob->{$attr}; 372 next unless exists $ob->{$attr};
219 373
220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 374 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
221
222 next if $ob->{$attr} =~ /^\d+$/;
223
224 my $flags = 0;
225
226 # assume list
227 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
228 $flags |= MOVE_WALK if $flag eq "walk";
229 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
230 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
231 $flags |= MOVE_FLYING if $flag eq "flying";
232 $flags |= MOVE_SWIM if $flag eq "swim";
233 $flags |= MOVE_BOAT if $flag eq "boat";
234 $flags |= MOVE_ALL if $flag eq "all";
235
236 $flags &= ~MOVE_WALK if $flag eq "-walk";
237 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
238 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
239 $flags &= ~MOVE_FLYING if $flag eq "-flying";
240 $flags &= ~MOVE_SWIM if $flag eq "-swim";
241 $flags &= ~MOVE_BOAT if $flag eq "-boat";
242 $flags &= ~MOVE_ALL if $flag eq "-all";
243 }
244
245 $ob->{$attr} = $flags;
246 } 375 }
247 376
248 # convert outdated movement flags to new movement sets 377 # convert outdated movement flags to new movement sets
249 if (defined (my $v = delete $ob->{no_pass})) { 378 if (defined (my $v = delete $ob->{no_pass})) {
250 $ob->{move_block} = $v ? MOVE_ALL : 0; 379 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
251 } 380 }
252 if (defined (my $v = delete $ob->{slow_move})) { 381 if (defined (my $v = delete $ob->{slow_move})) {
253 $ob->{move_slow} |= MOVE_WALK; 382 $ob->{move_slow} += "walk";
254 $ob->{move_slow_penalty} = $v; 383 $ob->{move_slow_penalty} = $v;
255 } 384 }
256 if (defined (my $v = delete $ob->{walk_on})) { 385 if (defined (my $v = delete $ob->{walk_on})) {
257 $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" }
258 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
259 : $ob->{move_on} & ~MOVE_WALK;
260 } 387 }
261 if (defined (my $v = delete $ob->{walk_off})) { 388 if (defined (my $v = delete $ob->{walk_off})) {
262 $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" }
263 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
264 : $ob->{move_off} & ~MOVE_WALK;
265 } 390 }
266 if (defined (my $v = delete $ob->{fly_on})) { 391 if (defined (my $v = delete $ob->{fly_on})) {
267 $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" }
268 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
269 : $ob->{move_on} & ~MOVE_FLY_LOW;
270 } 393 }
271 if (defined (my $v = delete $ob->{fly_off})) { 394 if (defined (my $v = delete $ob->{fly_off})) {
272 $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" }
273 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
274 : $ob->{move_off} & ~MOVE_FLY_LOW;
275 } 396 }
276 if (defined (my $v = delete $ob->{flying})) { 397 if (defined (my $v = delete $ob->{flying})) {
277 $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" }
278 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
279 : $ob->{move_type} & ~MOVE_FLY_LOW;
280 } 399 }
281 400
282 # convert idiotic event_xxx things into objects 401 # convert idiotic event_xxx things into objects
283 while (my ($event, $subtype) = each %EVENT_TYPE) { 402 while (my ($event, $subtype) = each %EVENT_TYPE) {
284 if (exists $ob->{"event_${event}_plugin"}) { 403 if (exists $ob->{"event_${event}_plugin"}) {
… …
382sub read_arch($;$) { 501sub read_arch($;$) {
383 my ($path, $toplevel) = @_; 502 my ($path, $toplevel) = @_;
384 503
385 my %arc; 504 my %arc;
386 my ($more, $prev); 505 my ($more, $prev);
506 my $comment;
387 507
388 open my $fh, "<:raw:perlio:utf8", $path 508 open my $fh, "<:raw:perlio:utf8", $path
389 or Carp::croak "$path: $!"; 509 or Carp::croak "$path: $!";
390 510
391# binmode $fh; 511# binmode $fh;
… …
395 515
396 while (<$fh>) { 516 while (<$fh>) {
397 s/\s+$//; 517 s/\s+$//;
398 if (/^end$/i) { 518 if (/^end$/i) {
399 last; 519 last;
520
400 } elsif (/^arch (\S+)$/i) { 521 } elsif (/^arch (\S+)$/i) {
401 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 522 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
523
402 } elsif (/^lore$/i) { 524 } elsif (/^lore$/i) {
403 while (<$fh>) { 525 while (<$fh>) {
404 last if /^endlore\s*$/i; 526 last if /^endlore\s*$/i;
405 $arc{lore} .= $_; 527 $arc{lore} .= $_;
406 } 528 }
… …
415 chomp; 537 chomp;
416 push @{ $arc{anim} }, $_; 538 push @{ $arc{anim} }, $_;
417 } 539 }
418 } elsif (/^(\S+)\s*(.*)$/) { 540 } elsif (/^(\S+)\s*(.*)$/) {
419 $arc{lc $1} = $2; 541 $arc{lc $1} = $2;
420 } elsif (/^\s*($|#)/) { 542 } elsif (/^\s*#/) {
543 $arc{_comment} .= "$_\n";
544
545 } elsif (/^\s*$/) {
421 # 546 #
422 } else { 547 } else {
423 warn "$path: unparsable line '$_' in arch $arc{_name}"; 548 warn "$path: unparsable line '$_' in arch $arc{_name}";
424 } 549 }
425 } 550 }
… …
431 s/\s+$//; 556 s/\s+$//;
432 if (/^more$/i) { 557 if (/^more$/i) {
433 $more = $prev; 558 $more = $prev;
434 } elsif (/^object (\S+)$/i) { 559 } elsif (/^object (\S+)$/i) {
435 my $name = $1; 560 my $name = $1;
436 my $arc = attr_thaw 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};
437 $arc->{_atype} = 'object'; 564 $arc->{_atype} = 'object';
438 565
439 if ($more) { 566 if ($more) {
440 $more->{more} = $arc; 567 $more->{more} = $arc;
441 } else { 568 } else {
… …
443 } 570 }
444 $prev = $arc; 571 $prev = $arc;
445 $more = undef; 572 $more = undef;
446 } elsif (/^arch (\S+)$/i) { 573 } elsif (/^arch (\S+)$/i) {
447 my $name = $1; 574 my $name = $1;
448 my $arc = attr_thaw 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};
449 $arc->{_atype} = 'arch'; 578 $arc->{_atype} = 'arch';
450 579
451 if ($more) { 580 if ($more) {
452 $more->{more} = $arc; 581 $more->{more} = $arc;
453 } else { 582 } else {
… …
462 push @{$toplevel->{lev_array}}, $_+0; 591 push @{$toplevel->{lev_array}}, $_+0;
463 } 592 }
464 } else { 593 } else {
465 $toplevel->{$1} = $2; 594 $toplevel->{$1} = $2;
466 } 595 }
596 } elsif (/^\s*#/) {
597 $comment .= "$_\n";
467 } elsif (/^\s*($|#)/) { 598 } elsif (/^\s*($|#)/) {
468 # 599 #
469 } else { 600 } else {
470 die "$path: unparseable top-level line '$_'"; 601 die "$path: unparseable top-level line '$_'";
471 } 602 }
… …
491 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 622 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
492 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 623 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
493 | (delete $a{attack_movement_bits_4_7}); 624 | (delete $a{attack_movement_bits_4_7});
494 } 625 }
495 626
627 if (my $comment = delete $a{_comment}) {
628 if ($comment =~ /[^\n\s#]/) {
629 $str .= $comment;
630 }
631 }
632
496 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 633 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
497 634
498 my $inv = delete $a{inventory}; 635 my $inv = delete $a{inventory};
499 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 636 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
500 my $anim = delete $a{anim}; 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 }
501 643
502 my @kv; 644 my @kv;
503 645
504 for ($a{_name} eq "map" 646 for ($a{_name} eq "map"
505 ? @Crossfire::FIELD_ORDER_MAP 647 ? @Crossfire::FIELD_ORDER_MAP
… …
517 my ($k, $v) = @$_; 659 my ($k, $v) = @$_;
518 660
519 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 661 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
520 $v =~ s/\n$//; 662 $v =~ s/\n$//;
521 $str .= "$k\n$v\n$end\n"; 663 $str .= "$k\n$v\n$end\n";
522 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
523 if ($v & ~Crossfire::MOVE_ALL or !$v) {
524 $str .= "$k $v\n";
525
526 } elsif ($v & Crossfire::MOVE_ALLBIT) {
527 $str .= "$k all";
528
529 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
530 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
531 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
532 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
533 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
534
535 $str .= "\n";
536
537 } else {
538 $str .= $k;
539
540 $str .= " walk" if $v & Crossfire::MOVE_WALK;
541 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
542 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
543 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
544 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
545
546 $str .= "\n";
547 }
548 } else { 664 } else {
549 $str .= "$k $v\n"; 665 $str .= "$k $v\n";
550 } 666 }
551 } 667 }
552 668
553 if ($inv) { 669 if ($inv) {
554 $append->($_) for @$inv; 670 $append->($_) for @$inv;
555 } 671 }
556 672
673 $str .= "end\n";
674
557 if ($a{_atype} eq 'object') { 675 if ($a{_atype} eq 'object') {
558 $str .= join "\n", "anim", @$anim, "mina\n" 676 if ($more) {
559 if $anim;
560 }
561
562 $str .= "end\n";
563
564 if (($a{_atype} eq 'object') && $more) {
565 $str .= "\nmore\n"; 677 $str .= "more\n";
566 $append->($more) if $more; 678 $append->($more) if $more;
679 } else {
680 $str .= "\n";
681 }
567 } 682 }
568 }; 683 };
569 684
570 for (@$arch) { 685 for (@$arch) {
571 $append->($_); 686 $append->($_);
… …
600 my ($a) = @_; 715 my ($a) = @_;
601 716
602 my $o = $ARCH{$a->{_name}} 717 my $o = $ARCH{$a->{_name}}
603 or return; 718 or return;
604 719
605 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"}
606 or (warn "no face data found for arch '$a->{_name}'"), return; 723 or (warn "no face data found for arch '$a->{_name}'"), return;
724 }
607 725
608 if ($face->{w} > 1 || $face->{h} > 1) { 726 if ($face->{w} > 1 || $face->{h} > 1) {
609 # bigface 727 # bigface
610 return (0, 0, $face->{w} - 1, $face->{h} - 1); 728 return (0, 0, $face->{w} - 1, $face->{h} - 1);
611 729
… …
718 ]; 836 ];
719 837
720 $attr 838 $attr
721} 839}
722 840
723sub arch_edit_sections {
724# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
725# edit_type = 0;
726# else if (edit_type != 0) {
727# // all flags from 'check_type' must be unset in this arch because they get recalculated now
728# edit_type &= ~check_type;
729# }
730#
731# }
732# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
733# getAttributeValue("alive", defarch) == 1 &&
734# (getAttributeValue("monster", defarch) == 1 ||
735# getAttributeValue("generator", defarch) == 1)) {
736# // Monster: monsters/npcs/generators
737# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
738# }
739# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
740# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
741# // Walls
742# edit_type |= IGUIConstants.TILE_EDIT_WALL;
743# }
744# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
745# getAttributeValue("connected", defarch) != 0) {
746# // Connected Objects
747# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
748# }
749# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
750# arch_type == 66 || arch_type == 41 || arch_type == 95) {
751# // Exit: teleporter/exit/trapdoors
752# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
753# }
754# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
755# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
756# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
757# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
758# arch_type == 124 || arch_type == 130)) {
759# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
760# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
761# }
762# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
763# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
764# arch_type == 91 || arch_type == 21 || arch_type == 24) {
765# // Door: door/special door/gates + keys
766# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
767# }
768# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
769# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
770# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
771# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
772# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
773# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
774# arch_type == 122 || arch_type == 3)) {
775# // Equipment: weapons/armour/wands/rods
776# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
777# }
778#
779# return(edit_type);
780#
781#
782}
783
784sub cache_file($$&&) { 841sub cache_file($$&&) {
785 my ($src, $cache, $load, $create) = @_; 842 my ($src, $cache, $load, $create) = @_;
786 843
787 my ($size, $mtime) = (stat $src)[7,9] 844 my ($size, $mtime) = (stat $src)[7,9]
788 or Carp::croak "$src: $!"; 845 or Carp::croak "$src: $!";

Diff Legend

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