From ec400f968032e4775893c33bface2c9490c1221d Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Fri, 5 Mar 2004 22:31:37 +0000
Subject: [PATCH] http://eressea.upb.de/mantis/bug_view_page.php?bug_id=0000005
 - Wurmloch-Meldung
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

http://eressea.upb.de/mantis/bug_view_page.php?bug_id=0000007
- Änderung bei Flucht
---
 src/common/kernel/battle.c       |  4 ++--
 src/common/kernel/combatspells.c |  2 +-
 src/common/modules/wormhole.c    |  1 +
 src/res/de/strings.xml           |  4 ++++
 src/res/messages.xml             | 14 +++++++++++---
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 929917f06..18311e413 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -3679,12 +3679,12 @@ do_battle(void)
 
 						/* Versuche zu fliehen, wenn
 						 * - Kampfstatus fliehe
-						 * - schwer verwundet
+						 * - schwer verwundet und nicht erste kampfrunde
 						 * - in panik (Zauber)
 						 * aber nicht, wenn der Zaubereffekt Held auf dir liegt!
 						 */
 						if ((u->status == ST_FLEE
-									|| fig->person[dt.index].hp <= runhp
+									|| (b->turn>1 && fig->person[dt.index].hp <= runhp)
 									|| (fig->person[dt.index].flags & FL_PANICED))
 								&& !(fig->person[dt.index].flags & FL_HERO))
 						{
diff --git a/src/common/kernel/combatspells.c b/src/common/kernel/combatspells.c
index e4f6048c1..e6941dfd3 100644
--- a/src/common/kernel/combatspells.c
+++ b/src/common/kernel/combatspells.c
@@ -972,7 +972,7 @@ sp_chaosrow(fighter * fi, int level, double power, spell * sp)
 			if (df->unit->race->battle_flags & BF_NOBLOCK) {
 				df->side->nonblockers[row] += df->alive;
 			}
-			k++;
+			k+=df->alive;
 		}
 		power = max(0, power-n);
 	}
diff --git a/src/common/modules/wormhole.c b/src/common/modules/wormhole.c
index 8c41d9f4d..afb4be222 100644
--- a/src/common/modules/wormhole.c
+++ b/src/common/modules/wormhole.c
@@ -95,6 +95,7 @@ wormhole_age(struct attrib * a)
   /* it's important that destroy_building doesn't change b->region, because
    * otherwise the tunnel would no longer be bi-directional after this */
   destroy_building(data->entry);
+  ADDMSG(&r->msgs, msg_message("wormhole_dissolve", "region", r));
   assert(data->entry->region==r);
 
   /* age returns 0 if the attribute needs to be removed, !=0 otherwise */
diff --git a/src/res/de/strings.xml b/src/res/de/strings.xml
index b48064a39..f4d9d18ab 100644
--- a/src/res/de/strings.xml
+++ b/src/res/de/strings.xml
@@ -553,6 +553,10 @@
 	<string name="lighthouse">
 		<text locale="de">Leuchtturm</text>
 	</string>
+	<string name="wormhole">
+		<text locale="de">Wurmloch</text>
+		<text locale="en">wormhole</text>
+	</string>
 	<string name="mine">
 		<text locale="de">Bergwerk</text>
 	</string>
diff --git a/src/res/messages.xml b/src/res/messages.xml
index 589d7a75d..8c3f0800b 100644
--- a/src/res/messages.xml
+++ b/src/res/messages.xml
@@ -1181,7 +1181,7 @@
 		<arg name="region" type="region"></arg>
 		<arg name="command" type="string"></arg>
 	</type>
-	<text locale="de">"$unit($unit) in $region($region): '$command' - Die Region konnte nicht verzaubert werden."</text>
+	<text locale="de">"$unit($unit) in $region($region): '$command' - Die Region widersteht der Verzauberung."</text>
 	<text locale="fr">"$unit($unit) in $region($region): '$command' - The region could not be charmed."</text>
 	<text locale="en">"$unit($unit) in $region($region): '$command' - The region could not be charmed."</text>
 </message>
@@ -1192,7 +1192,7 @@
 		<arg name="command" type="string"></arg>
 		<arg name="id" type="int"></arg>
 	</type>
-	<text locale="de">"$unit($unit) in $region($region): '$command' - Schiff $int36($id) konnte nicht verzaubert werden."</text>
+	<text locale="de">"$unit($unit) in $region($region): '$command' - Schiff $int36($id) widersteht der Verzauberung."</text>
 	<text locale="fr">"$unit($unit) in $region($region): '$command' - Ship $int36($id) could not be charmed."</text>
 	<text locale="en">"$unit($unit) in $region($region): '$command' - Ship $int36($id) could not be charmed."</text>
 </message>
@@ -1203,7 +1203,7 @@
 		<arg name="command" type="string"></arg>
 		<arg name="id" type="int"></arg>
 	</type>
-	<text locale="de">"$unit($unit) in $region($region): '$command' - Gebäude $int36($id) konnte nicht verzaubert werden."</text>
+	<text locale="de">"$unit($unit) in $region($region): '$command' - Gebäude $int36($id) widersteht der Verzauberung."</text>
 	<text locale="fr">"$unit($unit) in $region($region): '$command' - Building $int36($id) could not be charmed."</text>
 	<text locale="en">"$unit($unit) in $region($region): '$command' - Building $int36($id) could not be charmed."</text>
 </message>
@@ -5673,4 +5673,12 @@
 	<text locale="fr">"A wormhole appears in $region($region)."</text>
 	<text locale="en">"A wormhole appears in $region($region)."</text>
 </message>
+<message name="wormhole_dissolve" section="events">
+	<type>
+		<arg name="region" type="region"></arg>
+	</type>
+	<text locale="de">"Das Wurmloch in $region($region) schließt sich."</text>
+	<text locale="fr">"The wormhole in $region($region) disappears."</text>
+	<text locale="en">"The wormhole in $region($region) disappears."</text>
+</message>
 </messages>