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.72 by root, Mon Sep 4 17:58:51 2006 UTC vs.
Revision 1.92 by root, Sat Mar 3 19:32:00 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.9'; 9our $VERSION = '0.96';
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 '""' => \&as_string,
163 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
164 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
165 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
166 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
167 'x=' => sub {
168 my $cur = $_[0] >= $_[1];
169 if (!defined $cur) {
170 $_[0] += $_[1];
171 } elsif ($cur) {
172 $_[0] -= $_[1];
173 } else {
174 $_[0] /= $_[1];
175 }
176
177 $_[0]
178 },
179 'eq' => sub { "$_[0]" eq "$_[1]" },
180 'ne' => sub { "$_[0]" ne "$_[1]" },
181 ;
182}
183
184sub Crossfire::MoveType::new {
185 my ($class, $string) = @_;
186
187 my $mask;
188 my $value;
189
190 if ($string =~ /^\s*\d+\s*$/) {
191 $mask = MOVE_ALL;
192 $value = $string+0;
193 } else {
194 for (split /\s+/, lc $string) {
195 if (s/^-//) {
196 $mask |= $MOVE_TYPE{$_};
197 $value &= ~$MOVE_TYPE{$_};
198 } else {
199 $mask |= $MOVE_TYPE{$_};
200 $value |= $MOVE_TYPE{$_};
201 }
202 }
203 }
204
205 (bless [$mask, $value], $class)->normalise
206}
207
208sub Crossfire::MoveType::normalise {
209 my ($self) = @_;
210
211 if ($self->[0] & MOVE_ALL) {
212 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
213 $self->[0] &= $mask;
214 $self->[1] &= $mask;
215 }
216
217 $self->[1] &= $self->[0];
218
219 $self
220}
221
222sub Crossfire::MoveType::as_string {
223 my ($self) = @_;
224
225 my @res;
226
227 my ($mask, $value) = @$self;
228
229 for (@Crossfire::MOVE_TYPE) {
230 my $bit = $Crossfire::MOVE_TYPE{$_};
231 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
232 $mask &= ~$bit;
233 push @res, $value & $bit ? $_ : "-$_";
234 }
235 }
236
237 join " ", @res
238}
143 239
144sub load_ref($) { 240sub load_ref($) {
145 my ($path) = @_; 241 my ($path) = @_;
146 242
147 open my $fh, "<:raw:perlio", $path 243 open my $fh, "<:raw:perlio", $path
… …
193 289
194sub _add_resist($$$) { 290sub _add_resist($$$) {
195 my ($ob, $mask, $value) = @_; 291 my ($ob, $mask, $value) = @_;
196 292
197 while (my ($k, $v) = each %attack_mask) { 293 while (my ($k, $v) = each %attack_mask) {
198 $ob->{"resist_$k"} += $value if $mask & $v; 294 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
199 } 295 }
200} 296}
297
298my %MATERIAL = reverse
299 paper => 1,
300 iron => 2,
301 glass => 4,
302 leather => 8,
303 wood => 16,
304 organic => 32,
305 stone => 64,
306 cloth => 128,
307 adamant => 256,
308 liquid => 512,
309 tin => 1024,
310 bone => 2048,
311 ice => 4096,
312
313 # guesses
314 runestone => 12,
315 bronze => 18,
316 "ancient wood" => 20,
317 glass => 36,
318 marble => 66,
319 ice => 68,
320 stone => 70,
321 stone => 80,
322 cloth => 136,
323 ironwood => 144,
324 adamantium => 258,
325 glacium => 260,
326 blood => 544,
327;
201 328
202# object as in "Object xxx", i.e. archetypes 329# object as in "Object xxx", i.e. archetypes
203sub normalize_object($) { 330sub normalize_object($) {
204 my ($ob) = @_; 331 my ($ob) = @_;
332
333 # convert material bitset to materialname, if possible
334 if (exists $ob->{material}) {
335 if (!$ob->{material}) {
336 delete $ob->{material};
337 } elsif (exists $ob->{materialname}) {
338 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
339 delete $ob->{material};
340 } else {
341 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
342 delete $ob->{material}; # assume materilname is more specific and nuke material
343 }
344 } elsif (my $name = $MATERIAL{$ob->{material}}) {
345 delete $ob->{material};
346 $ob->{materialname} = $name;
347 } else {
348 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
349 }
350 }
205 351
206 # nuke outdated or never supported fields 352 # nuke outdated or never supported fields
207 delete @$ob{qw( 353 delete @$ob{qw(
208 can_knockback can_parry can_impale can_cut can_dam_armour 354 can_knockback can_parry can_impale can_cut can_dam_armour
209 can_apply pass_thru can_pass_thru 355 can_apply pass_thru can_pass_thru
… …
215 361
216 # convert movement strings to bitsets 362 # convert movement strings to bitsets
217 for my $attr (keys %FIELD_MOVEMENT) { 363 for my $attr (keys %FIELD_MOVEMENT) {
218 next unless exists $ob->{$attr}; 364 next unless exists $ob->{$attr};
219 365
220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 366 $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 } 367 }
247 368
248 # convert outdated movement flags to new movement sets 369 # convert outdated movement flags to new movement sets
249 if (defined (my $v = delete $ob->{no_pass})) { 370 if (defined (my $v = delete $ob->{no_pass})) {
250 $ob->{move_block} = $v ? MOVE_ALL : 0; 371 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
251 } 372 }
252 if (defined (my $v = delete $ob->{slow_move})) { 373 if (defined (my $v = delete $ob->{slow_move})) {
253 $ob->{move_slow} |= MOVE_WALK; 374 $ob->{move_slow} += "walk";
254 $ob->{move_slow_penalty} = $v; 375 $ob->{move_slow_penalty} = $v;
255 } 376 }
256 if (defined (my $v = delete $ob->{walk_on})) { 377 if (defined (my $v = delete $ob->{walk_on})) {
257 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 378 $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 } 379 }
261 if (defined (my $v = delete $ob->{walk_off})) { 380 if (defined (my $v = delete $ob->{walk_off})) {
262 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 381 $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 } 382 }
266 if (defined (my $v = delete $ob->{fly_on})) { 383 if (defined (my $v = delete $ob->{fly_on})) {
267 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 384 $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 } 385 }
271 if (defined (my $v = delete $ob->{fly_off})) { 386 if (defined (my $v = delete $ob->{fly_off})) {
272 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 387 $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 } 388 }
276 if (defined (my $v = delete $ob->{flying})) { 389 if (defined (my $v = delete $ob->{flying})) {
277 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 390 $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 } 391 }
281 392
282 # convert idiotic event_xxx things into objects 393 # convert idiotic event_xxx things into objects
283 while (my ($event, $subtype) = each %EVENT_TYPE) { 394 while (my ($event, $subtype) = each %EVENT_TYPE) {
284 if (exists $ob->{"event_${event}_plugin"}) { 395 if (exists $ob->{"event_${event}_plugin"}) {
… …
288 slaying => delete $ob->{"event_${event}"}, 399 slaying => delete $ob->{"event_${event}"},
289 name => delete $ob->{"event_${event}_options"}, 400 name => delete $ob->{"event_${event}_options"},
290 }; 401 };
291 } 402 }
292 } 403 }
404
405 # some archetypes had "+3" instead of the canonical "3", so fix
406 $ob->{dam} *= 1 if exists $ob->{dam};
293 407
294 $ob 408 $ob
295} 409}
296 410
297# arch as in "arch xxx", ie.. objects 411# arch as in "arch xxx", ie.. objects
… …
379sub read_arch($;$) { 493sub read_arch($;$) {
380 my ($path, $toplevel) = @_; 494 my ($path, $toplevel) = @_;
381 495
382 my %arc; 496 my %arc;
383 my ($more, $prev); 497 my ($more, $prev);
498 my $comment;
384 499
385 open my $fh, "<:raw:perlio:utf8", $path 500 open my $fh, "<:raw:perlio:utf8", $path
386 or Carp::croak "$path: $!"; 501 or Carp::croak "$path: $!";
387 502
388# binmode $fh; 503# binmode $fh;
… …
392 507
393 while (<$fh>) { 508 while (<$fh>) {
394 s/\s+$//; 509 s/\s+$//;
395 if (/^end$/i) { 510 if (/^end$/i) {
396 last; 511 last;
512
397 } elsif (/^arch (\S+)$/i) { 513 } elsif (/^arch (\S+)$/i) {
398 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 514 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
515
399 } elsif (/^lore$/i) { 516 } elsif (/^lore$/i) {
400 while (<$fh>) { 517 while (<$fh>) {
401 last if /^endlore\s*$/i; 518 last if /^endlore\s*$/i;
402 $arc{lore} .= $_; 519 $arc{lore} .= $_;
403 } 520 }
… …
412 chomp; 529 chomp;
413 push @{ $arc{anim} }, $_; 530 push @{ $arc{anim} }, $_;
414 } 531 }
415 } elsif (/^(\S+)\s*(.*)$/) { 532 } elsif (/^(\S+)\s*(.*)$/) {
416 $arc{lc $1} = $2; 533 $arc{lc $1} = $2;
417 } elsif (/^\s*($|#)/) { 534 } elsif (/^\s*#/) {
535 $arc{_comment} .= "$_\n";
536
537 } elsif (/^\s*$/) {
418 # 538 #
419 } else { 539 } else {
420 warn "$path: unparsable line '$_' in arch $arc{_name}"; 540 warn "$path: unparsable line '$_' in arch $arc{_name}";
421 } 541 }
422 } 542 }
… …
428 s/\s+$//; 548 s/\s+$//;
429 if (/^more$/i) { 549 if (/^more$/i) {
430 $more = $prev; 550 $more = $prev;
431 } elsif (/^object (\S+)$/i) { 551 } elsif (/^object (\S+)$/i) {
432 my $name = $1; 552 my $name = $1;
433 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 553 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
554 undef $comment;
555 delete $arc{_comment} unless length $arc{_comment};
434 $arc->{_atype} = 'object'; 556 $arc->{_atype} = 'object';
435 557
436 if ($more) { 558 if ($more) {
437 $more->{more} = $arc; 559 $more->{more} = $arc;
438 } else { 560 } else {
… …
440 } 562 }
441 $prev = $arc; 563 $prev = $arc;
442 $more = undef; 564 $more = undef;
443 } elsif (/^arch (\S+)$/i) { 565 } elsif (/^arch (\S+)$/i) {
444 my $name = $1; 566 my $name = $1;
445 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 567 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
568 undef $comment;
569 delete $arc{_comment} unless length $arc{_comment};
446 $arc->{_atype} = 'arch'; 570 $arc->{_atype} = 'arch';
447 571
448 if ($more) { 572 if ($more) {
449 $more->{more} = $arc; 573 $more->{more} = $arc;
450 } else { 574 } else {
… …
459 push @{$toplevel->{lev_array}}, $_+0; 583 push @{$toplevel->{lev_array}}, $_+0;
460 } 584 }
461 } else { 585 } else {
462 $toplevel->{$1} = $2; 586 $toplevel->{$1} = $2;
463 } 587 }
588 } elsif (/^\s*#/) {
589 $comment .= "$_\n";
464 } elsif (/^\s*($|#)/) { 590 } elsif (/^\s*($|#)/) {
465 # 591 #
466 } else { 592 } else {
467 die "$path: unparseable top-level line '$_'"; 593 die "$path: unparseable top-level line '$_'";
468 } 594 }
… …
488 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 614 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
489 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 615 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
490 | (delete $a{attack_movement_bits_4_7}); 616 | (delete $a{attack_movement_bits_4_7});
491 } 617 }
492 618
619 if (my $comment = delete $a{_comment}) {
620 if ($comment =~ /[^\n\s#]/) {
621 $str .= $comment;
622 }
623 }
624
493 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 625 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
494 626
495 my $inv = delete $a{inventory}; 627 my $inv = delete $a{inventory};
496 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 628 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
497 my $anim = delete $a{anim}; 629 my $anim = delete $a{anim};
630
631 if ($a{_atype} eq 'object') {
632 $str .= join "\n", "anim", @$anim, "mina\n"
633 if $anim;
634 }
498 635
499 my @kv; 636 my @kv;
500 637
501 for ($a{_name} eq "map" 638 for ($a{_name} eq "map"
502 ? @Crossfire::FIELD_ORDER_MAP 639 ? @Crossfire::FIELD_ORDER_MAP
… …
514 my ($k, $v) = @$_; 651 my ($k, $v) = @$_;
515 652
516 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 653 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
517 $v =~ s/\n$//; 654 $v =~ s/\n$//;
518 $str .= "$k\n$v\n$end\n"; 655 $str .= "$k\n$v\n$end\n";
519 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
520 if ($v & ~Crossfire::MOVE_ALL or !$v) {
521 $str .= "$k $v\n";
522
523 } elsif ($v & Crossfire::MOVE_ALLBIT) {
524 $str .= "$k all";
525
526 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
527 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
528 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
529 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
530 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
531
532 $str .= "\n";
533
534 } else {
535 $str .= $k;
536
537 $str .= " walk" if $v & Crossfire::MOVE_WALK;
538 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
539 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
540 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
541 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
542
543 $str .= "\n";
544 }
545 } else { 656 } else {
546 $str .= "$k $v\n"; 657 $str .= "$k $v\n";
547 } 658 }
548 } 659 }
549 660
550 if ($inv) { 661 if ($inv) {
551 $append->($_) for @$inv; 662 $append->($_) for @$inv;
552 } 663 }
553 664
665 $str .= "end\n";
666
554 if ($a{_atype} eq 'object') { 667 if ($a{_atype} eq 'object') {
555 $str .= join "\n", "anim", @$anim, "mina\n" 668 if ($more) {
556 if $anim;
557 }
558
559 $str .= "end\n";
560
561 if (($a{_atype} eq 'object') && $more) {
562 $str .= "\nmore\n"; 669 $str .= "more\n";
563 $append->($more) if $more; 670 $append->($more) if $more;
671 } else {
672 $str .= "\n";
673 }
564 } 674 }
565 }; 675 };
566 676
567 for (@$arch) { 677 for (@$arch) {
568 $append->($_); 678 $append->($_);
… …
597 my ($a) = @_; 707 my ($a) = @_;
598 708
599 my $o = $ARCH{$a->{_name}} 709 my $o = $ARCH{$a->{_name}}
600 or return; 710 or return;
601 711
602 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 712 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
713 unless ($face) {
714 $face = $FACE{"blank.x11"}
603 or (warn "no face data found for arch '$a->{_name}'"), return; 715 or (warn "no face data found for arch '$a->{_name}'"), return;
716 }
604 717
605 if ($face->{w} > 1 || $face->{h} > 1) { 718 if ($face->{w} > 1 || $face->{h} > 1) {
606 # bigface 719 # bigface
607 return (0, 0, $face->{w} - 1, $face->{h} - 1); 720 return (0, 0, $face->{w} - 1, $face->{h} - 1);
608 721
… …
715 ]; 828 ];
716 829
717 $attr 830 $attr
718} 831}
719 832
720sub arch_edit_sections {
721# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
722# edit_type = 0;
723# else if (edit_type != 0) {
724# // all flags from 'check_type' must be unset in this arch because they get recalculated now
725# edit_type &= ~check_type;
726# }
727#
728# }
729# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
730# getAttributeValue("alive", defarch) == 1 &&
731# (getAttributeValue("monster", defarch) == 1 ||
732# getAttributeValue("generator", defarch) == 1)) {
733# // Monster: monsters/npcs/generators
734# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
735# }
736# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
737# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
738# // Walls
739# edit_type |= IGUIConstants.TILE_EDIT_WALL;
740# }
741# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
742# getAttributeValue("connected", defarch) != 0) {
743# // Connected Objects
744# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
745# }
746# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
747# arch_type == 66 || arch_type == 41 || arch_type == 95) {
748# // Exit: teleporter/exit/trapdoors
749# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
750# }
751# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
752# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
753# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
754# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
755# arch_type == 124 || arch_type == 130)) {
756# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
757# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
758# }
759# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
760# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
761# arch_type == 91 || arch_type == 21 || arch_type == 24) {
762# // Door: door/special door/gates + keys
763# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
764# }
765# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
766# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
767# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
768# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
769# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
770# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
771# arch_type == 122 || arch_type == 3)) {
772# // Equipment: weapons/armour/wands/rods
773# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
774# }
775#
776# return(edit_type);
777#
778#
779}
780
781sub cache_file($$&&) { 833sub cache_file($$&&) {
782 my ($src, $cache, $load, $create) = @_; 834 my ($src, $cache, $load, $create) = @_;
783 835
784 my ($size, $mtime) = (stat $src)[7,9] 836 my ($size, $mtime) = (stat $src)[7,9]
785 or Carp::croak "$src: $!"; 837 or Carp::croak "$src: $!";

Diff Legend

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