Merge pull request #31 from CTD1/XML_config_changes

Xml config changes

conf/e2/config.xml

@@ -93,9 +93,17 @@
     <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"/>
+    <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>
@@ -114,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>

conf/e3/config.xml

@@ -114,9 +114,10 @@
     <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"/>
     <param name="rules.monsters.attack_chance" value="0.0"/>
     <param name="rules.transfermen" value="0"/>
     <param name="rules.stealth.faction" value="1"/>
@@ -128,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 -->
@@ -148,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"/>
@@ -171,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="de">E3 BEFEHLE</text>
-      <text locale="en">ERESSEA 3 ORDERS</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>

conf/e4/config.xml

@@ -114,7 +114,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"/>
@@ -128,6 +128,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 -->
@@ -148,6 +149,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"/>
@@ -179,5 +181,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>