From 02b2157fe58b525b4854e32c98ecc7bb47f6cd4b Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 17 Dec 2015 20:20:48 +0100 Subject: [PATCH 1/3] move description from shared file to game-specific file https://bugs.eressea.de/view.php?id=2177 --- res/core/de/strings.xml | 8 -------- res/eressea/strings.xml | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/res/core/de/strings.xml b/res/core/de/strings.xml index 1b84e5a6a..e7b13a89c 100644 --- a/res/core/de/strings.xml +++ b/res/core/de/strings.xml @@ -5181,14 +5181,6 @@ powerful spells he will need some luck for a successful analysis. - - Dieser Zauber wird die gesamte Ausrüstung der - Zieleinheit für - einige Zeit vor den Blicken anderer verschleiern. - This spell will hide the whole equipment of a target - unit from the - looks of others. - Dieser Zauber legt ein antimagisches Feld um die Magier der Feinde und behindert ihre Zauber erheblich. Nur wenige werden die Kraft diff --git a/res/eressea/strings.xml b/res/eressea/strings.xml index b7a0539ff..8c77d9e82 100644 --- a/res/eressea/strings.xml +++ b/res/eressea/strings.xml @@ -1,6 +1,14 @@ + + Dieser Zauber wird die gesamte Ausrüstung der + Zieleinheit für + einige Zeit vor den Blicken anderer verschleiern. + This spell will hide the whole equipment of a target + unit from the + looks of others. + Aufzeichung des Vortrags von Selen Ard'Ragorn in Bar'Glingal: From 30acc38d53b0cbb0f2bd9707cd0bf101ec6f057a Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Thu, 17 Dec 2015 20:36:21 +0100 Subject: [PATCH 2/3] https://bugs.eressea.de/view.php?id=2174 fix terrain type in detectocean message. --- res/core/messages.xml | 5 +++-- src/move.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/res/core/messages.xml b/res/core/messages.xml index 00f0107e9..0090360b0 100644 --- a/res/core/messages.xml +++ b/res/core/messages.xml @@ -2899,9 +2899,10 @@ + - "$unit($unit) entdeckt, dass $region($region) $terrain($region) ist." - "$unit($unit) discovered that $region($region) is $terrain($region)." + "$unit($unit) entdeckt, dass $region($region) $localize($terrain) ist." + "$unit($unit) discovered that $region($region) is $localize($terrain)." diff --git a/src/move.c b/src/move.c index 01a521391..04a50b45d 100644 --- a/src/move.c +++ b/src/move.c @@ -1592,13 +1592,13 @@ static const region_list *travel_route(unit * u, else if ((u_race(u)->flags & RCF_WALK) == 0) { /* Spezialeinheiten, die nicht laufen können. */ ADDMSG(&u->faction->msgs, msg_message("detectocean", - "unit region", u, next)); + "unit region terrain", u, next, terrain_name(next))); break; } else if (landing) { /* wir sind diese woche angelandet */ ADDMSG(&u->faction->msgs, msg_message("detectocean", - "unit region", u, next)); + "unit region terrain", u, next, terrain_name(next))); break; } } @@ -1607,7 +1607,7 @@ static const region_list *travel_route(unit * u, * Pferde betreten werden. */ if (!(canswim(u) || canfly(u))) { ADDMSG(&u->faction->msgs, msg_message("detectocean", - "unit region", u, next)); + "unit region terrain", u, next, terrain_name(next))); break; } } From 810ad094afc4a83be3d08329eb10c2886c33f284 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 18 Dec 2015 15:13:15 +0100 Subject: [PATCH 3/3] suppress misc warnings in the log file by reorganizing E3 strings and tuning down log levels --- res/core/de/strings.xml | 10 ++++++++++ res/eressea/strings.xml | 8 -------- scripts/eressea/autoseed.lua | 2 +- scripts/newplayer.lua | 2 +- src/kernel/save.c | 8 ++++---- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/res/core/de/strings.xml b/res/core/de/strings.xml index 090344483..f384f3a23 100644 --- a/res/core/de/strings.xml +++ b/res/core/de/strings.xml @@ -21,6 +21,12 @@ Ruderschwanz und einem riesigen runden Maul zu bestehen scheint. Wobbling green vapours drift through the mists to form an eldritch creature that seems to be entirely made up of huge jaws and a long tail. + + + Keine Informationen über diesen Schiffstyp verfügbar. + No Information available for this type of ship. + + Keine Informationen über diese Rasse verfügbar. @@ -62,6 +68,10 @@ + + Keine Informationen. + No Information available. + Das Horn eines Trolles. Kein Troll würde sich lebend davon trennen. The horn of an adult troll. No troll would ever part with this while he's alive. diff --git a/res/eressea/strings.xml b/res/eressea/strings.xml index 8c77d9e82..7e444e8e3 100644 --- a/res/eressea/strings.xml +++ b/res/eressea/strings.xml @@ -103,10 +103,6 @@ - - Keine Informationen über diesen Schiffstyp verfügbar. - No Information available for this type of ship. - Der Sumpfgasballon besteht aus einem großen Weidenkorb, welcher Platz @@ -128,10 +124,6 @@ Eine Geburtstagstorte mit 10 Kerzen. Herzlichen Glückwunsch, Eressea! A birthday cake with 10 candles. Happy Birthday, Eressea! - - Keine Informationen. - No Information available. - Dieses Fluggerät aus der Schmiede der Zwerge von Celeband galt wie die 'Ebene der Herausforderung' seit Urzeiten als verschollen, ja man diff --git a/scripts/eressea/autoseed.lua b/scripts/eressea/autoseed.lua index 733df06f8..35c7f0e34 100644 --- a/scripts/eressea/autoseed.lua +++ b/scripts/eressea/autoseed.lua @@ -88,7 +88,7 @@ function autoseed.init() end local dupe = get_faction_by_email(p.email) if dupe then - eressea.log.warning("seed: duplicate email " .. p.email .. " already used by faction " .. tostring(dupe)) + eressea.log.warning("seed: duplicate email " .. p.email .. " already used by " .. tostring(dupe)) else local f = seed(start, p.email, p.race or "human", p.lang or "de") num_seeded = num_seeded + 1 diff --git a/scripts/newplayer.lua b/scripts/newplayer.lua index 45df076d6..9e536595b 100644 --- a/scripts/newplayer.lua +++ b/scripts/newplayer.lua @@ -72,7 +72,7 @@ for _, p in ipairs(players) do local dupe = false for f in factions() do if f.email==p.email then - print("seed: duplicate email " .. p.email .. " already used by faction " .. tostring(f)) + print("seed: duplicate email " .. p.email .. " already used by " .. tostring(f)) dupe = true break end diff --git a/src/kernel/save.c b/src/kernel/save.c index d4df2b6f8..afcb6c988 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -712,11 +712,11 @@ unit *read_unit(struct gamedata *data) ord = NULL; } else if (p == MAXPERSISTENT) { - log_warning("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT); + log_info("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT); } } else if (n == MAXORDERS) { - log_warning("%s had %d or more orders\n", unitname(u), MAXORDERS); + log_info("%s had %d or more orders\n", unitname(u), MAXORDERS); } if (ord != NULL) free_order(ord); @@ -779,7 +779,7 @@ void write_unit(struct gamedata *data, const unit * u) writeorder(data, ord, u->faction->locale); } else { - log_warning("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT); + log_info("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT); break; } } @@ -792,7 +792,7 @@ void write_unit(struct gamedata *data, const unit * u) writeorder(data, ord, u->faction->locale); } else { - log_warning("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT); + log_info("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT); break; } }