Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ore generation #242

Merged
merged 4 commits into from
Nov 17, 2023
Merged

Fix ore generation #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf59529
Fix generation in dirt & water generation
fluffyloafie Nov 15, 2023
0d889bc
Merge branch 'master' into ore_patches_generation
fluffyloafie Nov 15, 2023
cd9f34b
Fix clang-format
fluffyloafie Nov 15, 2023
8b07dc5
Merge branch 'master' into ore_patches_generation
fluffyloafie Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cubic-server/generation/features/underground/OreVein.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@ void OreVein::createBlob(const BlockId &blockID, const int spawnSize, const Posi
customSkipRate =
abs((((blobCenter.x - x) % SECTION_WIDTH) ^ 2) + (((blobCenter.y - y) % SECTION_WIDTH) ^ 2) + (((blobCenter.z - z) % SECTION_WIDTH) ^ 2) % SECTION_WIDTH);
auto block = _chunk.getBlock({x, y, z});
if ((x - pos.x < r && z - pos.z < r) && r / 2 > customSkipRate && nb < nbOfBlocksInBlob &&
(block != Blocks::Air::toProtocol() && block != Blocks::Bedrock::toProtocol()) && y > CHUNK_HEIGHT_MIN) {
// TODO: When the generation will support decoration, block = stone has to be changed so every "stone" block is taken into account
if ((x - pos.x < r && z - pos.z < r) && r / 2 > customSkipRate && nb < nbOfBlocksInBlob && (block == Blocks::Stone::toProtocol()) &&
(y > CHUNK_HEIGHT_MIN && y < CHUNK_HEIGHT_MAX)) {
_chunk.updateBlock({x, y, z}, blockID);
nb++;
}
Expand Down
20 changes: 10 additions & 10 deletions cubic-server/world_storage/ChunkColumn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,19 +482,19 @@ void ChunkColumn::_generateRawGeneration(generation::Generator &generator)
void ChunkColumn::_generateLakes(UNUSED generation::Generator &generator)
{
std::lock_guard<std::mutex> _(this->_generationLock);
// int waterLevel = 86;
int waterLevel = 86;

// TODO: improve this to fill caves
// generate water
// for (int z = 0; z < SECTION_WIDTH; z++) {
// for (int x = 0; x < SECTION_WIDTH; x++) {
// for (int y = waterLevel; 0 < y; y--) {
// if (getBlock({x, y, z}) == 1)
// break;
// updateBlock({x, y, z}, Blocks::Water::toProtocol(Blocks::Water::Properties::Level::ZERO));
// }
// }
// }
for (int z = 0; z < SECTION_WIDTH; z++) {
for (int x = 0; x < SECTION_WIDTH; x++) {
for (int y = waterLevel; 0 < y; y--) {
if (getBlock({x, y, z}) == 1)
break;
updateBlock({x, y, z}, Blocks::Water::toProtocol(Blocks::Water::Properties::Level::ZERO));
}
}
}
_currentState = GenerationState::LAKES;
}

Expand Down