From d904d49ba63e038bc9d1ceb9aff4fa5e4da20375 Mon Sep 17 00:00:00 2001
From: Katja Zedel <katze@felidae.kn-bremen.de>
Date: Sat, 2 Mar 2002 12:16:12 +0000
Subject: [PATCH] =?UTF-8?q?diverse=20fixe=20-trank=20Trank=20neue=20zauber?=
 =?UTF-8?q?spr=C3=BCche=20anzeigen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/kernel/spell.c | 5 +++--
 src/eressea/korrektur.c   | 2 ++
 src/res/de/messages.xml   | 2 +-
 src/res/en/messages.xml   | 2 +-
 src/res/races.xml         | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c
index d36e5b00d..d4ee1b465 100644
--- a/src/common/kernel/spell.c
+++ b/src/common/kernel/spell.c
@@ -7053,6 +7053,7 @@ sp_earn_silver(castorder *co)
 	earned = min(rmoney(r), wanted);
 	rsetmoney(r, rmoney(r) - earned);
 	change_money(mage, earned);
+	/* TODO klären: ist das Silber damit schon reserviert? */
 
 	add_income(mage, IC_MAGIC, wanted, earned);
 	return cast_level;
@@ -8807,9 +8808,9 @@ spell spelldaten[] =
 		"und in der Folge entstehn dort Irrlichter. "
 		"Wer durch diese Nebel wandert, wird von Visionen geplagt und "
 		"in die Irre geleitet.",
-		"ZAUBERE \"Irrlichter\" <Richtung>",
+		"ZAUBERE [REGION x y] [STUFE n] \"Irrlichter\" <Richtung>",
 		"c",
-	 M_TRAUM, (SPELLLEVEL), 5, 7,
+	 M_TRAUM, (SPELLLEVEL | FARCASTING), 5, 7,
 	 {
 		 {R_AURA, 2, SPC_LEVEL},
 		 {0, 0, 0},
diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c
index 93d3d368f..146443403 100644
--- a/src/eressea/korrektur.c
+++ b/src/eressea/korrektur.c
@@ -678,6 +678,8 @@ show_newspells(void)
 	 * terminieren */
 
 	spellid_t newspellids[] = {
+		SPL_WISPS,
+		SPL_MALLORNTREEGROW,
 		SPL_NOSPELL };
 
 	/* die id's der neuen oder veränderten Sprüche werden in newspellids[]
diff --git a/src/res/de/messages.xml b/src/res/de/messages.xml
index 8151566ee..5887c5cd0 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)trank."</text>
+				<text>"$unit($unit) benutzt einen $resource($potion,1)."</text>
 			</nr>
 		</locale>
 	</message>
diff --git a/src/res/en/messages.xml b/src/res/en/messages.xml
index 0f25eac9f..343a4f8d1 100644
--- a/src/res/en/messages.xml
+++ b/src/res/en/messages.xml
@@ -3290,7 +3290,7 @@
 		</type>
 		<locale name="en">
 			<nr section="none">
-				<text>"$unit($unit) uses a $resource($potion,1) potion."</text>
+				<text>"$unit($unit) uses a $resource($potion,1)."</text>
 			</nr>
 		</locale>
 	</message>
diff --git a/src/res/races.xml b/src/res/races.xml
index 8c2c7a450..8ab1b3f6b 100644
--- a/src/res/races.xml
+++ b/src/res/races.xml
@@ -809,7 +809,7 @@
 		<ai splitsize="1"></ai>
 		<attack type="1" damage="1d4"></attack>
 	</race>
-	<race name="mountainguard" magres="0.500000" maxaura="1.000000" regaura="0.500000" recruitcost="50000" maintenance="0" weight="10000" speed="0.000000" hp="1000" ac="12" damage="2d40" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="8" cannotmove nolearn noteach noweapons>
+	<race name="mountainguard" magres="0.500000" maxaura="1.000000" regaura="0.500000" recruitcost="50000" maintenance="0" weight="10000" speed="0.000000" hp="1000" ac="12" damage="2d40" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="8" cannotmove nolearn noteach noweapons canguard>
 		<ai splitsize="1"></ai>
 		<attack type="4" damage="2d40"></attack>
 	</race>