From e915e2b57865b957ddb736b0ce6a152b94fd92ac Mon Sep 17 00:00:00 2001
From: Christian Schlittchen <corwin@amber.kn-bremen.de>
Date: Sun, 27 Jan 2002 13:08:47 +0000
Subject: [PATCH] =?UTF-8?q?=C3=84nderung=201:=20Bauernwachstum=20-=20Bauer?=
 =?UTF-8?q?nwachstum=20um=20Faktor=2010=20reduziert.=20-=20Verluste=20durc?=
 =?UTF-8?q?h=20Schlachten=20gef=C3=BCnftelt.=20-=20Bauerngl=C3=BCck-Wirkun?=
 =?UTF-8?q?g=20verst=C3=A4rkt.=20-=20#define=20REDUCED=5FPEASANTGROWTH=201?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/gamecode/laws.c              |  9 ++++++---
 src/common/kernel/battle.c              |  2 +-
 src/common/kernel/eressea.h             | 14 ++++++++++++--
 src/common/settings-eressea.h           |  4 ++++
 src/common/settings-vinyambar-classic.h |  3 +++
 src/common/settings-vinyambar.h         |  3 +++
 6 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index f6adb2d16..6469e7bb6 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -475,11 +475,12 @@ peasants(region * r)
 {
 
 	int glueck;
+
 	/* Das Geld, daß die Bauern erwirtschaftet haben unter expandwork, gibt
 	 * den Bauern genug für 11 Bauern pro Ebene ohne Wald. Der Wald
 	 * breitet sich nicht in Gebiete aus, die bebaut werden. */
 
-	int peasants, money, n, dead, satiated;
+	int peasants, money, n, i, dead, satiated;
 	attrib * a;
 
 	/* Bauern vermehren sich */
@@ -509,8 +510,10 @@ peasants(region * r)
 			glueck++;
 
 		if (glueck > 0) {		/* Doppelvermehrung */
-			if (rand() % 100 < PEASANTGROWTH)
-				peasants++;
+			for(i=0; i<PEASANTLUCK; i++) {
+				if (rand() % 10000 < PEASANTGROWTH)
+					peasants++;
+			}
 			glueck--;
 		}
 	}
diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index a66e40d63..ad7077666 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -2395,7 +2395,7 @@ aftermath(battle * b)
 			}
 		} next(df);
 	} next(s);
-	dead_peasants = min(rpeasants(r), is);
+	dead_peasants = min(rpeasants(r), (is*BATTLE_KILLS_PEASANTS)/100);
 	deathcounts(r, dead_peasants + is);
 	chaoscounts(r, dead_peasants / 2);
 	rsetpeasants(r, rpeasants(r) - dead_peasants);
diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h
index 86fbc17a6..c13de6419 100644
--- a/src/common/kernel/eressea.h
+++ b/src/common/kernel/eressea.h
@@ -219,8 +219,18 @@ extern void read_laen(struct region * r, int laen);
 #define DMRISE         10
 #define DMRISEHAFEN    20
 
-/* Vermehrungsrate Bauern (PEASANTDIE inklusive) */
-#define PEASANTGROWTH   1
+/* Vermehrungsrate Bauern in 1/10000.
+ * Evt. Berechnungsfehler, reale Vermehrungsraten scheinen höher. */
+#if REDUCED_PEASANTGROWTH == 1
+#define PEASANTGROWTH		10
+#define BATTLE_KILLS_PEASANTS 20
+#define PEASANTLUCK			10
+#else
+#define PEASANTGROWTH   100
+#define BATTLE_KILLS_PEASANTS 100
+#define PEASANTLUCK			1
+#endif
+
 /* Vermehrung trotz 90% Auslastung */
 #define PEASANTFORCE   75
 
diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h
index 350ab955a..df1afbbc4 100644
--- a/src/common/settings-eressea.h
+++ b/src/common/settings-eressea.h
@@ -21,3 +21,7 @@
 #define REMOVENMRNEWBIE 1
 #define REMOVENMRTIMEOUT 1
 #define HUNGER_DISABLES_LONGORDERS 1
+#define REDUCED_PEASANTGROWTH 1
+#define ELVES_NEWTREES 1
+
+
diff --git a/src/common/settings-vinyambar-classic.h b/src/common/settings-vinyambar-classic.h
index fae383065..e3d3da58c 100644
--- a/src/common/settings-vinyambar-classic.h
+++ b/src/common/settings-vinyambar-classic.h
@@ -21,3 +21,6 @@
 #define REMOVENMRNEWBIE 0
 #define REMOVENMRTIMEOUT 0
 #define HUNGER_DISABLES_LONGORDERS 1
+#define REDUCED_PEASANTGROWTH 0
+#define ELVES_NEWTREES 0
+
diff --git a/src/common/settings-vinyambar.h b/src/common/settings-vinyambar.h
index 7555060f8..b73d24f9e 100644
--- a/src/common/settings-vinyambar.h
+++ b/src/common/settings-vinyambar.h
@@ -21,3 +21,6 @@
 #define REMOVENMRNEWBIE 0
 #define REMOVENMRTIMEOUT 0
 #define HUNGER_DISABLES_LONGORDERS 0
+#define REDUCED_PEASANTGROWTH 0
+#define ELVES_NEWTREES 0
+