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

give the first unit a sword, set skills from the equipment-config, not script 

make the preview link use a soft-link, not calculate the build-directory again.
This commit is contained in:
Enno Rehling 2015-07-19 20:05:38 +02:00
parent 38ecf783c2
commit a31dd95de0
3 changed files with 36 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
conf/e2/config.xml
View File

@ -1,62 +1,64 @@
<?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/messages.xml"/>
<!-- Localization --> <!-- Localization -->
<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/spellinfo.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" />
<xi:include href="config://core/common/weapons.xml" /> <xi:include href="config:///core/common/weapons.xml" />
<xi:include href="config://core/common/resources.xml" /> <xi:include href="config:///core/common/resources.xml" />
<xi:include href="config://core/common/luxuries.xml" /> <xi:include href="config:///core/common/luxuries.xml" />
<xi:include href="config://core/common/herbs.xml" /> <xi:include href="config:///core/common/herbs.xml" />
<xi:include href="config://core/common/potions.xml" /> <xi:include href="config:///core/common/potions.xml" />
<xi:include href="config://core/spoils.xml"/> <xi:include href="config:///core/spoils.xml"/>
<xi:include href="config://game/races.xml"/> <xi:include href="config:///game/races.xml"/>
<xi:include href="config://core/prefixes.xml"/> <xi:include href="config:///core/prefixes.xml"/>
<xi:include href="config://core/ships.xml"/> <xi:include href="config:///core/ships.xml"/>
<xi:include href="config://core/common/buildings.xml"/> <xi:include href="config:///core/common/buildings.xml"/>
<xi:include href="config://game/familiars.xml"/> <xi:include href="config:///game/familiars.xml"/>
<xi:include href="config://core/terrains.xml"/> <xi:include href="config:///core/terrains.xml"/>
<xi:include href="config://game/terrains.xml"/> <xi:include href="config:///game/terrains.xml"/>
<xi:include href="config://game/artrewards.xml"/> <xi:include href="config:///game/artrewards.xml"/>
<xi:include href="config://game/buildings.xml"/> <xi:include href="config:///game/buildings.xml"/>
<xi:include href="config://core/calendar.xml"/> <xi:include href="config:///core/calendar.xml"/>
<calendar name="secondage" newyear="month_1" start="184"/> <calendar name="secondage" newyear="month_1" start="184"/>
<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:///game/strings.xml"/>
<xi:include href="config://default/adamantium.xml"/> <xi:include href="config:///default/adamantium.xml"/>
<equipment> <equipment>
<set name="first_unit"> <set name="first_unit">
<item name="log" amount="50"/> <item name="log" amount="50"/>
<item name="stone" amount="50"/> <item name="stone" amount="50"/>
<item name="iron" amount="50"/> <item name="iron" amount="50"/>
<item name="laen" amount="10"/> <item name="laen" amount="10"/>
<item name="sword" amount="1"/>
<item name="mallorn" amount="10"/> <item name="mallorn" amount="10"/>
<item name="skillpotion" amount="5"/> <item name="skillpotion" amount="5"/>
<item name="money" amount="20000"/> <item name="money" amount="20000"/>
<skill name="perception" level="30"/>
<skill name="melee" level="1"/>
</set> </set>
<set name="new_faction"> <set name="new_faction">
<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-undead.xml"/>
<xi:include href="config://default/names-skeletons.xml"/> <xi:include href="config:///default/names-skeletons.xml"/>
<xi:include href="config://default/names-zombies.xml"/> <xi:include href="config:///default/names-zombies.xml"/>
<xi:include href="config://default/names-ghouls.xml"/> <xi:include href="config:///default/names-ghouls.xml"/>
<xi:include href="config://default/names-dragons.xml"/> <xi:include href="config:///default/names-dragons.xml"/>
<game name="Eressea"> <game name="Eressea">
<!-- Game specific settings --> <!-- Game specific settings -->
<order name="pay" disable="yes"/> <order name="pay" disable="yes"/>
<order name="besiege" disable="yes"/>
<skill name="alchemy" enable="true"/> <skill name="alchemy" enable="true"/>
<skill name="crossbow" enable="true"/> <skill name="crossbow" enable="true"/>
@ -97,11 +99,7 @@
<param name="GiveRestriction" value="3"/> <param name="GiveRestriction" value="3"/>
<param name="hunger.long" value="1"/> <param name="hunger.long" value="1"/>
<param name="init_spells" value="0"/> <param name="init_spells" value="0"/>
<param name="world.era" value="2"/>
<param name="seed.population.min" value="8"/>
<param name="seed.population.max" value="8"/>
<param name="rules.reserve.twophase" value="1"/> <param name="rules.reserve.twophase" value="1"/>
<param name="rules.owners.force_leave" value="0"/>
<param name="rules.give.max_men" value="-1"/> <param name="rules.give.max_men" value="-1"/>
<param name="rules.check_overload" value="0"/> <param name="rules.check_overload" value="0"/>
<param name="rules.limit.faction" value="2500"/> <param name="rules.limit.faction" value="2500"/>

9
s/preview
View File

@ -1,12 +1,5 @@
#!/bin/bash #!/bin/bash
MACHINE=`uname -m`
[ -z "$CC" ] && [ ! -z `which clang` ] && CC="clang"
[ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc"
[ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc"
[ -z "$CC" ] && [ ! -z `which cc` ] && CC="cc"
BUILD="build-$MACHINE-$CC-Debug"
function usage() { function usage() {
cat <<HEREDOC cat <<HEREDOC
usage: $0 [-t <turn>] [-g <game>] [-f <file>] command [args] usage: $0 [-t <turn>] [-g <game>] [-f <file>] command [args]
@ -89,7 +82,7 @@ rm -rf reports
mkdir -p reports mkdir -p reports
SUPP="$SOURCE/share/ubuntu-12_04.supp" SUPP="$SOURCE/share/ubuntu-12_04.supp"
SERVER="$SOURCE/$BUILD/eressea/eressea" SERVER="$SOURCE/Debug/eressea/eressea"
VALGRIND=$(which valgrind) VALGRIND=$(which valgrind)
if [ ! -z $VALGRIND ]; then if [ ! -z $VALGRIND ]; then
SERVER="$VALGRIND --suppressions=$SUPP --error-exitcode=1 --leak-check=no $SERVER" SERVER="$VALGRIND --suppressions=$SUPP --error-exitcode=1 --leak-check=no $SERVER"

1
scripts/newplayer.lua
View File

@ -22,7 +22,6 @@ local function seed(r, email, race, lang)
equip_unit(u, "new_faction") equip_unit(u, "new_faction")
equip_unit(u, "first_unit") equip_unit(u, "first_unit")
equip_unit(u, "first_" .. race, 7) -- disable old callbacks equip_unit(u, "first_" .. race, 7) -- disable old callbacks
u:set_skill("perception", 30)
unit.create(f, r, 5):set_skill("mining", 30) unit.create(f, r, 5):set_skill("mining", 30)
unit.create(f, r, 5):set_skill("quarrying", 30) unit.create(f, r, 5):set_skill("quarrying", 30)
return f return f