forked from github/server
Merge branch 'master' of github.com:eressea/server
This commit is contained in:
commit
c508f48f54
|
@ -20,6 +20,7 @@
|
|||
<xi:include href="config:///core/ships.xml"/>
|
||||
<xi:include href="config:///core/common/buildings.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:///game/terrains.xml"/>
|
||||
<xi:include href="config:///default/directions.xml"/>
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
<xi:include href="config:///core/prefixes.xml"/>
|
||||
<xi:include href="config:///core/common/buildings.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/shipnames.xml"/>
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
#!/bin/sh
|
||||
#!/bin/bash
|
||||
GAME=$1
|
||||
BIN=$HOME/bin
|
||||
export ERESSEA=$HOME/eressea
|
||||
export PATH
|
||||
TURN=$(cat $ERESSEA/game-$GAME)
|
||||
TURN=$(cat $ERESSEA/game-$GAME/turn)
|
||||
if [ ! -e $ERESSEA/game-$GAME/data/$TURN.dat ]; then
|
||||
echo "data file $TURN is missing, cannot run turn for game $GAME"
|
||||
exit 1
|
||||
fi
|
||||
$REPORTS=$ERESSEA/game-$GAME/reports
|
||||
REPORTS=$ERESSEA/game-$GAME/reports
|
||||
if [ -d $REPORTS ]; then
|
||||
rm -rf $REPORTS
|
||||
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"
|
||||
exit 2
|
||||
fi
|
||||
LET TURN=$TURN+1
|
||||
let TURN=$TURN+1
|
||||
if [ ! -s $ERESSEA/game-$GAME/data/$TURN.dat ]; then
|
||||
echo "server did not create data for turn $TURN in game $GAME"
|
||||
exit 3
|
||||
|
|
Loading…
Reference in New Issue