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

Merge branch 'master' of github.com:eressea/server

This commit is contained in:
Enno Rehling 2014-05-10 13:33:58 -07:00
parent 515b582144 5c70c45b50
commit c508f48f54
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
game-e2/config.xml
View File

@ -20,6 +20,7 @@
<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:///core/equipment.xml"/> <xi:include href="config:///core/equipment.xml"/>
<xi:include href="config:///core/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:///default/directions.xml"/> <xi:include href="config:///default/directions.xml"/>

1
game-e3/config.xml
View File

@ -13,6 +13,7 @@
<xi:include href="config:///core/prefixes.xml"/> <xi:include href="config:///core/prefixes.xml"/>
<xi:include href="config:///core/common/buildings.xml"/> <xi:include href="config:///core/common/buildings.xml"/>
<xi:include href="config:///core/equipment.xml"/> <xi:include href="config:///core/equipment.xml"/>
<xi:include href="config:///core/familiars.xml"/>
<xi:include href="config:///game/ships.xml"/> <xi:include href="config:///game/ships.xml"/>
<xi:include href="config:///game/shipnames.xml"/> <xi:include href="config:///game/shipnames.xml"/>

8
process/cron/run-eressea
View File

@ -1,14 +1,14 @@
#!/bin/sh #!/bin/bash
GAME=$1 GAME=$1
BIN=$HOME/bin BIN=$HOME/bin
export ERESSEA=$HOME/eressea export ERESSEA=$HOME/eressea
export PATH export PATH
TURN=$(cat $ERESSEA/game-$GAME) TURN=$(cat $ERESSEA/game-$GAME/turn)
if [ ! -e $ERESSEA/game-$GAME/data/$TURN.dat ]; then if [ ! -e $ERESSEA/game-$GAME/data/$TURN.dat ]; then
echo "data file $TURN is missing, cannot run turn for game $GAME" echo "data file $TURN is missing, cannot run turn for game $GAME"
exit 1 exit 1
fi fi
$REPORTS=$ERESSEA/game-$GAME/reports REPORTS=$ERESSEA/game-$GAME/reports
if [ -d $REPORTS ]; then if [ -d $REPORTS ]; then
rm -rf $REPORTS rm -rf $REPORTS
fi fi
@ -18,7 +18,7 @@ if [ ! -s $ERESSEA/game-$GAME/orders.$TURN ]; then
echo "server did not create orders for turn $TURN in game $GAME" echo "server did not create orders for turn $TURN in game $GAME"
exit 2 exit 2
fi fi
LET TURN=$TURN+1 let TURN=$TURN+1
if [ ! -s $ERESSEA/game-$GAME/data/$TURN.dat ]; then if [ ! -s $ERESSEA/game-$GAME/data/$TURN.dat ]; then
echo "server did not create data for turn $TURN in game $GAME" echo "server did not create data for turn $TURN in game $GAME"
exit 3 exit 3