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

load locales and rules separately (xml prep work)

This commit is contained in:
Enno Rehling 2017-02-19 16:33:24 +01:00
parent 5490b45381
commit be14394529
5 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/e2/locales.xml
View File

@ -3,6 +3,7 @@
<xi:include href="config://core/messages.xml"/> <xi:include href="config://core/messages.xml"/>
<xi:include href="config://core/de/strings.xml"/> <xi:include href="config://core/de/strings.xml"/>
<xi:include href="config://core/en/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://game/spellinfo.xml" />
<xi:include href="config://default/names-undead.xml"/> <xi:include href="config://default/names-undead.xml"/>
<xi:include href="config://default/names-skeletons.xml"/> <xi:include href="config://default/names-skeletons.xml"/>

13
conf/e2/config.xml → conf/e2/rules.xml
View File

@ -1,11 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea xmlns:xi="http://www.w3.org/2001/XInclude"> <eressea xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="config://core/messages.xml"/>
<!-- Localization -->
<xi:include href="config://core/de/strings.xml"/>
<xi:include href="config://core/en/strings.xml"/>
<xi:include href="config://game/spellinfo.xml" />
<xi:include href="config://core/common/items.xml" /> <xi:include href="config://core/common/items.xml" />
<xi:include href="config://core/common/armor.xml" /> <xi:include href="config://core/common/armor.xml" />
@ -26,7 +20,6 @@
<xi:include href="config://game/equipment.xml"/> <xi:include href="config://game/equipment.xml"/>
<xi:include href="config://game/items.xml"/> <xi:include href="config://game/items.xml"/>
<xi:include href="config://game/spells.xml"/> <xi:include href="config://game/spells.xml"/>
<xi:include href="config://game/strings.xml"/>
<xi:include href="config://default/adamantium.xml"/> <xi:include href="config://default/adamantium.xml"/>
<equipment> <equipment>
<set name="autoseed_unit"> <set name="autoseed_unit">
@ -46,10 +39,4 @@
<item name="adamantium" amount="1"/> <item name="adamantium" amount="1"/>
</set> </set>
</equipment> </equipment>
<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> </eressea>

13
conf/e3/locales.xml Normal file
View File

@ -0,0 +1,13 @@
<?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/messages.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>

5
conf/e3/config.xml → conf/e3/rules.xml
View File

@ -1,8 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<eressea xmlns:xi="http://www.w3.org/2001/XInclude"> <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://core/common/items.xml"/> <xi:include href="config://core/common/items.xml"/>
<xi:include href="config://core/common/herbs.xml" /> <xi:include href="config://core/common/herbs.xml" />
<xi:include href="config://core/spoils.xml"/> <xi:include href="config://core/spoils.xml"/>
@ -15,8 +12,6 @@
<xi:include href="config://game/shipnames.xml"/> <xi:include href="config://game/shipnames.xml"/>
<xi:include href="config://core/calendar.xml"/> <xi:include href="config://core/calendar.xml"/>
<xi:include href="config://game/items.xml" /> <xi:include href="config://game/items.xml" />
<xi:include href="config://game/strings.xml"/>
<xi:include href="config://game/messages.xml"/>
<xi:include href="config://game/races.xml"/> <xi:include href="config://game/races.xml"/>
<xi:include href="config://game/buildings.xml"/> <xi:include href="config://game/buildings.xml"/>
<xi:include href="config://game/equipment.xml"/> <xi:include href="config://game/equipment.xml"/>

3
scripts/eressea/xmlconf.lua
View File

@ -4,7 +4,8 @@ if config.install then
end end
if config.rules then if config.rules then
local rules = config.rules .. '/' local rules = config.rules .. '/'
assert(0 == read_xml(confdir .. rules .. 'config.xml', confdir .. rules .. 'catalog.xml'), "could not load XML data, did you compile with LIBXML2 ?")
assert(0 == eressea.config.read(rules .. 'config.json', confdir), "could not read JSON data") assert(0 == eressea.config.read(rules .. 'config.json', confdir), "could not read JSON data")
assert(0 == read_xml(confdir .. rules .. 'rules.xml', confdir .. rules .. 'catalog.xml'), "could not load XML data, did you compile with LIBXML2 ?")
assert(0 == read_xml(confdir .. rules .. 'locales.xml', confdir .. rules .. 'catalog.xml'), "could not load XML data, did you compile with LIBXML2 ?")
end end
eressea.game.reset() eressea.game.reset()