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

Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Enno Rehling 2018-02-05 17:45:06 +01:00
parent 2d7d46d3ac 961c6e0130
commit 79b54060f9
7 changed files with 1 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
process/cron/preview.cron
View File

@ -9,7 +9,7 @@ if [ -e ${ERESSEA}/build/.preview ]; then
fi fi
SRC=${ERESSEA}/git SRC=${ERESSEA}/git
${SRC}/s/preview build ${branch} || exit $? ${SRC}/s/preview build ${branch} || exit $?
for game in 2 3 4 ; do for game in 2 3 ; do
${SRC}/s/preview -g ${game} run && \ ${SRC}/s/preview -g ${game} run && \
${SRC}/s/preview -g ${game} send ${SRC}/s/preview -g ${game} send
done done

13
res/armor.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0"?>
<resources xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- this file contains a lot of armor -->
<xi:include href="eressea://core/armor/plate.xml"/>
<xi:include href="eressea://core/armor/chainmail.xml"/>
<xi:include href="eressea://core/armor/laenmail.xml"/>
<xi:include href="eressea://core/armor/laenshield.xml"/>
<xi:include href="eressea://core/armor/rustychainmail.xml"/>
<xi:include href="eressea://core/armor/rustyshield.xml"/>
<xi:include href="eressea://core/armor/shield.xml"/>
</resources>

4
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>

89
res/herbs.xml
View File

@ -1,89 +0,0 @@
<?xml version="1.0"?>
<resources>
<!-- this file contains herbs that are part of the alchemy system -->
<resource name="h0" appearance="herbbag"><!-- Flachwurz -->
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h1" appearance="herbbag"><!-- Würziger Wagemut -->
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h2" appearance="herbbag"><!-- Eulenauge -->
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h3" appearance="herbbag"><!-- Grüner Spinnerich -->
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h4" appearance="herbbag"><!-- Blauer Baumringel -->
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h5" appearance="herbbag"><!-- Elfenlieb -->
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h6" appearance="herbbag"><!-- Gurgelkraut -->
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h7" appearance="herbbag"><!-- Knotiger Saugwurz -->
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h8" appearance="herbbag"><!-- Blasenmorchel -->
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h9" appearance="herbbag"><!-- Wasserfinder -->
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h10" appearance="herbbag">
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h11" appearance="herbbag">
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h12" appearance="herbbag"><!-- Windbeutel -->
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h13" appearance="herbbag">
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h14" appearance="herbbag"><!-- Alraune -->
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h15" appearance="herbbag">
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h16" appearance="herbbag">
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h17" appearance="herbbag">
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h18" appearance="herbbag">
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h19" appearance="herbbag">
<item weight="0" score="10" herb="yes" />
</resource>
<resource name="h20" appearance="herbbag">
<item weight="0" score="10" herb="yes" />
</resource>
</resources>

40
res/luxuries.xml
View File

@ -1,40 +0,0 @@
<?xml version="1.0"?>
<resources>
<!-- this file contains luxury items that are part of the trade system -->
<resource name="balm">
<item weight="200">
<luxury price="4" />
</item>
</resource>
<resource name="spice">
<item weight="200">
<luxury price="5" />
</item>
</resource>
<resource name="jewel">
<item weight="100">
<luxury price="7" />
</item>
</resource>
<resource name="myrrh">
<item weight="200">
<luxury price="5" />
</item>
</resource>
<resource name="oil">
<item weight="300">
<luxury price="3" />
</item>
</resource>
<resource name="silk">
<item weight="300">
<luxury price="6" />
</item>
</resource>
<resource name="incense">
<item weight="200">
<luxury price="4" />
</item>
</resource>
</resources>

4
res/ships.xml
View File

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

25
res/weapons.xml
View File

@ -1,25 +0,0 @@
<?xml version="1.0"?>
<resources xmlns:xi="http://www.w3.org/2001/XInclude">
<!-- this file contains a lot of weapons -->
<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/crossbow.xml"/>
<xi:include href="eressea://core/weapons/firesword.xml"/>
<xi:include href="eressea://core/weapons/greatbow.xml"/>
<xi:include href="eressea://core/weapons/greatsword.xml"/>
<xi:include href="eressea://core/weapons/halberd.xml"/>
<xi:include href="eressea://core/weapons/laensword.xml"/>
<xi:include href="eressea://core/weapons/lance.xml"/>
<xi:include href="eressea://core/weapons/mallornbow.xml"/>
<xi:include href="eressea://core/weapons/mallorncrossbow.xml"/>
<xi:include href="eressea://core/weapons/mallornlance.xml"/>
<xi:include href="eressea://core/weapons/mallornspear.xml"/>
<xi:include href="eressea://core/weapons/runesword.xml"/>
<xi:include href="eressea://core/weapons/rustyaxe.xml"/>
<xi:include href="eressea://core/weapons/rustygreatsword.xml"/>
<xi:include href="eressea://core/weapons/rustyhalberd.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"/>
</resources>