From d75ae59e96d97f7f53434e922ad594b7e9682e27 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Tue, 3 Jun 2008 10:58:06 +0000
Subject: [PATCH] internal rename diamond->adamantium before it's too late.

---
 src/res/eressea.xml         |  2 +-
 src/res/eressea/items.xml   | 10 +++++-----
 src/res/eressea/strings.xml | 12 ++++++------
 src/scripts/adamant.lua     |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/res/eressea.xml b/src/res/eressea.xml
index ccf7ac919..35e98874d 100644
--- a/src/res/eressea.xml
+++ b/src/res/eressea.xml
@@ -27,7 +27,7 @@
       <item name="money" amount="4200"/>
     </set>
     <set name="new_faction">
-      <item name="diamond" amount="4"/>
+      <item name="adamantium" amount="4"/>
     </set>
   </equipment>
 
diff --git a/src/res/eressea/items.xml b/src/res/eressea/items.xml
index e92fdf1c2..a18cada18 100644
--- a/src/res/eressea/items.xml
+++ b/src/res/eressea/items.xml
@@ -164,7 +164,7 @@
   </resource>
   <!-- christmas items: end -->
 
-  <resource name="diamond" limited="yes">
+  <resource name="adamantium" limited="yes">
     <item weight="200" score="200">
       <construction skill="mining" minskill="8" reqsize="1"/>
     </item>
@@ -173,10 +173,10 @@
     </resourcelimit>
   </resource>
 
-  <resource name="diamondaxe">
+  <resource name="adamantiumaxe">
     <item weight="100" score="500">
       <construction skill="weaponsmithing" minskill="8" reqsize="1">
-        <requirement type="diamond" quantity="1"/>
+        <requirement type="adamantium" quantity="1"/>
         <requirement type="log" quantity="1"/>
       </construction>
       <weapon cut="true" skill="melee" offmod="2" defmod="-2" magres="0.30">
@@ -186,10 +186,10 @@
     </item>
   </resource>
 
-  <resource name="diamondplate">
+  <resource name="adamantiumplate">
     <item weight="100" score="2000">
       <construction skill="armorer" minskill="10" reqsize="1">
-        <requirement type="diamond" quantity="3"/>
+        <requirement type="adamantium" quantity="3"/>
       </construction>
       <armor ac="7" penalty="0.1"/>
     </item>
diff --git a/src/res/eressea/strings.xml b/src/res/eressea/strings.xml
index d903cc654..aeb6c8f59 100644
--- a/src/res/eressea/strings.xml
+++ b/src/res/eressea/strings.xml
@@ -358,29 +358,29 @@
   </string>
   <!-- igjarjuk queste end -->
 
-  <string name="diamond">
+  <string name="adamantium">
     <text locale="de">Adamant</text>
     <text locale="en">adamantium</text>
   </string>
-  <string name="diamond_p">
+  <string name="adamantium_p">
     <text locale="de">Adamant</text>
     <text locale="en">adamantium</text>
   </string>
 
-  <string name="diamondaxe">
+  <string name="adamantiumaxe">
     <text locale="de">Adamantaxt</text>
     <text locale="en">adamantium axe</text>
   </string>
-  <string name="diamondaxe_p">
+  <string name="adamantiumaxe_p">
     <text locale="de">Adamantäxte</text>
     <text locale="en">adamantium axes</text>
   </string>
 
-  <string name="diamondplate">
+  <string name="adamantiumplate">
     <text locale="de">Adamantrüstung</text>
     <text locale="en">adamantium plate</text>
   </string>
-  <string name="diamondplate_p">
+  <string name="adamantiumplate_p">
     <text locale="de">Adamantrüstungen</text>
     <text locale="en">adamantium plates</text>
   </string>
diff --git a/src/scripts/adamant.lua b/src/scripts/adamant.lua
index 06c29718c..63985cf5b 100644
--- a/src/scripts/adamant.lua
+++ b/src/scripts/adamant.lua
@@ -5,11 +5,11 @@ function adamant_gifts()
   for f in factions() do
     local i = math.mod(test.rng_int(), 2)
     if i==0 then
-      f:add_item("diamond", 1)
-      f:add_item("diamondplate", 1)
+      f:add_item("adamantium", 1)
+      f:add_item("adamantiumplate", 1)
     else
-      f:add_item("diamond", 3)
-      f:add_item("diamondaxe", 1)
+      f:add_item("adamantium", 3)
+      f:add_item("adamantiumaxe", 1)
     end
   end
 end