Mercurial > hg > batmud > misc
changeset 138:e001efd8d490 misc
Fixed.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 20 Dec 2010 21:34:26 +0000 |
parents | 723216311cd1 |
children | ff2d8ebe1818 |
files | materials/parsematerial.pl |
diffstat | 1 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/materials/parsematerial.pl Mon Dec 20 17:34:14 2010 +0000 +++ b/materials/parsematerial.pl Mon Dec 20 21:34:26 2010 +0000 @@ -16,7 +16,7 @@ # # Data translation table generated with csv2transtab.pl # -my %matTransTable = ( +my %transTable = ( 2 => { "very light" => 0, "light" => 1, @@ -528,12 +528,12 @@ print "package Materials;\nrequire Exporter;\n". "\@ISA = qw(Exporter);\n\n". - "\@EXPORT = qw(matTable matTransTable matByType matTypes);\n\n"; + "\@EXPORT = qw(matTable transTable matByType matTypes);\n\n"; my $dumper = Data::Dumper->new([\%data], ["matTable"]); print "our ".$dumper->Dump()."\n\n"; - $dumper = Data::Dumper->new([\%matTransTable], ["matTransTable"]); + $dumper = Data::Dumper->new([\%transTable], ["transTable"]); print "our ".$dumper->Dump()."\n\n"; $dumper = Data::Dumper->new([\%matByType], ["matByType"]); @@ -553,17 +553,17 @@ print "\"".$$info{"l"}."\","; } print ");\n\n". - "\$matTransTable = array(\n"; - foreach my $i (sort { $a <=> $b } keys %matTransTable) { + "\$transTable = array(\n"; + foreach my $i (sort { $a <=> $b } keys %transTable) { print " array("; - foreach my $j (keys %{$matTransTable{$i}}) { - if (defined($matTransTable{$i}{$j})) { - print $matTransTable{$i}{$j}; + foreach my $j (keys %{$transTable{$i}}) { + if (defined($transTable{$i}{$j})) { + print $transTable{$i}{$j}; $j =~ s/very /v./; $j =~ s/incredibly /incr./; print " => \"$j\"," } else { - print STDERR "$0: Unknown matTransTable type $i : $j\n"; + print STDERR "$0: Unknown transTable type $i : $j\n"; } } print "),\n"; @@ -581,18 +581,18 @@ if (defined($data{$name}{$arr})) { print "array("; foreach my $q (sort { $a cmp $b } @{$data{$name}{$arr}}) { - if (defined($matTransTable{$s}{$q})) { - print $matTransTable{$s}{$q}.","; + if (defined($transTable{$s}{$q})) { + print $transTable{$s}{$q}.","; } else { - print STDERR "$0: Unknown matTransTable type for '$name' : $s :: $q ($idx)\n"; + print STDERR "$0: Unknown transTable type for '$name' : $s :: $q ($idx)\n"; } } print "),"; - } elsif (defined($matTransTable{$s}{$idx})) { - print $matTransTable{$s}{$idx}.", "; + } elsif (defined($transTable{$s}{$idx})) { + print $transTable{$s}{$idx}.", "; } else { if ($s != 1) { - print STDERR "$0: Unknown matTransTable type for '$name' : $s == $f ($idx)\n"; + print STDERR "$0: Unknown transTable type for '$name' : $s == $f ($idx)\n"; print "-1,"; } }