… | |
… | |
213 | adamant => 256, |
213 | adamant => 256, |
214 | liquid => 512, |
214 | liquid => 512, |
215 | tin => 1024, |
215 | tin => 1024, |
216 | bone => 2048, |
216 | bone => 2048, |
217 | ice => 4096, |
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 | blood => 544, |
218 | ; |
231 | ; |
219 | |
232 | |
220 | # object as in "Object xxx", i.e. archetypes |
233 | # object as in "Object xxx", i.e. archetypes |
221 | sub normalize_object($) { |
234 | sub normalize_object($) { |
222 | my ($ob) = @_; |
235 | my ($ob) = @_; |
… | |
… | |
230 | delete $ob->{material}; |
243 | delete $ob->{material}; |
231 | } else { |
244 | } else { |
232 | warn "object $ob->{_name} has both materialname ($ob->{materialname}) and material ($ob->{material}) set.\n"; |
245 | 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 |
246 | delete $ob->{material}; # assume materilname is more specific and nuke material |
234 | } |
247 | } |
|
|
248 | } elsif (my $name = $MATERIAL{$ob->{material}}) { |
|
|
249 | delete $ob->{material}; |
|
|
250 | $ob->{materialname} = $name; |
235 | } else { |
251 | } else { |
236 | if (my $name = $MATERIAL{$ob->{material}}) { |
252 | warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; |
237 | delete $ob->{material}; |
|
|
238 | $ob->{materialname} = $name; |
|
|
239 | } |
|
|
240 | } |
253 | } |
241 | } |
254 | } |
242 | |
255 | |
243 | # nuke outdated or never supported fields |
256 | # nuke outdated or never supported fields |
244 | delete @$ob{qw( |
257 | delete @$ob{qw( |