… | |
… | |
4 | |
4 | |
5 | =cut |
5 | =cut |
6 | |
6 | |
7 | package Crossfire; |
7 | package Crossfire; |
8 | |
8 | |
9 | our $VERSION = '0.1'; |
9 | our $VERSION = '0.96'; |
10 | |
10 | |
11 | use strict; |
11 | use strict; |
12 | |
12 | |
13 | use base 'Exporter'; |
13 | use base 'Exporter'; |
14 | |
14 | |
… | |
… | |
19 | |
19 | |
20 | our @EXPORT = qw( |
20 | our @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 | |
|
|
24 | use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working |
|
|
25 | |
|
|
26 | sub from_json($) { |
|
|
27 | $JSON::Syck::ImplicitUnicode = 1; |
|
|
28 | JSON::Syck::Load $_[0] |
|
|
29 | } |
|
|
30 | |
|
|
31 | sub to_json($) { |
|
|
32 | $JSON::Syck::ImplicitUnicode = 0; |
|
|
33 | JSON::Syck::Dump $_[0] |
|
|
34 | } |
|
|
35 | |
24 | our $LIB = $ENV{CROSSFIRE_LIBDIR}; |
36 | our $LIB = $ENV{CROSSFIRE_LIBDIR}; |
25 | |
37 | |
26 | our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; |
38 | our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" |
|
|
39 | : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" |
|
|
40 | : File::Spec->tmpdir . "/crossfire"; |
27 | |
41 | |
28 | mkdir $VARDIR, 0777; |
42 | mkdir $VARDIR, 0777; |
29 | |
43 | |
30 | sub TILESIZE (){ 32 } |
44 | sub 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. |
48 | our @FIELD_ORDER_MAP = (qw( |
62 | our @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 | |
57 | our @FIELD_ORDER = (qw( |
71 | our @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 |
… | |
… | |
148 | close $fh; |
162 | close $fh; |
149 | rename "$path~", $path |
163 | rename "$path~", $path |
150 | or die "$path: $!"; |
164 | or die "$path: $!"; |
151 | } |
165 | } |
152 | |
166 | |
|
|
167 | my %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 | |
|
|
196 | sub _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 | |
|
|
204 | my %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 | glacium => 260, |
|
|
231 | blood => 544, |
|
|
232 | ; |
|
|
233 | |
153 | # object as in "Object xxx", i.e. archetypes |
234 | # object as in "Object xxx", i.e. archetypes |
154 | sub normalize_object($) { |
235 | sub normalize_object($) { |
155 | my ($ob) = @_; |
236 | my ($ob) = @_; |
156 | |
237 | |
|
|
238 | # convert material bitset to materialname, if possible |
|
|
239 | if (exists $ob->{material}) { |
|
|
240 | if (!$ob->{material}) { |
|
|
241 | delete $ob->{material}; |
|
|
242 | } elsif (exists $ob->{materialname}) { |
|
|
243 | if ($MATERIAL{$ob->{material}} eq $ob->{materialname}) { |
|
|
244 | delete $ob->{material}; |
|
|
245 | } else { |
|
|
246 | warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n"; |
|
|
247 | delete $ob->{material}; # assume materilname is more specific and nuke material |
|
|
248 | } |
|
|
249 | } elsif (my $name = $MATERIAL{$ob->{material}}) { |
|
|
250 | delete $ob->{material}; |
|
|
251 | $ob->{materialname} = $name; |
|
|
252 | } else { |
|
|
253 | warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; |
|
|
254 | } |
|
|
255 | } |
|
|
256 | |
157 | # nuke outdated or never supported fields |
257 | # nuke outdated or never supported fields |
158 | delete $ob->{$_} for qw( |
258 | delete @$ob{qw( |
159 | can_knockback can_parry can_impale can_cut can_dam_armour |
259 | can_knockback can_parry can_impale can_cut can_dam_armour |
160 | can_apply pass_thru can_pass_thru |
260 | can_apply pass_thru can_pass_thru |
161 | ); |
261 | )}; |
|
|
262 | |
|
|
263 | if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; } |
|
|
264 | if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; } |
|
|
265 | if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; } |
162 | |
266 | |
163 | # convert movement strings to bitsets |
267 | # convert movement strings to bitsets |
164 | for my $attr (keys %FIELD_MOVEMENT) { |
268 | for my $attr (keys %FIELD_MOVEMENT) { |
165 | next unless exists $ob->{$attr}; |
269 | next unless exists $ob->{$attr}; |
166 | |
270 | |
… | |
… | |
199 | if (defined (my $v = delete $ob->{slow_move})) { |
303 | if (defined (my $v = delete $ob->{slow_move})) { |
200 | $ob->{move_slow} |= MOVE_WALK; |
304 | $ob->{move_slow} |= MOVE_WALK; |
201 | $ob->{move_slow_penalty} = $v; |
305 | $ob->{move_slow_penalty} = $v; |
202 | } |
306 | } |
203 | if (defined (my $v = delete $ob->{walk_on})) { |
307 | if (defined (my $v = delete $ob->{walk_on})) { |
|
|
308 | $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; |
204 | $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK |
309 | $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK |
205 | : $ob->{move_on} & ~MOVE_WALK; |
310 | : $ob->{move_on} & ~MOVE_WALK; |
206 | } |
311 | } |
207 | if (defined (my $v = delete $ob->{walk_off})) { |
312 | if (defined (my $v = delete $ob->{walk_off})) { |
|
|
313 | $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; |
208 | $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK |
314 | $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK |
209 | : $ob->{move_off} & ~MOVE_WALK; |
315 | : $ob->{move_off} & ~MOVE_WALK; |
210 | } |
316 | } |
211 | if (defined (my $v = delete $ob->{fly_on})) { |
317 | if (defined (my $v = delete $ob->{fly_on})) { |
|
|
318 | $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on}; |
212 | $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW |
319 | $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW |
213 | : $ob->{move_on} & ~MOVE_FLY_LOW; |
320 | : $ob->{move_on} & ~MOVE_FLY_LOW; |
214 | } |
321 | } |
215 | if (defined (my $v = delete $ob->{fly_off})) { |
322 | if (defined (my $v = delete $ob->{fly_off})) { |
|
|
323 | $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off}; |
216 | $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW |
324 | $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW |
217 | : $ob->{move_off} & ~MOVE_FLY_LOW; |
325 | : $ob->{move_off} & ~MOVE_FLY_LOW; |
218 | } |
326 | } |
219 | if (defined (my $v = delete $ob->{flying})) { |
327 | if (defined (my $v = delete $ob->{flying})) { |
|
|
328 | $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type}; |
220 | $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW |
329 | $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW |
221 | : $ob->{move_type} & ~MOVE_FLY_LOW; |
330 | : $ob->{move_type} & ~MOVE_FLY_LOW; |
222 | } |
331 | } |
223 | |
332 | |
224 | # convert idiotic event_xxx things into objects |
333 | # convert idiotic event_xxx things into objects |
… | |
… | |
230 | slaying => delete $ob->{"event_${event}"}, |
339 | slaying => delete $ob->{"event_${event}"}, |
231 | name => delete $ob->{"event_${event}_options"}, |
340 | name => delete $ob->{"event_${event}_options"}, |
232 | }; |
341 | }; |
233 | } |
342 | } |
234 | } |
343 | } |
|
|
344 | |
|
|
345 | # some archetypes had "+3" instead of the canonical "3", so fix |
|
|
346 | $ob->{dam} *= 1 if exists $ob->{dam}; |
235 | |
347 | |
236 | $ob |
348 | $ob |
237 | } |
349 | } |
238 | |
350 | |
239 | # arch as in "arch xxx", ie.. objects |
351 | # arch as in "arch xxx", ie.. objects |
… | |
… | |
281 | } |
393 | } |
282 | |
394 | |
283 | $ob |
395 | $ob |
284 | } |
396 | } |
285 | |
397 | |
|
|
398 | sub attr_thaw($) { |
|
|
399 | my ($ob) = @_; |
|
|
400 | |
|
|
401 | $ob->{attach} = from_json $ob->{attach} |
|
|
402 | if exists $ob->{attach}; |
|
|
403 | |
|
|
404 | $ob |
|
|
405 | } |
|
|
406 | |
|
|
407 | sub attr_freeze($) { |
|
|
408 | my ($ob) = @_; |
|
|
409 | |
|
|
410 | $ob->{attach} = Crossfire::to_json $ob->{attach} |
|
|
411 | if exists $ob->{attach}; |
|
|
412 | |
|
|
413 | $ob |
|
|
414 | } |
|
|
415 | |
286 | sub read_pak($) { |
416 | sub read_pak($) { |
287 | my ($path) = @_; |
417 | my ($path) = @_; |
288 | |
418 | |
289 | my %pak; |
419 | my %pak; |
290 | |
420 | |
… | |
… | |
298 | } |
428 | } |
299 | |
429 | |
300 | \%pak |
430 | \%pak |
301 | } |
431 | } |
302 | |
432 | |
303 | sub read_arch($) { |
433 | sub read_arch($;$) { |
304 | my ($path) = @_; |
434 | my ($path, $toplevel) = @_; |
305 | |
435 | |
306 | my %arc; |
436 | my %arc; |
307 | my ($more, $prev); |
437 | my ($more, $prev); |
|
|
438 | my $comment; |
308 | |
439 | |
309 | open my $fh, "<:raw:perlio:utf8", $path |
440 | open my $fh, "<:raw:perlio:utf8", $path |
310 | or Carp::croak "$path: $!"; |
441 | or Carp::croak "$path: $!"; |
311 | |
442 | |
312 | binmode $fh; |
443 | # binmode $fh; |
313 | |
444 | |
314 | my $parse_block; $parse_block = sub { |
445 | my $parse_block; $parse_block = sub { |
315 | my %arc = @_; |
446 | my %arc = @_; |
316 | |
447 | |
317 | while (<$fh>) { |
448 | while (<$fh>) { |
318 | s/\s+$//; |
449 | s/\s+$//; |
319 | if (/^end$/i) { |
450 | if (/^end$/i) { |
320 | last; |
451 | last; |
|
|
452 | |
321 | } elsif (/^arch (\S+)$/i) { |
453 | } elsif (/^arch (\S+)$/i) { |
322 | push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); |
454 | push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); |
|
|
455 | |
323 | } elsif (/^lore$/i) { |
456 | } elsif (/^lore$/i) { |
324 | while (<$fh>) { |
457 | while (<$fh>) { |
325 | last if /^endlore\s*$/i; |
458 | last if /^endlore\s*$/i; |
326 | $arc{lore} .= $_; |
459 | $arc{lore} .= $_; |
327 | } |
460 | } |
328 | } elsif (/^msg$/i) { |
461 | } elsif (/^msg$/i) { |
329 | while (<$fh>) { |
462 | while (<$fh>) { |
330 | last if /^endmsg\s*$/i; |
463 | last if /^endmsg\s*$/i; |
331 | $arc{msg} .= $_; |
464 | $arc{msg} .= $_; |
332 | } |
465 | } |
|
|
466 | } elsif (/^anim$/i) { |
|
|
467 | while (<$fh>) { |
|
|
468 | last if /^mina\s*$/i; |
|
|
469 | chomp; |
|
|
470 | push @{ $arc{anim} }, $_; |
|
|
471 | } |
333 | } elsif (/^(\S+)\s*(.*)$/) { |
472 | } elsif (/^(\S+)\s*(.*)$/) { |
334 | $arc{lc $1} = $2; |
473 | $arc{lc $1} = $2; |
335 | } elsif (/^\s*($|#)/) { |
474 | } elsif (/^\s*#/) { |
|
|
475 | $arc{_comment} .= "$_\n"; |
|
|
476 | |
|
|
477 | } elsif (/^\s*$/) { |
336 | # |
478 | # |
337 | } else { |
479 | } else { |
338 | warn "$path: unparsable line '$_' in arch $arc{_name}"; |
480 | warn "$path: unparsable line '$_' in arch $arc{_name}"; |
339 | } |
481 | } |
340 | } |
482 | } |
… | |
… | |
346 | s/\s+$//; |
488 | s/\s+$//; |
347 | if (/^more$/i) { |
489 | if (/^more$/i) { |
348 | $more = $prev; |
490 | $more = $prev; |
349 | } elsif (/^object (\S+)$/i) { |
491 | } elsif (/^object (\S+)$/i) { |
350 | my $name = $1; |
492 | my $name = $1; |
351 | my $arc = normalize_object $parse_block->(_name => $name); |
493 | my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment); |
|
|
494 | undef $comment; |
|
|
495 | delete $arc{_comment} unless length $arc{_comment}; |
|
|
496 | $arc->{_atype} = 'object'; |
352 | |
497 | |
353 | if ($more) { |
498 | if ($more) { |
354 | $more->{more} = $arc; |
499 | $more->{more} = $arc; |
355 | } else { |
500 | } else { |
356 | $arc{$name} = $arc; |
501 | $arc{$name} = $arc; |
357 | } |
502 | } |
358 | $prev = $arc; |
503 | $prev = $arc; |
359 | $more = undef; |
504 | $more = undef; |
360 | } elsif (/^arch (\S+)$/i) { |
505 | } elsif (/^arch (\S+)$/i) { |
361 | my $name = $1; |
506 | my $name = $1; |
362 | my $arc = normalize_arch $parse_block->(_name => $name); |
507 | my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment); |
|
|
508 | undef $comment; |
|
|
509 | delete $arc{_comment} unless length $arc{_comment}; |
|
|
510 | $arc->{_atype} = 'arch'; |
363 | |
511 | |
364 | if ($more) { |
512 | if ($more) { |
365 | $more->{more} = $arc; |
513 | $more->{more} = $arc; |
366 | } else { |
514 | } else { |
367 | push @{ $arc{arch} }, $arc; |
515 | push @{ $arc{arch} }, $arc; |
368 | } |
516 | } |
369 | $prev = $arc; |
517 | $prev = $arc; |
370 | $more = undef; |
518 | $more = undef; |
|
|
519 | } elsif ($toplevel && /^(\S+)\s+(.*)$/) { |
|
|
520 | if ($1 eq "lev_array") { |
|
|
521 | while (<$fh>) { |
|
|
522 | last if /^endplst\s*$/; |
|
|
523 | push @{$toplevel->{lev_array}}, $_+0; |
|
|
524 | } |
|
|
525 | } else { |
|
|
526 | $toplevel->{$1} = $2; |
|
|
527 | } |
|
|
528 | } elsif (/^\s*#/) { |
|
|
529 | $comment .= "$_\n"; |
371 | } elsif (/^\s*($|#)/) { |
530 | } elsif (/^\s*($|#)/) { |
372 | # |
531 | # |
373 | } else { |
532 | } else { |
374 | warn "$path: unparseable top-level line '$_'"; |
533 | die "$path: unparseable top-level line '$_'"; |
375 | } |
534 | } |
376 | } |
535 | } |
377 | |
536 | |
378 | undef $parse_block; # work around bug in perl not freeing $fh etc. |
537 | undef $parse_block; # work around bug in perl not freeing $fh etc. |
379 | |
538 | |
380 | \%arc |
539 | \%arc |
|
|
540 | } |
|
|
541 | |
|
|
542 | sub archlist_to_string { |
|
|
543 | my ($arch) = @_; |
|
|
544 | |
|
|
545 | my $str; |
|
|
546 | |
|
|
547 | my $append; $append = sub { |
|
|
548 | my %a = %{$_[0]}; |
|
|
549 | |
|
|
550 | Crossfire::attr_freeze \%a; |
|
|
551 | Crossfire::normalize_arch \%a; |
|
|
552 | |
|
|
553 | # undo the bit-split we did before |
|
|
554 | if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { |
|
|
555 | $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) |
|
|
556 | | (delete $a{attack_movement_bits_4_7}); |
|
|
557 | } |
|
|
558 | |
|
|
559 | if (my $comment = delete $a{_comment}) { |
|
|
560 | if ($comment =~ /[^\n\s#]/) { |
|
|
561 | $str .= $comment; |
|
|
562 | } |
|
|
563 | } |
|
|
564 | |
|
|
565 | $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n"; |
|
|
566 | |
|
|
567 | my $inv = delete $a{inventory}; |
|
|
568 | my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some |
|
|
569 | my $anim = delete $a{anim}; |
|
|
570 | |
|
|
571 | my @kv; |
|
|
572 | |
|
|
573 | for ($a{_name} eq "map" |
|
|
574 | ? @Crossfire::FIELD_ORDER_MAP |
|
|
575 | : @Crossfire::FIELD_ORDER) { |
|
|
576 | push @kv, [$_, delete $a{$_}] |
|
|
577 | if exists $a{$_}; |
|
|
578 | } |
|
|
579 | |
|
|
580 | for (sort keys %a) { |
|
|
581 | next if /^_/; # ignore our _-keys |
|
|
582 | push @kv, [$_, delete $a{$_}]; |
|
|
583 | } |
|
|
584 | |
|
|
585 | for (@kv) { |
|
|
586 | my ($k, $v) = @$_; |
|
|
587 | |
|
|
588 | if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { |
|
|
589 | $v =~ s/\n$//; |
|
|
590 | $str .= "$k\n$v\n$end\n"; |
|
|
591 | } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) { |
|
|
592 | if ($v & ~Crossfire::MOVE_ALL or !$v) { |
|
|
593 | $str .= "$k $v\n"; |
|
|
594 | |
|
|
595 | } elsif ($v & Crossfire::MOVE_ALLBIT) { |
|
|
596 | $str .= "$k all"; |
|
|
597 | |
|
|
598 | $str .= " -walk" unless $v & Crossfire::MOVE_WALK; |
|
|
599 | $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW; |
|
|
600 | $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH; |
|
|
601 | $str .= " -swim" unless $v & Crossfire::MOVE_SWIM; |
|
|
602 | $str .= " -boat" unless $v & Crossfire::MOVE_BOAT; |
|
|
603 | |
|
|
604 | $str .= "\n"; |
|
|
605 | |
|
|
606 | } else { |
|
|
607 | $str .= $k; |
|
|
608 | |
|
|
609 | $str .= " walk" if $v & Crossfire::MOVE_WALK; |
|
|
610 | $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW; |
|
|
611 | $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH; |
|
|
612 | $str .= " swim" if $v & Crossfire::MOVE_SWIM; |
|
|
613 | $str .= " boat" if $v & Crossfire::MOVE_BOAT; |
|
|
614 | |
|
|
615 | $str .= "\n"; |
|
|
616 | } |
|
|
617 | } else { |
|
|
618 | $str .= "$k $v\n"; |
|
|
619 | } |
|
|
620 | } |
|
|
621 | |
|
|
622 | if ($inv) { |
|
|
623 | $append->($_) for @$inv; |
|
|
624 | } |
|
|
625 | |
|
|
626 | if ($a{_atype} eq 'object') { |
|
|
627 | $str .= join "\n", "anim", @$anim, "mina\n" |
|
|
628 | if $anim; |
|
|
629 | } |
|
|
630 | |
|
|
631 | $str .= "end\n"; |
|
|
632 | |
|
|
633 | if ($a{_atype} eq 'object') { |
|
|
634 | if ($more) { |
|
|
635 | $str .= "more\n"; |
|
|
636 | $append->($more) if $more; |
|
|
637 | } else { |
|
|
638 | $str .= "\n"; |
|
|
639 | } |
|
|
640 | } |
|
|
641 | }; |
|
|
642 | |
|
|
643 | for (@$arch) { |
|
|
644 | $append->($_); |
|
|
645 | } |
|
|
646 | |
|
|
647 | $str |
381 | } |
648 | } |
382 | |
649 | |
383 | # put all archs into a hash with editor_face as it's key |
650 | # put all archs into a hash with editor_face as it's key |
384 | # NOTE: the arrays in the hash values are references to |
651 | # NOTE: the arrays in the hash values are references to |
385 | # the archs from $ARCH |
652 | # the archs from $ARCH |
… | |
… | |
406 | my ($a) = @_; |
673 | my ($a) = @_; |
407 | |
674 | |
408 | my $o = $ARCH{$a->{_name}} |
675 | my $o = $ARCH{$a->{_name}} |
409 | or return; |
676 | or return; |
410 | |
677 | |
411 | my $face = $FACE{$a->{face} || $o->{face} || "blank.111"} |
678 | my $face = $FACE{$a->{face} || $o->{face} || "blank.111"}; |
|
|
679 | unless ($face) { |
|
|
680 | $face = $FACE{"blank.x11"} |
412 | or (warn "no face data found for arch '$a->{_name}'"), return; |
681 | or (warn "no face data found for arch '$a->{_name}'"), return; |
|
|
682 | } |
413 | |
683 | |
414 | if ($face->{w} > 1 || $face->{h} > 1) { |
684 | if ($face->{w} > 1 || $face->{h} > 1) { |
415 | # bigface |
685 | # bigface |
416 | return (0, 0, $face->{w} - 1, $face->{h} - 1); |
686 | return (0, 0, $face->{w} - 1, $face->{h} - 1); |
417 | |
687 | |