From aa29f976af1e4192c7ece69b114c9a3b83e00ae4 Mon Sep 17 00:00:00 2001
From: Katja Zedel <katze@felidae.kn-bremen.de>
Date: Sun, 21 Apr 2002 11:23:58 +0000
Subject: [PATCH] =?UTF-8?q?spr=C3=BCche=20angepasst?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/gamecode/laws.c | 29 +++++++++++++++++++++++++++++
 src/common/kernel/spell.c  | 18 +++++++++---------
 src/eressea/korrektur.c    |  6 ++++++
 3 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index 056d75734..ba4910a2e 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -2804,6 +2804,31 @@ reorder(void)
 	}
 }
 
+#if 0
+
+static void
+evict(void)
+{
+	region *r;
+	strlist *S;
+	unit * u;
+
+	for (r=regions;r;r=r->next) {
+		for (u=r->units;u;u=u->next) {
+			for (S = u->orders; S; S = S->next) if (igetkeyword(S->s, u->faction->locale)==K_EVICT) {
+				/* Nur der Kapitän bzw Burgherr kann jemanden rausschmeißen */
+				if(!fval(u, FL_OWNER)) {
+					cmistake(u,S->s,146,MSG_EVENT);
+					continue;
+				}
+				int id = getid();
+				unit *u2 = findunit(id);
+			}
+		}
+	}
+}
+#endif
+
 static void
 renumber(void)
 {
@@ -3538,6 +3563,10 @@ processorders (void)
 
 	puts(" - Einheiten Sortieren");
 	reorder();
+#if 0
+	puts(" - Einheiten aus Gebäuden/Schiffen weisen");
+	evict();
+#endif
 	puts(" - Neue Nummern");
 	renumber();
 
diff --git a/src/common/kernel/spell.c b/src/common/kernel/spell.c
index 8c48de448..6ce932102 100644
--- a/src/common/kernel/spell.c
+++ b/src/common/kernel/spell.c
@@ -3257,7 +3257,7 @@ sp_unholypower(castorder *co)
  * Kategorie:  Region, negativ
  *
  * Wirkung:
- *   alle Personen in der Region verlieren 8 HP * Magieresistenz
+ *   alle Personen in der Region verlieren 18 HP * Magieresistenz
  *   Wirkt gegen MR
  *   Rüstung wirkt nicht
  * Patzer:
@@ -3295,8 +3295,8 @@ sp_deathcloud(castorder *co)
 		if (target_resists_magic(mage, u, TYP_UNIT, 0)){
 			continue;
 		}
-		/* Jede Person verliert 8 HP */
-		damage = 8 * u->number;
+		/* Jede Person verliert 18 HP */
+		damage = 18 * u->number;
 		/* Reduziert durch Magieresistenz */
 		damage *= (100.0 - magic_resistance(u))/100.0;
 		change_hitpoints(u, -(int)damage);
@@ -8122,7 +8122,7 @@ spell spelldaten[] =
 		NULL,
 		M_CHAOS, (ONSHIPCAST), 1, 4,
 		{
-			{R_HITPOINTS, 4, SPC_FIX},
+			{R_HITPOINTS, 12, SPC_FIX},
 			{0, 0, 0},
 			{0, 0, 0},
 			{0, 0, 0},
@@ -8277,7 +8277,7 @@ spell spelldaten[] =
 		5, 7,
 		{
 			{R_AURA, 30, SPC_FIX},
-		  {R_PEASANTS, 250, SPC_FIX},
+		  {R_PEASANTS, 50, SPC_FIX},
 			{0, 0, 0},
 			{0, 0, 0},
 			{0, 0, 0}},
@@ -8440,8 +8440,8 @@ spell spelldaten[] =
 		"u+",
 		M_CHAOS, (UNITSPELL | SPELLLEVEL | TESTCANSEE), 5, 10,
 		{
-			{R_AURA, 8, SPC_LEVEL},
-			{R_PEASANTS, 50, SPC_LEVEL},
+			{R_AURA, 10, SPC_LEVEL},
+			{R_PEASANTS, 5, SPC_LEVEL},
 			{0, 0, 0},
 			{0, 0, 0},
 			{0, 0, 0}},
@@ -8459,7 +8459,7 @@ spell spelldaten[] =
 		M_CHAOS, (FARCASTING | REGIONSPELL | TESTRESISTANCE), 5, 11,
 		{
 			{R_AURA, 40, SPC_FIX},
-			{R_HITPOINTS, 4, SPC_FIX},
+			{R_HITPOINTS, 15, SPC_FIX},
 			{0, 0, 0},
 			{0, 0, 0},
 			{0, 0, 0}},
@@ -8546,7 +8546,7 @@ spell spelldaten[] =
 		M_CHAOS, (0), 5, 14,
 		{
 			{R_AURA, 150, SPC_FIX},
-		 {R_PEASANTS, 500, SPC_FIX},
+		 {R_PEASANTS, 200, SPC_FIX},
 		 {0, 0, 0},
 		 {0, 0, 0},
 		 {0, 0, 0}},
diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c
index 182229c35..6c6f4f99c 100644
--- a/src/eressea/korrektur.c
+++ b/src/eressea/korrektur.c
@@ -578,6 +578,12 @@ show_newspells(void)
 	 * terminieren */
 
 	spellid_t newspellids[] = {
+		SPL_BLOODSACRIFICE,
+		SPL_DEATHCLOUD,
+		SPL_PLAGUE,
+		SPL_UNHOLYPOWER,
+		SPL_CHAOSSUCTION,
+		SPL_CHAOSROW,
 		SPL_NOSPELL };
 
 	/* die id's der neuen oder veränderten Sprüche werden in newspellids[]