diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index 8d52fc6e9..935a5eeae 100644 --- a/src/common/gamecode/report.c +++ b/src/common/gamecode/report.c @@ -2125,6 +2125,8 @@ report(FILE *F, faction * f, const faction_list * addresses, ch = 0; for (a=a_find(f->attribs, &at_showitem);a;a=a->nexttype) { const potion_type * ptype = resource2potion(((const item_type*)a->data.v)->rtype); + const char * description = NULL; + const char * pname = ptype->resourcename(ptype->itype->rtype, 0); requirement * m; if (ptype==NULL) continue; m = ptype->itype->construction->materials; @@ -2135,7 +2137,7 @@ report(FILE *F, faction * f, const faction_list * addresses, } rnl(F); - centre(F, LOC(f->locale, resourcename(ptype->itype->rtype, 0)), true); + centre(F, LOC(f->locale, pname), true); sprintf(buf, "%s %d", LOC(f->locale, "nr_level"), ptype->level); centre(F, buf, true); rnl(F); @@ -2147,7 +2149,9 @@ report(FILE *F, faction * f, const faction_list * addresses, } centre(F, buf, true); rnl(F); - centre(F, ptype->text, true); + description = LOC(mkname("potion", pname)); + if (description==pname) description = ptype->text; + centre(F, description, true); } rnl(F); centre(F, LOC(f->locale, "nr_alliances"), false); diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index a100188ba..4beb5dad2 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -42,6 +42,8 @@ #define GIVERESTRICTION 3 #define NEWATSROI 0 +#define ZEROFOKS_QUESTMASTER "eressea@zerofoks.net" + #define CHECK_OVERLOAD_ON_ENTER #undef REGIONOWNERS diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c index 96cdd1a5e..cb9f8015d 100644 --- a/src/eressea/korrektur.c +++ b/src/eressea/korrektur.c @@ -1811,6 +1811,30 @@ regatta_quest(void) return 0; } +static int +zero_quest(void) +{ + const char * name = "Sergint Saiquent"; + plane * p = getplanebyname(name); +#ifdef ZEROFOKS_QUESTE /* "gregorjochmann@gmx.de" */ + if (p==NULL { + region * center; + p = gm_addplane(4, 0, name); + center = findregion(p->minx+(p->maxx-p->minx)/2, p->miny+(p->maxy-p->miny)/2); + gm_addfaction(ZEROFOKS_QUESTMASTER, p, center); + } +#endif + if (p!=NULL) { + fset(p, PFL_NORECRUITS); + fset(p, PFL_NOMAGIC); + fset(p, PFL_NOFEED); + fset(p, PFL_NOSTEALTH); + fset(p, PFL_NOMONSTERS); + return resize_plane(p, 4); + } + return 0; +} + static int secondfaction(faction * pf) { @@ -1852,6 +1876,7 @@ update_gmquests(void) do_once("et02", secondfaction(f)); } do_once("rq02", regatta_quest()); + do_once("zq01", zero_quest()); do_once("rq03", regatta_quest()); do_once("renm", fix_foreign()); } diff --git a/src/res/de/strings.xml b/src/res/de/strings.xml index 9a62b6a84..33fa9aa28 100644 --- a/src/res/de/strings.xml +++ b/src/res/de/strings.xml @@ -1492,7 +1492,7 @@ Bauernlieb - + Trank der Wahrheit @@ -1505,7 +1505,7 @@ Siebenmeilentees - + Goliathwasser @@ -1538,7 +1538,7 @@ Bauernlieb - + Tränke der Wahrheit @@ -3575,6 +3575,27 @@ exhausted + + + + This simple but very potent brew sharpens the senses of anyone + that drinks of it and makes him able to see through even the + most complex illusions for one week. + + + + + 'First roast the Gurgelkraut quickly and add some Fjordwuchs to + spice it up. Let it all boil slowly until almost all liquid has + evaporated. Leave the mash over night and finally squeeze it + the next morning until a thick fluid drips out.' The liquid + thus produced, 'Goliath Water' as we call it, is enough for + 10 men and gives each man the carrying capacity of a horse + for one week. + + + + Hohes Lied der Gaukelei diff --git a/src/res/en/strings.xml b/src/res/en/strings.xml index 4232df974..fdcda796c 100644 --- a/src/res/en/strings.xml +++ b/src/res/en/strings.xml @@ -1085,7 +1085,7 @@ seven mile teas - + goliath water @@ -1151,10 +1151,10 @@ peasant love potion - + potion of truth - + potions of truth