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

convert all of E2 to new config loading.

This commit is contained in:
Enno Rehling 2018-02-05 19:35:15 +01:00
parent da02c1b92e
commit 434b7ae29e
64 changed files with 299 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
conf/e2/config.json
View File

@ -1,30 +1,28 @@
{ {
"include": [ "include": [
"config://keywords.json", "config://conf/keywords.json",
"config://calendar.json", "config://conf/calendar.json",
"config://prefixes.json", "config://conf/prefixes.json",
"config://e2/terrains.json", "config://conf/e2/terrains.json",
"config://e2/locales.xml", "config://conf/e2/items.json",
"config://e2/rules.xml", "config://conf/e2/locales.json",
"rules://core/ships.xml", "config://conf/e2/rules.xml",
"rules://core/spoils.xml", "config://res/core/ships.xml",
"rules://core/common/buildings.xml", "config://res/core/spoils.xml",
"rules://core/common/items.xml", "config://res/core/common/buildings.xml",
"rules://core/common/resources.xml", "config://res/eressea/buildings.xml",
"rules://core/common/luxuries.xml", "config://res/buildings/castle.xml",
"rules://core/common/herbs.xml", "config://res/eressea/races.xml",
"rules://core/common/potions.xml", "config://res/eressea/artrewards.xml",
"rules://core/common/armor.xml", "config://res/eressea/familiars.xml",
"rules://core/common/weapons.xml", "config://res/eressea/equipment.xml",
"rules://eressea/races.xml", "config://res/eressea/spells.xml",
"rules://eressea/artrewards.xml", "config://res/eressea/spellbooks/gray.xml",
"rules://eressea/buildings.xml", "config://res/eressea/spellbooks/gwyrrd.xml",
"rules://eressea/familiars.xml", "config://res/eressea/spellbooks/draig.xml",
"rules://eressea/buildings.xml", "config://res/eressea/spellbooks/illaun.xml",
"rules://eressea/equipment.xml", "config://res/eressea/spellbooks/cerddor.xml",
"rules://eressea/items.xml", "config://res/eressea/spellbooks/tybied.xml"
"rules://eressea/spells.xml",
"rules://adamantium.xml"
], ],
"disabled": [ "disabled": [
"jsreport" "jsreport"

49
conf/e2/items.json Normal file
View File

@ -0,0 +1,49 @@
{
"include": [
"config://res/core/common/items.xml",
"config://res/core/armor/chainmail.xml",
"config://res/core/armor/laenmail.xml",
"config://res/core/armor/laenshield.xml",
"config://res/core/armor/plate.xml",
"config://res/core/armor/rustychainmail.xml",
"config://res/core/armor/rustyshield.xml",
"config://res/core/armor/shield.xml",
"config://res/core/resources/cart.xml",
"config://res/core/resources/horse.xml",
"config://res/core/resources/hp.xml",
"config://res/core/resources/iron.xml",
"config://res/core/resources/laen.xml",
"config://res/core/resources/log.xml",
"config://res/core/resources/mallorn.xml",
"config://res/core/resources/mallornseed.xml",
"config://res/core/resources/seed.xml",
"config://res/core/resources/peasant.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/bow.xml",
"config://res/core/weapons/catapult.xml",
"config://res/core/weapons/crossbow.xml",
"config://res/core/weapons/firesword.xml",
"config://res/core/weapons/greatbow.xml",
"config://res/core/weapons/greatsword.xml",
"config://res/core/weapons/halberd.xml",
"config://res/core/weapons/laensword.xml",
"config://res/core/weapons/lance.xml",
"config://res/core/weapons/mallornbow.xml",
"config://res/core/weapons/mallorncrossbow.xml",
"config://res/core/weapons/mallornlance.xml",
"config://res/core/weapons/mallornspear.xml",
"config://res/core/weapons/runesword.xml",
"config://res/core/weapons/rustyaxe.xml",
"config://res/core/weapons/rustygreatsword.xml",
"config://res/core/weapons/rustyhalberd.xml",
"config://res/core/weapons/rustysword.xml",
"config://res/core/weapons/spear.xml",
"config://res/core/weapons/sword.xml",
"config://res/eressea/items.xml",
"config://res/adamantium.xml"
]
}

14
conf/e2/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/eressea/strings.xml",
"config://res/eressea/spellinfo.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"
]
}

13
conf/e2/locales.xml
View File

@ -1,13 +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://game/spellinfo.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/adamantium.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<eressea>
<resources> <resources>
<resource name="adamantium" limited="yes" material="yes"> <resource name="adamantium" limited="yes" material="yes">
@ -32,3 +33,4 @@
</resource> </resource>
</resources> </resources>
</eressea>

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

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<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"/>
@ -19,3 +20,4 @@
<requirement type="stone" quantity="1"/> <requirement type="stone" quantity="1"/>
</construction> </construction>
</building> </building>
</eressea>

4
res/buildings/castle.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<buildings>
<building name="castle" fort="yes"> <building name="castle" fort="yes">
<construction skill="building" minskill="1" maxsize="2" name="site"> <construction skill="building" minskill="1" maxsize="2" name="site">
<requirement type="stone" quantity="1"/> <requirement type="stone" quantity="1"/>
@ -22,3 +24,5 @@
<requirement type="stone" quantity="1"/> <requirement type="stone" quantity="1"/>
</construction> </construction>
</building> </building>
</buildings>
</eressea>

2
res/core/armor/chainmail.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea><resources>
<resource name="chainmail"> <resource name="chainmail">
<item weight="200" score="90"> <item weight="200" score="90">
<construction skill="armorer" minskill="3"> <construction skill="armorer" minskill="3">
@ -7,3 +8,4 @@
<armor ac="3" penalty="0.15" magres="0.0"/> <armor ac="3" penalty="0.15" magres="0.0"/>
</item> </item>
</resource> </resource>
</resources></eressea>

2
res/core/armor/laenmail.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea><resources>
<resource name="laenmail"> <resource name="laenmail">
<item weight="100" score="1000"> <item weight="100" score="1000">
<construction skill="armorer" minskill="9"> <construction skill="armorer" minskill="9">
@ -7,3 +8,4 @@
<armor ac="6" penalty="0.0" magres="0.3" laen="yes" /> <armor ac="6" penalty="0.0" magres="0.3" laen="yes" />
</item> </item>
</resource> </resource>
</resources></eressea>

2
res/core/armor/laenshield.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea><resources>
<resource name="laenshield"> <resource name="laenshield">
<item weight="0" score="1000"> <item weight="0" score="1000">
<construction skill="armorer" minskill="7"> <construction skill="armorer" minskill="7">
@ -7,3 +8,4 @@
<armor ac="2" penalty="-0.25" magres="0.3" laen="yes" shield="yes" /> <armor ac="2" penalty="-0.25" magres="0.3" laen="yes" shield="yes" />
</item> </item>
</resource> </resource>
</resources></eressea>

2
res/core/armor/plate.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea><resources>
<resource name="plate"> <resource name="plate">
<item weight="400" score="150"> <item weight="400" score="150">
<construction skill="armorer" minskill="4"> <construction skill="armorer" minskill="4">
@ -7,3 +8,4 @@
<armor ac="5" penalty="0.30" magres="0.0"/> <armor ac="5" penalty="0.30" magres="0.0"/>
</item> </item>
</resource> </resource>
</resources></eressea>

3
res/core/armor/rustychainmail.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea><resources>
<resource name="rustychainmail"> <resource name="rustychainmail">
<item weight="200" score="30"> <item weight="200" score="30">
<construction skill="armorer" minskill="3"> <construction skill="armorer" minskill="3">
@ -7,4 +8,4 @@
<armor ac="2" penalty="0.30" magres="0.0"/> <armor ac="2" penalty="0.30" magres="0.0"/>
</item> </item>
</resource> </resource>
</resources></eressea>

2
res/core/armor/rustyshield.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea><resources>
<resource name="rustyshield"> <resource name="rustyshield">
<item weight="100" score="10"> <item weight="100" score="10">
<construction skill="armorer" minskill="2"> <construction skill="armorer" minskill="2">
@ -7,3 +8,4 @@
<armor ac="1" penalty="0.0" magres="0.0" shield="yes"/> <armor ac="1" penalty="0.0" magres="0.0" shield="yes"/>
</item> </item>
</resource> </resource>
</resources></eressea>

2
res/core/armor/shield.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea><resources>
<resource name="shield"> <resource name="shield">
<item weight="100" score="30"> <item weight="100" score="30">
<construction skill="armorer" minskill="2"> <construction skill="armorer" minskill="2">
@ -7,3 +8,4 @@
<armor ac="1" penalty="-0.15" magres="0.0" shield="yes"/> <armor ac="1" penalty="-0.15" magres="0.0" shield="yes"/>
</item> </item>
</resource> </resource>
</resources></eressea>

10
res/core/common/armor.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0"?>
<resources xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="../armor/chainmail.xml"/>
<xi:include href="../armor/laenmail.xml"/>
<xi:include href="../armor/laenshield.xml"/>
<xi:include href="../armor/plate.xml"/>
<xi:include href="../armor/rustychainmail.xml"/>
<xi:include href="../armor/rustyshield.xml"/>
<xi:include href="../armor/shield.xml"/>
</resources>

3
res/core/common/buildings.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<buildings> <buildings>
<building name="wormhole" maxsize="4" 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="illusioncastle" capacity="0" maxcapacity="0" maxsize="0" nobuild="yes"/>
@ -167,4 +168,4 @@
</building> </building>
</buildings> </buildings>
</eressea>

10
res/core/common/construction.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0"?>
<!-- TODO: this does not work yet -->
<production>
<construction resource="laenshield" skill="armorer" minskill="7">
<requirement type="laen" quantity="1"/>
</construction>
<construction resource="laenmail" skill="armorer" minskill="9">
<requirement type="laen" quantity="3"/>
</construction>
</production>

2
res/core/common/herbs.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources> <resources>
<!-- this file contains herbs that are part of the alchemy system --> <!-- this file contains herbs that are part of the alchemy system -->
@ -87,3 +88,4 @@
</resource> </resource>
</resources> </resources>
</eressea>

2
res/core/common/luxuries.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources> <resources>
<!-- this file contains luxury items that are part of the trade system --> <!-- this file contains luxury items that are part of the trade system -->
<resource name="balm"> <resource name="balm">
@ -24,3 +25,4 @@
</resource> </resource>
</resources> </resources>
</eressea>

2
res/core/common/potions.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources> <resources>
<!-- this file contains potions that are part of the alchemy system --> <!-- this file contains potions that are part of the alchemy system -->
@ -180,3 +181,4 @@
</resource> </resource>
</resources> </resources>
</eressea>

19
res/core/common/resources.xml
View File

@ -1,19 +0,0 @@
<?xml version="1.0"?>
<resources xmlns:xi="http://www.w3.org/2001/XInclude">
<!--
this file contains the most important items and resources any game will
want to use. Or maybe you just have to roll your own file.
-->
<xi:include href="../resources/cart.xml"/>
<xi:include href="../resources/horse.xml"/>
<xi:include href="../resources/hp.xml"/>
<xi:include href="../resources/iron.xml"/>
<xi:include href="../resources/laen.xml"/>
<xi:include href="../resources/log.xml"/>
<xi:include href="../resources/mallorn.xml"/>
<xi:include href="../resources/mallornseed.xml"/>
<xi:include href="../resources/seed.xml"/>
<xi:include href="../resources/peasant.xml"/>
<xi:include href="../resources/stone.xml"/>
</resources>

24
res/core/common/weapons.xml
View File

@ -1,24 +0,0 @@
<?xml version="1.0"?>
<resources xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="../weapons/axe.xml"/>
<xi:include href="../weapons/bow.xml"/>
<xi:include href="../weapons/catapult.xml"/>
<xi:include href="../weapons/crossbow.xml"/>
<xi:include href="../weapons/firesword.xml"/>
<xi:include href="../weapons/greatbow.xml"/>
<xi:include href="../weapons/greatsword.xml"/>
<xi:include href="../weapons/halberd.xml"/>
<xi:include href="../weapons/laensword.xml"/>
<xi:include href="../weapons/lance.xml"/>
<xi:include href="../weapons/mallornbow.xml"/>
<xi:include href="../weapons/mallorncrossbow.xml"/>
<xi:include href="../weapons/mallornlance.xml"/>
<xi:include href="../weapons/mallornspear.xml"/>
<xi:include href="../weapons/runesword.xml"/>
<xi:include href="../weapons/rustyaxe.xml"/>
<xi:include href="../weapons/rustygreatsword.xml"/>
<xi:include href="../weapons/rustyhalberd.xml"/>
<xi:include href="../weapons/rustysword.xml"/>
<xi:include href="../weapons/spear.xml"/>
<xi:include href="../weapons/sword.xml"/>
</resources>

4
res/core/resources/cart.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="cart"> <resource name="cart">
<item capacity="14000" weight="4000" score="60" vehicle="yes" big="yes"> <item capacity="14000" weight="4000" score="60" vehicle="yes" big="yes">
<construction skill="cartmaking" minskill="1"> <construction skill="cartmaking" minskill="1">
@ -6,3 +8,5 @@
</construction> </construction>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/resources/horse.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="horse" limited="yes"> <resource name="horse" limited="yes">
<item big="yes" weight="5000" score="10" capacity="7000" animal="yes"> <item big="yes" weight="5000" score="10" capacity="7000" animal="yes">
<construction skill="training" minskill="1" /> <construction skill="training" minskill="1" />
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/resources/hp.xml
View File

@ -1,4 +1,8 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="hp" pooled="false"> <resource name="hp" pooled="false">
<function name="change" value="lua_changeresource"/> <function name="change" value="lua_changeresource"/>
</resource> </resource>
</resources>
</eressea>

4
res/core/resources/iron.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="iron" limited="yes" material="yes"> <resource name="iron" limited="yes" material="yes">
<item weight="500" score="10"> <item weight="500" score="10">
<construction skill="mining" minskill="1"/> <construction skill="mining" minskill="1"/>
@ -8,3 +10,5 @@
<modifier building="mine" type="material" value="0.5"/> <modifier building="mine" type="material" value="0.5"/>
<modifier race="dwarf" type="material" value="0.6"/> <modifier race="dwarf" type="material" value="0.6"/>
</resource> </resource>
</resources>
</eressea>

4
res/core/resources/laen.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="laen" limited="yes" material="yes"> <resource name="laen" limited="yes" material="yes">
<item weight="200" score="100"> <item weight="200" score="100">
<construction skill="mining" minskill="7"/> <construction skill="mining" minskill="7"/>
@ -6,3 +8,5 @@
<modifier building="mine" type="skill" value="1"/> <modifier building="mine" type="skill" value="1"/>
<modifier type="require" building="mine"/> <modifier type="require" building="mine"/>
</resource> </resource>
</resources>
</eressea>

4
res/core/resources/log.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="log" limited="yes"> <resource name="log" limited="yes">
<item weight="500" score="10"> <item weight="500" score="10">
<construction skill="forestry" minskill="1"/> <construction skill="forestry" minskill="1"/>
@ -6,3 +8,5 @@
<modifier building="sawmill" type="skill" value="1"/> <modifier building="sawmill" type="skill" value="1"/>
<modifier building="sawmill" type="material" value="0.5"/> <modifier building="sawmill" type="material" value="0.5"/>
</resource> </resource>
</resources>
</eressea>

4
res/core/resources/mallorn.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="mallorn" limited="yes"> <resource name="mallorn" limited="yes">
<item weight="500" score="30"> <item weight="500" score="30">
<construction skill="forestry" minskill="2"/> <construction skill="forestry" minskill="2"/>
@ -6,3 +8,5 @@
<modifier building="sawmill" type="skill" value="1"/> <modifier building="sawmill" type="skill" value="1"/>
<modifier building="sawmill" type="material" value="0.5"/> <modifier building="sawmill" type="material" value="0.5"/>
</resource> </resource>
</resources>
</eressea>

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

@ -1,6 +1,10 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="mallornseed" limited="yes"> <resource name="mallornseed" limited="yes">
<item weight="10" score="100"> <item weight="10" score="100">
<construction skill="herbalism" minskill="4"/> <construction skill="herbalism" minskill="4"/>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/resources/peasant.xml
View File

@ -1,4 +1,8 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="peasant" pooled="false"> <resource name="peasant" pooled="false">
<function name="change" value="lua_changeresource"/> <function name="change" value="lua_changeresource"/>
</resource> </resource>
</resources>
</eressea>

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

@ -1,6 +1,10 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="seed" limited="yes"> <resource name="seed" limited="yes">
<item weight="10" score="50"> <item weight="10" score="50">
<construction skill="herbalism" minskill="3"/> <construction skill="herbalism" minskill="3"/>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/resources/stone.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="stone" limited="yes" material="yes"> <resource name="stone" limited="yes" material="yes">
<item weight="6000" score="10" big="yes"> <item weight="6000" score="10" big="yes">
<construction skill="quarrying" minskill="1"/> <construction skill="quarrying" minskill="1"/>
@ -7,3 +9,5 @@
<modifier building="quarry" type="material" value="0.5"/> <modifier building="quarry" type="material" value="0.5"/>
<modifier race="troll" type="material" value="0.75"/> <modifier race="troll" type="material" value="0.75"/>
</resource> </resource>
</resources>
</eressea>

3
res/core/ships.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<ships> <ships>
<ship name="trireme" range="7" storm="1.00" damage="1.00" cargo="200000" cptskill="4" minskill="1" sumskill="120" opensea="yes"> <ship name="trireme" range="7" storm="1.00" damage="1.00" cargo="200000" cptskill="4" minskill="1" sumskill="120" opensea="yes">
<coast terrain="plain"/> <coast terrain="plain"/>
@ -73,4 +74,4 @@
</ship> </ship>
</ships> </ships>
</eressea>

2
res/core/spoils.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources> <resources>
<resource name="elfspoil"> <resource name="elfspoil">
@ -57,3 +58,4 @@
</resource> </resource>
</resources> </resources>
</eressea>

4
res/core/weapons/axe.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="axe"> <resource name="axe">
<item weight="200"> <item weight="200">
<construction skill="weaponsmithing" minskill="3"> <construction skill="weaponsmithing" minskill="3">
@ -11,3 +13,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/bow.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="bow"> <resource name="bow">
<item weight="100"> <item weight="100">
<construction skill="weaponsmithing" minskill="2"> <construction skill="weaponsmithing" minskill="2">
@ -11,3 +13,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/catapult.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="catapult"> <resource name="catapult">
<item weight="10000" big="yes"> <item weight="10000" big="yes">
<construction skill="cartmaking" minskill="5"> <construction skill="cartmaking" minskill="5">
@ -12,3 +14,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/crossbow.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="crossbow"> <resource name="crossbow">
<item weight="100"> <item weight="100">
<construction skill="weaponsmithing" minskill="3"> <construction skill="weaponsmithing" minskill="3">
@ -11,3 +13,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/firesword.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="firesword"> <resource name="firesword">
<item weight="100"> <item weight="100">
<weapon magres="0.3" cut="true" skill="melee" offmod="1" defmod="1"> <weapon magres="0.3" cut="true" skill="melee" offmod="1" defmod="1">
@ -8,3 +10,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/greatbow.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="greatbow"> <resource name="greatbow">
<modifier type="require" race="elf"/> <modifier type="require" race="elf"/>
<item weight="100"> <item weight="100">
@ -15,3 +17,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/greatsword.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="greatsword"> <resource name="greatsword">
<item weight="200" score="30"> <item weight="200" score="30">
<construction skill="weaponsmithing" minskill="4"> <construction skill="weaponsmithing" minskill="4">
@ -10,3 +12,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/halberd.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="halberd"> <resource name="halberd">
<item weight="200"> <item weight="200">
<construction skill="weaponsmithing" minskill="3"> <construction skill="weaponsmithing" minskill="3">
@ -12,3 +14,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/laensword.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="laensword"> <resource name="laensword">
<item weight="100" score="400"> <item weight="100" score="400">
<construction skill="weaponsmithing" minskill="8"> <construction skill="weaponsmithing" minskill="8">
@ -10,3 +12,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/lance.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="lance"> <resource name="lance">
<item weight="200"> <item weight="200">
<construction skill="weaponsmithing" minskill="2"> <construction skill="weaponsmithing" minskill="2">
@ -10,3 +12,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/mallornbow.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="mallornbow"> <resource name="mallornbow">
<item weight="100"> <item weight="100">
<construction skill="weaponsmithing" minskill="5"> <construction skill="weaponsmithing" minskill="5">
@ -14,3 +16,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/mallorncrossbow.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="mallorncrossbow"> <resource name="mallorncrossbow">
<item weight="100"> <item weight="100">
<construction skill="weaponsmithing" minskill="5"> <construction skill="weaponsmithing" minskill="5">
@ -11,3 +13,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/mallornlance.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="mallornlance"> <resource name="mallornlance">
<item weight="100"> <item weight="100">
<construction skill="weaponsmithing" minskill="5"> <construction skill="weaponsmithing" minskill="5">
@ -10,3 +12,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/mallornspear.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="mallornspear"> <resource name="mallornspear">
<item weight="100"> <item weight="100">
<construction skill="weaponsmithing" minskill="5"> <construction skill="weaponsmithing" minskill="5">
@ -12,3 +14,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/runesword.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="runesword"> <resource name="runesword">
<item weight="100" score="2000"> <item weight="100" score="2000">
<weapon cut="true" magical="yes" skill="melee" offmod="2" defmod="2"> <weapon cut="true" magical="yes" skill="melee" offmod="2" defmod="2">
@ -8,3 +10,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/rustyaxe.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="rustyaxe"> <resource name="rustyaxe">
<item weight="200"> <item weight="200">
<construction skill="weaponsmithing" minskill="3"> <construction skill="weaponsmithing" minskill="3">
@ -11,3 +13,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/rustygreatsword.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="rustygreatsword"> <resource name="rustygreatsword">
<item weight="200" score="20"> <item weight="200" score="20">
<construction skill="weaponsmithing" minskill="4"> <construction skill="weaponsmithing" minskill="4">
@ -10,3 +12,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/rustyhalberd.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="rustyhalberd"> <resource name="rustyhalberd">
<item weight="200" score="20"> <item weight="200" score="20">
<construction skill="weaponsmithing" minskill="3"> <construction skill="weaponsmithing" minskill="3">
@ -12,3 +14,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/rustysword.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="rustysword"> <resource name="rustysword">
<item weight="100" score="10"> <item weight="100" score="10">
<construction skill="weaponsmithing" minskill="3"> <construction skill="weaponsmithing" minskill="3">
@ -10,3 +12,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/spear.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="spear"> <resource name="spear">
<item weight="100"> <item weight="100">
<construction skill="weaponsmithing" minskill="2"> <construction skill="weaponsmithing" minskill="2">
@ -12,3 +14,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/core/weapons/sword.xml
View File

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<resources>
<resource name="sword"> <resource name="sword">
<item weight="100" score="30"> <item weight="100" score="30">
<construction skill="weaponsmithing" minskill="3"> <construction skill="weaponsmithing" minskill="3">
@ -10,3 +12,5 @@
</weapon> </weapon>
</item> </item>
</resource> </resource>
</resources>
</eressea>

4
res/eressea/artrewards.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<resources> <eressea><resources>
<resource name="aurapotion50"> <resource name="aurapotion50">
<function name="change" value="changeitem"/> <function name="change" value="changeitem"/>
@ -11,4 +11,4 @@
<item weight="0" use="yes"/> <item weight="0" use="yes"/>
</resource> </resource>
</resources> </resources></eressea>

3
res/eressea/buildings.xml
View File

@ -1,8 +1,9 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea>
<buildings xmlns:xi="http://www.w3.org/2001/XInclude"> <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="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" />
<building name="artacademy" maxsize="100" nobuild="yes" nodestroy="yes" unique="yes"/> <building name="artacademy" maxsize="100" nobuild="yes" nodestroy="yes" unique="yes"/>
</buildings> </buildings>
</eressea>

4
res/eressea/equipment.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<equipment> <eressea><equipment>
<!-- one equipment-set per player-race for the first unit in a faction --> <!-- one equipment-set per player-race for the first unit in a faction -->
<set name="seed_dwarf"> <set name="seed_dwarf">
@ -271,3 +271,5 @@
</set> </set>
</equipment> </equipment>
</eressea>

3
res/eressea/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 -->
@ -129,4 +130,4 @@
</set> </set>
</equipment> </equipment>
</eressea>

2
res/eressea/items.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<eressea>
<resources> <resources>
<!-- xmas gimmicks --> <!-- xmas gimmicks -->
@ -128,3 +129,4 @@
<!-- christmas items: end --> <!-- christmas items: end -->
</resources> </resources>
</eressea>

2
res/eressea/races.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<eressea>
<races xmlns:xi="http://www.w3.org/2001/XInclude"> <races xmlns:xi="http://www.w3.org/2001/XInclude">
<race name="snowman" magres="80" maxaura="0.000000" <race name="snowman" magres="80" maxaura="0.000000"
@ -1214,3 +1215,4 @@
<attack type="6" spell="aura_of_fear" level="12"/> <attack type="6" spell="aura_of_fear" level="12"/>
</race> </race>
</races> </races>
</eressea>

12
res/eressea/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/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">
@ -616,3 +610,5 @@
</spell> </spell>
</spells> </spells>
</eressea>

49
src/jsonconf.c
View File

@ -887,24 +887,45 @@ static void json_races(cJSON *json) {
const char * json_relpath; const char * json_relpath;
static const char * uri_to_file(const char * uri, char *name, size_t size) { /* TODO: much more configurable authority-to-file lookup */
const char *pos, *path = json_relpath; static const char * authority_to_path(const char *authority, char *name, size_t size) {
/* source and destination cannot share the same buffer */
assert(authority < name || authority > name + size);
return join_path(json_relpath, authority, name, size);
}
static const char * uri_to_file(const char * uri, char *name, size_t size) {
const char *pos, *scheme, *path = uri;
/* source and destination cannot share the same buffer */
assert(uri < name || uri > name + size);
pos = strstr(uri, "://");
if (pos) {
size_t slen = pos - uri;
/* identify scheme */ /* identify scheme */
if (strncmp(uri, "config", slen) == 0) { scheme = uri;
path = path_join(path, "conf", name, size); pos = strstr(scheme, "://");
} if (pos) {
else if (strncmp(uri, "rules", slen) == 0) { size_t slen = pos - scheme;
path = path_join(path, "res", name, size); if (strncmp(scheme, "config", slen) == 0) {
} const char *authority = pos + 3;
if (path) { /* authority */
return path_join(path, pos + 3, name, size); pos = strstr(authority, "/");
if (pos) {
char buffer[16];
size_t alen = pos - authority;
assert(alen < sizeof(buffer));
memcpy(buffer, authority, alen);
buffer[alen] = 0;
path = authority_to_path(buffer, name, size);
path = path_join(path, pos + 1, name, size);
} }
} }
return uri; else {
log_fatal("unknown URI scheme: %s", uri);
}
}
return path;
} }
static void include_json(const char *uri) { static void include_json(const char *uri) {