From 31bcc1030ad84923e431ce485668fd1617677026 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Mon, 28 May 2007 09:26:08 +0000
Subject: [PATCH] recycle="0.5" is a more sensible default for building
 materials.

---
 src/common/kernel/xmlreader.c |   2 +-
 src/res/buildings.xml         | 110 +++++++++++++++++-----------------
 2 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c
index 70a9b0011..2850d433c 100644
--- a/src/common/kernel/xmlreader.c
+++ b/src/common/kernel/xmlreader.c
@@ -149,7 +149,7 @@ xml_readrequirements(xmlNodePtr * nodeTab, int nodeNr, requirement ** reqArray)
     xmlChar * property;
 
     radd->number = xml_ivalue(node, "quantity", 1);
-    radd->recycle = xml_fvalue(node, "recycle", 0.0);
+    radd->recycle = xml_fvalue(node, "recycle", 0.5);
 
     property = xmlGetProp(node, BAD_CAST "type");
     radd->rtype = rt_findorcreate((const char*)property);
diff --git a/src/res/buildings.xml b/src/res/buildings.xml
index da1b1c01e..dc428cae3 100644
--- a/src/res/buildings.xml
+++ b/src/res/buildings.xml
@@ -9,35 +9,35 @@
 
   <building name="blessedstonecircle" maxcapacity="3" maxsize="100" nobuild="yes" magic="yes" magres="60" magresbonus="30" auraregen="1.50">
     <construction skill="building" minskill="2" reqsize="100" maxsize="100">
-      <requirement type="log" recycle="0.5" quantity="500"/>
-      <requirement type="stone" recycle="0.5" quantity="500"/>
+      <requirement type="log" quantity="500"/>
+      <requirement type="stone" quantity="500"/>
     </construction>
   </building>
 
   <building name="stonecircle" maxsize="100">
     <construction skill="building" minskill="2" reqsize="100" maxsize="100">
-      <requirement type="log" recycle="0.5" quantity="500"/>
-      <requirement type="stone" recycle="0.5" quantity="500"/>
+      <requirement type="log" quantity="500"/>
+      <requirement type="stone" quantity="500"/>
     </construction>
   </building>
 
   <building name="inn" capacity="1">
     <maintenance type="money" amount="5" variable="yes" vital="yes"/>
     <construction skill="building" minskill="2" reqsize="10">
-      <requirement type="iron" recycle="0.5" quantity="10"/>
-      <requirement type="log" recycle="0.5" quantity="30"/>
-      <requirement type="stone" recycle="0.5" quantity="40"/>
+      <requirement type="iron" quantity="10"/>
+      <requirement type="log" quantity="30"/>
+      <requirement type="stone" quantity="40"/>
       <requirement type="money" quantity="2000"/>
     </construction>
   </building>
 
   <building name="tunnel" capacity="1" maxsize="100">
-    <maintenance type="stone" recycle="0.5" amount="2"/>
+    <maintenance type="stone" amount="2"/>
     <maintenance type="money" amount="100" vital="yes"/>
     <construction skill="building" minskill="6" reqsize="100" maxsize="100">
-      <requirement type="iron" recycle="0.5" quantity="100"/>
-      <requirement type="log" recycle="0.5" quantity="500"/>
-      <requirement type="stone" recycle="0.5" quantity="1000"/>
+      <requirement type="iron" quantity="100"/>
+      <requirement type="log" quantity="500"/>
+      <requirement type="stone" quantity="1000"/>
       <requirement type="money" quantity="30000"/>
     </construction>
   </building>
@@ -46,29 +46,29 @@
     <maintenance type="horse" amount="2"/>
     <maintenance type="money" amount="3000" vital="yes"/>
     <construction skill="building" minskill="2" reqsize="10" maxsize="10">
-      <requirement type="iron" recycle="0.5" quantity="10"/>
-      <requirement type="log" recycle="0.5" quantity="50"/>
-      <requirement type="stone" recycle="0.5" quantity="10"/>
+      <requirement type="iron" quantity="10"/>
+      <requirement type="log" quantity="50"/>
+      <requirement type="stone" quantity="10"/>
       <requirement type="money" quantity="5000"/>
     </construction>
   </building>
 
   <building name="dam" capacity="1" maxsize="50">
-    <maintenance type="log" recycle="0.5" amount="3"/>
+    <maintenance type="log" amount="3"/>
     <maintenance type="money" amount="1000" vital="yes"/>
     <construction skill="building" minskill="4" reqsize="50" maxsize="50">
-      <requirement type="iron" recycle="0.5" quantity="50"/>
-      <requirement type="log" recycle="0.5" quantity="500"/>
-      <requirement type="stone" recycle="0.5" quantity="250"/>
+      <requirement type="iron" quantity="50"/>
+      <requirement type="log" quantity="500"/>
+      <requirement type="stone" quantity="250"/>
       <requirement type="money" quantity="25000"/>
     </construction>
   </building>
 
   <building name="monument" capacity="1">
     <construction skill="building" minskill="4" reqsize="1">
-      <requirement type="log" recycle="0.5" quantity="1"/>
-      <requirement type="stone" recycle="0.5" quantity="1"/>
-      <requirement type="iron" recycle="0.5" quantity="1"/>
+      <requirement type="log" quantity="1"/>
+      <requirement type="stone" quantity="1"/>
+      <requirement type="iron" quantity="1"/>
       <requirement type="money" quantity="400"/>
     </construction>
   </building>
@@ -76,9 +76,9 @@
   <building name="stables" capacity="1">
     <maintenance type="money" amount="150" vital="yes"/>
     <construction skill="building" minskill="2" reqsize="1">
-      <requirement type="log" recycle="0.5" quantity="4"/>
-      <requirement type="stone" recycle="0.5" quantity="2"/>
-      <requirement type="iron" recycle="0.5" quantity="1"/>
+      <requirement type="log" quantity="4"/>
+      <requirement type="stone" quantity="2"/>
+      <requirement type="iron" quantity="1"/>
       <requirement type="money" quantity="100"/>
     </construction>
   </building>
@@ -86,9 +86,9 @@
   <building name="sawmill" capacity="1">
     <maintenance type="money" amount="250" vital="yes"/>
     <construction skill="building" minskill="3" reqsize="1">
-      <requirement type="log" recycle="0.5" quantity="5"/>
-      <requirement type="stone" recycle="0.5" quantity="5"/>
-      <requirement type="iron" recycle="0.5" quantity="3"/>
+      <requirement type="log" quantity="5"/>
+      <requirement type="stone" quantity="5"/>
+      <requirement type="iron" quantity="3"/>
       <requirement type="money" quantity="200"/>
     </construction>
   </building>
@@ -96,11 +96,11 @@
   <building name="smithy" capacity="1">
     <function name="init" value="init_smithy"/>
     <maintenance type="money" amount="300" vital="yes"/>
-    <maintenance type="log" recycle="0.5" amount="1"/>
+    <maintenance type="log" amount="1"/>
     <construction skill="building" minskill="3" reqsize="1">
-      <requirement type="log" recycle="0.5" quantity="5"/>
-      <requirement type="stone" recycle="0.5" quantity="5"/>
-      <requirement type="iron" recycle="0.5" quantity="2"/>
+      <requirement type="log" quantity="5"/>
+      <requirement type="stone" quantity="5"/>
+      <requirement type="iron" quantity="2"/>
       <requirement type="money" quantity="200"/>
     </construction>
   </building>
@@ -108,10 +108,10 @@
   <building name="magictower" maxcapacity="2" maxsize="50" magic="yes" magres="40" fumblebonus="10" auraregen="1.75">
     <maintenance type="money" amount="1000" vital="yes"/>
     <construction skill="building" minskill="5" reqsize="50" maxsize="50">
-      <requirement type="log" recycle="0.5" quantity="150"/>
-      <requirement type="stone" recycle="0.5" quantity="250"/>
+      <requirement type="log" quantity="150"/>
+      <requirement type="stone" quantity="250"/>
       <requirement type="mallorn" quantity="100"/>
-      <requirement type="iron" recycle="0.5" quantity="150"/>
+      <requirement type="iron" quantity="150"/>
       <requirement type="laen" quantity="100"/>
       <requirement type="money" quantity="25000"/>
     </construction>
@@ -120,9 +120,9 @@
   <building name="academy" maxcapacity="25" maxsize="25">
     <maintenance type="money" amount="1000" vital="yes"/>
     <construction skill="building" minskill="3" reqsize="25" maxsize="25">
-      <requirement type="log" recycle="0.5" quantity="125"/>
-      <requirement type="stone" recycle="0.5" quantity="125"/>
-      <requirement type="iron" recycle="0.5" quantity="25"/>
+      <requirement type="log" quantity="125"/>
+      <requirement type="stone" quantity="125"/>
+      <requirement type="iron" quantity="25"/>
       <requirement type="money" quantity="12500"/>
     </construction>
   </building>
@@ -130,8 +130,8 @@
   <building name="harbour" capacity="1" maxcapacity="25" maxsize="25">
     <maintenance type="money" amount="250" vital="yes"/>
     <construction skill="building" minskill="3" reqsize="25" maxsize="25">
-      <requirement type="log" recycle="0.5" quantity="125"/>
-      <requirement type="stone" recycle="0.5" quantity="125"/>
+      <requirement type="log" quantity="125"/>
+      <requirement type="stone" quantity="125"/>
       <requirement type="money" quantity="6250"/>
     </construction>
   </building>
@@ -139,9 +139,9 @@
   <building name="quarry" capacity="1">
     <maintenance type="money" amount="250" vital="yes"/>
     <construction skill="building" minskill="2" reqsize="1">
-      <requirement type="iron" recycle="0.5" quantity="1"/>
-      <requirement type="log" recycle="0.5" quantity="5"/>
-      <requirement type="stone" recycle="0.5" quantity="1"/>
+      <requirement type="iron" quantity="1"/>
+      <requirement type="log" quantity="5"/>
+      <requirement type="stone" quantity="1"/>
       <requirement type="money" quantity="250"/>
     </construction>
   </building>
@@ -149,9 +149,9 @@
   <building name="mine" capacity="1">
     <maintenance type="money" amount="500" vital="yes"/>
     <construction skill="building" minskill="4" reqsize="1">
-      <requirement type="iron" recycle="0.5" quantity="1"/>
-      <requirement type="log" recycle="0.5" quantity="10"/>
-      <requirement type="stone" recycle="0.5" quantity="5"/>
+      <requirement type="iron" quantity="1"/>
+      <requirement type="log" quantity="10"/>
+      <requirement type="stone" quantity="5"/>
       <requirement type="money" quantity="250"/>
     </construction>
   </building>
@@ -159,9 +159,9 @@
   <building name="lighthouse" capacity="1" maxcapacity="4">
     <maintenance type="money" amount="100" vital="yes"/>
     <construction skill="building" minskill="3" reqsize="1">
-      <requirement type="iron" recycle="0.5" quantity="1"/>
-      <requirement type="log" recycle="0.5" quantity="1"/>
-      <requirement type="stone" recycle="0.5" quantity="2"/>
+      <requirement type="iron" quantity="1"/>
+      <requirement type="log" quantity="1"/>
+      <requirement type="stone" quantity="2"/>
       <requirement type="money" quantity="100"/>
     </construction>
   </building>
@@ -169,25 +169,25 @@
   <building name="castle" capacity="1">
     <function name="name" value="castle_name"/>
     <construction skill="building" minskill="1" maxsize="2" reqsize="1">
-      <requirement type="stone" quantity="1" recycle="0.5"/>
+      <requirement type="stone" quantity="1"/>
     </construction>
     <construction skill="building" minskill="1" maxsize="8" reqsize="1">
-      <requirement type="stone" quantity="1" recycle="0.5"/>
+      <requirement type="stone" quantity="1"/>
     </construction>
     <construction skill="building" minskill="2" maxsize="40" reqsize="1">
-      <requirement type="stone" quantity="1" recycle="0.5"/>
+      <requirement type="stone" quantity="1"/>
     </construction>
     <construction skill="building" minskill="3" maxsize="200" reqsize="1">
-      <requirement type="stone" quantity="1" recycle="0.5"/>
+      <requirement type="stone" quantity="1"/>
     </construction>
     <construction skill="building" minskill="4" maxsize="1000" reqsize="1">
-      <requirement type="stone" quantity="1" recycle="0.5"/>
+      <requirement type="stone" quantity="1"/>
     </construction>
     <construction skill="building" minskill="5" maxsize="5000" reqsize="1">
-      <requirement type="stone" quantity="1" recycle="0.5"/>
+      <requirement type="stone" quantity="1"/>
     </construction>
     <construction skill="building" minskill="6" reqsize="1">
-      <requirement type="stone" quantity="1" recycle="0.5"/>
+      <requirement type="stone" quantity="1"/>
     </construction>
   </building>