queste fuer zero, englishe potions

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);

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
 

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());
 }

src/res/de/strings.xml

@@ -1492,7 +1492,7 @@
 	<string name="p11">
 		<text locale="de">Bauernlieb</text>
 	</string>
-	<string name="p12">
+	<string name="truthpotion">
 		<text locale="de">Trank der Wahrheit</text>
 	</string>
 	<string name="p13">
@@ -1505,7 +1505,7 @@
 	<string name="p0_p">
 		<text locale="de">Siebenmeilentees</text>
 	</string>
-	<string name="p1_p">
+	<string name="goliathwater">
 		<text locale="de">Goliathwasser</text>
 	</string>
 	<string name="p2_p">
@@ -1538,7 +1538,7 @@
 	<string name="p11_p">
 		<text locale="de">Bauernlieb</text>
 	</string>
-	<string name="p12_p">
+	<string name="truthpotion_p">
 		<text locale="de">Tränke der Wahrheit</text>
 	</string>
 	<string name="p13_p">
@@ -3575,6 +3575,27 @@
 			<text locale="en">exhausted</text>
 		</string>
 	</namespace>
+	<namespace name="potion">
+		<string name="truthpotion">
+			<text locale="en">
+				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.
+			</text>
+		</string>
+		<string name="goliathwater">
+			<text locale="en">
+				'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.
+			</text>
+			
+		</string>
+	</namespace>
 	<namespace name="spell">
 		<string name="generous">
 			<text locale="de">Hohes Lied der Gaukelei</text>

src/res/en/strings.xml

@@ -1085,7 +1085,7 @@
 	<string name="p0_p">
 		<text locale="en">seven mile teas</text>
 	</string>
-	<string name="p1">
+	<string name="goliathwater">
 		<text locale="en">goliath water</text>
 	</string>
 	<string name="p1_p">
@@ -1151,10 +1151,10 @@
 	<string name="p11_p">
 		<text locale="en">peasant love potion</text>
 	</string>
-	<string name="p12">
+	<string name="truthpotion">
 		<text locale="en">potion of truth</text>
 	</string>
-	<string name="p12_p">
+	<string name="truthpotion_p">
 		<text locale="en">potions of truth</text>
 	</string>
 	<string name="p13">