From c0ec4a9a15ac6e05c4f160a9806689898ac3a56d Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 11 Mar 2007 21:37:38 +0000
Subject: [PATCH] English spell effect

---
 src/common/spells/spells.c | 11 +++--------
 src/res/messages.xml       | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/common/spells/spells.c b/src/common/spells/spells.c
index 99a8e7699..d6a5b12a2 100644
--- a/src/common/spells/spells.c
+++ b/src/common/spells/spells.c
@@ -3428,9 +3428,8 @@ sp_summonshadow(castorder *co)
   set_level(u, SK_STEALTH, val);
   set_level(u, SK_OBSERVATION, 1);
 
-  sprintf(buf, "%s beschwört %d Dämonen aus dem Reich der Schatten.",
-    unitname(mage), (int)(force*force));
-  addmessage(0, mage->faction, buf, MSG_MAGIC, ML_INFO);
+  ADDMSG(&mage->faction->msgs, msg_message("summonshadow_effect",
+    "mage number", mage, force*force));
 
   return cast_level;
 }
@@ -5103,11 +5102,7 @@ sp_illusionary_shapeshift(castorder *co)
 
   /* ähnlich wie in laws.c:setealth() */
   if (!playerrace(rc)) {
-    sprintf(buf, "%s %s keine %s-Gestalt annehmen.",
-      unitname(u),
-      u->number > 1 ? "können" : "kann",
-      LOC(u->faction->locale, rc_name(rc, 2)));
-    addmessage(r, mage->faction, buf, MSG_MAGIC, ML_MISTAKE);
+    ADDMSG(&mage->faction->msgs, msg_feedback(mage, co->order, "sp_shapeshift_fail", "target race", u, rc));
     return 0;
   }
   {
diff --git a/src/res/messages.xml b/src/res/messages.xml
index 4744b0a34..4856635b5 100644
--- a/src/res/messages.xml
+++ b/src/res/messages.xml
@@ -1107,6 +1107,17 @@
     <text locale="de">"$unit($unit) in $region($region): '$order($command)' - Der Magier erschafft ein Traumgebäude."</text>
     <text locale="en">"$unit($unit) in $region($region): '$order($command)' - The magician creates an illusionary building."</text>
   </message>
+  <message name="sp_shapeshift_fail" section="magic">
+    <type>
+      <arg name="unit" type="unit"/>
+      <arg name="region" type="region"/>
+      <arg name="command" type="order"/>
+      <arg name="target" type="unit"/>
+      <arg name="race" type="race"/>
+    </type>
+    <text locale="de">"$unit($unit) in $region($region): '$order($command)' - $unit($target) kann keine $race($race,1)-Gestalt annehmen."</text>
+    <text locale="en">"$unit($unit) in $region($region): '$order($command)' - $unit($target) cannot assume the shape of a $race($race,1)."</text>
+  </message>
   <message name="sp_migranten_fail1" section="magic">
     <type>
       <arg name="unit" type="unit"/>
@@ -6529,6 +6540,14 @@
     <text locale="de">"$unit($mage) zaubert $spell($spell): $int($dead) $if($eq($dead,1),"Krieger wurde", "Krieger wurden") getötet."</text>
     <text locale="en">"$unit($mage) casts $spell($spell): $int($dead) $if($eq($dead,1),"enemy was", "enemies were") killed."</text>
   </message>
+  <message name="summonshadow_effect" section="magic">
+    <type>
+      <arg name="mage" type="unit"/>
+      <arg name="number" type="int"/>
+    </type>
+    <text locale="de">"$unit($mage) beschwört $int($number) Dämonen aus dem Reich der Schatten."</text>
+    <text locale="en">"$unit($mage) summons $int($number) demons from the realm of shadows."</text>
+  </message>
   <message name="cast_spell_effect" section="magic">
     <type>
       <arg name="mage" type="unit"/>