Mercurial > hg > batmud > misc
changeset 295:89262bdba061 misc
Cleanups.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 09 Mar 2015 13:36:55 +0200 |
parents | 33672035cf36 |
children | 8724b9de70bf |
files | materials/parsematerial.pl |
diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/materials/parsematerial.pl Mon Mar 09 12:47:26 2015 +0200 +++ b/materials/parsematerial.pl Mon Mar 09 13:36:55 2015 +0200 @@ -305,7 +305,7 @@ { "i" => 17, "f" => "found_nature", "w" => 3, "l" => "Found in Nature", "s" => "FN?" }, { "i" => 18, "f" => "lode_name", "w" => 13, "l" => "Lode name", "s" => "Lode name" }, { "i" => 19, "f" => "raw_names", "w" => 35, "l" => "Raw names", "s" => "Raw names" }, - { "i" => 20, "f" => "refined_names", "w" => 35, "l" => "Refined names", "s" => "Refined names" } + { "i" => 20, "f" => "refined_names", "w" => 35, "l" => "Refined names", "s" => "Refined names" }, ); @@ -436,10 +436,11 @@ } elsif ($line =~ /^Article\: *([a-z. ]+) *Type: *([A-Za-z]+)/) { - $data{$name}{16} = mtranslate(16, $2); + my ($tmp1, $tmp2) = ($1, $2); + $tmp1 =~ s/ *$//; - $data{$name}{"article"} = $1; - $data{$name}{"article"} =~ s/ *$//; + $data{$name}{"article"} = $tmp1; + $data{$name}{16} = mtranslate(16, $tmp2); } elsif ($line =~ /^Found nature\: *(Yes|No) *Lode name\: *([A-Za-z]+)/) {