From d5b6353493868ac14b277155f398bd87f08c484c Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 2 Nov 2014 16:36:59 +0100
Subject: Grown biomes: Unified with GrownProt biomes.

Also fixed a Zoom filter randomness.
---
 src/Generating/BioGen.cpp | 104 +++++++++++++++++++++++++++-------------------
 1 file changed, 61 insertions(+), 43 deletions(-)

(limited to 'src/Generating/BioGen.cpp')

diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index dc5f715ca..0f2b0a73d 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -928,59 +928,77 @@ public:
 	cBioGenGrown(int a_Seed)
 	{
 		auto FinalRivers =
-			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 1,
-			std::make_shared<cIntGenZoom  <8>>  (a_Seed + 3,
-			std::make_shared<cIntGenRiver <6>>   (a_Seed + 2,
-			std::make_shared<cIntGenSmooth<8>>   (a_Seed + 4,
-			std::make_shared<cIntGenZoom  <10>>  (a_Seed + 5,
-			std::make_shared<cIntGenZoom  <7>>   (a_Seed + 6,
-			std::make_shared<cIntGenZoom  <5>>   (a_Seed + 7,
-			std::make_shared<cIntGenZoom  <4>>   (a_Seed + 8,
-			std::make_shared<cIntGenZoom  <4>>   (a_Seed + 9,
-			std::make_shared<cIntGenZoom  <4>>   (a_Seed + 10,
-			std::make_shared<cIntGenZoom  <4>>   (a_Seed + 11,
-			std::make_shared<cIntGenChoice<2, 4>>(a_Seed + 12
-		))))))))))));
+			std::make_shared<cIntGenSmooth<8>>   (a_Seed + 1,
+			std::make_shared<cIntGenZoom  <10>>  (a_Seed + 2,
+			std::make_shared<cIntGenRiver <7>>   (a_Seed + 3,
+			std::make_shared<cIntGenZoom  <9>>   (a_Seed + 4,
+			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
+			std::make_shared<cIntGenZoom  <8>>   (a_Seed + 8,
+			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
+			std::make_shared<cIntGenZoom  <8>>   (a_Seed + 9,
+			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
+			std::make_shared<cIntGenZoom  <8>>   (a_Seed + 10,
+			std::make_shared<cIntGenSmooth<6>>   (a_Seed + 5,
+			std::make_shared<cIntGenSmooth<8>>   (a_Seed + 6,
+			std::make_shared<cIntGenZoom  <10>>  (a_Seed + 11,
+			std::make_shared<cIntGenChoice<2, 7>>(a_Seed + 12
+		))))))))))))));
+
+		auto alteration =
+			std::make_shared<cIntGenZoom     <8>>(a_Seed,
+			std::make_shared<cIntGenLandOcean<6>>(a_Seed, 20
+		));
+
+		auto alteration2 =
+			std::make_shared<cIntGenZoom     <8>>(a_Seed + 1,
+			std::make_shared<cIntGenZoom     <6>>(a_Seed + 2,
+			std::make_shared<cIntGenZoom     <5>>(a_Seed + 1,
+			std::make_shared<cIntGenZoom     <4>>(a_Seed + 2,
+			std::make_shared<cIntGenLandOcean<4>>(a_Seed + 1, 10
+		)))));
 
 		auto FinalBiomes =
-			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1008,
-			std::make_shared<cIntGenZoom           <8>>(a_Seed + 15,
-			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1000,
-			std::make_shared<cIntGenZoom           <8>> (a_Seed + 16,
+			std::make_shared<cIntGenSmooth         <8>> (a_Seed + 1,
+			std::make_shared<cIntGenZoom           <10>>(a_Seed + 15,
+			std::make_shared<cIntGenSmooth         <7>> (a_Seed + 1,
+			std::make_shared<cIntGenZoom           <9>> (a_Seed + 16,
 			std::make_shared<cIntGenBeaches        <6>> (
-			std::make_shared<cIntGenSmooth         <8>> (a_Seed + 1002,
-			std::make_shared<cIntGenZoom           <10>>(a_Seed + 1,
-			std::make_shared<cIntGenSmooth         <7>> (a_Seed + 1002,
-			std::make_shared<cIntGenZoom           <9>> (a_Seed + 2,
+			std::make_shared<cIntGenZoom           <8>> (a_Seed + 1,
 			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2004, 10,
-			std::make_shared<cIntGenZoom           <6>> (a_Seed + 4,
-			std::make_shared<cIntGenAddToOcean     <5>> (a_Seed + 9, 10, biMushroomIsland,
-			std::make_shared<cIntGenReplaceRandomly<7>> (biIcePlains, biIcePlainsSpikes, 5, a_Seed + 99,
-			std::make_shared<cIntGenZoom           <7>> (a_Seed + 8,
-			std::make_shared<cIntGenAddToOcean     <5>> (a_Seed + 10, 500, biDeepOcean,
-			std::make_shared<cIntGenBiomes         <7>> (a_Seed + 3000,
-			std::make_shared<cIntGenZoom           <7>> (a_Seed + 5,
-			std::make_shared<cIntGenBiomeGroupEdges<5>> (
-			std::make_shared<cIntGenSmooth         <7>> (a_Seed + 1003,
-			std::make_shared<cIntGenZoom           <9>> (a_Seed + 7,
+			std::make_shared<cIntGenAddToOcean     <6>> (a_Seed + 10, 500, biDeepOcean,
+			std::make_shared<cIntGenReplaceRandomly<8>> (a_Seed + 1, biPlains, biSunflowerPlains, 20,
+			std::make_shared<cIntGenMBiomes        <8>> (a_Seed + 5, alteration2,
+			std::make_shared<cIntGenAlternateBiomes<8>> (a_Seed + 1, alteration,
+			std::make_shared<cIntGenBiomeEdges     <8>> (a_Seed + 3,
+			std::make_shared<cIntGenZoom           <10>>(a_Seed + 2,
+			std::make_shared<cIntGenZoom           <7>> (a_Seed + 4,
+			std::make_shared<cIntGenReplaceRandomly<5>> (a_Seed + 99, biIcePlains, biIcePlainsSpikes, 50,
+			std::make_shared<cIntGenZoom           <5>> (a_Seed + 8,
+			std::make_shared<cIntGenAddToOcean     <4>> (a_Seed + 10, 300, biDeepOcean,
+			std::make_shared<cIntGenAddToOcean     <6>> (a_Seed + 9, 8, biMushroomIsland,
+			std::make_shared<cIntGenBiomes         <8>> (a_Seed + 3000,
+			std::make_shared<cIntGenAddIslands     <8>> (a_Seed + 2000, 200,
+			std::make_shared<cIntGenZoom           <8>> (a_Seed + 5,
+			std::make_shared<cIntGenRareBiomeGroups<6>> (a_Seed + 5, 50,
+			std::make_shared<cIntGenBiomeGroupEdges<6>> (
+			std::make_shared<cIntGenAddIslands     <8>> (a_Seed + 2000, 200,
+			std::make_shared<cIntGenZoom           <8>> (a_Seed + 7,
 			std::make_shared<cIntGenSetRandomly    <6>> (a_Seed + 8, 50, bgOcean,
-			std::make_shared<cIntGenReplaceRandomly<6>> (bgIce,    bgTemperate, 50, a_Seed + 101,
-			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2000, 70,
+			std::make_shared<cIntGenReplaceRandomly<6>> (a_Seed + 101, bgIce, bgTemperate, 150,
+			std::make_shared<cIntGenAddIslands     <6>> (a_Seed + 2000, 200,
 			std::make_shared<cIntGenSetRandomly    <6>> (a_Seed + 9, 50, bgOcean,
-			std::make_shared<cIntGenSmooth         <6>> (a_Seed + 1004,
-			std::make_shared<cIntGenZoom           <8>> (a_Seed + 10,
-			std::make_shared<cIntGenLandOcean      <6>> (a_Seed + 100, 65
-		)))))))))))))))))))))))))));
+			std::make_shared<cIntGenZoom           <6>> (a_Seed + 10,
+			std::make_shared<cIntGenLandOcean      <5>> (a_Seed + 100, 30
+		)))))))))))))))))))))))))))))));
 
 		m_Gen =
 			std::make_shared<cIntGenSmooth   <16>>(a_Seed,
 			std::make_shared<cIntGenZoom     <18>>(a_Seed,
-			std::make_shared<cIntGenZoom     <11>>(a_Seed,
-			std::make_shared<cIntGenSmooth   <7>>(a_Seed,
-			std::make_shared<cIntGenZoom     <9>>(a_Seed,
-			std::make_shared<cIntGenMixRivers<6>> (
+			std::make_shared<cIntGenSmooth   <11>>(a_Seed,
+			std::make_shared<cIntGenZoom     <13>>(a_Seed,
+			std::make_shared<cIntGenMixRivers<8>> (
 			FinalBiomes, FinalRivers
-		))))));
+		)))));
 	}
 
 	virtual void GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap & a_Biomes) override
@@ -1025,7 +1043,7 @@ public:
 			std::make_shared<cProtIntGenSmooth>(a_Seed + 5,
 			std::make_shared<cProtIntGenZoom  >(a_Seed + 10,
 			std::make_shared<cProtIntGenSmooth>(a_Seed + 5,
-			std::make_shared<cProtIntGenSmooth>(a_Seed + 5,
+			std::make_shared<cProtIntGenSmooth>(a_Seed + 6,
 			std::make_shared<cProtIntGenZoom  >(a_Seed + 11,
 			std::make_shared<cProtIntGenChoice>(a_Seed + 12, 2
 		))))))))))))));
-- 
cgit v1.2.3