Mercurial > hg > batmud > misc

changeset 118:08373f9769d3 misc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updates.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 19 Dec 2010 21:13:06 +0000
parents 4b048fa10014
children 959ba6d00c05
files materials/data/aquamarine.mat materials/data/bamboo.mat materials/data/basalt.mat materials/data/batium.mat materials/data/bone.mat materials/mkmaterialinfo.sh materials/parsematerial.pl
diffstat 7 files changed, 75 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/materials/data/aquamarine.mat	Sun Dec 19 19:54:26 2010 +0000
+++ b/materials/data/aquamarine.mat	Sun Dec 19 21:13:06 2010 +0000
@@ -1,6 +1,5 @@
 MATERIAL STATS (aquamarine):
 -------------------------------------------------------------------------------
-
 Weight (g/l):  (normal)           Sturdyness:    (very sturdy)
 Magic:         (a bit magical)    Flammability:  (almost unburnable)
 Warmth:        (icy outfit)       Toxicity:      (highly toxic)
--- a/materials/data/bamboo.mat	Sun Dec 19 19:54:26 2010 +0000
+++ b/materials/data/bamboo.mat	Sun Dec 19 21:13:06 2010 +0000
@@ -1,6 +1,5 @@
 MATERIAL STATS (bamboo):
 -------------------------------------------------------------------------------
-
 Weight (g/l):  (very light)       Sturdyness:    (sturdy)
 Magic:         (weakly magical)   Flammability:  (highly flammable)
 Warmth:        (chilly outfit)    Toxicity:      (very low toxicity)
--- a/materials/data/basalt.mat	Sun Dec 19 19:54:26 2010 +0000
+++ b/materials/data/basalt.mat	Sun Dec 19 21:13:06 2010 +0000
@@ -1,14 +1,13 @@
 MATERIAL STATS (basalt):
 -------------------------------------------------------------------------------
-
-Weight (g/l):  (heavy)            Sturdyness:    (very sturdy)      
-Magic:         (weakly magical)   Flammability:  (unburnable)       
-Warmth:        (chilly outfit)    Toxicity:      (highly toxic)     
-Resistivity:   (great insulator)  Malleability:  (loose)            
-Mentality:     (poor mentality)   Reactivity:    (reactive)         
-Weapon rarity: (not used)         Armour rarity: (not used)         
-Value (gp/kg): (low-priced)       Rarity:        (quite common)     
+Weight (g/l):  (heavy)            Sturdyness:    (very sturdy)
+Magic:         (weakly magical)   Flammability:  (unburnable)
+Warmth:        (chilly outfit)    Toxicity:      (highly toxic)
+Resistivity:   (great insulator)  Malleability:  (loose)
+Mentality:     (poor mentality)   Reactivity:    (reactive)
+Weapon rarity: (not used)         Armour rarity: (not used)
+Value (gp/kg): (low-priced)       Rarity:        (quite common)
 Article:       a                       Type:          Stone
-Found nature:  Yes                     Lode name:     Crag           
+Found nature:  Yes                     Lode name:     Crag
 Raw names:     chunk, block, clump, hunk, lump
 Refined names: block, brick
--- a/materials/data/batium.mat	Sun Dec 19 19:54:26 2010 +0000
+++ b/materials/data/batium.mat	Sun Dec 19 21:13:06 2010 +0000
@@ -1,14 +1,13 @@
 MATERIAL STATS (batium):
 -------------------------------------------------------------------------------
-
-Weight (g/l):  (very heavy)       Sturdyness:    (sturdy)           
-Magic:         (highly magical)   Flammability:  (normal)           
-Warmth:        (chilly outfit)    Toxicity:      (very toxic)       
-Resistivity:   (lousy insulator)  Malleability:  (very solid)       
-Mentality:     (poor mentality)   Reactivity:    (low reactivity)   
-Weapon rarity: (not used)         Armour rarity: (not used)         
-Value (gp/kg): (very valuable)    Rarity:        (common)           
+Weight (g/l):  (very heavy)       Sturdyness:    (sturdy)
+Magic:         (highly magical)   Flammability:  (normal)
+Warmth:        (chilly outfit)    Toxicity:      (very toxic)
+Resistivity:   (lousy insulator)  Malleability:  (very solid)
+Mentality:     (poor mentality)   Reactivity:    (low reactivity)
+Weapon rarity: (not used)         Armour rarity: (not used)
+Value (gp/kg): (very valuable)    Rarity:        (common)
 Article:       a                       Type:          Metal
-Found nature:  Yes                     Lode name:     Lode           
+Found nature:  Yes                     Lode name:     Lode
 Raw names:     nugget, chunk
 Refined names: bar, ingot, casting
--- a/materials/data/bone.mat	Sun Dec 19 19:54:26 2010 +0000
+++ b/materials/data/bone.mat	Sun Dec 19 21:13:06 2010 +0000
@@ -1,14 +1,13 @@
 MATERIAL STATS (bone):
 -------------------------------------------------------------------------------
-
-Weight (g/l):  (normal)           Sturdyness:    (normal)           
-Magic:         (a bit magical)    Flammability:  (quite unburnable) 
+Weight (g/l):  (normal)           Sturdyness:    (normal)
+Magic:         (a bit magical)    Flammability:  (quite unburnable)
 Warmth:        (chilly outfit)    Toxicity:      (mediocre toxicity)
-Resistivity:   (great insulator)  Malleability:  (loose)            
-Mentality:     (poor mentality)   Reactivity:    (great reactivity) 
-Weapon rarity: (rarely used)      Armour rarity: (not used)         
-Value (gp/kg): (cheap)            Rarity:        (average)          
-Article:       a                       Type:          Bone 
-Found nature:  Yes                     Lode name:     Graveyard      
+Resistivity:   (great insulator)  Malleability:  (loose)
+Mentality:     (poor mentality)   Reactivity:    (great reactivity)
+Weapon rarity: (rarely used)      Armour rarity: (not used)
+Value (gp/kg): (cheap)            Rarity:        (average)
+Article:       a                       Type:          Bone
+Found nature:  Yes                     Lode name:     Graveyard
 Raw names:     piece, chunk
 Refined names: shaped
--- a/materials/mkmaterialinfo.sh	Sun Dec 19 19:54:26 2010 +0000
+++ b/materials/mkmaterialinfo.sh	Sun Dec 19 21:13:06 2010 +0000
@@ -36,5 +36,4 @@
 perl -w csv2phpsql.pl -mat < "$LISTCSV" > "$LISTMAT"
 
 echo "Uploading ..."
-scp -C "$LISTLONG" "$LISTSHORT" "$LISTCSV" ccr@tnsp.org:public_html/bat/ &&
-scp -C "$LISTPHP" ccr@tnsp.org:public_html/bat/mat/
+scp -C "$LISTLONG" "$LISTSHORT" "$LISTCSV" "$LISTPHP" ccr@tnsp.org:public_html/bat/mat/
--- a/materials/parsematerial.pl	Sun Dec 19 19:54:26 2010 +0000
+++ b/materials/parsematerial.pl	Sun Dec 19 21:13:06 2010 +0000
@@ -4,12 +4,14 @@
 
 my $opt_header = 0;
 my $opt_mode = "";
+my $opt_strip = 1;
 
 while (defined(my $arg = shift)) {
   if ($arg eq "-head") { $opt_header = 1; }
   elsif ($arg eq "-csv") { $opt_mode = $arg; }
   elsif ($arg eq "-tf") { $opt_mode = $arg; }
   elsif ($arg eq "-names") { $opt_mode = $arg; }
+  elsif ($arg eq "-dump") { $opt_mode = $arg; $opt_strip = 0; }
   else {
     die("Invalid option '$arg'\n");
   }
@@ -65,23 +67,27 @@
       $data{$name}{"magic"} = $1;
       $data{$name}{"flammability"} = $2;
     }
-    elsif (/^Warmth\: *\(([a-z. ]+) outfit\) *Toxicity\: *\(([a-z. ]+)\)/) {
+    elsif (/^Warmth\: *\(([a-z. ]+ outfit)\) *Toxicity\: *\(([a-z. ]+)\)/) {
       $data{$name}{"warmth"} = $1;
       $data{$name}{"toxicity"} = $2;
+      
+      $data{$name}{"warmth"} =~ s/ +outfit$// if ($opt_strip);
     }
     elsif (/^Warmth\: *\(([a-z. ]+)\) *Toxicity\: *\(([a-z. ]+)\)/) {
       $data{$name}{"warmth"} = $1;
       $data{$name}{"toxicity"} = $2;
     }
-    elsif (/^Resistivity\: *\(([a-z. ]+) insulator\) *Malleability\: *\(([a-z. ]+)\)/) {
+    elsif (/^Resistivity\: *\(([a-z. ]+ insulator)\) *Malleability\: *\(([a-z. ]+)\)?/) {
+      $data{$name}{"resistivity"} = $1;
+      $data{$name}{"malleability"} = $2;
+
+      $data{$name}{"resistivity"} =~ s/ +insulator$// if ($opt_strip);
+    }
+    elsif (/^Resistivity\: *\(([a-z. ]+)\) *Malleability\: *\(([a-z. ]+)\)?/) {
       $data{$name}{"resistivity"} = $1;
       $data{$name}{"malleability"} = $2;
     }
-    elsif (/^Resistivity\: *\(([a-z. ]+)\) *Malleability\: *\(([a-z. ]+)\)/) {
-      $data{$name}{"resistivity"} = $1;
-      $data{$name}{"malleability"} = $2;
-    }
-    elsif (/^Mentality\: *\(([a-z. ]+)\) *Reactivity\: *\(([a-z. ]+)\)/) {
+    elsif (/^Mentality\: *\(([a-z. ]+)\) *Reactivity\: *\(([a-z. ]+)\)?/) {
       $data{$name}{"mentality"} = $1;
       $data{$name}{"reactivity"} = $2;
     }
@@ -96,6 +102,8 @@
     elsif (/^Article\: *([a-z. ]+) *Type: *([A-Za-z]+)/) {
       $data{$name}{"article"} = $1;
       $data{$name}{"type"} = $2;
+      
+      $data{$name}{"article"} =~ s/ *$//;
     }
     elsif (/^Found nature\: *(Yes|No) *Lode name\: *([A-Za-z]+)/) {
       $data{$name}{"found_nature"} = $1;
@@ -148,6 +156,41 @@
   }
 }
 
+# Dump normal data to files
+elsif ($opt_mode eq "-dump") {
+  foreach my $name (@entries) {
+    my $mat = $data{$name};
+    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".
+    "Warmth:        %-17s  Toxicity:      (%s)\n".
+    "Resistivity:   %-17s  Malleability:  (%s)\n".
+    "Mentality:     %-17s  Reactivity:    (%s)\n".
+    "Weapon rarity: %-17s  Armour rarity: (%s)\n".
+    "Value (gp/kg): %-17s  Rarity:        (%s)\n".
+    "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);
+  }
+}
+
 # Print TinyFugue formatted data
 elsif ($opt_mode eq "-tf") {
   print "/set gmat_names=".join(' ', @entries)."\n";