changeset 122:f1cbbb262047 misc

Updates.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 19 Dec 2010 21:55:11 +0000
parents 2ed4ec36ccac
children e97f6db77197
files materials/csv2phpsql.pl materials/parsematerial.pl
diffstat 2 files changed, 22 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/materials/csv2phpsql.pl	Sun Dec 19 21:44:35 2010 +0000
+++ b/materials/csv2phpsql.pl	Sun Dec 19 21:55:11 2010 +0000
@@ -303,7 +303,7 @@
       $data{$1}{$i} = \@tmp;
     }
   } else {
-    print STDERR "# $_\n";
+    print STDERR "$0: # $_\n";
   }
 }
 
@@ -341,7 +341,7 @@
         $j =~ s/incredibly /incr./;
         print " => \"$j\","
       } else {
-        print STDERR "Unknown transTable type $i : $j\n";
+        print STDERR "$0: Unknown transTable type $i : $j\n";
       }
     }
     print "),\n";
@@ -360,12 +360,12 @@
           if (defined($transtab{$j}{$q})) {
             print $transtab{$j}{$q}.",";
           } else {
-            print STDERR "Unknown matTable type $i : $j :: $q!\n";
+            print STDERR "$0: Unknown matTable type $i : $j :: $q!\n";
           }
         }
         print "),";
       } else {
-        print STDERR "Unknown matTable type $i : $j == $s\n";
+        print STDERR "$0: Unknown matTable type $i : $j == $s\n";
         print "-1,";
       }
     }
--- a/materials/parsematerial.pl	Sun Dec 19 21:44:35 2010 +0000
+++ b/materials/parsematerial.pl	Sun Dec 19 21:55:11 2010 +0000
@@ -163,30 +163,38 @@
     my $filename = $name.".mat";
     $filename =~ s/ /_/g;
     open(OUTFILE, ">", $filename) or die("Error opening file '$filename' ".$!."\n");
+    
     printf OUTFILE
     "MATERIAL STATS ($name):\n".
     "-------------------------------------------------------------------------------\n".
     "Weight (g/l):  %-17s  Sturdyness:    (%s)\n".
-    "Magic:         %-17s  Flammability:  (%s)\n".
+    "Magic:         %-17s  Flammability:  (%s)\n",
+    "(".$$mat{"weight"}.")", $$mat{"sturdyness"},
+    "(".$$mat{"magic"}.")", $$mat{"flammability"};
+    
+    printf OUTFILE
     "Warmth:        %-17s  Toxicity:      (%s)\n".
-    "Resistivity:   %-17s  Malleability:  (%s)\n".
+    "Resistivity:   %-17s  Malleability:  (%s)\n",
+    "(".$$mat{"warmth"}.")", $$mat{"toxicity"},
+    "(".$$mat{"resistivity"}.")", $$mat{"malleability"};
+    
+    printf OUTFILE
     "Mentality:     %-17s  Reactivity:    (%s)\n".
     "Weapon rarity: %-17s  Armour rarity: (%s)\n".
-    "Value (gp/kg): %-17s  Rarity:        (%s)\n".
+    "Value (gp/kg): %-17s  Rarity:        (%s)\n",
+    "(".$$mat{"mentality"}.")", $$mat{"reactivity"},
+    "(".$$mat{"weapon_rarity"}.")", $$mat{"armour_rarity"},
+    "(".$$mat{"value"}.")", $$mat{"rarity"};
+
+    printf OUTFILE
     "Article:       %-17s       Type:          %s\n".
     "Found nature:  %-17s       Lode name:     %s\n".
     "Raw names:     %s\n".
     "Refined names: %s\n",
-    "(".$$mat{"weight"}.")", $$mat{"sturdyness"},
-    "(".$$mat{"magic"}.")", $$mat{"flammability"},
-    "(".$$mat{"warmth"}.")", $$mat{"toxicity"},
-    "(".$$mat{"resistivity"}.")", $$mat{"malleability"},
-    "(".$$mat{"mentality"}.")", $$mat{"reactivity"},
-    "(".$$mat{"weapon_rarity"}.")", $$mat{"armour_rarity"},
-    "(".$$mat{"value"}.")", $$mat{"rarity"},
     $$mat{"article"}, $$mat{"type"},
     $$mat{"found_nature"}, $$mat{"lode_name"},
     $$mat{"raw_names"}, $$mat{"refined_names"};
+
     close(OUTFILE);
   }
 }