From 80819ad4e5a0ee9e99a2828a7dbc3044b946d457 Mon Sep 17 00:00:00 2001
From: CTD <C_T_D@GMX.DE>
Date: Tue, 26 Aug 2014 10:53:51 +0200
Subject: [PATCH 1/2] XML Config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ich habe mal alle neuen Sachen in die XML Dateien eingetragen, und
gleich noch 2 kleine Bugs behoben (Natürlich Rüstung war wieder aus und
default Arbeiten gab es nicht mehr).
---
 conf/e2/config.xml | 12 ++++++++++++
 conf/e3/config.xml | 17 ++++++++++++-----
 conf/e4/config.xml |  9 ++++++++-
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/conf/e2/config.xml b/conf/e2/config.xml
index 2ca33346c..a89de272a 100644
--- a/conf/e2/config.xml
+++ b/conf/e2/config.xml
@@ -97,6 +97,13 @@
     <param name="rules.check_overload" value="0"/>
     <param name="rules.limit.faction" value="2500"/>
     <param name="rules.maxskills.magic" value="5"/>
+    <param name="rules.guard.base_stop_prob" value="0.30"/>
+    <param name="rules.guard.skill_stop_prob" value="0.05"/>
+    <param name="rules.guard.amulet_stop_prob" value="0.10"/>
+    <param name="rules.guard.guard_number_stop_prob" value="0.001"/>
+    <param name="rules.guard.castle_stop_prob" value="0.05"/>
+    <param name="rules.guard.region_type_stop_prob" value="0.05"/>
+    <param name="rules.region_owner_pay_building" value="harbour lighthouse"/>
     <param name="game.id" value="2"/>
     <param name="game.name" value="Eressea"/>
   </game>
@@ -115,5 +122,10 @@
       <text locale="de">ERESSEA 2 BEFEHLE</text>
       <text locale="en">ERESSEA 2 ORDERS</text>
     </string>
+    </string>
+      <string name="defaultorder">
+      <text locale="de">ARBEITEN</text>
+      <text locale="en">WORK</text>
+    </string>
   </strings>
 </eressea>
diff --git a/conf/e3/config.xml b/conf/e3/config.xml
index b30ad8bfc..786348dfd 100644
--- a/conf/e3/config.xml
+++ b/conf/e3/config.xml
@@ -115,7 +115,7 @@
     <param name="init_spells" value="0"/>
     <param name="recruit.allow_merge" value="1"/>
     <param name="study.expensivemigrants" value="1"/>
-    <param name="study.speedup" value="0"/>
+    <param name="study.speedup" value="2"/>
     <param name="world.era" value="3"/>
     <param name="rules.migrants" value="0"/>
     <param name="rules.monsters.attack_chance" value="0.0"/>
@@ -129,6 +129,7 @@
     <param name="rules.combat.herospeed" value="3"/>
     <param name="rules.combat.demon_vampire" value="5"/> <!-- regen 1 hp per X points of damage done -->
     <param name="rules.combat.skill_bonus" value="0"/>
+    <param name="rules.combat.nat_armor" value="1"/>
     <!--param name="rules.combat.loot" value="5"/--> <!-- only self + others - keeploot -->
     <param name="rules.items.loot_divisor" value="2"/> <!-- damage skims off 1/2 of goods transfers -->
     <param name="rules.items.give_divisor" value="2"/> <!-- corruption skims off 1/2 of goods transfers -->
@@ -149,6 +150,7 @@
     <param name="rules.economy.wages" value="1"/>
     <param name="rules.economy.roqf" value="5"/>
     <param name="rules.economy.herbrot" value="0"/>
+    <param name="rules.region_owner_pay_building" value="market harbour lighthouse"/>
     <param name="rules.dwarf_castles" value="1"/>
     <!-- param name="rules.nmr.destroy" value="1"/ -->
     <param name="rules.limit.faction" value="250"/>
@@ -172,13 +174,18 @@
     </string>
     <string name="newbie_info_1">
       <text locale="de">Bitte denke daran, deine Befehle mit dem Betreff
-      ERESSEA 3 BEFEHLE an eressea-server@eressea.de zu senden.</text>
+      E3 BEFEHLE an eressea-server@eressea.de zu senden.</text>
       <text locale="en">Remember to send your orders to
-      eressea-server@eressea.de with the subject ERESSEA 3 ORDERS.</text>
+      eressea-server@eressea.de with the subject E3 ORDERS.</text>
     </string>
     <string name="mailcmd">
-      <text locale="de">ERESSEA 3 BEFEHLE</text>
-      <text locale="en">ERESSEA 3 ORDERS</text>
+      <text locale="de">E3 BEFEHLE</text>
+      <text locale="en">E3 ORDERS</text>
     </string>
+    </string>
+      <string name="defaultorder">
+      <text locale="de">ARBEITEN</text>
+      <text locale="en">WORK</text>
+    </string> 
   </strings>
 </eressea>
diff --git a/conf/e4/config.xml b/conf/e4/config.xml
index 44cc35471..484db1539 100644
--- a/conf/e4/config.xml
+++ b/conf/e4/config.xml
@@ -115,7 +115,7 @@
     <param name="init_spells" value="0"/>
     <param name="recruit.allow_merge" value="1"/>
     <param name="study.expensivemigrants" value="1"/>
-    <param name="study.speedup" value="0"/>
+    <param name="study.speedup" value="2"/>
     <param name="world.era" value="3"/>
     <param name="rules.migrants" value="0"/>
     <param name="rules.reserve.twophase" value="1"/>
@@ -129,6 +129,7 @@
     <param name="rules.combat.herospeed" value="3"/>
     <param name="rules.combat.demon_vampire" value="5"/> <!-- regen 1 hp per X points of damage done -->
     <param name="rules.combat.skill_bonus" value="0"/>
+    <param name="rules.combat.nat_armor" value="1"/>
     <!--param name="rules.combat.loot" value="5"/--> <!-- only self + others - keeploot -->
     <param name="rules.items.loot_divisor" value="2"/> <!-- damage skims off 1/2 of goods transfers -->
     <param name="rules.items.give_divisor" value="2"/> <!-- corruption skims off 1/2 of goods transfers -->
@@ -149,6 +150,7 @@
     <param name="rules.economy.wages" value="1"/>
     <param name="rules.economy.roqf" value="5"/>
     <param name="rules.economy.herbrot" value="0"/>
+    <param name="rules.region_owner_pay_building" value="market harbour lighthouse"/>
     <param name="rules.dwarf_castles" value="1"/>
     <!-- param name="rules.nmr.destroy" value="1"/ -->
     <param name="rules.limit.faction" value="250"/>
@@ -180,5 +182,10 @@
       <text locale="de">ERESSEA 4 BEFEHLE</text>
       <text locale="en">ERESSEA 4 ORDERS</text>
     </string>
+    </string>
+      <string name="defaultorder">
+      <text locale="de">ARBEITEN</text>
+      <text locale="en">WORK</text>
+    </string>
   </strings>
 </eressea>

From 3fd4a29356c13effe78acd58c18f88ef5f4639e7 Mon Sep 17 00:00:00 2001
From: CTD <C_T_D@GMX.DE>
Date: Tue, 26 Aug 2014 16:19:59 +0200
Subject: [PATCH 2/2] =?UTF-8?q?rules.reserve.twophase=20f=C3=BCr=20alle=20?=
 =?UTF-8?q?Spiele?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/e2/config.xml | 1 +
 conf/e3/config.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/conf/e2/config.xml b/conf/e2/config.xml
index a89de272a..34be1567b 100644
--- a/conf/e2/config.xml
+++ b/conf/e2/config.xml
@@ -94,6 +94,7 @@
     <param name="GiveRestriction" value="3"/>
     <param name="hunger.long" value="1"/>
     <param name="init_spells" value="0"/>
+    <param name="rules.reserve.twophase" value="1"/>
     <param name="rules.check_overload" value="0"/>
     <param name="rules.limit.faction" value="2500"/>
     <param name="rules.maxskills.magic" value="5"/>
diff --git a/conf/e3/config.xml b/conf/e3/config.xml
index 786348dfd..74a64ab58 100644
--- a/conf/e3/config.xml
+++ b/conf/e3/config.xml
@@ -118,6 +118,7 @@
     <param name="study.speedup" value="2"/>
     <param name="world.era" value="3"/>
     <param name="rules.migrants" value="0"/>
+    <param name="rules.reserve.twophase" value="1"/>
     <param name="rules.monsters.attack_chance" value="0.0"/>
     <param name="rules.transfermen" value="0"/>
     <param name="rules.stealth.faction" value="1"/>