From e6d8c0df33a8c8c62baf494ad5a5b4d36ed2c5d8 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Mon, 18 Jan 2010 05:42:04 +0000
Subject: [PATCH] - remove dwarf bonus from e3 - dragons go into a separate
 file

---
 src/res/e3a/races.xml               | 44 +++--------------------------
 src/res/e3a/resources.xml           |  6 ++--
 src/res/races/dragon.xml            | 14 +++++++++
 src/res/races/wyrm.xml              | 11 ++++++++
 src/res/races/youngdragon.xml       | 13 +++++++++
 src/res/resources/iron-nobonus.xml  | 12 ++++++++
 src/res/resources/stone-nobonus.xml | 10 +++++++
 7 files changed, 68 insertions(+), 42 deletions(-)
 create mode 100644 src/res/races/dragon.xml
 create mode 100644 src/res/races/wyrm.xml
 create mode 100644 src/res/races/youngdragon.xml
 create mode 100644 src/res/resources/iron-nobonus.xml
 create mode 100644 src/res/resources/stone-nobonus.xml

diff --git a/src/res/e3a/races.xml b/src/res/e3a/races.xml
index ff75b5468..499b8e0a6 100644
--- a/src/res/e3a/races.xml
+++ b/src/res/e3a/races.xml
@@ -4,7 +4,10 @@
   <!-- begin main races -->
 
   <xi:include href="../races/goblin-3.xml"/>
-
+  <xi:include href="../races/wyrm.xml"/>
+  <xi:include href="../races/dragon.xml"/>
+  <xi:include href="../races/youngdragon.xml"/>
+  
   <race name="uruk" studyspeed="-5" magres="-0.05" maxaura="1.0" regaura="1.0" recruitcost="100" maintenance="10" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="itemdrop" value="defaultdrops"/>
@@ -729,45 +732,6 @@
     <attack type="4" damage="2d12"/>
   </race>
 
-  <race name="wyrm" magres="0.900000" maxaura="1.0" regaura="3.000000" weight="18000" capacity="1000000" speed="1.0" hp="2700" ac="8" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="10" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" resistbash="yes">
-    <ai splitsize="1" killpeasants="yes" learn="yes"/>
-    <function name="name" value="namedragon"/>
-    <function name="move" value="movedragon"/>
-    <skill name="magic" modifier="12"/>
-    <skill name="tactics" modifier="12"/>
-    <attack type="4" damage="3d20"/>
-    <attack type="4" damage="3d20"/>
-    <attack type="4" damage="5d30"/>
-    <attack type="6" spell="powerful_dragonbreath"/>
-  </race>
-
-  <race name="dragon" magres="0.700000" maxaura="1.0" regaura="2.000000" weight="10000" capacity="1000000" speed="1.500000" hp="900" ac=
-"6" damage="2d30" unarmedattack="0" unarmeddefense="0" attackmodifier="7" defensemodifier="7" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" giveitem="yes" resistbash="yes">
-    <ai splitsize="2" killpeasants="yes" learn="yes"/>
-    <function name="name" value="namedragon"/>
-    <function name="age" value="agedragon"/>
-    <function name="move" value="movedragon"/>
-    <skill name="magic" modifier="8"/>
-    <skill name="tactics" modifier="8"/>
-    <attack type="4" damage="2d20"/>
-    <attack type="4" damage="2d20"/>
-    <attack type="4" damage="3d30"/>
-    <attack type="6" spell="icy_dragonbreath"/>
-  </race>
-
-  <race name="youngdragon" magres="0.500000" maxaura="1.0" regaura="1.0" weight="20000" capacity="10000" speed="1.0" hp="300" ac="4" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" resistbash="yes">
-    <ai splitsize="6" killpeasants="yes" learn="yes"/>
-    <function name="name" value="namedragon"/>
-    <function name="age" value="agefiredragon"/>
-    <function name="move" value="movedragon"/>
-    <skill name="magic" modifier="4"/>
-    <skill name="tactics" modifier="4"/>
-    <attack type="4" damage="1d30"/>
-    <attack type="4" damage="1d30"/>
-    <attack type="4" damage="1d30"/>
-    <attack type="6" spell="fiery_dragonbreath"/>
-  </race>
-
   <race name="illusion" magres="0.000000" maxaura="0.000000" regaura="0.000000" weight="0" capacity="0" speed="1.0" hp="1" damage="1d1" unarmedattack="0" unarmeddefense="0" walk="yes" canlearn="no" teach="no" noweapons="yes" illusionary="yes">
     <ai splitsize="999999"/>
     <function name="age" value="ageillusion"/>
diff --git a/src/res/e3a/resources.xml b/src/res/e3a/resources.xml
index 390487586..7c06ebc9a 100644
--- a/src/res/e3a/resources.xml
+++ b/src/res/e3a/resources.xml
@@ -2,8 +2,10 @@
 <resources xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- this file contains resources that can be mined in some way (anything with a resourcelimit) -->
 
-  <xi:include href="../resources/iron.xml"/>
-  <xi:include href="../resources/stone-2.xml"/>
+  <!--xi:include href="../resources/iron.xml"/-->
+  <!--xi:include href="../resources/stone-2.xml"/-->
+  <xi:include href="../resources/iron-nobonus.xml"/>
+  <xi:include href="../resources/stone-nobonus.xml"/>
   <xi:include href="../resources/laen.xml"/>
   <xi:include href="../resources/horse.xml"/>
   <xi:include href="../resources/mallorn.xml"/>
diff --git a/src/res/races/dragon.xml b/src/res/races/dragon.xml
new file mode 100644
index 000000000..1e508db89
--- /dev/null
+++ b/src/res/races/dragon.xml
@@ -0,0 +1,14 @@
+<race name="dragon" magres="0.700000" maxaura="1.0" regaura="2.000000" weight="10000" capacity="1000000" speed="1.500000" hp="900" ac=
+"6" damage="2d30" unarmedattack="0" unarmeddefense="0" attackmodifier="7" defensemodifier="7" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" giveitem="yes" resistbash="yes">
+  <ai splitsize="2" killpeasants="yes" learn="yes"/>
+  <function name="name" value="namedragon"/>
+  <function name="age" value="agedragon"/>
+  <function name="move" value="movedragon"/>
+  <skill name="magic" modifier="8"/>
+  <skill name="tactics" modifier="8"/>
+  <attack type="4" damage="2d20"/>
+  <attack type="4" damage="2d20"/>
+  <attack type="4" damage="3d30"/>
+  <attack type="6" spell="icy_dragonbreath"/>
+</race>
+
diff --git a/src/res/races/wyrm.xml b/src/res/races/wyrm.xml
new file mode 100644
index 000000000..924178c25
--- /dev/null
+++ b/src/res/races/wyrm.xml
@@ -0,0 +1,11 @@
+<race name="wyrm" magres="0.900000" maxaura="1.0" regaura="3.000000" weight="18000" capacity="1000000" speed="1.0" hp="2700" ac="8" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" defensemodifier="10" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" resistbash="yes">
+  <ai splitsize="1" killpeasants="yes" learn="yes"/>
+  <function name="name" value="namedragon"/>
+  <function name="move" value="movedragon"/>
+  <skill name="magic" modifier="12"/>
+  <skill name="tactics" modifier="12"/>
+  <attack type="4" damage="3d20"/>
+  <attack type="4" damage="3d20"/>
+  <attack type="4" damage="5d30"/>
+  <attack type="6" spell="powerful_dragonbreath"/>
+</race>
diff --git a/src/res/races/youngdragon.xml b/src/res/races/youngdragon.xml
new file mode 100644
index 000000000..18af1f46a
--- /dev/null
+++ b/src/res/races/youngdragon.xml
@@ -0,0 +1,13 @@
+<race name="youngdragon" magres="0.500000" maxaura="1.0" regaura="1.0" weight="20000" capacity="10000" speed="1.0" hp="300" ac="4" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="4" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes" resistbash="yes">
+  <ai splitsize="6" killpeasants="yes" learn="yes"/>
+  <function name="name" value="namedragon"/>
+  <function name="age" value="agefiredragon"/>
+  <function name="move" value="movedragon"/>
+  <skill name="magic" modifier="4"/>
+  <skill name="tactics" modifier="4"/>
+  <attack type="4" damage="1d30"/>
+  <attack type="4" damage="1d30"/>
+  <attack type="4" damage="1d30"/>
+  <attack type="6" spell="fiery_dragonbreath"/>
+</race>
+
diff --git a/src/res/resources/iron-nobonus.xml b/src/res/resources/iron-nobonus.xml
new file mode 100644
index 000000000..94dbc6390
--- /dev/null
+++ b/src/res/resources/iron-nobonus.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<resource name="iron" limited="yes" material="rm_iron">
+  <item weight="500" score="10">
+    <construction skill="mining" minskill="1" reqsize="1"/>
+  </item>
+  <resourcelimit>
+    <modifier building="mine" type="skill" value="1"/>
+    <modifier building="mine" type="material" value="0.5"/>
+    <modifier race="dwarf" type="material" value="0.60"/>
+    <guard flag="mining"/>
+  </resourcelimit>
+</resource>
diff --git a/src/res/resources/stone-nobonus.xml b/src/res/resources/stone-nobonus.xml
new file mode 100644
index 000000000..854003c86
--- /dev/null
+++ b/src/res/resources/stone-nobonus.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<resource name="stone" limited="yes" material="rm_stone">
+  <item weight="6000" score="10" big="yes">
+    <construction skill="quarrying" minskill="1" reqsize="1"/>
+  </item>
+  <resourcelimit>
+    <modifier building="quarry" type="skill" value="1"/>
+    <modifier building="quarry" type="material" value="0.5"/>
+  </resourcelimit>
+</resource>