From 84da00f62de81ef28dd39265a1210cba35674771 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 6 Feb 2015 01:42:12 +0100 Subject: [PATCH 01/18] increase version number for develop branch --- src/buildno.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/buildno.h b/src/buildno.h index 008d66547..0f6b1dc97 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 -#define VERSION_MINOR 4 +#define VERSION_MINOR 5 #define VERSION_BUILD 698 From 741cb30e90eaf8ee6f77a8e5bdbdbc847889a1ae Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 7 Feb 2015 19:04:50 +0100 Subject: [PATCH 02/18] clean up cron jobs, add crontab, add flag to disable jobs --- .../{backup-eressea => backup-eressea.cron} | 0 .../cron/{create-orders => create-orders.cron} | 0 process/cron/crontab | 17 +++++++++++++++++ process/cron/orders.cron | 16 ++++++++++++++++ s/cron/previews.sh => process/cron/preview.cron | 10 +++++----- process/cron/{run-eressea => run-eressea.cron} | 0 process/cron/{run-turn => run-turn.cron} | 0 s/install | 5 +++++ 8 files changed, 43 insertions(+), 5 deletions(-) rename process/cron/{backup-eressea => backup-eressea.cron} (100%) rename process/cron/{create-orders => create-orders.cron} (100%) create mode 100644 process/cron/crontab create mode 100755 process/cron/orders.cron rename s/cron/previews.sh => process/cron/preview.cron (53%) rename process/cron/{run-eressea => run-eressea.cron} (100%) rename process/cron/{run-turn => run-turn.cron} (100%) diff --git a/process/cron/backup-eressea b/process/cron/backup-eressea.cron similarity index 100% rename from process/cron/backup-eressea rename to process/cron/backup-eressea.cron diff --git a/process/cron/create-orders b/process/cron/create-orders.cron similarity index 100% rename from process/cron/create-orders rename to process/cron/create-orders.cron diff --git a/process/cron/crontab b/process/cron/crontab new file mode 100644 index 000000000..9e37aec59 --- /dev/null +++ b/process/cron/crontab @@ -0,0 +1,17 @@ +# Crontab for Eressea on gruenbaer.kn-bremen.de + +PATH=$HOME/bin:/opt/bin:/usr/local/bin:/usr/bin:/bin +ERESSEA=/home/eressea/eressea +ATLANTIS=/home/eressea/atlantis +ENABLED=no +CONFIRM=yes + +# m h dom mon dow command +00 00 * * * $HOME/bin/fetchmail.cron +00 22 * * * $HOME/bin/backup-db.sh + +*/2 * * * * [ "$CONFIRM" = "yes" ] || $ERESSEA/eressea/server/bin/orders.cron 2 3 4 +15 21 * * Sat [ "$ENABLED" = "yes" ] || $ERESSEA/server/bin/run-eressea.cron 3 +25 21 * * Sat [ "$ENABLED" = "yes" ] || $ERESSEA/server/bin/run-eressea.cron 4 +35 21 * * Sat [ "$ENABLED" = "yes" ] || $ERESSEA/server/bin/run-eressea.cron 2 +39 08 * * Sun [ "$ENABLED" = "yes" ] || $ERESSEA/server/bin/previews.cron diff --git a/process/cron/orders.cron b/process/cron/orders.cron new file mode 100755 index 000000000..be573fe86 --- /dev/null +++ b/process/cron/orders.cron @@ -0,0 +1,16 @@ +#!/bin/bash + +## this script processes incoming order files. +# files are delivered into an incoming queue by procmail, then cron runs +# this here script to make a non-blocking syntax check and reject or +# accept the order file. + +for GAME in $* +do + if [ "$GAME" == "eressea" ]; then GAME=2 ; fi + if [ "$GAME" == "e3a" ]; then GAME=3 ; fi + if [ -e $HOME/eressea/game-$GAME/orders.queue ] + then + $HOME/bin/orders-process $GAME + fi +done diff --git a/s/cron/previews.sh b/process/cron/preview.cron similarity index 53% rename from s/cron/previews.sh rename to process/cron/preview.cron index 37147ac53..fe2c49ba1 100755 --- a/s/cron/previews.sh +++ b/process/cron/preview.cron @@ -5,10 +5,10 @@ branch="master" if [ -e ${ERESSEA}/build/.preview ]; then branch=`cat ${ERESSEA}/build/.preview` fi -SRC=${ERESSEA}/git -${SRC}/s/preview build ${branch} || exit $? -${SRC}/s/preview version +BIN=${ERESSEA}/server/s +${BIN}/preview build ${branch} || exit $? +${BIN}/preview version for game in 2 3 4 ; do - ${SRC}/s/preview -g ${game} run && \ - ${SRC}/s/preview -g ${game} send + ${BIN}/preview -g ${game} run && \ + ${BIN}/preview -g ${game} send done diff --git a/process/cron/run-eressea b/process/cron/run-eressea.cron similarity index 100% rename from process/cron/run-eressea rename to process/cron/run-eressea.cron diff --git a/process/cron/run-turn b/process/cron/run-turn.cron similarity index 100% rename from process/cron/run-turn rename to process/cron/run-turn.cron diff --git a/s/install b/s/install index 08d171849..fe1f6196c 100755 --- a/s/install +++ b/s/install @@ -8,6 +8,8 @@ while [ ! -d $ROOT/.git ]; do fi done +DEST=$(dirname $ROOT)/server + MACHINE=`uname -m` [ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc" [ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc" @@ -17,3 +19,6 @@ BIN_DIR="build-$MACHINE-$CC-Debug" cd $ROOT/$BIN_DIR make install +[ -d $DEST/bin ] || mkdir -p $DEST/bin +install -v $ROOT/process/cron/*.cron $DEST/bin/ +crontab $ROOT/process/cron/crontab From f9bced467d0ab4f558020388fdbf9de0d6150a11 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 8 Feb 2015 10:33:45 +0100 Subject: [PATCH 03/18] fix a crash in rename_cmd --- src/laws.c | 5 ++++- src/tests.c | 2 +- src/util/language.c | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/laws.c b/src/laws.c index acb15e747..7fc04876b 100755 --- a/src/laws.c +++ b/src/laws.c @@ -1896,7 +1896,10 @@ int name_cmd(struct unit *u, struct order *ord) } if (s != NULL) { - return rename_cmd(u, ord, s, getstrtoken()); + const char *name = getstrtoken(); + if (name) { + rename_cmd(u, ord, s, name); + } } return 0; diff --git a/src/tests.c b/src/tests.c index 108cde2a4..10eefd9c4 100644 --- a/src/tests.c +++ b/src/tests.c @@ -240,7 +240,7 @@ const message_type *register_msg(const char *type, int n_param, ...) { void assert_messages(struct CuTest * tc, struct mlist *msglist, const message_type **types, int num_msgs, bool exact_match, ...) { va_list args; - int found, argc; + int found, argc = -1; struct message *msg; bool match = true; diff --git a/src/util/language.c b/src/util/language.c index ec83b98b9..677832636 100644 --- a/src/util/language.c +++ b/src/util/language.c @@ -263,6 +263,7 @@ void init_translations(const struct locale *lang, int ut, const char * (*string_ assert(maxstrings > 0); tokens = get_translations(lang, ut); for (i = 0; i != maxstrings; ++i) { + // TODO: swap the name of s and key const char * s = string_cb(i); const char * key = s ? locale_string(lang, s, false) : 0; key = key ? key : s; From 742f464ee568a1c091d281cb4b25c8d0f4f4a86b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 8 Feb 2015 10:35:59 +0100 Subject: [PATCH 04/18] further fixes to the crontab system --- process/{cron/backup-eressea.cron => backup-eressea} | 0 process/{cron/create-orders.cron => create-orders} | 0 process/cron/crontab | 5 +++-- process/cron/run-eressea.cron | 4 ++-- process/{cron/run-turn.cron => run-turn} | 0 s/install | 4 ++++ 6 files changed, 9 insertions(+), 4 deletions(-) rename process/{cron/backup-eressea.cron => backup-eressea} (100%) rename process/{cron/create-orders.cron => create-orders} (100%) rename process/{cron/run-turn.cron => run-turn} (100%) diff --git a/process/cron/backup-eressea.cron b/process/backup-eressea similarity index 100% rename from process/cron/backup-eressea.cron rename to process/backup-eressea diff --git a/process/cron/create-orders.cron b/process/create-orders similarity index 100% rename from process/cron/create-orders.cron rename to process/create-orders diff --git a/process/cron/crontab b/process/cron/crontab index 9e37aec59..bcdc326c9 100644 --- a/process/cron/crontab +++ b/process/cron/crontab @@ -4,14 +4,15 @@ PATH=$HOME/bin:/opt/bin:/usr/local/bin:/usr/bin:/bin ERESSEA=/home/eressea/eressea ATLANTIS=/home/eressea/atlantis ENABLED=no +PREVIEW=no CONFIRM=yes # m h dom mon dow command 00 00 * * * $HOME/bin/fetchmail.cron 00 22 * * * $HOME/bin/backup-db.sh -*/2 * * * * [ "$CONFIRM" = "yes" ] || $ERESSEA/eressea/server/bin/orders.cron 2 3 4 15 21 * * Sat [ "$ENABLED" = "yes" ] || $ERESSEA/server/bin/run-eressea.cron 3 25 21 * * Sat [ "$ENABLED" = "yes" ] || $ERESSEA/server/bin/run-eressea.cron 4 35 21 * * Sat [ "$ENABLED" = "yes" ] || $ERESSEA/server/bin/run-eressea.cron 2 -39 08 * * Sun [ "$ENABLED" = "yes" ] || $ERESSEA/server/bin/previews.cron +39 08 * * Sun [ "$PREVIEW" = "yes" ] || $ERESSEA/server/bin/previews.cron +*/5 * * * * [ "$CONFIRM" = "yes" ] || $ERESSEA/server/bin/orders.cron 2 3 4 diff --git a/process/cron/run-eressea.cron b/process/cron/run-eressea.cron index e932378fc..becf5b860 100755 --- a/process/cron/run-eressea.cron +++ b/process/cron/run-eressea.cron @@ -39,7 +39,7 @@ if [ ! -s $ERESSEA/game-$GAME/data/$TURN.dat ]; then fi echo "sending reports for game $GAME, turn $TURN" $BIN/compress.sh $GAME $TURN -$BIN/sendreports.sh $GAME +# $BIN/sendreports.sh $GAME +# [ $GAME -lt 4 ] && $BIN/send-summary $GAME $BIN/backup-eressea $GAME $TURN -[ $GAME -lt 4 ] && $BIN/send-summary $GAME rm -f test/execute.lock diff --git a/process/cron/run-turn.cron b/process/run-turn similarity index 100% rename from process/cron/run-turn.cron rename to process/run-turn diff --git a/s/install b/s/install index fe1f6196c..39c91174a 100755 --- a/s/install +++ b/s/install @@ -21,4 +21,8 @@ make install [ -d $DEST/bin ] || mkdir -p $DEST/bin install -v $ROOT/process/cron/*.cron $DEST/bin/ +programs="create-orders backup-eressea run-turn" +for prg in ${programs} ; do +install -v $ROOT/process/$prg $DEST/bin/ +done crontab $ROOT/process/cron/crontab From 954a649d3fa484b3fc8c6bc365c15dffa55ada31 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 8 Feb 2015 10:41:05 +0100 Subject: [PATCH 05/18] version number bump --- src/buildno.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/buildno.h b/src/buildno.h index 008d66547..69c61645e 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 4 -#define VERSION_BUILD 698 +#define VERSION_BUILD 1 From c8f4204abe8ea8e27fb2acb2e43ac6d94918f707 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 8 Feb 2015 12:05:50 +0100 Subject: [PATCH 06/18] fix install process to include json files --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9730625b2..aaf07e2a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,5 +70,6 @@ add_subdirectory (quicklist) add_subdirectory (critbit) add_subdirectory (src eressea) install(DIRECTORY res conf DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.xml") +install(DIRECTORY res conf DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.json") install(DIRECTORY scripts DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.lua") From a2e071d35ba4e8899d0d8760e1c53371a2e94e9f Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 8 Feb 2015 13:09:04 +0100 Subject: [PATCH 07/18] Fix broken syntax in message about effects on units. Add some missing descriptions. Bump version number. --- res/core/de/strings.xml | 8 ++++++++ res/core/messages.xml | 2 +- src/buildno.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/res/core/de/strings.xml b/res/core/de/strings.xml index e2003f997..999d59270 100644 --- a/res/core/de/strings.xml +++ b/res/core/de/strings.xml @@ -4345,6 +4345,14 @@ + + Erzeugt einen Ring der Regeneration. + Creates a ring of regeneration. + + + Erzeugt einen Aurafokus. + Creates an aurafocus crystal. + Tötet die Feinde mit Säure. Kills enemies with acid. diff --git a/res/core/messages.xml b/res/core/messages.xml index c8eba5cfb..16396b77c 100644 --- a/res/core/messages.xml +++ b/res/core/messages.xml @@ -889,7 +889,7 @@ "Auf der Einheit $if($eq($left,1),"liegt","liegen") $int($left) Wirkung$if($eq($left,1),"","en") $resource($potion,1)." - "There are $int($left) use($eq($left,1),"s","") of $resource($potion,1) left." + "There $if($eq($left,1),"is","are") $int($left) $if($eq($left,1),"use","uses") of $resource($potion,1) left." diff --git a/src/buildno.h b/src/buildno.h index 69c61645e..a213d5520 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 4 -#define VERSION_BUILD 1 +#define VERSION_BUILD 2 From 39806eaef53c5c97910a42be1dfcb2f43e96ac59 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 8 Feb 2015 13:37:44 +0100 Subject: [PATCH 08/18] disable broken test_luck_message for now. --- src/laws.test.c | 2 +- src/tests.c | 4 ++++ src/tests.h | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/laws.test.c b/src/laws.test.c index 75c19a798..b7a8e4693 100644 --- a/src/laws.test.c +++ b/src/laws.test.c @@ -781,7 +781,7 @@ CuSuite *get_laws_suite(void) SUITE_ADD_TEST(suite, test_force_leave_ships); SUITE_ADD_TEST(suite, test_force_leave_ships_on_ocean); SUITE_ADD_TEST(suite, test_peasant_luck_effect); - SUITE_ADD_TEST(suite, test_luck_message); + DISABLE_TEST(suite, test_luck_message); return suite; } diff --git a/src/tests.c b/src/tests.c index 10eefd9c4..f560dc59a 100644 --- a/src/tests.c +++ b/src/tests.c @@ -272,3 +272,7 @@ void assert_messages(struct CuTest * tc, struct mlist *msglist, const message_ty va_end(args); } + +void disabled_test(void *suite, const char *name) { + fprintf(stderr, "%s: SKIP\n", name); +} diff --git a/src/tests.h b/src/tests.h index e517a6fb7..15c27f315 100644 --- a/src/tests.h +++ b/src/tests.h @@ -47,6 +47,10 @@ extern "C" { void assert_messages(struct CuTest * tc, struct mlist *msglist, const struct message_type **types, int num_msgs, bool exact_match, ...); + void disabled_test(void *suite, const char *name); + +#define DISABLE_TEST(SUITE, TEST) disabled_test(SUITE, #TEST) + #ifdef __cplusplus } #endif From 30f5fbd4caf6332d469c3cc77e7bfaafa4748fbf Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 8 Feb 2015 13:42:04 +0100 Subject: [PATCH 09/18] work around gcc being nervous when static functions are unused. --- src/tests.c | 3 ++- src/tests.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tests.c b/src/tests.c index f560dc59a..b1dbc876b 100644 --- a/src/tests.c +++ b/src/tests.c @@ -273,6 +273,7 @@ void assert_messages(struct CuTest * tc, struct mlist *msglist, const message_ty va_end(args); } -void disabled_test(void *suite, const char *name) { +void disabled_test(void *suite, void (*test)(CuTest *), const char *name) { + (void)test; fprintf(stderr, "%s: SKIP\n", name); } diff --git a/src/tests.h b/src/tests.h index 15c27f315..3da238fdc 100644 --- a/src/tests.h +++ b/src/tests.h @@ -47,9 +47,9 @@ extern "C" { void assert_messages(struct CuTest * tc, struct mlist *msglist, const struct message_type **types, int num_msgs, bool exact_match, ...); - void disabled_test(void *suite, const char *name); + void disabled_test(void *suite, void (*)(struct CuTest *), const char *name); -#define DISABLE_TEST(SUITE, TEST) disabled_test(SUITE, #TEST) +#define DISABLE_TEST(SUITE, TEST) disabled_test(SUITE, TEST, #TEST) #ifdef __cplusplus } From dd586f720355039ac5ad439776938e0ba59cceea Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 8 Feb 2015 14:01:22 +0100 Subject: [PATCH 10/18] re-enable sending reports --- process/cron/run-eressea.cron | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/process/cron/run-eressea.cron b/process/cron/run-eressea.cron index becf5b860..471031237 100755 --- a/process/cron/run-eressea.cron +++ b/process/cron/run-eressea.cron @@ -39,7 +39,7 @@ if [ ! -s $ERESSEA/game-$GAME/data/$TURN.dat ]; then fi echo "sending reports for game $GAME, turn $TURN" $BIN/compress.sh $GAME $TURN -# $BIN/sendreports.sh $GAME -# [ $GAME -lt 4 ] && $BIN/send-summary $GAME +$BIN/sendreports.sh $GAME +[ $GAME -lt 4 ] && $BIN/send-summary $GAME $BIN/backup-eressea $GAME $TURN rm -f test/execute.lock From 8c606a59fbf70d560a3e20ecac1dcd408b9dc4a0 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 8 Feb 2015 21:22:39 +0100 Subject: [PATCH 11/18] fix crontab switches --- process/cron/crontab | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/process/cron/crontab b/process/cron/crontab index bcdc326c9..ff56eb86e 100644 --- a/process/cron/crontab +++ b/process/cron/crontab @@ -11,8 +11,8 @@ CONFIRM=yes 00 00 * * * $HOME/bin/fetchmail.cron 00 22 * * * $HOME/bin/backup-db.sh -15 21 * * Sat [ "$ENABLED" = "yes" ] || $ERESSEA/server/bin/run-eressea.cron 3 -25 21 * * Sat [ "$ENABLED" = "yes" ] || $ERESSEA/server/bin/run-eressea.cron 4 -35 21 * * Sat [ "$ENABLED" = "yes" ] || $ERESSEA/server/bin/run-eressea.cron 2 -39 08 * * Sun [ "$PREVIEW" = "yes" ] || $ERESSEA/server/bin/previews.cron -*/5 * * * * [ "$CONFIRM" = "yes" ] || $ERESSEA/server/bin/orders.cron 2 3 4 +15 21 * * Sat [ "$ENABLED" = "yes" ] && $ERESSEA/server/bin/run-eressea.cron 3 +25 21 * * Sat [ "$ENABLED" = "yes" ] && $ERESSEA/server/bin/run-eressea.cron 4 +35 21 * * Sat [ "$ENABLED" = "yes" ] && $ERESSEA/server/bin/run-eressea.cron 2 +39 08 * * Sun [ "$PREVIEW" = "yes" ] && $ERESSEA/server/bin/previews.cron +*/5 * * * * [ "$CONFIRM" = "yes" ] && $ERESSEA/server/bin/orders.cron 2 3 4 From f2434346c971223cc90d64f168c6c4c7030e4338 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 8 Feb 2015 21:49:50 +0100 Subject: [PATCH 12/18] fix the crontab, again --- process/cron/crontab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/process/cron/crontab b/process/cron/crontab index ff56eb86e..516b204dd 100644 --- a/process/cron/crontab +++ b/process/cron/crontab @@ -1,6 +1,6 @@ # Crontab for Eressea on gruenbaer.kn-bremen.de -PATH=$HOME/bin:/opt/bin:/usr/local/bin:/usr/bin:/bin +PATH=/home/eressea/bin:/opt/bin:/usr/local/bin:/usr/bin:/bin ERESSEA=/home/eressea/eressea ATLANTIS=/home/eressea/atlantis ENABLED=no From d6500f7e4fc56cca0de69f93744c2d76213e965f Mon Sep 17 00:00:00 2001 From: Steffen Mecke Date: Mon, 9 Feb 2015 10:57:03 +0100 Subject: [PATCH 13/18] fix bug in tests introduced by previous merge --- src/laws.test.c | 2 +- src/tests.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/laws.test.c b/src/laws.test.c index b7a8e4693..75c19a798 100644 --- a/src/laws.test.c +++ b/src/laws.test.c @@ -781,7 +781,7 @@ CuSuite *get_laws_suite(void) SUITE_ADD_TEST(suite, test_force_leave_ships); SUITE_ADD_TEST(suite, test_force_leave_ships_on_ocean); SUITE_ADD_TEST(suite, test_peasant_luck_effect); - DISABLE_TEST(suite, test_luck_message); + SUITE_ADD_TEST(suite, test_luck_message); return suite; } diff --git a/src/tests.c b/src/tests.c index f10befba6..07dcef979 100644 --- a/src/tests.c +++ b/src/tests.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -239,22 +240,24 @@ const message_type *register_msg(const char *type, int n_param, ...) { void assert_messages(struct CuTest * tc, struct mlist *msglist, const message_type **types, int num_msgs, bool exact_match, ...) { + char buf[100]; va_list args; - int found, argc = -1; + int found = 0, argc = -1; struct message *msg; bool match = true; va_start(args, exact_match); while (msglist) { + msg = msglist->msg; if (found >= num_msgs) { if (exact_match) { - CuFail(tc, "too many messages"); + slprintf(buf, sizeof(buf), "too many messages: %s", msg->type->name); + CuFail(tc, buf); } else { break; } } - msg = msglist->msg; if (exact_match || match) argc = va_arg(args, int); From f6e37bd875dc3e713231d3361b0fe3073ee90fd5 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 15 Feb 2015 18:27:26 +0100 Subject: [PATCH 14/18] bump build number --- src/buildno.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/buildno.h b/src/buildno.h index f26ec2251..decff2fd0 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 4 -#define VERSION_BUILD 3 +#define VERSION_BUILD 4 From 58fae8e90d368434743bc82ea4f7d72a1d6816a9 Mon Sep 17 00:00:00 2001 From: CTD Date: Fri, 13 Feb 2015 16:22:52 +0100 Subject: [PATCH 15/18] Guard chance repaired MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Das muss auch in den master damit es in der nächsten Auswertung wieder richtig ist! --- src/move.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/move.c b/src/move.c index b935789be..14c305c11 100644 --- a/src/move.c +++ b/src/move.c @@ -919,17 +919,17 @@ static unit *bewegung_blockiert_von(unit * reisender, region * r) } if (guard) { prob += base_prob; /* 30% base chance */ - prob = +guard_count*guard_number_prob; + prob += guard_count*guard_number_prob; if (r->terrain == newterrain(T_GLACIER)) - prob = +region_type_prob * 2; + prob += region_type_prob * 2; if (r->terrain == newterrain(T_SWAMP)) - prob = +region_type_prob * 2; + prob += region_type_prob * 2; if (r->terrain == newterrain(T_MOUNTAIN)) - prob = +region_type_prob; + prob += region_type_prob; if (r->terrain == newterrain(T_VOLCANO)) - prob = +region_type_prob; + prob += region_type_prob; if (r->terrain == newterrain(T_VOLCANO_SMOKING)) - prob = +region_type_prob; + prob += region_type_prob; if (prob > 0 && chance(prob)) { return guard; From 8e34658a6fe6e213f0eed7b349b70a9d593766f2 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 22 Feb 2015 16:04:33 +0100 Subject: [PATCH 16/18] fix crontab --- process/cron/crontab | 6 +++--- process/cron/preview.cron | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/process/cron/crontab b/process/cron/crontab index 516b204dd..8bbabab53 100644 --- a/process/cron/crontab +++ b/process/cron/crontab @@ -3,8 +3,8 @@ PATH=/home/eressea/bin:/opt/bin:/usr/local/bin:/usr/bin:/bin ERESSEA=/home/eressea/eressea ATLANTIS=/home/eressea/atlantis -ENABLED=no -PREVIEW=no +ENABLED=yes +PREVIEW=yes CONFIRM=yes # m h dom mon dow command @@ -14,5 +14,5 @@ CONFIRM=yes 15 21 * * Sat [ "$ENABLED" = "yes" ] && $ERESSEA/server/bin/run-eressea.cron 3 25 21 * * Sat [ "$ENABLED" = "yes" ] && $ERESSEA/server/bin/run-eressea.cron 4 35 21 * * Sat [ "$ENABLED" = "yes" ] && $ERESSEA/server/bin/run-eressea.cron 2 -39 08 * * Sun [ "$PREVIEW" = "yes" ] && $ERESSEA/server/bin/previews.cron +39 08 * * Sun [ "$PREVIEW" = "yes" ] && $ERESSEA/server/bin/preview.cron */5 * * * * [ "$CONFIRM" = "yes" ] && $ERESSEA/server/bin/orders.cron 2 3 4 diff --git a/process/cron/preview.cron b/process/cron/preview.cron index 56bdeb940..b18038843 100755 --- a/process/cron/preview.cron +++ b/process/cron/preview.cron @@ -5,10 +5,10 @@ branch="develop" if [ -e ${ERESSEA}/build/.preview ]; then branch=`cat ${ERESSEA}/build/.preview` fi -BIN=${ERESSEA}/server/s -${BIN}/preview build ${branch} || exit $? -${BIN}/preview version +SRC=${ERESSEA}/git +${SRC}/s/preview build ${branch} || exit $? +${SRC}/s/preview version for game in 2 3 4 ; do - ${BIN}/preview -g ${game} run && \ - ${BIN}/preview -g ${game} send + ${SRC}/s/preview -g ${game} run && \ + ${SRC}/s/preview -g ${game} send done From 53241bc95ffce8ce4cc47576948472583d6370e3 Mon Sep 17 00:00:00 2001 From: CTD Date: Fri, 13 Feb 2015 16:22:52 +0100 Subject: [PATCH 17/18] Guard chance repaired MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Das muss auch in den master damit es in der nächsten Auswertung wieder richtig ist! --- src/buildno.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/buildno.h b/src/buildno.h index decff2fd0..be62c19a5 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 4 -#define VERSION_BUILD 4 +#define VERSION_BUILD 5 From d637571a52e3a0625de61133bb816eb97dd0a87b Mon Sep 17 00:00:00 2001 From: Steffen Mecke Date: Mon, 9 Feb 2015 08:56:43 +0100 Subject: [PATCH 18/18] fix spy and volcano messages --- res/core/messages.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/res/core/messages.xml b/res/core/messages.xml index 16396b77c..ddd17856c 100644 --- a/res/core/messages.xml +++ b/res/core/messages.xml @@ -3156,7 +3156,7 @@ "Der Vulkan in $region($regionv) bricht aus. Die Lavamassen verwüsten $region($regionn)." - "The volcano in $region($regionv) erupts. The lava devastates $region($region)." + "The volcano in $region($regionv) erupts. The lava devastates $region($regionn)." @@ -3461,16 +3461,16 @@ - "$unit($spy) gelang es, Informationen über $unit($target) herauszubekommen: Kampfstatus $status." - "$unit($spy) managed to gather information about $unit($target): combat status ($status)." + "$unit($spy) gelang es, Informationen über $unit($target) herauszubekommen: Kampfstatus ${status}." + "$unit($spy) managed to gather information about $unit($target): combat status ${status}." - "$unit($target) ist ein $type-Magier." - "$unit($target) is a $type-magician" + "$unit($target) ist ein ${type}-Magier." + "$unit($target) is a ${type}-magician"