Index: source/Generating/ChunkGenerator.cpp =================================================================== --- source/Generating/ChunkGenerator.cpp (revision 1029) +++ source/Generating/ChunkGenerator.cpp (working copy) @@ -340,7 +340,7 @@ void cChunkGenerator::InitFinishGens(cIniFile & a_IniFile) { - AString Structures = a_IniFile.GetValueSet("Generator", "Finishers", "SprinkleFoliage,Ice,Snow,Lilypads,BottomLava"); + AString Structures = a_IniFile.GetValueSet("Generator", "Finishers", "SprinkleFoliage,Ice,Snow,Lilypads,BottomLava,DeathBushes"); AStringVector Str = StringSplit(Structures, ","); for (AStringVector::const_iterator itr = Str.begin(); itr != Str.end(); ++itr) @@ -361,6 +361,10 @@ { m_FinishGens.push_back(new cFinishGenLilypads(m_Seed)); } + else if (NoCaseCompare(*itr, "DeathBushes") == 0) + { + m_FinishGens.push_back(new cFinishGenDeathBushes(m_Seed)); + } else if (NoCaseCompare(*itr, "BottomLava") == 0) { int BottomLavaLevel = a_IniFile.GetValueSetI("Generator", "BottomLavaLevel", 10); Index: source/Generating/FinishGen.cpp =================================================================== --- source/Generating/FinishGen.cpp (revision 1029) +++ source/Generating/FinishGen.cpp (working copy) @@ -543,5 +543,70 @@ } +/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// cFinishGenDeathBushes: +int cFinishGenDeathBushes::GetNumDeathBushes(const cChunkDef::BiomeMap & a_BiomeMap) +{ + int res = 0; + for (int i = 0; i < ARRAYCOUNT(a_BiomeMap); i++) + { + if (a_BiomeMap[i] == biDesert) + { + res++; + } + } // for i - a_BiomeMap[] + return res / 128; +} + + + + +void cFinishGenDeathBushes::GenFinish( + int a_ChunkX, int a_ChunkZ, + cChunkDef::BlockTypes & a_BlockTypes, // Block types to read and change + cChunkDef::BlockNibbles & a_BlockMeta, // Block meta to read and change + cChunkDef::HeightMap & a_HeightMap, // Height map to read and change by the current data + const cChunkDef::BiomeMap & a_BiomeMap, // Biomes to adhere to + cEntityList & a_Entities, // Entities may be added or deleted + cBlockEntityList & a_BlockEntities // Block entities may be added or deleted +) +{ + // Add DeathBushes on top of sand surface in Desert + + int NumDeathBushes = GetNumDeathBushes(a_BiomeMap); + for (int i = 0; i < NumDeathBushes; i++) + { + int x = m_Noise.IntNoise3DInt(a_ChunkX + a_ChunkZ, a_ChunkZ, i) % cChunkDef::Width; + int z = m_Noise.IntNoise3DInt(a_ChunkX - a_ChunkZ, i, a_ChunkZ) % cChunkDef::Width; + + // Place a lily pad at {x, z} if possible (swampland, empty block, water below): + if (cChunkDef::GetBiome(a_BiomeMap, x, z) != biDesert) + { + // not swampland + continue; + } + int Height = cChunkDef::GetHeight(a_HeightMap, x, z); + if (Height >= cChunkDef::Height) + { + // Too high up + continue; + } + if (cChunkDef::GetBlock(a_BlockTypes, x, Height + 1, z) != E_BLOCK_AIR) + { + // not empty block + continue; + } + switch (cChunkDef::GetBlock(a_BlockTypes, x, Height, z)) + { + case E_BLOCK_SAND: + { + cChunkDef::SetBlock(a_BlockTypes, x, Height + 1, z, E_BLOCK_DEAD_BUSH); + cChunkDef::SetHeight(a_HeightMap, x, z, Height + 1); + break; + } + } // switch (GetBlock) + } // for i +} + Index: source/Generating/FinishGen.h =================================================================== --- source/Generating/FinishGen.h (revision 1029) +++ source/Generating/FinishGen.h (working copy) @@ -190,3 +190,28 @@ +class cFinishGenDeathBushes : + public cFinishGen +{ +public: + cFinishGenDeathBushes(int a_Seed) : + m_Noise(a_Seed) + { + } + +protected: + cNoise m_Noise; + + int GetNumDeathBushes(const cChunkDef::BiomeMap & a_BiomeMap); + + // cFinishGen override: + virtual void GenFinish( + int a_ChunkX, int a_ChunkZ, + cChunkDef::BlockTypes & a_BlockTypes, // Block types to read and change + cChunkDef::BlockNibbles & a_BlockMeta, // Block meta to read and change + cChunkDef::HeightMap & a_HeightMap, // Height map to read and change by the current data + const cChunkDef::BiomeMap & a_BiomeMap, // Biomes to adhere to + cEntityList & a_Entities, // Entities may be added or deleted + cBlockEntityList & a_BlockEntities // Block entities may be added or deleted + ) override; +} ;