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.60 by root, Mon Mar 27 17:23:35 2006 UTC vs.
Revision 1.85 by root, Wed Feb 7 00:44:18 2007 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.96';
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(
49 name swap_time reset_timeout fixed_resettime difficulty region 63 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 64 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 65 darkness width height enter_x enter_y msg maplore
52 unique template 66 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 67 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4 68 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55)); 69));
56 70
57our @FIELD_ORDER = (qw( 71our @FIELD_ORDER = (qw(
58 elevation 72 elevation
59 73
60 name name_pl custom_name title race 74 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch face
62 #todo-events 76 #todo-events
63 animation is_animated 77 animation is_animated
64 str dex con wis pow cha int 78 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
… …
102 116
103 body_range body_arm body_torso body_head body_neck body_skill 117 body_range body_arm body_torso body_head body_neck body_skill
104 body_finger body_shoulder body_foot body_hand body_wrist body_waist 118 body_finger body_shoulder body_foot body_hand body_wrist body_waist
105)); 119));
106 120
121our %EVENT_TYPE = (
122 apply => 1,
123 attack => 2,
124 death => 3,
125 drop => 4,
126 pickup => 5,
127 say => 6,
128 stop => 7,
129 time => 8,
130 throw => 9,
131 trigger => 10,
132 close => 11,
133 timer => 12,
134);
135
107sub MOVE_WALK (){ 0x01 } 136sub MOVE_WALK (){ 0x01 }
108sub MOVE_FLY_LOW (){ 0x02 } 137sub MOVE_FLY_LOW (){ 0x02 }
109sub MOVE_FLY_HIGH (){ 0x04 } 138sub MOVE_FLY_HIGH (){ 0x04 }
110sub MOVE_FLYING (){ 0x06 } 139sub MOVE_FLYING (){ 0x06 }
111sub MOVE_SWIM (){ 0x08 } 140sub MOVE_SWIM (){ 0x08 }
… …
115sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
116 145
117sub load_ref($) { 146sub load_ref($) {
118 my ($path) = @_; 147 my ($path) = @_;
119 148
120 open my $fh, "<", $path 149 open my $fh, "<:raw:perlio", $path
121 or die "$path: $!"; 150 or die "$path: $!";
122 binmode $fh;
123 local $/; 151 local $/;
124 152
125 thaw <$fh> 153 thaw <$fh>
126} 154}
127 155
128sub save_ref($$) { 156sub save_ref($$) {
129 my ($ref, $path) = @_; 157 my ($ref, $path) = @_;
130 158
131 open my $fh, ">", "$path~" 159 open my $fh, ">:raw:perlio", "$path~"
132 or die "$path~: $!"; 160 or die "$path~: $!";
133 binmode $fh;
134 print $fh freeze $ref; 161 print $fh freeze $ref;
135 close $fh; 162 close $fh;
136 rename "$path~", $path 163 rename "$path~", $path
137 or die "$path: $!"; 164 or die "$path: $!";
138} 165}
139 166
167my %attack_mask = (
168 physical => 0x00000001,
169 magic => 0x00000002,
170 fire => 0x00000004,
171 electricity => 0x00000008,
172 cold => 0x00000010,
173 confusion => 0x00000020,
174 acid => 0x00000040,
175 drain => 0x00000080,
176 weaponmagic => 0x00000100,
177 ghosthit => 0x00000200,
178 poison => 0x00000400,
179 slow => 0x00000800,
180 paralyze => 0x00001000,
181 turn_undead => 0x00002000,
182 fear => 0x00004000,
183 cancellation => 0x00008000,
184 deplete => 0x00010000,
185 death => 0x00020000,
186 chaos => 0x00040000,
187 counterspell => 0x00080000,
188 godpower => 0x00100000,
189 holyword => 0x00200000,
190 blind => 0x00400000,
191 internal => 0x00800000,
192 life_stealing => 0x01000000,
193 disease => 0x02000000,
194);
195
196sub _add_resist($$$) {
197 my ($ob, $mask, $value) = @_;
198
199 while (my ($k, $v) = each %attack_mask) {
200 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
201 }
202}
203
204my %MATERIAL = reverse
205 paper => 1,
206 iron => 2,
207 glass => 4,
208 leather => 8,
209 wood => 16,
210 organic => 32,
211 stone => 64,
212 cloth => 128,
213 adamant => 256,
214 liquid => 512,
215 tin => 1024,
216 bone => 2048,
217 ice => 4096,
218
219 # guesses
220 runestone => 12,
221 bronze => 18,
222 "ancient wood" => 20,
223 glass => 36,
224 marble => 66,
225 ice => 68,
226 stone => 70,
227 stone => 80,
228 cloth => 136,
229 ironwood => 144,
230 adamantium => 258,
231 glacium => 260,
232 blood => 544,
233;
234
235# object as in "Object xxx", i.e. archetypes
140sub normalize_object($) { 236sub normalize_object($) {
141 my ($ob) = @_; 237 my ($ob) = @_;
142 238
239 # convert material bitset to materialname, if possible
240 if (exists $ob->{material}) {
241 if (!$ob->{material}) {
242 delete $ob->{material};
243 } elsif (exists $ob->{materialname}) {
244 if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) {
245 delete $ob->{material};
246 } else {
247 warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n";
248 delete $ob->{material}; # assume materilname is more specific and nuke material
249 }
250 } elsif (my $name = $MATERIAL{$ob->{material}}) {
251 delete $ob->{material};
252 $ob->{materialname} = $name;
253 } else {
254 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
255 }
256 }
257
258 # nuke outdated or never supported fields
143 delete $ob->{$_} for qw( 259 delete @$ob{qw(
144 can_knockback can_parry can_impale can_cut can_dam_armour 260 can_knockback can_parry can_impale can_cut can_dam_armour
145 can_apply pass_thru can_pass_thru 261 can_apply pass_thru can_pass_thru
146 ); 262 )};
147 263
264 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
265 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
266 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
267
268 # convert movement strings to bitsets
148 for my $attr (keys %FIELD_MOVEMENT) { 269 for my $attr (keys %FIELD_MOVEMENT) {
149 next unless exists $ob->{$attr}; 270 next unless exists $ob->{$attr};
150 271
151 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 272 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
152 273
… …
174 } 295 }
175 296
176 $ob->{$attr} = $flags; 297 $ob->{$attr} = $flags;
177 } 298 }
178 299
300 # convert outdated movement flags to new movement sets
179 if (defined (my $v = delete $ob->{no_pass})) { 301 if (defined (my $v = delete $ob->{no_pass})) {
180 $ob->{move_block} = $v ? MOVE_ALL : 0; 302 $ob->{move_block} = $v ? MOVE_ALL : 0;
181 } 303 }
182 if (defined (my $v = delete $ob->{slow_move})) { 304 if (defined (my $v = delete $ob->{slow_move})) {
183 $ob->{move_slow} |= MOVE_WALK; 305 $ob->{move_slow} |= MOVE_WALK;
184 $ob->{move_slow_penalty} = $v; 306 $ob->{move_slow_penalty} = $v;
185 } 307 }
186 if (defined (my $v = delete $ob->{walk_on})) { 308 if (defined (my $v = delete $ob->{walk_on})) {
309 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
187 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 310 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
188 : $ob->{move_on} & ~MOVE_WALK; 311 : $ob->{move_on} & ~MOVE_WALK;
189 } 312 }
190 if (defined (my $v = delete $ob->{walk_off})) { 313 if (defined (my $v = delete $ob->{walk_off})) {
314 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
191 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 315 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
192 : $ob->{move_off} & ~MOVE_WALK; 316 : $ob->{move_off} & ~MOVE_WALK;
193 } 317 }
194 if (defined (my $v = delete $ob->{fly_on})) { 318 if (defined (my $v = delete $ob->{fly_on})) {
319 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
195 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 320 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
196 : $ob->{move_on} & ~MOVE_FLY_LOW; 321 : $ob->{move_on} & ~MOVE_FLY_LOW;
197 } 322 }
198 if (defined (my $v = delete $ob->{fly_off})) { 323 if (defined (my $v = delete $ob->{fly_off})) {
324 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
199 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 325 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
200 : $ob->{move_off} & ~MOVE_FLY_LOW; 326 : $ob->{move_off} & ~MOVE_FLY_LOW;
201 } 327 }
202 if (defined (my $v = delete $ob->{flying})) { 328 if (defined (my $v = delete $ob->{flying})) {
329 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
203 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 330 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
204 : $ob->{move_type} & ~MOVE_FLY_LOW; 331 : $ob->{move_type} & ~MOVE_FLY_LOW;
205 } 332 }
206 333
334 # convert idiotic event_xxx things into objects
335 while (my ($event, $subtype) = each %EVENT_TYPE) {
336 if (exists $ob->{"event_${event}_plugin"}) {
337 push @{$ob->{inventory}}, {
338 _name => "event_$event",
339 title => delete $ob->{"event_${event}_plugin"},
340 slaying => delete $ob->{"event_${event}"},
341 name => delete $ob->{"event_${event}_options"},
342 };
343 }
344 }
345
346 # some archetypes had "+3" instead of the canonical "3", so fix
347 $ob->{dam} *= 1 if exists $ob->{dam};
348
207 $ob 349 $ob
208} 350}
209 351
352# arch as in "arch xxx", ie.. objects
210sub normalize_arch($) { 353sub normalize_arch($) {
211 my ($ob) = @_; 354 my ($ob) = @_;
212 355
213 normalize_object $ob; 356 normalize_object $ob;
214 357
… …
251 } 394 }
252 395
253 $ob 396 $ob
254} 397}
255 398
399sub attr_thaw($) {
400 my ($ob) = @_;
401
402 $ob->{attach} = from_json $ob->{attach}
403 if exists $ob->{attach};
404
405 $ob
406}
407
408sub attr_freeze($) {
409 my ($ob) = @_;
410
411 $ob->{attach} = Crossfire::to_json $ob->{attach}
412 if exists $ob->{attach};
413
414 $ob
415}
416
256sub read_pak($) { 417sub read_pak($) {
257 my ($path) = @_; 418 my ($path) = @_;
258 419
259 my %pak; 420 my %pak;
260 421
261 open my $fh, "<", $path 422 open my $fh, "<:raw:perlio", $path
262 or Carp::croak "$_[0]: $!"; 423 or Carp::croak "$_[0]: $!";
263 binmode $fh; 424 binmode $fh;
264 while (<$fh>) { 425 while (<$fh>) {
265 my ($type, $id, $len, $path) = split; 426 my ($type, $id, $len, $path) = split;
266 $path =~ s/.*\///; 427 $path =~ s/.*\///;
… …
268 } 429 }
269 430
270 \%pak 431 \%pak
271} 432}
272 433
273sub read_arch($) { 434sub read_arch($;$) {
274 my ($path) = @_; 435 my ($path, $toplevel) = @_;
275 436
276 my %arc; 437 my %arc;
277 my ($more, $prev); 438 my ($more, $prev);
439 my $comment;
278 440
279 open my $fh, "<", $path 441 open my $fh, "<:raw:perlio:utf8", $path
280 or Carp::croak "$path: $!"; 442 or Carp::croak "$path: $!";
281 443
282 binmode $fh; 444# binmode $fh;
283 445
284 my $parse_block; $parse_block = sub { 446 my $parse_block; $parse_block = sub {
285 my %arc = @_; 447 my %arc = @_;
286 448
287 while (<$fh>) { 449 while (<$fh>) {
288 s/\s+$//; 450 s/\s+$//;
289 if (/^end$/i) { 451 if (/^end$/i) {
290 last; 452 last;
453
291 } elsif (/^arch (\S+)$/i) { 454 } elsif (/^arch (\S+)$/i) {
292 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 455 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
456
293 } elsif (/^lore$/i) { 457 } elsif (/^lore$/i) {
294 while (<$fh>) { 458 while (<$fh>) {
295 last if /^endlore\s*$/i; 459 last if /^endlore\s*$/i;
296 $arc{lore} .= $_; 460 $arc{lore} .= $_;
297 } 461 }
298 } elsif (/^msg$/i) { 462 } elsif (/^msg$/i) {
299 while (<$fh>) { 463 while (<$fh>) {
300 last if /^endmsg\s*$/i; 464 last if /^endmsg\s*$/i;
301 $arc{msg} .= $_; 465 $arc{msg} .= $_;
302 } 466 }
467 } elsif (/^anim$/i) {
468 while (<$fh>) {
469 last if /^mina\s*$/i;
470 chomp;
471 push @{ $arc{anim} }, $_;
472 }
303 } elsif (/^(\S+)\s*(.*)$/) { 473 } elsif (/^(\S+)\s*(.*)$/) {
304 $arc{lc $1} = $2; 474 $arc{lc $1} = $2;
305 } elsif (/^\s*($|#)/) { 475 } elsif (/^\s*#/) {
476 $arc{_comment} .= "$_\n";
477
478 } elsif (/^\s*$/) {
306 # 479 #
307 } else { 480 } else {
308 warn "$path: unparsable line '$_' in arch $arc{_name}"; 481 warn "$path: unparsable line '$_' in arch $arc{_name}";
309 } 482 }
310 } 483 }
… …
316 s/\s+$//; 489 s/\s+$//;
317 if (/^more$/i) { 490 if (/^more$/i) {
318 $more = $prev; 491 $more = $prev;
319 } elsif (/^object (\S+)$/i) { 492 } elsif (/^object (\S+)$/i) {
320 my $name = $1; 493 my $name = $1;
321 my $arc = normalize_object $parse_block->(_name => $name); 494 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
495 undef $comment;
496 delete $arc{_comment} unless length $arc{_comment};
497 $arc->{_atype} = 'object';
322 498
323 if ($more) { 499 if ($more) {
324 $more->{more} = $arc; 500 $more->{more} = $arc;
325 } else { 501 } else {
326 $arc{$name} = $arc; 502 $arc{$name} = $arc;
327 } 503 }
328 $prev = $arc; 504 $prev = $arc;
329 $more = undef; 505 $more = undef;
330 } elsif (/^arch (\S+)$/i) { 506 } elsif (/^arch (\S+)$/i) {
331 my $name = $1; 507 my $name = $1;
332 my $arc = normalize_arch $parse_block->(_name => $name); 508 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
509 undef $comment;
510 delete $arc{_comment} unless length $arc{_comment};
511 $arc->{_atype} = 'arch';
333 512
334 if ($more) { 513 if ($more) {
335 $more->{more} = $arc; 514 $more->{more} = $arc;
336 } else { 515 } else {
337 push @{ $arc{arch} }, $arc; 516 push @{ $arc{arch} }, $arc;
338 } 517 }
339 $prev = $arc; 518 $prev = $arc;
340 $more = undef; 519 $more = undef;
520 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
521 if ($1 eq "lev_array") {
522 while (<$fh>) {
523 last if /^endplst\s*$/;
524 push @{$toplevel->{lev_array}}, $_+0;
525 }
526 } else {
527 $toplevel->{$1} = $2;
528 }
529 } elsif (/^\s*#/) {
530 $comment .= "$_\n";
341 } elsif (/^\s*($|#)/) { 531 } elsif (/^\s*($|#)/) {
342 # 532 #
343 } else { 533 } else {
344 warn "$path: unparseable top-level line '$_'"; 534 die "$path: unparseable top-level line '$_'";
345 } 535 }
346 } 536 }
347 537
348 undef $parse_block; # work around bug in perl not freeing $fh etc. 538 undef $parse_block; # work around bug in perl not freeing $fh etc.
349 539
350 \%arc 540 \%arc
541}
542
543sub archlist_to_string {
544 my ($arch) = @_;
545
546 my $str;
547
548 my $append; $append = sub {
549 my %a = %{$_[0]};
550
551 Crossfire::attr_freeze \%a;
552 Crossfire::normalize_arch \%a;
553
554 # undo the bit-split we did before
555 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})
557 | (delete $a{attack_movement_bits_4_7});
558 }
559
560 if (my $comment = delete $a{_comment}) {
561 if ($comment =~ /[^\n\s#]/) {
562 $str .= $comment;
563 }
564 }
565
566 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
567
568 my $inv = delete $a{inventory};
569 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
570 my $anim = delete $a{anim};
571
572 my @kv;
573
574 for ($a{_name} eq "map"
575 ? @Crossfire::FIELD_ORDER_MAP
576 : @Crossfire::FIELD_ORDER) {
577 push @kv, [$_, delete $a{$_}]
578 if exists $a{$_};
579 }
580
581 for (sort keys %a) {
582 next if /^_/; # ignore our _-keys
583 push @kv, [$_, delete $a{$_}];
584 }
585
586 for (@kv) {
587 my ($k, $v) = @$_;
588
589 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
590 $v =~ s/\n$//;
591 $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 {
619 $str .= "$k $v\n";
620 }
621 }
622
623 if ($inv) {
624 $append->($_) for @$inv;
625 }
626
627 if ($a{_atype} eq 'object') {
628 $str .= join "\n", "anim", @$anim, "mina\n"
629 if $anim;
630 }
631
632 $str .= "end\n";
633
634 if ($a{_atype} eq 'object') {
635 if ($more) {
636 $str .= "more\n";
637 $append->($more) if $more;
638 } else {
639 $str .= "\n";
640 }
641 }
642 };
643
644 for (@$arch) {
645 $append->($_);
646 }
647
648 $str
351} 649}
352 650
353# put all archs into a hash with editor_face as it's key 651# put all archs into a hash with editor_face as it's key
354# NOTE: the arrays in the hash values are references to 652# NOTE: the arrays in the hash values are references to
355# the archs from $ARCH 653# the archs from $ARCH
356sub editor_archs { 654sub editor_archs {
357 my %paths; 655 my %paths;
358 656
359 for (keys %ARCH) { 657 for (keys %ARCH) {
360 my $arch = $ARCH{$_}; 658 my $arch = $ARCH{$_};
361 push @{$paths{$arch->{editor_folder}}}, \$arch; 659 push @{$paths{$arch->{editor_folder}}}, $arch;
362 } 660 }
363 661
364 \%paths 662 \%paths
365} 663}
366 664
… …
376 my ($a) = @_; 674 my ($a) = @_;
377 675
378 my $o = $ARCH{$a->{_name}} 676 my $o = $ARCH{$a->{_name}}
379 or return; 677 or return;
380 678
381 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} 679 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"};
680 unless ($face) {
681 $face = $FACE{"blank.x11"}
382 or (warn "no face data found for arch '$a->{_name}'"), return; 682 or (warn "no face data found for arch '$a->{_name}'"), return;
683 }
383 684
384 if ($face->{w} > 1 || $face->{h} > 1) { 685 if ($face->{w} > 1 || $face->{h} > 1) {
385 # bigface 686 # bigface
386 return (0, 0, $face->{w} - 1, $face->{h} - 1); 687 return (0, 0, $face->{w} - 1, $face->{h} - 1);
387 688
… …
431 my $type = $obj->{type} || $arch->{type}; 732 my $type = $obj->{type} || $arch->{type};
432 733
433 if ($type > 0) { 734 if ($type > 0) {
434 $root = $Crossfire::Data::ATTR{$type}; 735 $root = $Crossfire::Data::ATTR{$type};
435 } else { 736 } else {
737 my %a = (%$arch, %$obj);
738
739 if ($a{is_floor} && !$a{alive}) {
740 $root = $Crossfire::Data::TYPE{Floor};
741 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
742 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
743 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
744 $root = $Crossfire::Data::TYPE{Wall};
745 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
746 $root = $Crossfire::Data::TYPE{"Weak Wall"};
747 } else {
436 $root = $Crossfire::Data::TYPE{Misc}; 748 $root = $Crossfire::Data::TYPE{Misc};
437
438 type:
439 for (@Crossfire::Data::ATTR0) {
440 my $req = $_->{required}
441 or die "internal error: ATTR0 without 'required'";
442
443 keys %$req;
444 while (my ($k, $v) = each %$req) {
445 next type
446 unless $obj->{$k} == $v || $arch->{$k} == $v;
447 }
448
449 $root = $_;
450 } 749 }
451 } 750 }
452 751
453 my @import = ($root); 752 my @import = ($root);
454 753

Diff Legend

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