Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

finish XInclude removal project. 

reduce number of XML files for E3.
This commit is contained in:
Enno Rehling 2018-02-06 21:28:48 +01:00
parent 9d54dac0f5
commit 1ee6f5444a
60 changed files with 407 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/e2/config.json
View File

@ -3,12 +3,11 @@
"config://conf/keywords.json", "config://conf/keywords.json",
"config://conf/calendar.json", "config://conf/calendar.json",
"config://conf/prefixes.json", "config://conf/prefixes.json",
"config://conf/e2/locales.json",
"config://conf/e2/terrains.json", "config://conf/e2/terrains.json",
"config://conf/e2/items.json", "config://conf/e2/items.json",
"config://conf/e2/locales.json",
"config://conf/e2/rules.xml", "config://conf/e2/rules.xml",
"config://res/core/ships.xml", "config://res/core/ships.xml",
"config://res/core/spoils.xml",
"config://res/core/common/buildings.xml", "config://res/core/common/buildings.xml",
"config://res/eressea/buildings.xml", "config://res/eressea/buildings.xml",
"config://res/buildings/castle.xml", "config://res/buildings/castle.xml",

7
conf/e2/items.json
View File

@ -1,6 +1,10 @@
{ {
"include": [ "include": [
"config://res/core/spoils.xml",
"config://res/core/common/herbs.xml",
"config://res/core/common/items.xml", "config://res/core/common/items.xml",
"config://res/core/common/luxuries.xml",
"config://res/core/common/potions.xml",
"config://res/core/armor/chainmail.xml", "config://res/core/armor/chainmail.xml",
"config://res/core/armor/laenmail.xml", "config://res/core/armor/laenmail.xml",
"config://res/core/armor/laenshield.xml", "config://res/core/armor/laenshield.xml",
@ -19,9 +23,6 @@
"config://res/core/resources/seed.xml", "config://res/core/resources/seed.xml",
"config://res/core/resources/peasant.xml", "config://res/core/resources/peasant.xml",
"config://res/core/resources/stone.xml", "config://res/core/resources/stone.xml",
"config://res/core/common/luxuries.xml",
"config://res/core/common/herbs.xml",
"config://res/core/common/potions.xml",
"config://res/core/weapons/axe.xml", "config://res/core/weapons/axe.xml",
"config://res/core/weapons/bow.xml", "config://res/core/weapons/bow.xml",
"config://res/core/weapons/catapult.xml", "config://res/core/weapons/catapult.xml",

24
conf/e3/config.json
View File

@ -1,9 +1,25 @@
{ {
"include": [ "include": [
"keywords.json", "config://conf/keywords.json",
"calendar.json", "config://conf/calendar.json",
"prefixes.json", "config://conf/prefixes.json",
"e3/terrains.json" "config://conf/e3/locales.json",
"config://conf/e3/terrains.json",
"config://conf/e3/items.json",
"config://conf/e3/races.json",
"config://res/e3a/familiars.xml",
"config://res/e3a/equipment.xml",
"config://res/e3a/ships.xml",
"config://res/e3a/buildings.xml",
"config://res/e3a/spells.xml",
"config://res/e3a/spellbooks/gray.xml",
"config://res/e3a/spellbooks/gwyrrd.xml",
"config://res/e3a/spellbooks/draig.xml",
"config://res/e3a/spellbooks/illaun.xml",
"config://res/e3a/spellbooks/cerddor.xml",
"config://res/e3a/spellbooks/common.xml",
"config://res/core/common/buildings.xml",
"config://res/buildings/castle-2.xml"
], ],
"disabled": [ "disabled": [
"herbalism", "herbalism",

29
conf/e3/items.json Normal file
View File

@ -0,0 +1,29 @@
{
"include": [
"config://res/core/spoils.xml",
"config://res/core/common/herbs.xml",
"config://res/core/common/items.xml",
"config://res/core/common/luxuries.xml",
"config://res/core/resources/cart.xml",
"config://res/core/resources/horse.xml",
"config://res/core/resources/hp.xml",
"config://res/core/resources/laen.xml",
"config://res/core/resources/log.xml",
"config://res/core/resources/mallorn.xml",
"config://res/core/resources/peasant.xml",
"config://res/core/weapons/bow.xml",
"config://res/core/weapons/catapult.xml",
"config://res/core/weapons/mallornbow.xml",
"config://res/core/weapons/mallornspear.xml",
"config://res/core/weapons/runesword.xml",
"config://res/core/weapons/rustyaxe.xml",
"config://res/core/weapons/rustysword.xml",
"config://res/core/weapons/spear.xml",
"config://res/core/weapons/sword.xml",
"config://res/core/weapons/firesword.xml",
"config://res/e3a/weapons.xml",
"config://res/e3a/armor.xml",
"config://res/e3a/items.xml",
"config://res/adamantium.xml"
]
}

14
conf/e3/locales.json Normal file
View File

@ -0,0 +1,14 @@
{
"include": [
"config://res/core/messages.xml",
"config://res/core/de/strings.xml",
"config://res/core/en/strings.xml",
"config://res/e3a/strings.xml",
"config://res/e3a/shipnames.xml",
"config://res/names-undead.xml",
"config://res/names-skeletons.xml",
"config://res/names-zombies.xml",
"config://res/names-ghouls.xml",
"config://res/names-dragons.xml"
]
}

12
conf/e3/locales.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0"?>
<eressea xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="config://core/messages.xml"/>
<xi:include href="config://core/de/strings.xml"/>
<xi:include href="config://core/en/strings.xml"/>
<xi:include href="config://game/strings.xml"/>
<xi:include href="config://default/names-undead.xml"/>
<xi:include href="config://default/names-skeletons.xml"/>
<xi:include href="config://default/names-zombies.xml"/>
<xi:include href="config://default/names-ghouls.xml"/>
<xi:include href="config://default/names-dragons.xml"/>
</eressea>

9
conf/e3/races.json Normal file
View File

@ -0,0 +1,9 @@
{
"include": [
"config://res/races/goblin-3.xml",
"config://res/races/wyrm.xml",
"config://res/races/dragon.xml",
"config://res/races/youngdragon.xml",
"config://res/e3a/races.xml"
]
}

28
conf/e3/rules.xml
View File

@ -1,28 +0,0 @@
<?xml version="1.0"?>
<eressea xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="config://core/common/items.xml"/>
<xi:include href="config://core/common/herbs.xml" />
<xi:include href="config://core/spoils.xml"/>
<xi:include href="config://core/common/buildings.xml"/>
<xi:include href="config://game/familiars.xml"/>
<xi:include href="config://default/adamantium.xml" />
<xi:include href="config://game/ships.xml"/>
<xi:include href="config://game/shipnames.xml"/>
<xi:include href="config://game/items.xml" />
<xi:include href="config://game/races.xml"/>
<xi:include href="config://game/buildings.xml"/>
<xi:include href="config://game/equipment.xml"/>
<xi:include href="config://game/spells.xml"/>
<xi:include href="config://game/luxuries.xml" />
<xi:include href="config://game/weapons.xml" />
<xi:include href="config://game/armor.xml" />
<xi:include href="config://game/resources.xml" />
<xi:include href="config://default/names-undead.xml"/>
<xi:include href="config://default/names-skeletons.xml"/>
<xi:include href="config://default/names-zombies.xml"/>
<xi:include href="config://default/names-ghouls.xml"/>
<xi:include href="config://default/names-dragons.xml"/>
</eressea>

2
res/buildings/castle-2.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea> <eressea>
<buildings>
<building name="castle" fort="yes" taxes="100"> <building name="castle" fort="yes" taxes="100">
<construction skill="building" minskill="1" maxsize="10" name="site"> <construction skill="building" minskill="1" maxsize="10" name="site">
<requirement type="stone" quantity="1"/> <requirement type="stone" quantity="1"/>
@ -20,4 +21,5 @@
<requirement type="stone" quantity="1"/> <requirement type="stone" quantity="1"/>
</construction> </construction>
</building> </building>
</buildings>
</eressea> </eressea>

9
res/core/spells.xml
View File

@ -1,12 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<spells xmlns:xi="http://www.w3.org/2001/XInclude"> <spells>
<xi:include href="spellbooks/gray.xml"/>
<xi:include href="spellbooks/gwyrrd.xml"/>
<xi:include href="spellbooks/draig.xml"/>
<xi:include href="spellbooks/illaun.xml"/>
<xi:include href="spellbooks/cerddor.xml"/>
<xi:include href="spellbooks/tybied.xml"/>
<!-- shared spells --> <!-- shared spells -->
<spell name="create_roi" ship="true" rank="5" index="130"> <spell name="create_roi" ship="true" rank="5" index="130">

91
res/e3a/armor.xml
View File

@ -1,12 +1,83 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<resources xmlns:xi="http://www.w3.org/2001/XInclude"> <eressea>
<xi:include href="armor/chainmail.xml"/> <resources>
<xi:include href="armor/laenmail.xml"/> <resource name="towershield">
<xi:include href="armor/laenshield.xml"/> <modifier type="require" race="dwarf"/>
<xi:include href="armor/plate.xml"/> <modifier type="require" race="irongolem"/>
<xi:include href="armor/rustychainmail.xml"/> <item weight="200" score="60" allow="dwarf">
<xi:include href="armor/rustyshield.xml"/> <construction skill="armorer" minskill="4">
<xi:include href="armor/scale.xml"/> <requirement type="iron" quantity="1"/>
<xi:include href="armor/shield.xml"/> </construction>
<xi:include href="armor/towershield.xml"/> <armor ac="0" penalty="-0.15" projectile="0.25" magres="0.0" shield="yes">
<modifier type="canuse" function="mod_dwarves_only"/>
</armor>
</item>
</resource>
<resource name="shield">
<item weight="100" score="30">
<construction skill="armorer" minskill="2">
<requirement type="iron" quantity="1"/>
</construction>
<armor ac="0" penalty="-0.10" magres="0.0" shield="yes"/>
</item>
</resource>
<resource name="scale">
<modifier type="require" race="dwarf"/>
<modifier type="require" race="irongolem"/>
<item weight="300" score="150" allow="dwarf halfling">
<construction skill="armorer" minskill="5">
<requirement type="iron" quantity="2"/>
</construction>
<armor ac="3" penalty="0.10" projectile="0.05" magres="0.0"/>
</item>
</resource>
<resource name="rustyshield">
<item weight="100" score="10">
<construction skill="armorer" minskill="2">
<requirement type="iron" quantity="1"/>
</construction>
<armor ac="0" penalty="-0.05" magres="0.0" shield="yes"/>
</item>
</resource>
<resource name="rustychainmail">
<item weight="200" score="30">
<construction skill="armorer" minskill="3">
<requirement type="iron" quantity="3"/>
</construction>
<armor ac="1" penalty="0.20" magres="0.0"/>
</item>
</resource>
<resource name="plate">
<item weight="400" score="150" deny="goblin">
<construction skill="armorer" minskill="4">
<requirement type="iron" quantity="4"/>
</construction>
<armor ac="3" penalty="0.15" projectile="0.10" magres="0.0"/>
</item>
</resource>
<resource name="laenshield">
<item weight="0" score="1000">
<construction skill="armorer" minskill="7">
<requirement type="laen" quantity="1"/>
</construction>
<armor ac="1" penalty="-0.10" magres="0.3" laen="yes" shield="yes" />
</item>
</resource>
<resource name="laenmail">
<item weight="100" score="1000">
<construction skill="armorer" minskill="9">
<requirement type="laen" quantity="2"/>
</construction>
<armor ac="3" penalty="0.0" projectile="0.10" magres="0.3" laen="yes" />
</item>
</resource>
<resource name="chainmail">
<item weight="200" score="90">
<construction skill="armorer" minskill="3">
<requirement type="iron" quantity="2"/>
</construction>
<armor ac="2" penalty="0.10" projectile="0.0" magres="0.0"/>
</item>
</resource>
</resources> </resources>
</eressea>

9
res/e3a/armor/chainmail.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0"?>
<resource name="chainmail">
<item weight="200" score="90">
<construction skill="armorer" minskill="3">
<requirement type="iron" quantity="2"/>
</construction>
<armor ac="2" penalty="0.10" projectile="0.0" magres="0.0"/>
</item>
</resource>

9
res/e3a/armor/laenmail.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0"?>
<resource name="laenmail">
<item weight="100" score="1000">
<construction skill="armorer" minskill="9">
<requirement type="laen" quantity="2"/>
</construction>
<armor ac="3" penalty="0.0" projectile="0.10" magres="0.3" laen="yes" />
</item>
</resource>

9
res/e3a/armor/laenshield.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0"?>
<resource name="laenshield">
<item weight="0" score="1000">
<construction skill="armorer" minskill="7">
<requirement type="laen" quantity="1"/>
</construction>
<armor ac="1" penalty="-0.10" magres="0.3" laen="yes" shield="yes" />
</item>
</resource>

9
res/e3a/armor/plate.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0"?>
<resource name="plate">
<item weight="400" score="150" deny="goblin">
<construction skill="armorer" minskill="4">
<requirement type="iron" quantity="4"/>
</construction>
<armor ac="3" penalty="0.15" projectile="0.10" magres="0.0"/>
</item>
</resource>

9
res/e3a/armor/rustychainmail.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0"?>
<resource name="rustychainmail">
<item weight="200" score="30">
<construction skill="armorer" minskill="3">
<requirement type="iron" quantity="3"/>
</construction>
<armor ac="1" penalty="0.20" magres="0.0"/>
</item>
</resource>

9
res/e3a/armor/rustyshield.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0"?>
<resource name="rustyshield">
<item weight="100" score="10">
<construction skill="armorer" minskill="2">
<requirement type="iron" quantity="1"/>
</construction>
<armor ac="0" penalty="-0.05" magres="0.0" shield="yes"/>
</item>
</resource>

11
res/e3a/armor/scale.xml
View File

@ -1,11 +0,0 @@
<?xml version="1.0"?>
<resource name="scale">
<modifier type="require" race="dwarf"/>
<modifier type="require" race="irongolem"/>
<item weight="300" score="150" allow="dwarf halfling">
<construction skill="armorer" minskill="5">
<requirement type="iron" quantity="2"/>
</construction>
<armor ac="3" penalty="0.10" projectile="0.05" magres="0.0"/>
</item>
</resource>

9
res/e3a/armor/shield.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0"?>
<resource name="shield">
<item weight="100" score="30">
<construction skill="armorer" minskill="2">
<requirement type="iron" quantity="1"/>
</construction>
<armor ac="0" penalty="-0.10" magres="0.0" shield="yes"/>
</item>
</resource>

13
res/e3a/armor/towershield.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0"?>
<resource name="towershield">
<modifier type="require" race="dwarf"/>
<modifier type="require" race="irongolem"/>
<item weight="200" score="60" allow="dwarf">
<construction skill="armorer" minskill="4">
<requirement type="iron" quantity="1"/>
</construction>
<armor ac="0" penalty="-0.15" projectile="0.25" magres="0.0" shield="yes">
<modifier type="canuse" function="mod_dwarves_only"/>
</armor>
</item>
</resource>

7
res/e3a/buildings.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<buildings xmlns:xi="http://www.w3.org/2001/XInclude"> <eressea>
<buildings>
<xi:include href="config://default/buildings/castle-2.xml" />
<building name="watch" maxsize="10" fort="yes" taxes="200"> <building name="watch" maxsize="10" fort="yes" taxes="200">
<construction skill="building" minskill="1" maxsize="5" name="scaffolding"> <construction skill="building" minskill="1" maxsize="5" name="scaffolding">
@ -24,4 +23,4 @@
</building> </building>
</buildings> </buildings>
</eressea>

2
res/e3a/equipment.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<equipment> <equipment>
<set name="spo_seaserpent"> <set name="spo_seaserpent">
@ -7,3 +8,4 @@
</set> </set>
</equipment> </equipment>
</eressea>

3
res/e3a/familiars.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<equipment> <equipment>
<!-- equipment given to familiars --> <!-- equipment given to familiars -->
@ -101,4 +102,4 @@
</set> </set>
</equipment> </equipment>
</eressea>

27
res/e3a/items.xml
View File

@ -1,6 +1,32 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<eressea>
<resources> <resources>
<resource name="stone" limited="yes" material="yes">
<item weight="6000" score="10" big="yes">
<construction skill="quarrying" minskill="1"/>
</item>
<modifier building="quarry" type="skill" value="1"/>
<modifier building="quarry" type="material" value="0.5"/>
</resource>
<resource name="iron" limited="yes" material="yes">
<item weight="500" score="10">
<construction skill="mining" minskill="1"/>
</item>
<modifier building="smithy" type="save" value="2"/>
<modifier building="mine" type="skill" value="1"/>
<modifier building="mine" type="material" value="0.5"/>
</resource>
<resource name="seed">
<item weight="10" score="50"/>
</resource>
<resource name="mallornseed">
<item weight="10" score="100"/>
</resource>
<resource name="rpg_item_1"><item weight="10"/></resource> <resource name="rpg_item_1"><item weight="10"/></resource>
<resource name="rpg_item_2"><item weight="1"/></resource> <resource name="rpg_item_2"><item weight="1"/></resource>
<resource name="rpg_item_3"><item weight="100"/></resource> <resource name="rpg_item_3"><item weight="100"/></resource>
@ -76,3 +102,4 @@
</resource> </resource>
</resources> </resources>
</eressea>

9
res/e3a/races.xml
View File

@ -1,13 +1,9 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<races xmlns:xi="http://www.w3.org/2001/XInclude"> <eressea>
<races>
<!-- begin main races --> <!-- begin main races -->
<xi:include href="config://default/races/goblin-3.xml"/>
<xi:include href="config://default/races/wyrm.xml"/>
<xi:include href="config://default/races/dragon.xml"/>
<xi:include href="config://default/races/youngdragon.xml"/>
<race name="lynx" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.0" hp="20" damage="2d3" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="5" walk="yes" teach="no" getitem="yes"> <race name="lynx" maxaura="0.000000" regaura="0.000000" weight="500" capacity="540" speed="1.0" hp="20" damage="2d3" unarmedattack="0" unarmeddefense="0" attackmodifier="4" defensemodifier="5" walk="yes" teach="no" getitem="yes">
<ai splitsize="99999"/> <ai splitsize="99999"/>
<skill name="crossbow" modifier="-99"/> <skill name="crossbow" modifier="-99"/>
@ -846,3 +842,4 @@
</race> </race>
</races> </races>
</eressea>

17
res/e3a/resources.xml
View File

@ -1,17 +0,0 @@
<?xml version="1.0"?>
<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="config://core/resources/cart.xml"/>
<xi:include href="config://core/resources/horse.xml"/>
<xi:include href="config://core/resources/hp.xml"/>
<xi:include href="config://core/resources/laen.xml"/>
<xi:include href="config://core/resources/log.xml"/>
<xi:include href="config://core/resources/mallorn.xml"/>
<xi:include href="config://core/resources/peasant.xml"/>
<xi:include href="resources/iron.xml"/>
<xi:include href="resources/mallornseed.xml"/>
<xi:include href="resources/seed.xml"/>
<xi:include href="resources/stone.xml"/>
</resources>

9
res/e3a/resources/iron.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0"?>
<resource name="iron" limited="yes" material="yes">
<item weight="500" score="10">
<construction skill="mining" minskill="1"/>
</item>
<modifier building="smithy" type="save" value="2"/>
<modifier building="mine" type="skill" value="1"/>
<modifier building="mine" type="material" value="0.5"/>
</resource>

4
res/e3a/resources/mallornseed.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0"?>
<resource name="mallornseed">
<item weight="10" score="100"/>
</resource>

4
res/e3a/resources/seed.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0"?>
<resource name="seed">
<item weight="10" score="50"/>
</resource>

8
res/e3a/resources/stone.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0"?>
<resource name="stone" limited="yes" material="yes">
<item weight="6000" score="10" big="yes">
<construction skill="quarrying" minskill="1"/>
</item>
<modifier building="quarry" type="skill" value="1"/>
<modifier building="quarry" type="material" value="0.5"/>
</resource>

2
res/e3a/shipnames.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<eressea>
<strings> <strings>
<string name="canoe_a"> <string name="canoe_a">
<text locale="de">ein Einbaum</text> <text locale="de">ein Einbaum</text>
@ -106,3 +107,4 @@
<text locale="en">trireme</text> <text locale="en">trireme</text>
</string> </string>
</strings> </strings>
</eressea>

3
res/e3a/ships.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<ships> <ships>
<ship name="canoe" nocoast="true" range="3" fishing="20" storm="1.00" damage="1.00" cabins="2" cargo="2000" cptskill="1" minskill="1" sumskill="2" opensea="no"> <ship name="canoe" nocoast="true" range="3" fishing="20" storm="1.00" damage="1.00" cabins="2" cargo="2000" cptskill="1" minskill="1" sumskill="2" opensea="no">
<coast terrain="plain"/> <coast terrain="plain"/>
@ -143,4 +144,4 @@
</ship> </ship>
</ships> </ships>
</eressea>

2
res/e3a/spellbooks/cerddor.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<eressea>
<spellbook name="cerddor"> <spellbook name="cerddor">
<entry spell="create_potion_p2" level="2" /> <entry spell="create_potion_p2" level="2" />
<entry spell="create_potion_p0" level="3" /> <entry spell="create_potion_p0" level="3" />
@ -35,3 +36,4 @@
<entry spell="incite_riot" level="15" /> <entry spell="incite_riot" level="15" />
<entry spell="summon_familiar" level="9" /> <entry spell="summon_familiar" level="9" />
</spellbook> </spellbook>
</eressea>

2
res/e3a/spellbooks/common.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<eressea>
<spellbook name="common"> <spellbook name="common">
<entry spell="goodwinds" level="4" /> <entry spell="goodwinds" level="4" />
<entry spell="create_trollbelt" level="9" /> <entry spell="create_trollbelt" level="9" />
@ -42,3 +43,4 @@
<entry spell="shockwave" level="5" /> <entry spell="shockwave" level="5" />
<entry spell="eternal_walls" level="7" /> <entry spell="eternal_walls" level="7" />
</spellbook> </spellbook>
</eressea>

2
res/e3a/spellbooks/draig.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<eressea>
<spellbook name="draig"> <spellbook name="draig">
<entry spell="create_potion_p2" level="2" /> <entry spell="create_potion_p2" level="2" />
<entry spell="create_potion_p0" level="3" /> <entry spell="create_potion_p0" level="3" />
@ -31,3 +32,4 @@
<entry spell="unholypower" level="14" /> <entry spell="unholypower" level="14" />
<entry spell="summon_familiar" level="9" /> <entry spell="summon_familiar" level="9" />
</spellbook> </spellbook>
</eressea>

2
res/e3a/spellbooks/gray.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<eressea>
<spellbook name="gray"> <spellbook name="gray">
<entry spell="acidrain" level="8" /> <entry spell="acidrain" level="8" />
<entry spell="airship" level="6" /> <entry spell="airship" level="6" />
@ -142,3 +143,4 @@
<entry spell="wolfhowl" level="7" /> <entry spell="wolfhowl" level="7" />
<entry spell="wyrm_transformation" level="1" /> <entry spell="wyrm_transformation" level="1" />
</spellbook> </spellbook>
</eressea>

2
res/e3a/spellbooks/gwyrrd.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<eressea>
<spellbook name="gwyrrd"> <spellbook name="gwyrrd">
<entry spell="create_potion_p2" level="2" /> <entry spell="create_potion_p2" level="2" />
<entry spell="create_potion_p0" level="3" /> <entry spell="create_potion_p0" level="3" />
@ -32,3 +33,4 @@
<entry spell="rustweapon" level="3" /> <entry spell="rustweapon" level="3" />
<entry spell="summon_familiar" level="9" /> <entry spell="summon_familiar" level="9" />
</spellbook> </spellbook>
</eressea>

2
res/e3a/spellbooks/illaun.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<eressea>
<spellbook name="illaun"> <spellbook name="illaun">
<entry spell="create_potion_p2" level="2" /> <entry spell="create_potion_p2" level="2" />
<entry spell="create_potion_p0" level="3" /> <entry spell="create_potion_p0" level="3" />
@ -32,3 +33,4 @@
<entry spell="create_dreameye" level="14" /> <entry spell="create_dreameye" level="14" />
<entry spell="summon_familiar" level="9" /> <entry spell="summon_familiar" level="9" />
</spellbook> </spellbook>
</eressea>

11
res/e3a/spells.xml
View File

@ -1,12 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<spells xmlns:xi="http://www.w3.org/2001/XInclude"> <eressea>
<spells>
<xi:include href="spellbooks/common.xml"/>
<xi:include href="spellbooks/gray.xml"/>
<xi:include href="spellbooks/gwyrrd.xml"/>
<xi:include href="spellbooks/draig.xml"/>
<xi:include href="spellbooks/illaun.xml"/>
<xi:include href="spellbooks/cerddor.xml"/>
<!-- shared spells --> <!-- shared spells -->
<spell name="create_roi" ship="true" rank="5" index="130"> <spell name="create_roi" ship="true" rank="5" index="130">
@ -656,3 +650,4 @@
</spell> </spell>
<!-- end gray spells --> <!-- end gray spells -->
</spells> </spells>
</eressea>

2
res/e3a/strings.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<eressea>
<strings> <strings>
<!-- <!--
_d: dativ (wir erklären allen /Trollen/ den Krieg) _d: dativ (wir erklären allen /Trollen/ den Krieg)
@ -290,3 +291,4 @@
</namespace> </namespace>
</strings> </strings>
</eressea>

191
res/e3a/weapons.xml
View File

@ -1,25 +1,170 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<resources xmlns:xi="http://www.w3.org/2001/XInclude"> <eressea>
<xi:include href="config://core/weapons/bow.xml"/> <resources>
<xi:include href="config://core/weapons/catapult.xml"/> <resource name="rustygreatsword">
<xi:include href="config://core/weapons/mallornbow.xml"/> <!-- changes to the regular weapon:
<xi:include href="config://core/weapons/mallornspear.xml"/> 1. you cannt use this with cavalry
<xi:include href="config://core/weapons/runesword.xml"/> -->
<xi:include href="config://core/weapons/rustyaxe.xml"/> <item weight="200" score="20">
<xi:include href="config://core/weapons/rustysword.xml"/> <construction skill="weaponsmithing" minskill="4">
<xi:include href="config://core/weapons/spear.xml"/> <requirement type="iron" quantity="2"/>
<xi:include href="config://core/weapons/sword.xml"/> </construction>
<xi:include href="config://core/weapons/firesword.xml"/> <weapon useshield="false" cut="true" skill="melee" offmod="-2" defmod="-3" horse="false">
<xi:include href="config://game/weapons/rep_crossbow.xml"/> <damage type="rider" value="2d8"/>
<xi:include href="config://game/weapons/lance.xml"/> <damage type="footman" value="2d8"/>
<xi:include href="config://game/weapons/axe.xml"/> </weapon>
<xi:include href="config://game/weapons/crossbow.xml"/> </item>
<xi:include href="config://game/weapons/greatbow.xml"/> </resource>
<xi:include href="config://game/weapons/greatsword.xml"/> <resource name="rustyhalberd">
<xi:include href="config://game/weapons/halberd.xml"/> <!-- changes to the regular weapon:
<xi:include href="config://game/weapons/laensword.xml"/> 1. you cannot use this with cavalry
<xi:include href="config://game/weapons/mallorncrossbow.xml"/> -->
<xi:include href="config://game/weapons/mallornlance.xml"/> <item weight="200" score="20" deny="goblin">
<xi:include href="config://game/weapons/rustygreatsword.xml"/> <construction skill="weaponsmithing" minskill="3">
<xi:include href="config://game/weapons/rustyhalberd.xml"/> <requirement type="iron" quantity="1"/>
<requirement type="log" quantity="1"/>
</construction>
<weapon useshield="false" cut="true" skill="polearm" offmod="-2" defmod="-1" horse="false">
<damage type="rider" value="2d6"/>
<damage type="footman" value="2d6"/>
</weapon>
</item>
</resource>
<resource name="rep_crossbow">
<modifier type="require" race="dwarf"/>
<item weight="100" allow="dwarf halfling">
<construction skill="weaponsmithing" minskill="5">
<requirement type="log" quantity="1"/>
<requirement type="iron" quantity="1"/>
</construction>
<weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="1">
<damage type="rider" value="3d4+5"/>
<damage type="footman" value="3d4+5"/>
<modifier type="missile_target" value="0"/>
</weapon>
</item>
</resource>
<resource name="mallornlance">
<item weight="100" deny="goblin">
<construction skill="weaponsmithing" minskill="5">
<requirement type="mallorn" quantity="2"/>
</construction>
<weapon pierce="true" skill="polearm" offmod="0" defmod="0" magres="0.15">
<damage type="footman" value="1d5+2"/>
<damage type="rider" value="2d6+7"/>
</weapon>
</item>
</resource>
<resource name="lance">
<item weight="200" deny="goblin">
<construction skill="weaponsmithing" minskill="2">
<requirement type="log" quantity="2"/>
</construction>
<weapon pierce="true" skill="polearm" offmod="0" defmod="-2">
<damage type="footman" value="1d5"/>
<damage type="rider" value="2d6+5"/>
</weapon>
</item>
</resource>
<resource name="mallorncrossbow">
<item weight="100">
<construction skill="weaponsmithing" minskill="5">
<requirement type="mallorn" quantity="1"/>
</construction>
<weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2" magres="0.15">
<damage type="rider" value="3d4+6"/>
<damage type="footman" value="3d4+6"/>
<modifier type="missile_target" value="0"/>
</weapon>
</item>
</resource>
<resource name="laensword">
<!-- changes:
* has lower damage
-->
<item weight="100" score="400">
<construction skill="weaponsmithing" minskill="8">
<requirement type="laen" quantity="1"/>
</construction>
<weapon cut="true" skill="melee" offmod="1" defmod="1" magres="0.30">
<damage type="rider" value="2d9+4"/>
<damage type="footman" value="2d9+4"/>
</weapon>
</item>
</resource>
<resource name="halberd">
<!-- changes to the regular weapon:
1. you cannt use this with cavalry
-->
<item weight="200" deny="goblin">
<construction skill="weaponsmithing" minskill="3">
<requirement type="log" quantity="2"/>
<requirement type="iron" quantity="1"/>
</construction>
<weapon useshield="false" cut="true" skill="polearm" offmod="-1" defmod="2" magres="0.0" horse="false">
<damage type="rider" value="2d6+3"/>
<damage type="footman" value="2d6+3"/>
<modifier type="skill" value="1" walking="true" against_riding="true" defensive="true"/>
</weapon>
</item>
</resource>
<resource name="greatsword">
<!-- changes to the regular weapon:
1. you cannt use this with cavalry
-->
<item weight="200" score="30">
<construction skill="weaponsmithing" minskill="4">
<requirement type="iron" quantity="2"/>
</construction>
<weapon useshield="false" cut="true" skill="melee" offmod="-1" defmod="-2" horse="false">
<damage type="rider" value="2d8+3"/>
<damage type="footman" value="2d8+3"/>
</weapon>
</item>
</resource>
<resource name="greatbow">
<!-- changes:
* has a lua canuse function
* has lower damage
-->
<modifier type="require" race="elf"/>
<item weight="100" allow="elf">
<construction skill="weaponsmithing" minskill="5">
<requirement type="mallorn" quantity="2"/>
</construction>
<weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0" magres="0.0">
<damage type="rider" value="2d4+5"/>
<damage type="footman" value="2d4+5"/>
<modifier type="missile_target" value="2"/>
<modifier type="damage" value="1">
<race name="elf"/>
</modifier>
</weapon>
</item>
</resource>
<resource name="crossbow">
<item weight="100">
<construction skill="weaponsmithing" minskill="3">
<requirement type="log" quantity="1"/>
</construction>
<weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2">
<damage type="rider" value="3d4+5"/>
<damage type="footman" value="3d4+5"/>
<modifier type="missile_target" value="0"/>
</weapon>
</item>
</resource>
<resource name="axe">
<item weight="200" deny="goblin">
<construction skill="weaponsmithing" minskill="3">
<requirement type="log" quantity="1"/>
<requirement type="iron" quantity="1"/>
</construction>
<weapon cut="true" skill="melee" offmod="1" defmod="-2">
<damage type="rider" value="2d6+4"/>
<damage type="footman" value="2d6+4"/>
</weapon>
</item>
</resource>
</resources> </resources>
</eressea>

13
res/e3a/weapons/axe.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0"?>
<resource name="axe">
<item weight="200" deny="goblin">
<construction skill="weaponsmithing" minskill="3">
<requirement type="log" quantity="1"/>
<requirement type="iron" quantity="1"/>
</construction>
<weapon cut="true" skill="melee" offmod="1" defmod="-2">
<damage type="rider" value="2d6+4"/>
<damage type="footman" value="2d6+4"/>
</weapon>
</item>
</resource>

13
res/e3a/weapons/crossbow.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0"?>
<resource name="crossbow">
<item weight="100">
<construction skill="weaponsmithing" minskill="3">
<requirement type="log" quantity="1"/>
</construction>
<weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2">
<damage type="rider" value="3d4+5"/>
<damage type="footman" value="3d4+5"/>
<modifier type="missile_target" value="0"/>
</weapon>
</item>
</resource>

21
res/e3a/weapons/greatbow.xml
View File

@ -1,21 +0,0 @@
<?xml version="1.0"?>
<!-- changes:
* has a lua canuse function
* has lower damage
-->
<resource name="greatbow">
<modifier type="require" race="elf"/>
<item weight="100" allow="elf">
<construction skill="weaponsmithing" minskill="5">
<requirement type="mallorn" quantity="2"/>
</construction>
<weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0" magres="0.0">
<damage type="rider" value="2d4+5"/>
<damage type="footman" value="2d4+5"/>
<modifier type="missile_target" value="2"/>
<modifier type="damage" value="1">
<race name="elf"/>
</modifier>
</weapon>
</item>
</resource>

15
res/e3a/weapons/greatsword.xml
View File

@ -1,15 +0,0 @@
<?xml version="1.0"?>
<!-- changes to the regular weapon:
1. you cannt use this with cavalry
-->
<resource name="greatsword">
<item weight="200" score="30">
<construction skill="weaponsmithing" minskill="4">
<requirement type="iron" quantity="2"/>
</construction>
<weapon useshield="false" cut="true" skill="melee" offmod="-1" defmod="-2" horse="false">
<damage type="rider" value="2d8+3"/>
<damage type="footman" value="2d8+3"/>
</weapon>
</item>
</resource>

17
res/e3a/weapons/halberd.xml
View File

@ -1,17 +0,0 @@
<?xml version="1.0"?>
<!-- changes to the regular weapon:
1. you cannt use this with cavalry
-->
<resource name="halberd">
<item weight="200" deny="goblin">
<construction skill="weaponsmithing" minskill="3">
<requirement type="log" quantity="2"/>
<requirement type="iron" quantity="1"/>
</construction>
<weapon useshield="false" cut="true" skill="polearm" offmod="-1" defmod="2" magres="0.0" horse="false">
<damage type="rider" value="2d6+3"/>
<damage type="footman" value="2d6+3"/>
<modifier type="skill" value="1" walking="true" against_riding="true" defensive="true"/>
</weapon>
</item>
</resource>

15
res/e3a/weapons/laensword.xml
View File

@ -1,15 +0,0 @@
<?xml version="1.0"?>
<!-- changes:
* has lower damage
-->
<resource name="laensword">
<item weight="100" score="400">
<construction skill="weaponsmithing" minskill="8">
<requirement type="laen" quantity="1"/>
</construction>
<weapon cut="true" skill="melee" offmod="1" defmod="1" magres="0.30">
<damage type="rider" value="2d9+4"/>
<damage type="footman" value="2d9+4"/>
</weapon>
</item>
</resource>

12
res/e3a/weapons/lance.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0"?>
<resource name="lance">
<item weight="200" deny="goblin">
<construction skill="weaponsmithing" minskill="2">
<requirement type="log" quantity="2"/>
</construction>
<weapon pierce="true" skill="polearm" offmod="0" defmod="-2">
<damage type="footman" value="1d5"/>
<damage type="rider" value="2d6+5"/>
</weapon>
</item>
</resource>

13
res/e3a/weapons/mallorncrossbow.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0"?>
<resource name="mallorncrossbow">
<item weight="100">
<construction skill="weaponsmithing" minskill="5">
<requirement type="mallorn" quantity="1"/>
</construction>
<weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="2" magres="0.15">
<damage type="rider" value="3d4+6"/>
<damage type="footman" value="3d4+6"/>
<modifier type="missile_target" value="0"/>
</weapon>
</item>
</resource>

12
res/e3a/weapons/mallornlance.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0"?>
<resource name="mallornlance">
<item weight="100" deny="goblin">
<construction skill="weaponsmithing" minskill="5">
<requirement type="mallorn" quantity="2"/>
</construction>
<weapon pierce="true" skill="polearm" offmod="0" defmod="0" magres="0.15">
<damage type="footman" value="1d5+2"/>
<damage type="rider" value="2d6+7"/>
</weapon>
</item>
</resource>

15
res/e3a/weapons/rep_crossbow.xml
View File

@ -1,15 +0,0 @@
<?xml version="1.0"?>
<resource name="rep_crossbow">
<modifier type="require" race="dwarf"/>
<item weight="100" allow="dwarf halfling">
<construction skill="weaponsmithing" minskill="5">
<requirement type="log" quantity="1"/>
<requirement type="iron" quantity="1"/>
</construction>
<weapon armorpiercing="true" pierce="true" missile="true" skill="crossbow" offmod="0" defmod="0" reload="1">
<damage type="rider" value="3d4+5"/>
<damage type="footman" value="3d4+5"/>
<modifier type="missile_target" value="0"/>
</weapon>
</item>
</resource>

15
res/e3a/weapons/rustygreatsword.xml
View File

@ -1,15 +0,0 @@
<?xml version="1.0"?>
<!-- changes to the regular weapon:
1. you cannt use this with cavalry
-->
<resource name="rustygreatsword">
<item weight="200" score="20">
<construction skill="weaponsmithing" minskill="4">
<requirement type="iron" quantity="2"/>
</construction>
<weapon useshield="false" cut="true" skill="melee" offmod="-2" defmod="-3" horse="false">
<damage type="rider" value="2d8"/>
<damage type="footman" value="2d8"/>
</weapon>
</item>
</resource>

16
res/e3a/weapons/rustyhalberd.xml
View File

@ -1,16 +0,0 @@
<?xml version="1.0"?>
<!-- changes to the regular weapon:
1. you cannot use this with cavalry
-->
<resource name="rustyhalberd">
<item weight="200" score="20" deny="goblin">
<construction skill="weaponsmithing" minskill="3">
<requirement type="iron" quantity="1"/>
<requirement type="log" quantity="1"/>
</construction>
<weapon useshield="false" cut="true" skill="polearm" offmod="-2" defmod="-1" horse="false">
<damage type="rider" value="2d6"/>
<damage type="footman" value="2d6"/>
</weapon>
</item>
</resource>

2
res/eressea/buildings.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea> <eressea>
<buildings xmlns:xi="http://www.w3.org/2001/XInclude"> <buildings>
<building name="temple" maxsize="50" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" auraregen="1.00" /> <building name="temple" maxsize="50" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" auraregen="1.00" />
<building name="portal" maxsize="2" 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="pavilion" maxsize="2" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" />

2
res/eressea/races.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<eressea> <eressea>
<races xmlns:xi="http://www.w3.org/2001/XInclude"> <races>
<race name="snowman" magres="80" maxaura="0.000000" <race name="snowman" magres="80" maxaura="0.000000"
regaura="0.000000" weight="500" capacity="200" equipment="no" regaura="0.000000" weight="500" capacity="200" equipment="no"

5
res/races/dragon.xml
View File

@ -1,3 +1,5 @@
<eressea>
<races>
<race name="dragon" magres="70" maxaura="1.0" regaura="2.000000" weight="10000" capacity="1000000" speed="1.500000" hp="900" ac= <race name="dragon" magres="70" maxaura="1.0" regaura="2.000000" weight="10000" capacity="1000000" speed="1.500000" hp="900" ac=
"6" damage="2d30" unarmedattack="0" unarmeddefense="0" "6" damage="2d30" unarmedattack="0" unarmeddefense="0"
attackmodifier="7" defensemodifier="7" scarepeasants="yes" fly="yes" attackmodifier="7" defensemodifier="7" scarepeasants="yes" fly="yes"
@ -12,4 +14,5 @@ dragon="yes">
<attack type="4" damage="3d30"/> <attack type="4" damage="3d30"/>
<attack type="6" spell="icy_dragonbreath" level="6" /> <attack type="6" spell="icy_dragonbreath" level="6" />
</race> </race>
</races>
</eressea>

4
res/races/goblin-3.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<eressea>
<races>
<race name="goblin" magres="-5" maxaura="1.0" <race name="goblin" magres="-5" maxaura="1.0"
recruitcost="60" maintenance="6" weight="600" capacity="440" recruitcost="60" maintenance="6" weight="600" capacity="440"
speed="1.0" hp="16" damage="1d5" unarmedattack="-2" unarmeddefense="0" speed="1.0" hp="16" damage="1d5" unarmedattack="-2" unarmeddefense="0"
@ -22,3 +24,5 @@ getitem="yes" equipment="yes" healing="2.0">
<familiar race="rat" default="yes"/> <familiar race="rat" default="yes"/>
<familiar race="imp"/> <familiar race="imp"/>
</race> </race>
</races>
</eressea>

5
res/races/wyrm.xml
View File

@ -1,3 +1,6 @@
<?xml version="1.0" ?>
<eressea>
<races>
<race name="wyrm" magres="90" maxaura="1.0" regaura="3.000000" <race name="wyrm" magres="90" maxaura="1.0" regaura="3.000000"
weight="18000" capacity="1000000" speed="1.0" hp="2700" ac="8" weight="18000" capacity="1000000" speed="1.0" hp="2700" ac="8"
damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10" damage="2d60" unarmedattack="0" unarmeddefense="0" attackmodifier="10"
@ -12,3 +15,5 @@ teach="no" getitem="yes" resistbash="yes" dragon="yes" income="5000">
<attack type="4" damage="5d30"/> <attack type="4" damage="5d30"/>
<attack type="6" spell="powerful_dragonbreath" level="12" /> <attack type="6" spell="powerful_dragonbreath" level="12" />
</race> </race>
</races>
</eressea>

5
res/races/youngdragon.xml
View File

@ -1,3 +1,5 @@
<eressea>
<races>
<race name="youngdragon" magres="50" maxaura="1.0" regaura="1.0" <race name="youngdragon" magres="50" maxaura="1.0" regaura="1.0"
weight="8000" capacity="10000" speed="1.0" hp="300" ac="4" weight="8000" capacity="10000" speed="1.0" hp="300" ac="4"
damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4" damage="2d15" unarmedattack="0" unarmeddefense="0" attackmodifier="4"
@ -12,4 +14,5 @@ teach="no" getitem="yes" resistbash="yes" dragon="yes" income="150">
<attack type="4" damage="1d30"/> <attack type="4" damage="1d30"/>
<attack type="6" spell="fiery_dragonbreath" level="3" /> <attack type="6" spell="fiery_dragonbreath" level="3" />
</race> </race>
</races>
</eressea>

1
scripts/tests/e3/production.lua
View File

@ -53,6 +53,7 @@ function test_dwarf_no_mining_bonus()
local r = region.create(0, 0, 'mountain') local r = region.create(0, 0, 'mountain')
local f = create_faction('dwarf') local f = create_faction('dwarf')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
u.name = 'Xolgrim'
turn_begin() turn_begin()
r:set_resource('iron', 100) r:set_resource('iron', 100)