Skip to content

Tag Restriction for Ores #3461

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

Open
Crepestrom wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Tag Restriction for Ores #3461

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
f5a1dac
added functionality
Crepestrom Aug 2, 2026
c1b5eb3
slight name change
Crepestrom Aug 2, 2026
986931a
Update src/server/terrain/chunkgen/OreGenerator.zig
Crepestrom Aug 16, 2026
c7c918e
actually implement outer:
Crepestrom Aug 16, 2026
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: 5 additions & 0 deletions src/blocks.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ pub const Ore = struct {
maxHeight: i32,
minHeight: i32,

targetTags: []const Tag,

blockType: u16,
seed: u64,
};
Expand Down Expand Up @@ -214,13 +216,16 @@ pub fn register(_: []const u8, id: []const u8, zon: ZonElement) u16 {
std.log.err("Ore must have rotation mode \"cubyz:ore\"!", .{});
break :blk;
}
const targetBlockTags = Tag.loadTagsFromZon(main.stackAllocator, oreProperties.getChild("targetTags"));
defer main.stackAllocator.free(targetBlockTags);
ores.append(main.worldArena, .{
.veins = oreProperties.get(f32, "veins") orelse 0,
.size = oreProperties.get(f32, "size") orelse 0,
.maxHeight = oreProperties.get(i32, "maxHeight") orelse std.math.maxInt(i32),
.minHeight = oreProperties.get(i32, "minHeight") orelse std.math.minInt(i32),
.density = oreProperties.get(f32, "density") orelse 0.5,
.blockType = @intCast(size),
.targetTags = targetBlockTags,
.seed = std.hash.Wyhash.hash(0, id),
});
}
Expand Down
18 changes: 10 additions & 8 deletions src/server/terrain/chunkgen/OreGenerator.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,20 @@ fn considerCoordinates(ore: *const main.blocks.Ore, relX: f32, relY: f32, relZ:
zMin = @max(zMin, 0);
zMax = @min(zMax, chunk.super.width);
var curZ = zMin;
while (curZ < zMax) : (curZ += 1) {
outer: while (curZ < zMax) : (curZ += 1) {
const distToCenterZ = (@as(f32, @floatFromInt(curZ)) - veinRelZ)/radius;
const distSqr = xyDistSqr + distToCenterZ*distToCenterZ;
if (distSqr < 1) {
// Add some roughness. The ore density gets smaller at the edges:
if ((1 - distSqr)*ore.density >= random.nextFloat(&veinSeed)) {
const stoneBlock = chunk.getBlock(curX, curY, curZ);
if (chunk.getBlock(curX, curY, curZ).allowOres()) {
chunk.updateBlockInGeneration(curX, curY, curZ, .{.typ = ore.blockType, .data = stoneBlock.typ});
}
if (distSqr >= 1) continue;
// Add some roughness. The ore density gets smaller at the edges:
if ((1 - distSqr)*ore.density < random.nextFloat(&veinSeed)) continue;
const stoneBlock = chunk.getBlock(curX, curY, curZ);
if (!stoneBlock.allowOres()) continue;
for (ore.targetTags) |tag| {
if (!stoneBlock.hasTag(tag)) {
continue :outer;
}
}
chunk.updateBlockInGeneration(curX, curY, curZ, .{.typ = ore.blockType, .data = stoneBlock.typ});
}
}
}
Expand Down
Loading