Merge pull request #724 from ennorehling/master

version 3.13 release
eressea · Aug 24, 2017 · 6b7da57 · 6b7da57
2 parents e52d4e3 + 9a7da6a
commit 6b7da57
Show file tree

Hide file tree

Showing 109 changed files with 1,944 additions and 1,416 deletions.
diff --git a/conf/e2/config.json b/conf/e2/config.json
@@ -35,6 +35,7 @@
         "rules.guard.guard_number_stop_prob": 0.001,
         "rules.guard.castle_stop_prob": 0.05,
         "rules.guard.region_type_stop_prob": 0.05,
-        "rules.economy.repopulate_maximum": 500
+        "rules.economy.repopulate_maximum": 500,
+        "rules.lighthouse.unit_capacity": true
     }
 }
diff --git a/conf/e3/config.json b/conf/e3/config.json
@@ -92,6 +92,7 @@
         "rules.grow.formula": 1,
         "rules.tactics.formula": 1,
         "rules.help.mask": "fight guard money give",
+        "rules.lighthouse.unit_capacity": true,
         "movement.shipspeed.skillbonus": 6,
         "alliance.auto": "fight",
         "alliance.restricted": "fight"

diff --git a/conf/keywords.json b/conf/keywords.json
@@ -1,7 +1,8 @@
 {
     "keywords": {
         "en" : {
-            "grow": [ "GROW", "BREED", "PLANT" ],
+            "plant": "PLANT",
+	    "grow": [ "GROW", "BREED" ],
             "promote": ["PROMOTE", "PROMOTION" ],
             "combat": [ "COMBAT", "FIGHT" ]
         },
@@ -53,7 +54,8 @@
             "cast": ["ZAUBERE", "ZAUBERN"],
             "show": ["ZEIGE", "ZEIGEN"],
             "destroy": ["ZERSTÖRE", "ZERSTÖREN"],
-            "grow": ["ZÜCHTE", "PFLANZE", "ZÜCHTEN", "PFLANZEN"],
+            "grow": ["ZÜCHTE", "ZÜCHTEN"],
+            "plant": ["PFLANZE", "PFLANZEN"],
             "default": "DEFAULT",
             "origin": "URSPRUNG",
             "email": "EMAIL",

diff --git a/res/buildings/castle-2.xml b/res/buildings/castle-2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="castle" capacity="1" fort="yes" taxes="100">
+<building name="castle" fort="yes" taxes="100">
   <construction skill="building" minskill="1" maxsize="10" name="site">
     <requirement type="stone" quantity="1"/>
   </construction>

diff --git a/res/buildings/castle.xml b/res/buildings/castle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<building name="castle" capacity="1" fort="yes">
+<building name="castle" fort="yes">
   <construction skill="building" minskill="1" maxsize="2" name="site">
     <requirement type="stone" quantity="1"/>
   </construction>

diff --git a/res/core/common/buildings.xml b/res/core/common/buildings.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0"?>
 <buildings>
-  <building name="wormhole" maxsize="4" capacity="1" maxcapacity="4" nobuild="yes" nodestroy="yes" unique="yes" />
+  <building name="wormhole" maxsize="4" maxcapacity="4" nobuild="yes" nodestroy="yes" unique="yes" />
   <building name="illusioncastle" capacity="0" maxcapacity="0" maxsize="0" nobuild="yes"/>
   <building name="xmas_exit" maxsize="10" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes"/>
-  <building name="caldera" capacity="1" nodestroy="yes" nobuild="yes"/>
+  <building name="caldera" nodestroy="yes" nobuild="yes"/>
   <building name="building" namechange="no" maxsize="1" nobuild="yes"/>
 
   <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">
+    <construction skill="building" minskill="2" reqsize="100">
       <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">
+    <construction skill="building" minskill="2" reqsize="100">
       <requirement type="log" quantity="500"/>
       <requirement type="stone" quantity="500"/>
     </construction>
   </building>
 
-  <building name="inn" capacity="1">
+  <building name="inn">
     <maintenance type="money" amount="5" variable="yes"/>
     <construction skill="building" minskill="2" reqsize="10">
       <requirement type="iron" quantity="10"/>
@@ -30,40 +30,40 @@
     </construction>
   </building>
 
-  <building name="tunnel" capacity="1" maxsize="100">
+  <building name="tunnel" maxsize="100">
     <maintenance type="stone" amount="2"/>
     <maintenance type="money" amount="100"/>
-    <construction skill="building" minskill="6" reqsize="100" maxsize="100">
+    <construction skill="building" minskill="6" reqsize="100">
       <requirement type="iron" quantity="100"/>
       <requirement type="log" quantity="500"/>
       <requirement type="stone" quantity="1000"/>
       <requirement type="money" quantity="30000"/>
     </construction>
   </building>
 
-  <building name="caravan" capacity="1" maxsize="10">
+  <building name="caravan" maxsize="10">
     <maintenance type="horse" amount="2"/>
     <maintenance type="money" amount="3000"/>
-    <construction skill="building" minskill="2" reqsize="10" maxsize="10">
+    <construction skill="building" minskill="2" reqsize="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">
+  <building name="dam" maxsize="50">
     <maintenance type="log" amount="3"/>
     <maintenance type="money" amount="1000"/>
-    <construction skill="building" minskill="4" reqsize="50" maxsize="50">
+    <construction skill="building" minskill="4" reqsize="50">
       <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" namechange="no" capacity="1">
+  <building name="monument" namechange="no">
     <construction skill="building" minskill="4">
       <requirement type="log" quantity="1"/>
       <requirement type="stone" quantity="1"/>
@@ -72,7 +72,7 @@
     </construction>
   </building>
 
-  <building name="stables" capacity="1">
+  <building name="stables">
     <maintenance type="money" amount="150"/>
     <construction skill="building" minskill="2">
       <requirement type="log" quantity="4"/>
@@ -82,7 +82,7 @@
     </construction>
   </building>
 
-  <building name="sawmill" capacity="1">
+  <building name="sawmill">
     <maintenance type="money" amount="250"/>
     <construction skill="building" minskill="3">
       <requirement type="log" quantity="5"/>
@@ -92,7 +92,7 @@
     </construction>
   </building>
 
-  <building name="smithy" capacity="1">
+  <building name="smithy">
     <maintenance type="money" amount="300"/>
     <maintenance type="log" amount="1"/>
     <construction skill="building" minskill="3">
@@ -107,7 +107,7 @@
 
   <building name="magictower" maxcapacity="2" maxsize="50" magic="yes" magres="40" fumblebonus="10" auraregen="1.75">
     <maintenance type="money" amount="1000"/>
-    <construction skill="building" minskill="5" reqsize="50" maxsize="50">
+    <construction skill="building" minskill="5" reqsize="50">
       <requirement type="log" quantity="150"/>
       <requirement type="stone" quantity="250"/>
       <requirement type="mallorn" quantity="100"/>
@@ -119,24 +119,24 @@
 
   <building name="academy" maxcapacity="25" maxsize="25">
     <maintenance type="money" amount="1000"/>
-    <construction skill="building" minskill="3" reqsize="25" maxsize="25">
+    <construction skill="building" minskill="3" reqsize="25">
       <requirement type="log" quantity="125"/>
       <requirement type="stone" quantity="125"/>
       <requirement type="iron" quantity="25"/>
       <requirement type="money" quantity="12500"/>
     </construction>
   </building>
 
-  <building name="harbour" capacity="1" maxcapacity="25" maxsize="25" unique="yes">
+  <building name="harbour" maxcapacity="25" maxsize="25" unique="yes">
     <maintenance type="money" amount="250"/>
-    <construction skill="building" minskill="3" reqsize="25" maxsize="25">
+    <construction skill="building" minskill="3" reqsize="25">
       <requirement type="log" quantity="125"/>
       <requirement type="stone" quantity="125"/>
       <requirement type="money" quantity="6250"/>
     </construction>
   </building>
 
-  <building name="quarry" capacity="1">
+  <building name="quarry">
     <maintenance type="money" amount="250"/>
     <construction skill="building" minskill="2">
       <requirement type="iron" quantity="1"/>
@@ -146,7 +146,7 @@
     </construction>
   </building>
 
-  <building name="mine" capacity="1">
+  <building name="mine">
     <maintenance type="money" amount="500"/>
     <construction skill="building" minskill="4">
       <requirement type="iron" quantity="1"/>
@@ -156,7 +156,7 @@
     </construction>
   </building>
 
-  <building name="lighthouse" capacity="1" maxcapacity="4">
+  <building name="lighthouse" maxcapacity="4">
     <maintenance type="money" amount="100"/>
     <construction skill="building" minskill="3">
       <requirement type="iron" quantity="1"/>

diff --git a/res/core/messages.xml b/res/core/messages.xml
@@ -1062,16 +1062,6 @@
     <text locale="de">"$unit($unit) in $region($region): '$order($command)' - $race($race,0) können nichts stehelen."</text>
     <text locale="en">"$unit($unit) in $region($region): '$order($command)' - $race($race,0) cannot steal anything."</text>
   </message>
-  <message name="race_nogive" section="production">
-    <type>
-      <arg name="unit" type="unit"/>
-      <arg name="region" type="region"/>
-      <arg name="command" type="order"/>
-      <arg name="race" type="race"/>
-    </type>
-    <text locale="de">"$unit($unit) in $region($region): '$order($command)' - $race($race,0) geben nichts weg."</text>
-    <text locale="en">"$unit($unit) in $region($region): '$order($command)' - $race($race,0) do not give things away."</text>
-  </message>
   <message name="regionmessage" section="mail">
     <type>
       <arg name="sender" type="unit"/>
@@ -8001,14 +7991,6 @@
     <text locale="en">"$unit($unit) tried but failed to send $unit($target) to another world."</text>
   </message>
 
-  <message name="renumber_twice" section="errors">
-    <type>
-      <arg name="id" type="int"/>
-    </type>
-    <text locale="de">"NUMMER PARTEI $int36($id): Die Partei kann nicht mehr als einmal ihre Nummer wecheln."</text>
-    <text locale="en">"NUMBER FACTION $int36($id): Your faction can only change its number once."</text>
-  </message>
-
   <message name="renumber_inuse" section="errors">
     <type>
       <arg name="id" type="int"/>

diff --git a/res/e3a/buildings.xml b/res/e3a/buildings.xml
@@ -3,7 +3,7 @@
 
   <xi:include href="config://default/buildings/castle-2.xml" />
 
-  <building name="watch" maxsize="10" capacity="1" fort="yes" taxes="200">
+  <building name="watch" maxsize="10" fort="yes" taxes="200">
     <construction skill="building" minskill="1" maxsize="5" name="scaffolding">
       <requirement type="log" quantity="1"/>
     </construction>
@@ -15,7 +15,7 @@
     </construction>
   </building>
 
-  <building name="market" capacity="1" maxsize="10">
+  <building name="market" maxsize="10">
     <maintenance type="money" amount="200"/>
     <construction skill="building" minskill="3">
       <requirement type="log" quantity="1"/>

diff --git a/res/e3a/races.xml b/res/e3a/races.xml
@@ -700,7 +700,11 @@
     <attack type="4" damage="2d12"/>
   </race>
 
-  <race name="undead" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="20" damage="1d7" unarmedattack="0" unarmeddefense="0" attackmodifier="1" defensemodifier="1" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noheal="yes" undead="yes" equipment="yes">
+  <race name="undead" maxaura="1.0" regaura="1.0" weight="1000"
+  capacity="540" speed="1.0" hp="20" damage="1d7" unarmedattack="0"
+  unarmeddefense="0" attackmodifier="1" defensemodifier="1"
+  scarepeasants="yes" walk="yes" canlearn="no" teach="no" noheal="yes"
+  undead="yes" equipment="yes" giveperson="yes">
     <ai splitsize="20000" moverandom="yes"/>
     <attack type="4" damage="1d7"/>
     <attack type="5"/>
@@ -732,7 +736,7 @@
     <attack type="1" damage="0d0"/>
   </race>
 
-  <race name="ghast" magres="60" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="60" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="6" defensemodifier="6" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes">
+  <race name="ghast" magres="60" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="60" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="6" defensemodifier="6" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" giveperson="yes">
     <ai splitsize="2000" killpeasants="yes" moverandom="yes"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="bow" modifier="1"/>
@@ -750,7 +754,7 @@
     <attack type="2" damage="1d30"/>
   </race>
 
-  <race name="ghoul" magres="30" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="30" ac="1" damage="1d7" unarmedattack="3" unarmeddefense="3" attackmodifier="3" defensemodifier="3" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes">
+  <race name="ghoul" magres="30" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="30" ac="1" damage="1d7" unarmedattack="3" unarmeddefense="3" attackmodifier="3" defensemodifier="3" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" giveperson="yes">
     <ai splitsize="10000" killpeasants="yes" moverandom="yes"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="bow" modifier="1"/>
@@ -767,7 +771,7 @@
     <attack type="2" damage="1d30"/>
   </race>
 
-  <race name="juju" magres="50" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="80" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" resistbash="yes" resistcut="yes" resistpierce="yes">
+  <race name="juju" magres="50" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="80" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" resistbash="yes" resistcut="yes" resistpierce="yes" giveperson="yes">
     <ai splitsize="2000" killpeasants="yes" moverandom="yes"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="bow" modifier="1"/>
@@ -783,7 +787,7 @@
     <attack type="3" damage="1d1"/>
   </race>
 
-  <race name="zombie" magres="20" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="40" ac="1" damage="1d7" unarmedattack="2" unarmeddefense="2" attackmodifier="5" defensemodifier="5" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes">
+  <race name="zombie" magres="20" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="40" ac="1" damage="1d7" unarmedattack="2" unarmeddefense="2" attackmodifier="5" defensemodifier="5" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes">
     <ai splitsize="10000" killpeasants="yes" moverandom="yes"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="bow" modifier="1"/>
@@ -797,7 +801,7 @@
     <attack type="1" damage="1d7"/>
   </race>
 
-  <race name="skeletonlord" magres="30" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="60" ac="4" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes">
+  <race name="skeletonlord" magres="30" maxaura="1.0" regaura="1.0" weight="1000" capacity="540" speed="1.0" hp="60" ac="4" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="8" defensemodifier="8" scarepeasants="yes" walk="yes" canlearn="no" teach="no" absorbpeasants="yes" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes">
     <ai splitsize="2000" killpeasants="yes" moverandom="yes"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="bow" modifier="1"/>
@@ -812,7 +816,7 @@
     <attack type="1" damage="1d7"/>
   </race>
 
-  <race name="skeleton" magres="10" maxaura="1.0" regaura="1.0" weight="500" capacity="540" speed="1.0" hp="20" ac="1" damage="1d7" unarmedattack="1" unarmeddefense="1" attackmodifier="6" defensemodifier="6" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes">
+  <race name="skeleton" magres="10" maxaura="1.0" regaura="1.0" weight="500" capacity="540" speed="1.0" hp="20" ac="1" damage="1d7" unarmedattack="1" unarmeddefense="1" attackmodifier="6" defensemodifier="6" scarepeasants="yes" walk="yes" canlearn="no" teach="no" noheal="yes" undead="yes" equipment="yes" resistcut="yes" resistpierce="yes" giveperson="yes">
     <ai splitsize="10000" killpeasants="yes" moverandom="yes"/>
     <skill name="crossbow" modifier="1"/>
     <skill name="bow" modifier="1"/>

diff --git a/res/eressea/buildings.xml b/res/eressea/buildings.xml
@@ -2,7 +2,7 @@
 <buildings xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="../buildings/castle.xml"/>
   <building name="temple" maxsize="50" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" auraregen="1.00" />
-  <building name="portal" maxsize="2" capacity="1" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" />
-  <building name="pavilion" maxsize="2" capacity="1" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" />
+  <building name="portal" maxsize="2" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" />
+  <building name="pavilion" maxsize="2" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" />
   <building name="artacademy" maxsize="100" nobuild="yes" nodestroy="yes" unique="yes"/>
 </buildings>