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

moving E3-related files 

fixing config-e3a
This commit is contained in:
Enno Rehling 2010-02-26 06:09:27 +00:00
parent 8a7200c60d
commit 0c328ba728
28 changed files with 1439 additions and 1475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/eressea/res/buildings.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0"?>
<buildings xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="buildings/castle.xml"/>
</buildings>

3
src/eressea/res/config-e3a.xml
View File

@ -6,6 +6,7 @@
<xi:include href="eressea:///core/de/strings.xml"/>
<xi:include href="eressea:///core/en/strings.xml"/>
<xi:include href="eressea:///core/common/items.xml"/>
<xi:include href="eressea:///core/common/herbs.xml" />
<xi:include href="eressea:///core/spoils.xml"/>
<xi:include href="eressea:///core/prefixes.xml"/>
@ -174,8 +175,6 @@
<rules>
<function name="wage" value="minimum_wage"/>
</rules>
<xi:include href="eressea/strings.xml"/>
<xi:include href="eressea/items.xml"/>
<strings>
<string name="mailto">
<text locale="de">eressea-server@eressea.de</text>

15
src/eressea/res/config-eressea.xml
View File

@ -5,7 +5,7 @@
<!-- Localization -->
<xi:include href="eressea:///core/de/strings.xml"/>
<xi:include href="eressea:///core/en/strings.xml"/>
<xi:include href="spellinfo.xml" />
<xi:include href="eressea/spellinfo.xml" />
<xi:include href="eressea:///core/common/items.xml" />
<xi:include href="eressea:///core/common/armor.xml" />
@ -15,7 +15,6 @@
<xi:include href="eressea:///core/common/herbs.xml" />
<xi:include href="eressea:///core/common/potions.xml" />
<xi:include href="eressea:///core/spoils.xml"/>
<xi:include href="races.xml"/>
<xi:include href="eressea/races.xml"/>
<xi:include href="eressea:///core/prefixes.xml"/>
<xi:include href="eressea:///core/ships.xml"/>
@ -24,14 +23,14 @@
<xi:include href="eressea:///core/terrains.xml"/>
<xi:include href="eressea/terrains.xml"/>
<xi:include href="directions.xml"/>
<xi:include href="artrewards.xml"/>
<xi:include href="buildings.xml"/>
<xi:include href="eressea/artrewards.xml"/>
<xi:include href="eressea/buildings.xml"/>
<xi:include href="eressea:///core/calendar.xml"/>
<calendar name="secondage" newyear="month_1" start="184"/>
<xi:include href="equipment.xml"/>
<xi:include href="items.xml"/>
<xi:include href="spells.xml"/>
<xi:include href="strings.xml"/>
<xi:include href="eressea/equipment.xml"/>
<xi:include href="eressea/items.xml"/>
<xi:include href="eressea/spells.xml"/>
<xi:include href="eressea/strings.xml"/>
<equipment>
<set name="first_unit">
<item name="conquesttoken" amount="1"/>

16
src/eressea/res/dungeons.xml
View File

@ -1,16 +0,0 @@
<?xml version="1.0"?>
<dungeon size="15" level="1" radius="5" connect="0.50" maxpeople="50">
<skilllimit name="stealth" maxvalue="4"/>
<skilllimit name="magic" maxvalue="5"/>
<monster boss="yes" size="1" max="1" chance="1.0" race="young dragon">
<treasure item="money" amount="1000"/>
<treasure item="jewel" amount="100"/>
</monster>
<monster size="30" max="10" chance="0.2" race="dracoid">
<weapon type="bow"/>
<treasure item="money" amount="10"/>
</monster>
</dungeon>

3
src/eressea/res/e3a/items.xml
View File

@ -80,11 +80,10 @@
</item>
</resource>
<!-- xmas 2009
<resource name="xmastree">
<item weight="0">
<function name="use" value="lua_useitem"/>
</item>
</resource> -->
</resource>
</resources>

16
src/eressea/res/e3a/resources.xml
View File

@ -2,11 +2,15 @@
<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="../resources/iron-nobonus.xml"/>
<xi:include href="../resources/stone-nobonus.xml"/>
<xi:include href="../resources/laen.xml"/>
<xi:include href="../resources/horse.xml"/>
<xi:include href="../resources/mallorn.xml"/>
<xi:include href="../resources/log.xml"/>
<xi:include href="eressea:///core/resources/horse.xml"/>
<xi:include href="eressea:///core/resources/hp.xml"/>
<xi:include href="eressea:///core/resources/laen.xml"/>
<xi:include href="eressea:///core/resources/log.xml"/>
<xi:include href="eressea:///core/resources/mallorn.xml"/>
<xi:include href="eressea:///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>

0
src/res/resources/iron-nobonus.xml → src/eressea/res/e3a/resources/iron.xml
View File

4
src/eressea/res/e3a/resources/mallornseed.xml Normal file
View File

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

4
src/eressea/res/e3a/resources/seed.xml Normal file
View File

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

0
src/res/resources/stone-nobonus.xml → src/eressea/res/e3a/resources/stone.xml
View File

25
src/eressea/res/e3a/weapons.xml
View File

@ -1,18 +1,17 @@
<?xml version="1.0"?>
<resources xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="eressea://core/weapons/axe.xml"/>
<xi:include href="eressea://core/weapons/bow.xml"/>
<xi:include href="eressea://core/weapons/catapult.xml"/>
<xi:include href="eressea://core/weapons/firesword.xml"/>
<xi:include href="eressea://core/weapons/lance.xml"/>
<xi:include href="eressea://core/weapons/mallornbow.xml"/>
<xi:include href="eressea://core/weapons/mallornspear.xml"/>
<xi:include href="eressea://core/weapons/rep_crossbow.xml"/>
<xi:include href="eressea://core/weapons/runesword.xml"/>
<xi:include href="eressea://core/weapons/rustyaxe.xml"/>
<xi:include href="eressea://core/weapons/rustysword.xml"/>
<xi:include href="eressea://core/weapons/spear.xml"/>
<xi:include href="eressea://core/weapons/sword.xml"/>
<xi:include href="eressea:///core/weapons/axe.xml"/>
<xi:include href="eressea:///core/weapons/bow.xml"/>
<xi:include href="eressea:///core/weapons/catapult.xml"/>
<xi:include href="eressea:///core/weapons/lance.xml"/>
<xi:include href="eressea:///core/weapons/mallornbow.xml"/>
<xi:include href="eressea:///core/weapons/mallornspear.xml"/>
<xi:include href="eressea:///core/weapons/rep_crossbow.xml"/>
<xi:include href="eressea:///core/weapons/runesword.xml"/>
<xi:include href="eressea:///core/weapons/rustyaxe.xml"/>
<xi:include href="eressea:///core/weapons/rustysword.xml"/>
<xi:include href="eressea:///core/weapons/spear.xml"/>
<xi:include href="eressea:///core/weapons/sword.xml"/>
<xi:include href="weapons/crossbow.xml"/>
<xi:include href="weapons/greatbow.xml"/>
<xi:include href="weapons/greatsword.xml"/>

0
src/eressea/res/artrewards.xml → src/eressea/res/eressea/artrewards.xml
View File

7
src/eressea/res/eressea/buildings.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0"?>
<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" />
</buildings>

0
src/eressea/res/equipment.xml → src/eressea/res/eressea/equipment.xml
View File

0
src/eressea/res/items.xml → src/eressea/res/eressea/items.xml
View File

1364
src/eressea/res/eressea/races.xml
View File

File diff suppressed because it is too large Load Diff

0
src/eressea/res/spellinfo.xml → src/eressea/res/eressea/spellinfo.xml
View File

0
src/eressea/res/spells.xml → src/eressea/res/eressea/spells.xml
View File

0
src/eressea/res/strings.xml → src/eressea/res/eressea/strings.xml
View File

1382
src/eressea/res/races.xml
View File

File diff suppressed because it is too large Load Diff

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

@ -1,9 +1,6 @@
<?xml version="1.0"?>
<buildings>
<building name="temple" maxsize="50" maxcapacity="2" nobuild="yes" nodestroy="yes" unique="yes" auraregen="1.00" />
<building name="wormhole" maxsize="4" capacity="1" maxcapacity="4" nobuild="yes" nodestroy="yes" unique="yes" />
<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="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"/>

12
src/res/common/items.xml
View File

@ -91,18 +91,6 @@
<item weight="500" score="300"/>
</resource>
<resource name="seed" limited="yes">
<item weight="10" score="50">
<construction skill="herbalism" minskill="3" reqsize="1"/>
</item>
</resource>
<resource name="mallornseed" limited="yes">
<item weight="10" score="100">
<construction skill="herbalism" minskill="4" reqsize="1"/>
</item>
</resource>
<!-- XE items -->
<resource name="skillpotion">
<!-- gives user one free learning attempt -->

23
src/res/common/resources.xml
View File

@ -2,21 +2,14 @@
<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="../resources/iron.xml"/>
<xi:include href="../resources/stone.xml"/>
<xi:include href="../resources/laen.xml"/>
<xi:include href="../resources/horse.xml"/>
<xi:include href="../resources/mallorn.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"/>
<resource name="peasant" pooled="false">
<function name="change" value="lua_changeresource"/>
<function name="get" value="lua_getresource"/>
</resource>
<resource name="hp" pooled="false">
<function name="change" value="lua_changeresource"/>
<function name="get" value="lua_getresource"/>
</resource>
<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>

5
src/res/resources/hp.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0"?>
<resource name="hp" pooled="false">
<function name="change" value="lua_changeresource"/>
<function name="get" value="lua_getresource"/>
</resource>

6
src/res/resources/mallornseed.xml Normal file
View File

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

5
src/res/resources/peasant.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0"?>
<resource name="peasant" pooled="false">
<function name="change" value="lua_changeresource"/>
<function name="get" value="lua_getresource"/>
</resource>

6
src/res/resources/seed.xml Normal file
View File

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

11
src/res/resources/stone-2.xml
View File

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