From 83da94a984d8d89c5961f9a7ed7c44896c760e90 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 5 Apr 2020 16:57:04 +0200 Subject: [PATCH 1/4] Bug 2626, Meldung war doppelt --- res/translations/messages.de.po | 3 --- 1 file changed, 3 deletions(-) diff --git a/res/translations/messages.de.po b/res/translations/messages.de.po index 75297f7db..92323da50 100644 --- a/res/translations/messages.de.po +++ b/res/translations/messages.de.po @@ -2768,9 +2768,6 @@ msgstr "\"$unit($unit) in $region($region): '$order($command)' - Die Einheit geh 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 selben Küste können einen Konvoi bilden.\"" - msgid "error323" msgstr "\"$unit($unit) in $region($region): '$order($command)' - Das Schiff ist verzaubert.\"" From 63028bdfccd1275b3ff3aa849e9d3e315352d130 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 5 Apr 2020 17:05:05 +0200 Subject: [PATCH 2/4] Der Duden sagt, dass ich kein Deutsch kann. https://www.duden.de/haeufige_fehler/der_selbe --- 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 92323da50..ae0f13dd4 100644 --- a/res/translations/messages.de.po +++ b/res/translations/messages.de.po @@ -2775,7 +2775,7 @@ msgid "error327" msgstr "\"$unit($unit) in $region($region): '$order($command)' - So viele Schiffe kann die Einheit nicht übergeben.\"" msgid "error328" -msgstr "\"$unit($unit) in $region($region): '$order($command)' - Dafür müssen die Schiffe an der selben Küste liegen.\"" +msgstr "\"$unit($unit) in $region($region): '$order($command)' - Dafür müssen die Schiffe an derselben Küste liegen.\"" msgid "error326" msgstr "\"$unit($unit) in $region($region): '$order($command)' - Diese Schiffe können keinen Konvoi bilden.\"" From 268d93293cc46dfdd9fda161be8716b2d6fa6858 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 18 Apr 2020 16:28:23 +0200 Subject: [PATCH 3/4] =?UTF-8?q?Fehlermeldungen=20f=C3=BCr=20GIB=20ALLES=20?= =?UTF-8?q?Entkomplizierung=20lange=20Befehle.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/give.c | 3 +++ src/laws.c | 9 +-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/give.c b/src/give.c index ff1a3ac03..8f352ccbb 100644 --- a/src/give.c +++ b/src/give.c @@ -796,6 +796,9 @@ static void give_all_items(unit *u, unit *u2, order *ord) { } } } + else { + cmistake(u, ord, 123, MSG_COMMERCE); + } } } } diff --git a/src/laws.c b/src/laws.c index b00da467c..fc1c8dc88 100644 --- a/src/laws.c +++ b/src/laws.c @@ -3091,14 +3091,7 @@ void update_long_order(unit * u) } break; default: - if (kwd > thiskwd) { - /* swap out thisorder for the new one */ - cmistake(u, u->thisorder, 52, MSG_EVENT); - set_order(&u->thisorder, copy_order(ord)); - } - else { - cmistake(u, ord, 52, MSG_EVENT); - } + cmistake(u, ord, 52, MSG_EVENT); break; } } From 260517f8cf75dabe4c3b4e381afbe6e5e1e3f58f Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 18 Apr 2020 22:34:12 +0200 Subject: [PATCH 4/4] es wird immer der erste lange Befehl ausgefuehrt. --- scripts/tests/e2/destroy.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tests/e2/destroy.lua b/scripts/tests/e2/destroy.lua index 430ca301c..db6f09c2a 100644 --- a/scripts/tests/e2/destroy.lua +++ b/scripts/tests/e2/destroy.lua @@ -41,8 +41,8 @@ function test_destroy_is_long() local u = unit.create(faction.create("human", "one@example.com", "de"), r1, 10) u.building = building.create(u.region, "castle") u:clear_orders() - u:add_order("LERNE Unterhaltung") u:add_order("ZERSTOERE " .. itoa36(u.building.id)) + u:add_order("LERNE Unterhaltung") process_orders() assert_equal(0, u:get_skill("entertainment")) assert_equal(nil, u.building)