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.71 by elmex, Thu Aug 31 21:09:32 2006 UTC vs.
Revision 1.93 by root, Sat Mar 3 19:38:06 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 '=' => 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 $_[0] += $_[1];
172 } elsif ($cur) {
173 $_[0] -= $_[1];
174 } else {
175 $_[0] /= $_[1];
176 }
177
178 $_[0]
179 },
180 'eq' => sub { "$_[0]" eq "$_[1]" },
181 'ne' => sub { "$_[0]" ne "$_[1]" },
182 ;
183}
184
185sub Crossfire::MoveType::new {
186 my ($class, $string) = @_;
187
188 my $mask;
189 my $value;
190
191 if ($string =~ /^\s*\d+\s*$/) {
192 $mask = MOVE_ALL;
193 $value = $string+0;
194 } else {
195 for (split /\s+/, lc $string) {
196 if (s/^-//) {
197 $mask |= $MOVE_TYPE{$_};
198 $value &= ~$MOVE_TYPE{$_};
199 } else {
200 $mask |= $MOVE_TYPE{$_};
201 $value |= $MOVE_TYPE{$_};
202 }
203 }
204 }
205
206 (bless [$mask, $value], $class)->normalise
207}
208
209sub Crossfire::MoveType::normalise {
210 my ($self) = @_;
211
212 if ($self->[0] & MOVE_ALL) {
213 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
214 $self->[0] &= $mask;
215 $self->[1] &= $mask;
216 }
217
218 $self->[1] &= $self->[0];
219
220 $self
221}
222
223sub Crossfire::MoveType::as_string {
224 my ($self) = @_;
225
226 my @res;
227
228 my ($mask, $value) = @$self;
229
230 for (@Crossfire::MOVE_TYPE) {
231 my $bit = $Crossfire::MOVE_TYPE{$_};
232 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
233 $mask &= ~$bit;
234 push @res, $value & $bit ? $_ : "-$_";
235 }
236 }
237
238 join " ", @res
239}
143 240
144sub load_ref($) { 241sub load_ref($) {
145 my ($path) = @_; 242 my ($path) = @_;
146 243
147 open my $fh, "<:raw:perlio", $path 244 open my $fh, "<:raw:perlio", $path
… …
160 close $fh; 257 close $fh;
161 rename "$path~", $path 258 rename "$path~", $path
162 or die "$path: $!"; 259 or die "$path: $!";
163} 260}
164 261
262my %attack_mask = (
263 physical => 0x00000001,
264 magic => 0x00000002,
265 fire => 0x00000004,
266 electricity => 0x00000008,
267 cold => 0x00000010,
268 confusion => 0x00000020,
269 acid => 0x00000040,
270 drain => 0x00000080,
271 weaponmagic => 0x00000100,
272 ghosthit => 0x00000200,
273 poison => 0x00000400,
274 slow => 0x00000800,
275 paralyze => 0x00001000,
276 turn_undead => 0x00002000,
277 fear => 0x00004000,
278 cancellation => 0x00008000,
279 deplete => 0x00010000,
280 death => 0x00020000,
281 chaos => 0x00040000,
282 counterspell => 0x00080000,
283 godpower => 0x00100000,
284 holyword => 0x00200000,
285 blind => 0x00400000,
286 internal => 0x00800000,
287 life_stealing => 0x01000000,
288 disease => 0x02000000,
289);
290
291sub _add_resist($$$) {
292 my ($ob, $mask, $value) = @_;
293
294 while (my ($k, $v) = each %attack_mask) {
295 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
296 }
297}
298
299my %MATERIAL = reverse
300 paper => 1,
301 iron => 2,
302 glass => 4,
303 leather => 8,
304 wood => 16,
305 organic => 32,
306 stone => 64,
307 cloth => 128,
308 adamant => 256,
309 liquid => 512,
310 tin => 1024,
311 bone => 2048,
312 ice => 4096,
313
314 # guesses
315 runestone => 12,
316 bronze => 18,
317 "ancient wood" => 20,
318 glass => 36,
319 marble => 66,
320 ice => 68,
321 stone => 70,
322 stone => 80,
323 cloth => 136,
324 ironwood => 144,
325 adamantium => 258,
326 glacium => 260,
327 blood => 544,
328;
329
165# object as in "Object xxx", i.e. archetypes 330# object as in "Object xxx", i.e. archetypes
166sub normalize_object($) { 331sub normalize_object($) {
167 my ($ob) = @_; 332 my ($ob) = @_;
168 333
334 # convert material bitset to materialname, if possible
335 if (exists $ob->{material}) {
336 if (!$ob->{material}) {
337 delete $ob->{material};
338 } elsif (exists $ob->{materialname}) {
339 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
340 delete $ob->{material};
341 } else {
342 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
343 delete $ob->{material}; # assume materilname is more specific and nuke material
344 }
345 } elsif (my $name = $MATERIAL{$ob->{material}}) {
346 delete $ob->{material};
347 $ob->{materialname} = $name;
348 } else {
349 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
350 }
351 }
352
169 # nuke outdated or never supported fields 353 # nuke outdated or never supported fields
170 delete $ob->{$_} for qw( 354 delete @$ob{qw(
171 can_knockback can_parry can_impale can_cut can_dam_armour 355 can_knockback can_parry can_impale can_cut can_dam_armour
172 can_apply pass_thru can_pass_thru 356 can_apply pass_thru can_pass_thru
173 ); 357 )};
358
359 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
360 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
361 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
174 362
175 # convert movement strings to bitsets 363 # convert movement strings to bitsets
176 for my $attr (keys %FIELD_MOVEMENT) { 364 for my $attr (keys %FIELD_MOVEMENT) {
177 next unless exists $ob->{$attr}; 365 next unless exists $ob->{$attr};
178 366
179 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 367 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr};
180
181 next if $ob->{$attr} =~ /^\d+$/;
182
183 my $flags = 0;
184
185 # assume list
186 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
187 $flags |= MOVE_WALK if $flag eq "walk";
188 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
189 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
190 $flags |= MOVE_FLYING if $flag eq "flying";
191 $flags |= MOVE_SWIM if $flag eq "swim";
192 $flags |= MOVE_BOAT if $flag eq "boat";
193 $flags |= MOVE_ALL if $flag eq "all";
194
195 $flags &= ~MOVE_WALK if $flag eq "-walk";
196 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
197 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
198 $flags &= ~MOVE_FLYING if $flag eq "-flying";
199 $flags &= ~MOVE_SWIM if $flag eq "-swim";
200 $flags &= ~MOVE_BOAT if $flag eq "-boat";
201 $flags &= ~MOVE_ALL if $flag eq "-all";
202 }
203
204 $ob->{$attr} = $flags;
205 } 368 }
206 369
207 # convert outdated movement flags to new movement sets 370 # convert outdated movement flags to new movement sets
208 if (defined (my $v = delete $ob->{no_pass})) { 371 if (defined (my $v = delete $ob->{no_pass})) {
209 $ob->{move_block} = $v ? MOVE_ALL : 0; 372 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : "";
210 } 373 }
211 if (defined (my $v = delete $ob->{slow_move})) { 374 if (defined (my $v = delete $ob->{slow_move})) {
212 $ob->{move_slow} |= MOVE_WALK; 375 $ob->{move_slow} += "walk";
213 $ob->{move_slow_penalty} = $v; 376 $ob->{move_slow_penalty} = $v;
214 } 377 }
215 if (defined (my $v = delete $ob->{walk_on})) { 378 if (defined (my $v = delete $ob->{walk_on})) {
216 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 379 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
217 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
218 : $ob->{move_on} & ~MOVE_WALK;
219 } 380 }
220 if (defined (my $v = delete $ob->{walk_off})) { 381 if (defined (my $v = delete $ob->{walk_off})) {
221 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 382 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
222 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
223 : $ob->{move_off} & ~MOVE_WALK;
224 } 383 }
225 if (defined (my $v = delete $ob->{fly_on})) { 384 if (defined (my $v = delete $ob->{fly_on})) {
226 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; 385 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
227 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
228 : $ob->{move_on} & ~MOVE_FLY_LOW;
229 } 386 }
230 if (defined (my $v = delete $ob->{fly_off})) { 387 if (defined (my $v = delete $ob->{fly_off})) {
231 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; 388 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
232 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
233 : $ob->{move_off} & ~MOVE_FLY_LOW;
234 } 389 }
235 if (defined (my $v = delete $ob->{flying})) { 390 if (defined (my $v = delete $ob->{flying})) {
236 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; 391 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
237 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
238 : $ob->{move_type} & ~MOVE_FLY_LOW;
239 } 392 }
240 393
241 # convert idiotic event_xxx things into objects 394 # convert idiotic event_xxx things into objects
242 while (my ($event, $subtype) = each %EVENT_TYPE) { 395 while (my ($event, $subtype) = each %EVENT_TYPE) {
243 if (exists $ob->{"event_${event}_plugin"}) { 396 if (exists $ob->{"event_${event}_plugin"}) {
… …
247 slaying => delete $ob->{"event_${event}"}, 400 slaying => delete $ob->{"event_${event}"},
248 name => delete $ob->{"event_${event}_options"}, 401 name => delete $ob->{"event_${event}_options"},
249 }; 402 };
250 } 403 }
251 } 404 }
405
406 # some archetypes had "+3" instead of the canonical "3", so fix
407 $ob->{dam} *= 1 if exists $ob->{dam};
252 408
253 $ob 409 $ob
254} 410}
255 411
256# arch as in "arch xxx", ie.. objects 412# arch as in "arch xxx", ie.. objects
… …
338sub read_arch($;$) { 494sub read_arch($;$) {
339 my ($path, $toplevel) = @_; 495 my ($path, $toplevel) = @_;
340 496
341 my %arc; 497 my %arc;
342 my ($more, $prev); 498 my ($more, $prev);
499 my $comment;
343 500
344 open my $fh, "<:raw:perlio:utf8", $path 501 open my $fh, "<:raw:perlio:utf8", $path
345 or Carp::croak "$path: $!"; 502 or Carp::croak "$path: $!";
346 503
347# binmode $fh; 504# binmode $fh;
… …
351 508
352 while (<$fh>) { 509 while (<$fh>) {
353 s/\s+$//; 510 s/\s+$//;
354 if (/^end$/i) { 511 if (/^end$/i) {
355 last; 512 last;
513
356 } elsif (/^arch (\S+)$/i) { 514 } elsif (/^arch (\S+)$/i) {
357 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 515 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
516
358 } elsif (/^lore$/i) { 517 } elsif (/^lore$/i) {
359 while (<$fh>) { 518 while (<$fh>) {
360 last if /^endlore\s*$/i; 519 last if /^endlore\s*$/i;
361 $arc{lore} .= $_; 520 $arc{lore} .= $_;
362 } 521 }
… …
371 chomp; 530 chomp;
372 push @{ $arc{anim} }, $_; 531 push @{ $arc{anim} }, $_;
373 } 532 }
374 } elsif (/^(\S+)\s*(.*)$/) { 533 } elsif (/^(\S+)\s*(.*)$/) {
375 $arc{lc $1} = $2; 534 $arc{lc $1} = $2;
376 } elsif (/^\s*($|#)/) { 535 } elsif (/^\s*#/) {
536 $arc{_comment} .= "$_\n";
537
538 } elsif (/^\s*$/) {
377 # 539 #
378 } else { 540 } else {
379 warn "$path: unparsable line '$_' in arch $arc{_name}"; 541 warn "$path: unparsable line '$_' in arch $arc{_name}";
380 } 542 }
381 } 543 }
… …
387 s/\s+$//; 549 s/\s+$//;
388 if (/^more$/i) { 550 if (/^more$/i) {
389 $more = $prev; 551 $more = $prev;
390 } elsif (/^object (\S+)$/i) { 552 } elsif (/^object (\S+)$/i) {
391 my $name = $1; 553 my $name = $1;
392 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 554 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
555 undef $comment;
556 delete $arc{_comment} unless length $arc{_comment};
393 $arc->{_atype} = 'object'; 557 $arc->{_atype} = 'object';
394 558
395 if ($more) { 559 if ($more) {
396 $more->{more} = $arc; 560 $more->{more} = $arc;
397 } else { 561 } else {
… …
399 } 563 }
400 $prev = $arc; 564 $prev = $arc;
401 $more = undef; 565 $more = undef;
402 } elsif (/^arch (\S+)$/i) { 566 } elsif (/^arch (\S+)$/i) {
403 my $name = $1; 567 my $name = $1;
404 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 568 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
569 undef $comment;
570 delete $arc{_comment} unless length $arc{_comment};
405 $arc->{_atype} = 'arch'; 571 $arc->{_atype} = 'arch';
406 572
407 if ($more) { 573 if ($more) {
408 $more->{more} = $arc; 574 $more->{more} = $arc;
409 } else { 575 } else {
… …
418 push @{$toplevel->{lev_array}}, $_+0; 584 push @{$toplevel->{lev_array}}, $_+0;
419 } 585 }
420 } else { 586 } else {
421 $toplevel->{$1} = $2; 587 $toplevel->{$1} = $2;
422 } 588 }
589 } elsif (/^\s*#/) {
590 $comment .= "$_\n";
423 } elsif (/^\s*($|#)/) { 591 } elsif (/^\s*($|#)/) {
424 # 592 #
425 } else { 593 } else {
426 die "$path: unparseable top-level line '$_'"; 594 die "$path: unparseable top-level line '$_'";
427 } 595 }
… …
447 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 615 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
448 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 616 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
449 | (delete $a{attack_movement_bits_4_7}); 617 | (delete $a{attack_movement_bits_4_7});
450 } 618 }
451 619
620 if (my $comment = delete $a{_comment}) {
621 if ($comment =~ /[^\n\s#]/) {
622 $str .= $comment;
623 }
624 }
625
452 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; 626 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
453 627
454 my $inv = delete $a{inventory}; 628 my $inv = delete $a{inventory};
455 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some 629 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
456 my $anim = delete $a{anim}; 630 my $anim = delete $a{anim};
631
632 if ($a{_atype} eq 'object') {
633 $str .= join "\n", "anim", @$anim, "mina\n"
634 if $anim;
635 }
457 636
458 my @kv; 637 my @kv;
459 638
460 for ($a{_name} eq "map" 639 for ($a{_name} eq "map"
461 ? @Crossfire::FIELD_ORDER_MAP 640 ? @Crossfire::FIELD_ORDER_MAP
… …
473 my ($k, $v) = @$_; 652 my ($k, $v) = @$_;
474 653
475 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 654 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
476 $v =~ s/\n$//; 655 $v =~ s/\n$//;
477 $str .= "$k\n$v\n$end\n"; 656 $str .= "$k\n$v\n$end\n";
478 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
479 if ($v & ~Crossfire::MOVE_ALL or !$v) {
480 $str .= "$k $v\n";
481
482 } elsif ($v & Crossfire::MOVE_ALLBIT) {
483 $str .= "$k all";
484
485 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
486 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
487 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
488 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
489 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
490
491 $str .= "\n";
492
493 } else {
494 $str .= $k;
495
496 $str .= " walk" if $v & Crossfire::MOVE_WALK;
497 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
498 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
499 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
500 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
501
502 $str .= "\n";
503 }
504 } else { 657 } else {
505 $str .= "$k $v\n"; 658 $str .= "$k $v\n";
506 } 659 }
507 } 660 }
508 661
509 if ($inv) { 662 if ($inv) {
510 $append->($_) for @$inv; 663 $append->($_) for @$inv;
511 } 664 }
512 665
666 $str .= "end\n";
667
513 if ($a{_atype} eq 'object') { 668 if ($a{_atype} eq 'object') {
514 $str .= join "\n", "anim", @$anim, "mina\n" 669 if ($more) {
515 if $anim;
516 }
517
518 $str .= "end\n";
519
520 if (($a{_atype} eq 'object') && $more) {
521 $str .= "\nmore\n"; 670 $str .= "more\n";
522 $append->($more) if $more; 671 $append->($more) if $more;
672 } else {
673 $str .= "\n";
674 }
523 } 675 }
524 }; 676 };
525 677
526 for (@$arch) { 678 for (@$arch) {
527 $append->($_); 679 $append->($_);
… …
556 my ($a) = @_; 708 my ($a) = @_;
557 709
558 my $o = $ARCH{$a->{_name}} 710 my $o = $ARCH{$a->{_name}}
559 or return; 711 or return;
560 712
561 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 713 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
714 unless ($face) {
715 $face = $FACE{"blank.x11"}
562 or (warn "no face data found for arch '$a->{_name}'"), return; 716 or (warn "no face data found for arch '$a->{_name}'"), return;
717 }
563 718
564 if ($face->{w} > 1 || $face->{h} > 1) { 719 if ($face->{w} > 1 || $face->{h} > 1) {
565 # bigface 720 # bigface
566 return (0, 0, $face->{w} - 1, $face->{h} - 1); 721 return (0, 0, $face->{w} - 1, $face->{h} - 1);
567 722
… …
674 ]; 829 ];
675 830
676 $attr 831 $attr
677} 832}
678 833
679sub arch_edit_sections {
680# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
681# edit_type = 0;
682# else if (edit_type != 0) {
683# // all flags from 'check_type' must be unset in this arch because they get recalculated now
684# edit_type &= ~check_type;
685# }
686#
687# }
688# if ((check_type & IGUIConstants.TILE_EDIT_MONSTER) != 0 &&
689# getAttributeValue("alive", defarch) == 1 &&
690# (getAttributeValue("monster", defarch) == 1 ||
691# getAttributeValue("generator", defarch) == 1)) {
692# // Monster: monsters/npcs/generators
693# edit_type |= IGUIConstants.TILE_EDIT_MONSTER;
694# }
695# if ((check_type & IGUIConstants.TILE_EDIT_WALL) != 0 &&
696# arch_type == 0 && getAttributeValue("no_pass", defarch) == 1) {
697# // Walls
698# edit_type |= IGUIConstants.TILE_EDIT_WALL;
699# }
700# if ((check_type & IGUIConstants.TILE_EDIT_CONNECTED) != 0 &&
701# getAttributeValue("connected", defarch) != 0) {
702# // Connected Objects
703# edit_type |= IGUIConstants.TILE_EDIT_CONNECTED;
704# }
705# if ((check_type & IGUIConstants.TILE_EDIT_EXIT) != 0 &&
706# arch_type == 66 || arch_type == 41 || arch_type == 95) {
707# // Exit: teleporter/exit/trapdoors
708# edit_type |= IGUIConstants.TILE_EDIT_EXIT;
709# }
710# if ((check_type & IGUIConstants.TILE_EDIT_TREASURE) != 0 &&
711# getAttributeValue("no_pick", defarch) == 0 && (arch_type == 4 ||
712# arch_type == 5 || arch_type == 36 || arch_type == 60 ||
713# arch_type == 85 || arch_type == 111 || arch_type == 123 ||
714# arch_type == 124 || arch_type == 130)) {
715# // Treasure: randomtreasure/money/gems/potions/spellbooks/scrolls
716# edit_type |= IGUIConstants.TILE_EDIT_TREASURE;
717# }
718# if ((check_type & IGUIConstants.TILE_EDIT_DOOR) != 0 &&
719# arch_type == 20 || arch_type == 23 || arch_type == 26 ||
720# arch_type == 91 || arch_type == 21 || arch_type == 24) {
721# // Door: door/special door/gates + keys
722# edit_type |= IGUIConstants.TILE_EDIT_DOOR;
723# }
724# if ((check_type & IGUIConstants.TILE_EDIT_EQUIP) != 0 &&
725# getAttributeValue("no_pick", defarch) == 0 && ((arch_type >= 13 &&
726# arch_type <= 16) || arch_type == 33 || arch_type == 34 ||
727# arch_type == 35 || arch_type == 39 || arch_type == 70 ||
728# arch_type == 87 || arch_type == 99 || arch_type == 100 ||
729# arch_type == 104 || arch_type == 109 || arch_type == 113 ||
730# arch_type == 122 || arch_type == 3)) {
731# // Equipment: weapons/armour/wands/rods
732# edit_type |= IGUIConstants.TILE_EDIT_EQUIP;
733# }
734#
735# return(edit_type);
736#
737#
738}
739
740sub cache_file($$&&) { 834sub cache_file($$&&) {
741 my ($src, $cache, $load, $create) = @_; 835 my ($src, $cache, $load, $create) = @_;
742 836
743 my ($size, $mtime) = (stat $src)[7,9] 837 my ($size, $mtime) = (stat $src)[7,9]
744 or Carp::croak "$src: $!"; 838 or Carp::croak "$src: $!";

Diff Legend

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