From f6e37bd875dc3e713231d3361b0fe3073ee90fd5 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 15 Feb 2015 18:27:26 +0100 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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"