flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

First attempt at creating a clumb version NetherFinisher.

Browse Source
This commit is contained in:
STRWarrior 2014-01-17 22:58:01 +01:00
parent 82a06725bd
commit 7c787de261
2 changed files with 71 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/Generating/FinishGen.cpp
View File

@ -44,38 +44,48 @@ static inline bool IsWater(BLOCKTYPE a_BlockType)
void cFinishGenNetherSprinkleFoliage::GenFinish(cChunkDesc & a_ChunkDesc) void cFinishGenNetherSprinkleFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
{ {
double ChunkX = a_ChunkDesc.GetChunkX() + 0.5; // We can't devide through 0 so lets add 0.5 to all the chunk coordinates. double ChunkX = a_ChunkDesc.GetChunkX() + 0.1; // We can't devide through 0 so lets add 0.1 to all the chunk coordinates.
double ChunkZ = a_ChunkDesc.GetChunkZ() + 0.5; double ChunkZ = a_ChunkDesc.GetChunkZ() + 0.1;
for (int z = 0; z < cChunkDef::Width; z++) NOISE_DATATYPE Val = m_Noise.CubicNoise2D((float) ChunkX, (float) ChunkZ);
int Pos;
if (Val <= 0)
{ {
for (int x = 0; x < cChunkDef::Width; x++) Pos = (int) (Val + 1) * 16;
}
else if (Val <= 1)
{ {
Pos = (int) Val * 16;
}
else
{
Pos = (int) 16 / Val;
}
for (int y = 1; y < cChunkDef::Height; y++) for (int y = 1; y < cChunkDef::Height; y++)
{ {
if (!g_BlockIsSolid[a_ChunkDesc.GetBlockType(x, y - 1, z)]) // Only place on solid blocks if (a_ChunkDesc.GetBlockType(Pos, y, Pos) != E_BLOCK_AIR)
{ {
continue; continue;
} }
if (a_ChunkDesc.GetBlockType(x, y, z) != E_BLOCK_AIR) if (!g_BlockIsSolid[a_ChunkDesc.GetBlockType(Pos, y - 1, Pos)]) // Only place on solid blocks
{ {
continue; continue;
} }
NOISE_DATATYPE Val = m_Noise.CubicNoise1D((float) ((ChunkX * x) * (ChunkZ * z) * y)); NOISE_DATATYPE BlockType = m_Noise.CubicNoise2D(ChunkX / ChunkZ, y * 0.01f);
if (Val < -0.98) if (BlockType > 0.08)
{ {
a_ChunkDesc.SetBlockType(x, y, z, E_BLOCK_BROWN_MUSHROOM); TryPlaceClumb(a_ChunkDesc, Pos, y, Pos, E_BLOCK_BROWN_MUSHROOM);
} }
else if (Val < -0.96) else if (BlockType > -0.18)
{ {
a_ChunkDesc.SetBlockType(x, y, z, E_BLOCK_RED_MUSHROOM); TryPlaceClumb(a_ChunkDesc, Pos, y, Pos, E_BLOCK_RED_MUSHROOM);
} }
else if (Val < -0.94) else if (BlockType > -0.28)
{ {
a_ChunkDesc.SetBlockType(x, y, z, E_BLOCK_FIRE); TryPlaceClumb(a_ChunkDesc, Pos, y, Pos, E_BLOCK_FIRE);
}
}
} }
} }
} }
@ -84,6 +94,36 @@ void cFinishGenNetherSprinkleFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
void cFinishGenNetherSprinkleFoliage::TryPlaceClumb(cChunkDesc & a_ChunkDesc, int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_Block)
{
a_ChunkDesc.SetBlockType(a_RelX, a_RelY, a_RelZ, a_Block);
for (int x = a_RelX - 4; x < a_RelX + 4; x++)
{
float xx = (float) a_ChunkDesc.GetChunkX() * cChunkDef::Width + x;
for (int z = a_RelZ - 4; x < a_RelX + 4; x++)
{
float zz = (float) a_ChunkDesc.GetChunkZ() * cChunkDef::Width + z;
for (int y = a_RelY - 2; y < a_RelY + 2; y++)
{
if (a_ChunkDesc.GetBlockType(x, y, z) != E_BLOCK_AIR) // Don't replace non air blocks.
{
continue;
}
if (!g_BlockIsSolid[a_ChunkDesc.GetBlockType(x, y - 1, z)]) // Only place on solid blocks
{
continue;
}
NOISE_DATATYPE Val = m_Noise.CubicNoise1D(xx * zz * 0.1f / y);
if (Val > 1)
{
a_ChunkDesc.SetBlockType(x, y, z, a_Block);
}
}
}
}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// cFinishGenSprinkleFoliage: // cFinishGenSprinkleFoliage:

1
src/Generating/FinishGen.h
View File

@ -61,6 +61,7 @@ protected:
cNoise m_Noise; cNoise m_Noise;
int m_Seed; int m_Seed;
void TryPlaceClumb(cChunkDesc & a_ChunkDesc, int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_Block);
virtual void GenFinish(cChunkDesc & a_ChunkDesc) override; virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
} ; } ;