From 46b5df42dca65547a804c735af4b90112a721e6f Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 10 Feb 2002 08:54:24 +0000
Subject: [PATCH] =?UTF-8?q?Tranksbenutzung=20=C3=BCbersetzt=20und=20in=20E?=
 =?UTF-8?q?vents=20(statt=20Errors)=20verschoben.=20Meldung=20f=C3=BCr=20B?=
 =?UTF-8?q?enutzung=20von=20Bluttrank.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/kernel/alchemy.c |  6 +++---
 src/common/kernel/item.c    |  5 ++++-
 src/res/de/messages.xml     | 15 +--------------
 src/res/en/messages.xml     |  2 +-
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/common/kernel/alchemy.c b/src/common/kernel/alchemy.c
index 0011d5db7..31c5e2f98 100644
--- a/src/common/kernel/alchemy.c
+++ b/src/common/kernel/alchemy.c
@@ -69,7 +69,7 @@ herbsearch(region * r, unit * u, int max)
 	rsetherbs(r, rherbs(r)-herbsfound);
 
 	if (herbsfound) {
-		change_skill(u, SK_HERBALISM, PRODUCEEXP * u->number);
+		produceexp(u, SK_HERBALISM, u->number);
 		i_change(&u->items, whichherb->itype, herbsfound);
 		add_message(&u->faction->msgs, new_message(u->faction,
 			"herbfound%u:unit%r:region%i:amount%X:herb", u, r, herbsfound,
@@ -146,8 +146,8 @@ use_potion(unit * u, const item_type * itype, const char * cmd)
 	new_use_pooled(u, ptype->itype->rtype, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK, 1);
 	usetpotionuse(u, ptype);
 
-	add_message(&u->faction->msgs, new_message(u->faction,
-		"usepotion%u:unit%X:potion", u, ptype->itype->rtype));
+	ADDMSG(&u->faction->msgs, msg_message("usepotion",
+		"unit potion", u, ptype->itype->rtype));
 	return 0;
 }
 
diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c
index fdc41a5c8..0c57875d3 100644
--- a/src/common/kernel/item.c
+++ b/src/common/kernel/item.c
@@ -1887,7 +1887,8 @@ use_warmthpotion(struct unit *u, const struct potion_type *ptype, const char *cm
 	assert(ptype==oldpotiontype[P_WARMTH]);
 	if (old_race(u->faction->race) == RC_INSECT) {
 		fset(u, FL_WARMTH);
-		cmistake(u, cmd, 164, MSG_EVENT);
+		ADDMSG(&u->faction->msgs, msg_message("usepotion",
+			"unit potion", u, ptype->itype->rtype));
 	} else {
 		/* nur für insekten: */
 		cmistake(u, cmd, 163, MSG_EVENT);
@@ -1906,6 +1907,8 @@ use_bloodpotion(struct unit *u, const struct potion_type *ptype, const char *cmd
 		attrib * a = (attrib*)a_find(u->attribs, &at_bauernblut);
 		if (!a) a = a_add(&u->attribs, a_new(&at_bauernblut));
 		a->data.i += 100;
+		ADDMSG(&u->faction->msgs, msg_message("usepotion",
+			"unit potion", u, ptype->itype->rtype));
 	} else {
 		/* bekommt nicht: */
 		cmistake(u, cmd, 165, MSG_EVENT);
diff --git a/src/res/de/messages.xml b/src/res/de/messages.xml
index 0bfb2a3e2..a9149e117 100644
--- a/src/res/de/messages.xml
+++ b/src/res/de/messages.xml
@@ -57,7 +57,7 @@
 		</type>
 		<locale name="de">
 			<nr section="events">
-				<text>"$unit($unit) benutzt einen $resource($potion,1)."</text>
+				<text>"$unit($unit) benutzt einen $resource($potion,1)trank."</text>
 			</nr>
 		</locale>
 	</message>
@@ -2414,19 +2414,6 @@
 		</locale>
 	</message>
 
-	<message name="error164">
-		<type>
-			<arg name="unit" type="unit"></arg>
-			<arg name="region" type="region"></arg>
-			<arg name="command" type="string"></arg>
-		</type>
-		<locale name="de">
-			<nr section="errors">
-				<text>"$unit($unit) in $region($region): '$command' - Die Einheit benutzte einen Nestwärmetrank."</text>
-			</nr>
-		</locale>
-	</message>
-
 	<message name="error165">
 		<type>
 			<arg name="unit" type="unit"></arg>
diff --git a/src/res/en/messages.xml b/src/res/en/messages.xml
index fa42d6561..7c2ccc326 100644
--- a/src/res/en/messages.xml
+++ b/src/res/en/messages.xml
@@ -3277,7 +3277,7 @@
 		</type>
 		<locale name="en">
 			<nr section="none">
-				<text>"$unit($unit) uses a $resource($potion,1)."</text>
+				<text>"$unit($unit) uses a $resource($potion,1) potion."</text>
 			</nr>
 		</locale>
 	</message>