Ores: Add stratum ore (#6352)

Creates a single undulating ore stratum that is continuous across mapchunk
borders and horizontally spans the world.
Due to being continuous is ideal for creating bands of alternative stone
type running through cliffs and mountains, or underground layers.

Add missing documentation of 'ore_param2' parameter.

src/mg_ore.cpp

@@ -74,6 +74,7 @@ void OreManager::clear()
 
 ///////////////////////////////////////////////////////////////////////////////
 
+
 Ore::~Ore()
 {
 	delete noise;
@@ -221,6 +222,8 @@ void OreSheet::generate(MMVManip *vm, int mapseed, u32 blockseed,
 
 
 ///////////////////////////////////////////////////////////////////////////////
+
+
 OrePuff::~OrePuff()
 {
 	delete noise_puff_top;
@@ -365,6 +368,8 @@ void OreBlob::generate(MMVManip *vm, int mapseed, u32 blockseed,
 
 
 ///////////////////////////////////////////////////////////////////////////////
+
+
 OreVein::~OreVein()
 {
 	delete noise2;
@@ -422,3 +427,58 @@ void OreVein::generate(MMVManip *vm, int mapseed, u32 blockseed,
 		vm->m_data[i] = n_ore;
 	}
 }
+
+
+///////////////////////////////////////////////////////////////////////////////
+
+
+OreStratum::~OreStratum()
+{
+	delete noise_stratum_thickness;
+}
+
+
+void OreStratum::generate(MMVManip *vm, int mapseed, u32 blockseed,
+	v3s16 nmin, v3s16 nmax, u8 *biomemap)
+{
+	PcgRandom pr(blockseed + 4234);
+	MapNode n_ore(c_ore, 0, ore_param2);
+
+	if (!noise) {
+		int sx = nmax.X - nmin.X + 1;
+		int sz = nmax.Z - nmin.Z + 1;
+		noise = new Noise(&np, 0, sx, sz);
+		noise_stratum_thickness = new Noise(&np_stratum_thickness, 0, sx, sz);
+	}
+	noise->perlinMap2D(nmin.X, nmin.Z);
+	noise_stratum_thickness->perlinMap2D(nmin.X, nmin.Z);
+
+	size_t index = 0;
+
+	for (int z = nmin.Z; z <= nmax.Z; z++)
+	for (int x = nmin.X; x <= nmax.X; x++, index++) {
+		if (biomemap && !biomes.empty()) {
+			std::unordered_set<u8>::const_iterator it = biomes.find(biomemap[index]);
+			if (it == biomes.end())
+				continue;
+		}
+
+		float nmid = noise->result[index];
+		float nhalfthick = noise_stratum_thickness->result[index] / 2.0f;
+		int y0 = MYMAX(nmin.Y, nmid - nhalfthick);
+		int y1 = MYMIN(nmax.Y, nmid + nhalfthick);
+
+		for (int y = y0; y <= y1; y++) {
+			if (pr.range(1, clust_scarcity) != 1)
+				continue;
+
+			u32 i = vm->m_area.index(x, y, z);
+			if (!vm->m_area.contains(i))
+				continue;
+			if (!CONTAINS(c_wherein, vm->m_data[i].getContent()))
+				continue;
+
+			vm->m_data[i] = n_ore;
+		}
+	}
+}

src/mg_ore.h

@@ -42,6 +42,7 @@ enum OreType {
 	ORE_PUFF,
 	ORE_BLOB,
 	ORE_VEIN,
+	ORE_STRATUM,
 };
 
 extern FlagDesc flagdesc_ore[];
@@ -133,6 +134,20 @@ public:
 		v3s16 nmin, v3s16 nmax, u8 *biomemap);
 };
 
+class OreStratum : public Ore {
+public:
+	static const bool NEEDS_NOISE = true;
+
+	NoiseParams np_stratum_thickness;
+	Noise *noise_stratum_thickness = nullptr;
+
+	OreStratum() = default;
+	virtual ~OreStratum();
+
+	virtual void generate(MMVManip *vm, int mapseed, u32 blockseed,
+		v3s16 nmin, v3s16 nmax, u8 *biomemap);
+};
+
 class OreManager : public ObjDefManager {
 public:
 	OreManager(IGameDef *gamedef);
@@ -156,6 +171,8 @@ public:
 			return new OreBlob;
 		case ORE_VEIN:
 			return new OreVein;
+		case ORE_STRATUM:
+			return new OreStratum;
 		default:
 			return nullptr;
 		}

src/script/lua_api/l_mapgen.cpp

@@ -73,6 +73,7 @@ struct EnumString ModApiMapgen::es_OreType[] =
 	{ORE_PUFF,    "puff"},
 	{ORE_BLOB,    "blob"},
 	{ORE_VEIN,    "vein"},
+	{ORE_STRATUM, "stratum"},
 	{0, NULL},
 };
 
@@ -1149,6 +1150,15 @@ int ModApiMapgen::l_register_ore(lua_State *L)
 
 			break;
 		}
+		case ORE_STRATUM: {
+			OreStratum *orestratum = (OreStratum *)ore;
+
+			lua_getfield(L, index, "np_stratum_thickness");
+			read_noiseparams(L, -1, &orestratum->np_stratum_thickness);
+			lua_pop(L, 1);
+
+			break;
+		}
 		default:
 			break;
 	}