From dcf9b9df26fbca5a19bedfe2235526c2d98af5b5 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 2 Jan 2020 11:34:26 +0100 Subject: [PATCH 1/5] bug 2626: fehlende neue messages nachtragen --- res/core/messages.xml | 56 +++++++++++++++++++++++++++++++++++++++++++ src/kernel/messages.c | 1 + 2 files changed, 57 insertions(+) diff --git a/res/core/messages.xml b/res/core/messages.xml index d40efb9ac..696cb9a2d 100644 --- a/res/core/messages.xml +++ b/res/core/messages.xml @@ -2690,6 +2690,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/kernel/messages.c b/src/kernel/messages.c index 656e08b3a..98411973d 100644 --- a/src/kernel/messages.c +++ b/src/kernel/messages.c @@ -62,6 +62,7 @@ static message *missing_feedback(const char *name, const struct unit *u, log_error("trying to create undefined feedback of type \"%s\"\n", name); } else if (missing_message_mode == MESSAGE_MISSING_REPLACE) { + log_warning("trying to create undefined message of type \"%s\"\n", name); if (strcmp(name, "missing_feedback") != 0) { if (!mt_find("missing_feedback")) { mt_create_va(mt_new("missing_feedback", NULL), "unit:unit", From 4f88bf137edf33de4f56d8c81f5789bfedfe058f Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 2 Jan 2020 12:10:38 +0100 Subject: [PATCH 2/5] bug 2625 samen werden direkt zu schoesslingen --- src/economy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/economy.c b/src/economy.c index 35e08ade6..5da191e50 100644 --- a/src/economy.c +++ b/src/economy.c @@ -1775,12 +1775,12 @@ static void breedtrees(unit * u, int raw) } if (n > raw) n = raw; - /* Fuer jeden Samen Talent*5% Erfolgschance. */ - for (i = n; i > 0; i--) { - if (rng_int() % 100 < skill * 5) - planted++; + /* Talent * 5% der Samen setzen an (max 100%) */ + planted = n; + if (skill < 20) { + planted = planted * skill / 20; } - rsettrees(r, 1, rtrees(r, 1) + planted); + rsettrees(r, 0, rtrees(r, 0) + planted); /* Alles ok. Abziehen. */ produceexp(u, SK_HERBALISM, u->number); From c8c22aea1b02f43df7f03e5aa80e297575ab8c89 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 2 Jan 2020 12:47:09 +0100 Subject: [PATCH 3/5] bug 2624: short range conversion bug in tree growth --- src/laws.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/laws.c b/src/laws.c index 4170975b5..53b49e1b6 100644 --- a/src/laws.c +++ b/src/laws.c @@ -594,6 +594,13 @@ growing_trees_e3(region * r, const int current_season, } } +static short cap_short(int i) { + if (i > SHRT_MIN) { + return ((i < SHRT_MAX) ? (short)i : SHRT_MAX); + } + return SHRT_MIN; +} + static void growing_trees(region * r, const season_t current_season, const season_t last_weeks_season) { @@ -687,8 +694,8 @@ growing_trees(region * r, const season_t current_season, const season_t last_wee a = a_find(r->attribs, &at_germs); if (!a) { a = a_add(&r->attribs, a_new(&at_germs)); - a->data.sa[0] = (short)rtrees(r, 0); - a->data.sa[1] = (short)rtrees(r, 1); + a->data.sa[0] = cap_short(rtrees(r, 0)); + a->data.sa[1] = cap_short(rtrees(r, 1)); } /* wir haben 6 Wochen zum wachsen, jeder Same/Spross hat 18% Chance * zu wachsen, damit sollten nach 5-6 Wochen alle gewachsen sein */ From e337b8b4947acf6b0eea1114c017088fb09b793b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 3 Jan 2020 17:14:44 +0100 Subject: [PATCH 4/5] Bug 2626: Korrekter Meldungstext. --- res/core/messages.xml | 8 ++++++++ res/translations/messages.de.po | 5 ++++- res/translations/messages.en.po | 5 ++++- src/give.c | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/res/core/messages.xml b/res/core/messages.xml index 696cb9a2d..ecb5707c1 100644 --- a/res/core/messages.xml +++ b/res/core/messages.xml @@ -2746,6 +2746,14 @@ + + + + + + + + diff --git a/res/translations/messages.de.po b/res/translations/messages.de.po index 5d2717e51..6cb2b413b 100644 --- a/res/translations/messages.de.po +++ b/res/translations/messages.de.po @@ -2775,7 +2775,10 @@ msgid "error324" msgstr "\"$unit($unit) in $region($region): '$order($command)' - Die Einheit gehört nicht zu unserer Partei.\"" msgid "error322" -msgstr "\"$unit($unit) in $region($region): '$order($command)' - Die Einheit ist bereits auf einem Schiff.\"" +msgstr "\"$unit($unit) in $region($region): '$order($command)' - Nur Schiffe gleicher Bauart können einen Konvoi bilden.\"" + +msgid "error328" +msgstr "\"$unit($unit) in $region($region): '$order($command)' - Nur Schiffe an der selbe Küste können einen Konvoi bilden.\"" msgid "error323" msgstr "\"$unit($unit) in $region($region): '$order($command)' - Das Schiff ist verzaubert.\"" diff --git a/res/translations/messages.en.po b/res/translations/messages.en.po index 659adee9f..9ec9c934b 100644 --- a/res/translations/messages.en.po +++ b/res/translations/messages.en.po @@ -2781,11 +2781,14 @@ msgid "error324" msgstr "\"$unit($unit) in $region($region): '$order($command)' - The unit is not one of ours.\"" msgid "error322" -msgstr "\"$unit($unit) in $region($region): '$order($command)' - The unit is already on a ship.\"" +msgstr "\"$unit($unit) in $region($region): '$order($command)' - Only ships of the same type can form a convoy.\"" msgid "error323" msgstr "\"$unit($unit) in $region($region): '$order($command)' - The ship is under a spell.\"" +msgid "error328" +msgstr "\"$unit($unit) in $region($region): '$order($command)' - All ships of a convoy must be on the same coast.\"" + msgid "dissolve_units_2" msgstr "\"$unit($unit) in $region($region): $int($number) $race($race,$number) turned into $if($eq($number,1),\"a tree\", \"trees\").\"" diff --git a/src/give.c b/src/give.c index ac792da9a..ff1a3ac03 100644 --- a/src/give.c +++ b/src/give.c @@ -371,7 +371,7 @@ message * give_ship(unit *u1, unit *u2, int n, order *ord) u2->ship->coast = u1->ship->coast; } else { - return msg_error(u1, ord, 182); + return msg_error(u1, ord, 328); } } } From 4785829d7f304f5f1b43054463f26a2c6fb2b819 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 3 Jan 2020 18:02:42 +0100 Subject: [PATCH 5/5] Typo --- res/translations/messages.de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/translations/messages.de.po b/res/translations/messages.de.po index 6cb2b413b..af60271ba 100644 --- a/res/translations/messages.de.po +++ b/res/translations/messages.de.po @@ -2778,7 +2778,7 @@ msgid "error322" msgstr "\"$unit($unit) in $region($region): '$order($command)' - Nur Schiffe gleicher Bauart können einen Konvoi bilden.\"" msgid "error328" -msgstr "\"$unit($unit) in $region($region): '$order($command)' - Nur Schiffe an der selbe Küste können einen Konvoi bilden.\"" +msgstr "\"$unit($unit) in $region($region): '$order($command)' - Nur Schiffe an der selben Küste können einen Konvoi bilden.\"" msgid "error323" msgstr "\"$unit($unit) in $region($region): '$order($command)' - Das Schiff ist verzaubert.\""