… | |
… | |
58 | 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); |
59 | |
59 | |
60 | # same as in server save routine, to (hopefully) be compatible |
60 | # same as in server save routine, to (hopefully) be compatible |
61 | # to the other editors. |
61 | # to the other editors. |
62 | our @FIELD_ORDER_MAP = (qw( |
62 | our @FIELD_ORDER_MAP = (qw( |
|
|
63 | file_format_version |
63 | name attach swap_time reset_timeout fixed_resettime difficulty region |
64 | name attach swap_time reset_timeout fixed_resettime difficulty region |
64 | shopitems shopgreed shopmin shopmax shoprace |
65 | shopitems shopgreed shopmin shopmax shoprace |
65 | darkness width height enter_x enter_y msg maplore |
66 | darkness width height enter_x enter_y msg maplore |
66 | unique template |
67 | unique template |
67 | outdoor temp pressure humid windspeed winddir sky nosmooth |
68 | outdoor temp pressure humid windspeed winddir sky nosmooth |
… | |
… | |
213 | adamant => 256, |
214 | adamant => 256, |
214 | liquid => 512, |
215 | liquid => 512, |
215 | tin => 1024, |
216 | tin => 1024, |
216 | bone => 2048, |
217 | bone => 2048, |
217 | ice => 4096, |
218 | ice => 4096, |
|
|
219 | |
|
|
220 | # guesses |
|
|
221 | runestone => 12, |
|
|
222 | bronze => 18, |
|
|
223 | "ancient wood" => 20, |
|
|
224 | glass => 36, |
|
|
225 | marble => 66, |
|
|
226 | ice => 68, |
|
|
227 | stone => 70, |
|
|
228 | stone => 80, |
|
|
229 | cloth => 136, |
|
|
230 | ironwood => 144, |
|
|
231 | adamantium => 258, |
|
|
232 | glacium => 260, |
|
|
233 | blood => 544, |
218 | ; |
234 | ; |
219 | |
235 | |
220 | # object as in "Object xxx", i.e. archetypes |
236 | # object as in "Object xxx", i.e. archetypes |
221 | sub normalize_object($) { |
237 | sub normalize_object($) { |
222 | my ($ob) = @_; |
238 | my ($ob) = @_; |
… | |
… | |
230 | delete $ob->{material}; |
246 | delete $ob->{material}; |
231 | } else { |
247 | } else { |
232 | warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n"; |
248 | warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n"; |
233 | delete $ob->{material}; # assume materilname is more specific and nuke material |
249 | delete $ob->{material}; # assume materilname is more specific and nuke material |
234 | } |
250 | } |
|
|
251 | } elsif (my $name = $MATERIAL{$ob->{material}}) { |
|
|
252 | delete $ob->{material}; |
|
|
253 | $ob->{materialname} = $name; |
235 | } else { |
254 | } else { |
236 | if (my $name = $MATERIAL{$ob->{material}}) { |
255 | warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; |
237 | delete $ob->{material}; |
|
|
238 | $ob->{materialname} = $name; |
|
|
239 | } |
|
|
240 | } |
256 | } |
241 | } |
257 | } |
242 | |
258 | |
243 | # nuke outdated or never supported fields |
259 | # nuke outdated or never supported fields |
244 | delete @$ob{qw( |
260 | delete @$ob{qw( |
… | |
… | |
552 | |
568 | |
553 | my $inv = delete $a{inventory}; |
569 | my $inv = delete $a{inventory}; |
554 | my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some |
570 | my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some |
555 | my $anim = delete $a{anim}; |
571 | my $anim = delete $a{anim}; |
556 | |
572 | |
|
|
573 | if ($a{_atype} eq 'object') { |
|
|
574 | $str .= join "\n", "anim", @$anim, "mina\n" |
|
|
575 | if $anim; |
|
|
576 | } |
|
|
577 | |
557 | my @kv; |
578 | my @kv; |
558 | |
579 | |
559 | for ($a{_name} eq "map" |
580 | for ($a{_name} eq "map" |
560 | ? @Crossfire::FIELD_ORDER_MAP |
581 | ? @Crossfire::FIELD_ORDER_MAP |
561 | : @Crossfire::FIELD_ORDER) { |
582 | : @Crossfire::FIELD_ORDER) { |
… | |
… | |
605 | } |
626 | } |
606 | } |
627 | } |
607 | |
628 | |
608 | if ($inv) { |
629 | if ($inv) { |
609 | $append->($_) for @$inv; |
630 | $append->($_) for @$inv; |
610 | } |
|
|
611 | |
|
|
612 | if ($a{_atype} eq 'object') { |
|
|
613 | $str .= join "\n", "anim", @$anim, "mina\n" |
|
|
614 | if $anim; |
|
|
615 | } |
631 | } |
616 | |
632 | |
617 | $str .= "end\n"; |
633 | $str .= "end\n"; |
618 | |
634 | |
619 | if ($a{_atype} eq 'object') { |
635 | if ($a{_atype} eq 'object') { |