18 files changed, 508 insertions, 373 deletions

diff --git a/src/Generating/Caves.cpp b/src/Generating/Caves.cpp
index 872e3341d..6aa7fd4cb 100644
--- a/src/Generating/Caves.cpp
+++ b/src/Generating/Caves.cpp
@@ -125,7 +125,7 @@ public:
 	int m_BlockX;
 	int m_BlockZ;
 
-	cCaveSystem(int a_OriginX, int a_OriginZ, int a_MaxOffset, int a_Size, cNoise & a_Noise);
+	cCaveSystem(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ, int a_MaxOffset, int a_Size, cNoise & a_Noise);
 	~cCaveSystem();
 
 protected:
@@ -574,8 +574,8 @@ AString cCaveTunnel::ExportAsSVG(int a_Color, int a_OffsetX, int a_OffsetZ) cons
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // cStructGenWormNestCaves::cCaveSystem:
 
-cStructGenWormNestCaves::cCaveSystem::cCaveSystem(int a_OriginX, int a_OriginZ, int a_MaxOffset, int a_Size, cNoise & a_Noise) :
-	super(a_OriginX, a_OriginZ),
+cStructGenWormNestCaves::cCaveSystem::cCaveSystem(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ, int a_MaxOffset, int a_Size, cNoise & a_Noise) :
+	super(a_GridX, a_GridZ, a_OriginX, a_OriginZ),
 	m_Size(a_Size)
 {
 	int Num = 1 + a_Noise.IntNoise2DInt(a_OriginX, a_OriginZ) % 3;
@@ -690,9 +690,9 @@ int cStructGenWormNestCaves::cCaveSystem::GetRadius(cNoise & a_Noise, int a_Orig
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // cStructGenWormNestCaves:
 
-cGridStructGen::cStructurePtr cStructGenWormNestCaves::CreateStructure(int a_OriginX, int a_OriginZ)
+cGridStructGen::cStructurePtr cStructGenWormNestCaves::CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ)
 {
-	return cStructurePtr(new cCaveSystem(a_OriginX, a_OriginZ, m_MaxOffset, m_Size, m_Noise));
+	return cStructurePtr(new cCaveSystem(a_GridX, a_GridZ, a_OriginX, a_OriginZ, m_MaxOffset, m_Size, m_Noise));
 }
 
 
diff --git a/src/Generating/Caves.h b/src/Generating/Caves.h
index 254dcddbd..0e17acf9e 100644
--- a/src/Generating/Caves.h
+++ b/src/Generating/Caves.h
@@ -69,7 +69,7 @@ class cStructGenWormNestCaves :
 	typedef cGridStructGen super;
 public:
 	cStructGenWormNestCaves(int a_Seed, int a_Size = 64, int a_Grid = 96, int a_MaxOffset = 128) :
-		super(a_Seed, a_Grid, a_Grid, a_Size + a_MaxOffset, a_Size + a_MaxOffset, 100),
+		super(a_Seed, a_Grid, a_Grid, a_MaxOffset, a_MaxOffset, a_Size, a_Size, 100),
 		m_Noise(a_Seed),
 		m_Size(a_Size),
 		m_MaxOffset(a_MaxOffset),
@@ -86,7 +86,7 @@ protected:
 	int          m_Grid;  // average spacing of the nests
 
 	// cGridStructGen override:
-	virtual cStructurePtr CreateStructure(int a_OriginX, int a_OriginZ) override;
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 } ;
 
 
diff --git a/src/Generating/ComposableGenerator.cpp b/src/Generating/ComposableGenerator.cpp
index 1801b7375..22941dcbe 100644
--- a/src/Generating/ComposableGenerator.cpp
+++ b/src/Generating/ComposableGenerator.cpp
@@ -357,12 +357,13 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
 		else if (NoCaseCompare(*itr, "MineShafts") == 0)
 		{
 			int GridSize        = a_IniFile.GetValueSetI("Generator", "MineShaftsGridSize",        512);
+			int MaxOffset       = a_IniFile.GetValueSetI("Generator", "MineShaftsMaxOffset",       256);
 			int MaxSystemSize   = a_IniFile.GetValueSetI("Generator", "MineShaftsMaxSystemSize",   160);
 			int ChanceCorridor  = a_IniFile.GetValueSetI("Generator", "MineShaftsChanceCorridor",  600);
 			int ChanceCrossing  = a_IniFile.GetValueSetI("Generator", "MineShaftsChanceCrossing",  200);
 			int ChanceStaircase = a_IniFile.GetValueSetI("Generator", "MineShaftsChanceStaircase", 200);
 			m_FinishGens.push_back(new cStructGenMineShafts(
-				Seed, GridSize, MaxSystemSize,
+				Seed, GridSize, MaxOffset, MaxSystemSize,
 				ChanceCorridor, ChanceCrossing, ChanceStaircase
 			));
 		}
@@ -376,9 +377,10 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
 		}
 		else if (NoCaseCompare(*itr, "NetherForts") == 0)
 		{
-			int GridSize = a_IniFile.GetValueSetI("Generator", "NetherFortsGridSize", 512);
-			int MaxDepth = a_IniFile.GetValueSetI("Generator", "NetherFortsMaxDepth", 12);
-			m_FinishGens.push_back(new cNetherFortGen(Seed, GridSize, MaxDepth));
+			int GridSize  = a_IniFile.GetValueSetI("Generator", "NetherFortsGridSize", 512);
+			int MaxOffset = a_IniFile.GetValueSetI("Generator", "NetherFortMaxOffset", 128);
+			int MaxDepth  = a_IniFile.GetValueSetI("Generator", "NetherFortsMaxDepth", 12);
+			m_FinishGens.push_back(new cNetherFortGen(Seed, GridSize, MaxOffset, MaxDepth));
 		}
 		else if (NoCaseCompare(*itr, "OreNests") == 0)
 		{
@@ -394,10 +396,11 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
 		}
 		else if (NoCaseCompare(*itr, "RainbowRoads") == 0)
 		{
-			int GridSize = a_IniFile.GetValueSetI("Generator", "RainbowRoadsGridSize", 512);
-			int MaxDepth = a_IniFile.GetValueSetI("Generator", "RainbowRoadsMaxDepth",  30);
-			int MaxSize  = a_IniFile.GetValueSetI("Generator", "RainbowRoadsMaxSize",  260);
-			m_FinishGens.push_back(new cRainbowRoadsGen(Seed, GridSize, MaxDepth, MaxSize));
+			int GridSize  = a_IniFile.GetValueSetI("Generator", "RainbowRoadsGridSize", 512);
+			int MaxOffset = a_IniFile.GetValueSetI("Generator", "RainbowRoadsMaxOffset", 128);
+			int MaxDepth  = a_IniFile.GetValueSetI("Generator", "RainbowRoadsMaxDepth",  30);
+			int MaxSize   = a_IniFile.GetValueSetI("Generator", "RainbowRoadsMaxSize",  260);
+			m_FinishGens.push_back(new cRainbowRoadsGen(Seed, GridSize, MaxOffset, MaxDepth, MaxSize));
 		}
 		else if (NoCaseCompare(*itr, "Ravines") == 0)
 		{
@@ -417,19 +420,21 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
 		}
 		else if (NoCaseCompare(*itr, "UnderwaterBases") == 0)
 		{
-			int GridSize = a_IniFile.GetValueSetI("Generator", "UnderwaterBaseGridSize", 1024);
-			int MaxDepth = a_IniFile.GetValueSetI("Generator", "UnderwaterBaseMaxDepth",    7);
-			int MaxSize  = a_IniFile.GetValueSetI("Generator", "UnderwaterBaseMaxSize",   128);
-			m_FinishGens.push_back(new cUnderwaterBaseGen(Seed, GridSize, MaxDepth, MaxSize, *m_BiomeGen));
+			int GridSize  = a_IniFile.GetValueSetI("Generator", "UnderwaterBaseGridSize", 1024);
+			int MaxOffset = a_IniFile.GetValueSetI("Generator", "UnderwaterBaseMaxOffset", 128);
+			int MaxDepth  = a_IniFile.GetValueSetI("Generator", "UnderwaterBaseMaxDepth",    7);
+			int MaxSize   = a_IniFile.GetValueSetI("Generator", "UnderwaterBaseMaxSize",   128);
+			m_FinishGens.push_back(new cUnderwaterBaseGen(Seed, GridSize, MaxOffset, MaxDepth, MaxSize, *m_BiomeGen));
 		}
 		else if (NoCaseCompare(*itr, "Villages") == 0)
 		{
 			int GridSize   = a_IniFile.GetValueSetI("Generator", "VillageGridSize",  384);
+			int MaxOffset  = a_IniFile.GetValueSetI("Generator", "VillageMaxOffset", 128);
 			int MaxDepth   = a_IniFile.GetValueSetI("Generator", "VillageMaxDepth",    2);
 			int MaxSize    = a_IniFile.GetValueSetI("Generator", "VillageMaxSize",   128);
 			int MinDensity = a_IniFile.GetValueSetI("Generator", "VillageMinDensity", 50);
 			int MaxDensity = a_IniFile.GetValueSetI("Generator", "VillageMaxDensity", 80);
-			m_FinishGens.push_back(new cVillageGen(Seed, GridSize, MaxDepth, MaxSize, MinDensity, MaxDensity, *m_BiomeGen, *m_HeightGen));
+			m_FinishGens.push_back(new cVillageGen(Seed, GridSize, MaxOffset, MaxDepth, MaxSize, MinDensity, MaxDensity, *m_BiomeGen, *m_HeightGen));
 		}
 		else if (NoCaseCompare(*itr, "WaterLakes") == 0)
 		{
@@ -442,7 +447,10 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
 		}
 		else if (NoCaseCompare(*itr, "WormNestCaves") == 0)
 		{
-			m_FinishGens.push_back(new cStructGenWormNestCaves(Seed));
+			int Size      = a_IniFile.GetValueSetI("Generator", "WormNestCavesSize", 64);
+			int Grid      = a_IniFile.GetValueSetI("Generator", "WormNestCavesGrid", 96);
+			int MaxOffset = a_IniFile.GetValueSetI("Generator", "WormNestMaxOffset", 32);
+			m_FinishGens.push_back(new cStructGenWormNestCaves(Seed, Size, Grid, MaxOffset));
 		}
 		else
 		{
diff --git a/src/Generating/GridStructGen.cpp b/src/Generating/GridStructGen.cpp
index 474242557..2931df3eb 100644
--- a/src/Generating/GridStructGen.cpp
+++ b/src/Generating/GridStructGen.cpp
@@ -21,8 +21,8 @@ class cEmptyStructure :
 	typedef cGridStructGen::cStructure super;
 	
 public:
-	cEmptyStructure(int a_OriginX, int a_OriginZ) :
-		super(a_OriginX, a_OriginZ)
+	cEmptyStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) :
+		super(a_GridX, a_GridZ, a_OriginX, a_OriginZ)
 	{
 	}
 	
@@ -40,17 +40,20 @@ protected:
 cGridStructGen::cGridStructGen(
 	int a_Seed,
 	int a_GridSizeX, int a_GridSizeZ,
+	int a_MaxOffsetX, int a_MaxOffsetZ,
 	int a_MaxStructureSizeX, int a_MaxStructureSizeZ,
 	size_t a_MaxCacheSize
 ) :
-	m_Seed(a_Seed),
+	m_Noise(a_Seed),
 	m_GridSizeX(a_GridSizeX),
 	m_GridSizeZ(a_GridSizeZ),
+	m_MaxOffsetX(a_MaxOffsetX),
+	m_MaxOffsetZ(a_MaxOffsetZ),
 	m_MaxStructureSizeX(a_MaxStructureSizeX),
 	m_MaxStructureSizeZ(a_MaxStructureSizeZ),
 	m_MaxCacheSize(a_MaxCacheSize)
 {
-	size_t NumStructuresPerQuery = (size_t)((m_MaxStructureSizeX / m_GridSizeX + 1) * (m_MaxStructureSizeZ / m_GridSizeZ + 1));
+	size_t NumStructuresPerQuery = (size_t)(((m_MaxStructureSizeX + m_MaxOffsetX) / m_GridSizeX + 1) * ((m_MaxStructureSizeZ + m_MaxOffsetZ) / m_GridSizeZ + 1));
 	if (NumStructuresPerQuery > m_MaxCacheSize)
 	{
 		m_MaxCacheSize = NumStructuresPerQuery * 4;
@@ -68,10 +71,10 @@ cGridStructGen::cGridStructGen(
 void cGridStructGen::GetStructuresForChunk(int a_ChunkX, int a_ChunkZ, cStructurePtrs & a_Structures)
 {
 	// Calculate the min and max grid coords of the structures to be returned:
-	int MinBlockX = a_ChunkX * cChunkDef::Width - m_MaxStructureSizeX;
-	int MinBlockZ = a_ChunkZ * cChunkDef::Width - m_MaxStructureSizeZ;
-	int MaxBlockX = a_ChunkX * cChunkDef::Width + m_MaxStructureSizeX + cChunkDef::Width - 1;
-	int MaxBlockZ = a_ChunkZ * cChunkDef::Width + m_MaxStructureSizeZ + cChunkDef::Width - 1;
+	int MinBlockX = a_ChunkX * cChunkDef::Width - m_MaxStructureSizeX - m_MaxOffsetX;
+	int MinBlockZ = a_ChunkZ * cChunkDef::Width - m_MaxStructureSizeZ - m_MaxOffsetZ;
+	int MaxBlockX = a_ChunkX * cChunkDef::Width + m_MaxStructureSizeX + m_MaxOffsetX + cChunkDef::Width - 1;
+	int MaxBlockZ = a_ChunkZ * cChunkDef::Width + m_MaxStructureSizeZ + m_MaxOffsetZ + cChunkDef::Width - 1;
 	int MinGridX = MinBlockX / m_GridSizeX;
 	int MinGridZ = MinBlockZ / m_GridSizeZ;
 	int MaxGridX = (MaxBlockX + m_GridSizeX - 1) / m_GridSizeX;
@@ -103,14 +106,14 @@ void cGridStructGen::GetStructuresForChunk(int a_ChunkX, int a_ChunkZ, cStructur
 	// Create those structures that haven't been in the cache:
 	for (int x = MinGridX; x < MaxGridX; x++)
 	{
-		int OriginX = x * m_GridSizeX;
+		int GridX = x * m_GridSizeX;
 		for (int z = MinGridZ; z < MaxGridZ; z++)
 		{
-			int OriginZ = z * m_GridSizeZ;
+			int GridZ = z * m_GridSizeZ;
 			bool Found = false;
 			for (cStructurePtrs::const_iterator itr = a_Structures.begin(), end = a_Structures.end(); itr != end; ++itr)
 			{
-				if (((*itr)->m_OriginX == OriginX) && ((*itr)->m_OriginZ == OriginZ))
+				if (((*itr)->m_GridX == GridX) && ((*itr)->m_GridZ == GridZ))
 				{
 					Found = true;
 					break;
@@ -118,10 +121,12 @@ void cGridStructGen::GetStructuresForChunk(int a_ChunkX, int a_ChunkZ, cStructur
 			}  // for itr - a_Structures[]
 			if (!Found)
 			{
-				cStructurePtr Structure = CreateStructure(OriginX, OriginZ);
+				int OriginX = GridX + ((m_Noise.IntNoise2DInt(GridX + 3, GridZ + 5) / 7) % (m_MaxOffsetX * 2)) - m_MaxOffsetX;
+				int OriginZ = GridZ + ((m_Noise.IntNoise2DInt(GridX + 5, GridZ + 3) / 7) % (m_MaxOffsetZ * 2)) - m_MaxOffsetZ;
+				cStructurePtr Structure = CreateStructure(GridX, GridZ, OriginX, OriginZ);
 				if (Structure.get() == NULL)
 				{
-					Structure.reset(new cEmptyStructure(OriginX, OriginZ));
+					Structure.reset(new cEmptyStructure(GridX, GridZ, OriginX, OriginZ));
 				}
 				a_Structures.push_back(Structure);
 			}
diff --git a/src/Generating/GridStructGen.h b/src/Generating/GridStructGen.h
index 630a5e44e..03131fce9 100644
--- a/src/Generating/GridStructGen.h
+++ b/src/Generating/GridStructGen.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "ComposableGenerator.h"
+#include "../Noise.h"
 
 
 
@@ -19,7 +20,12 @@
 Defines a grid in the XZ space with predefined cell size in each direction. Each cell then receives exactly
 one structure (provided by the descendant class). The structure is placed within the cell, but doesn't need
 to be bounded by the cell, it can be well outside the cell; the generator uses the MaxStructureSize parameter
-to determine how far away from the cell the structure can be at most.
+to determine how far away from the cell the structure can be at most. Each structure has an offset from the
+grid's center point, the offset is generated randomly from a range given to this class as a parameter.
+
+Each structure thus contains the coords of its grid center (m_GridX, m_GridZ) and the actual origin from
+which it's built (m_OriginX, m_OriginZ).
+
 This class provides a cache for the structures generated for successive chunks and manages that cache. It
 also provides the cFinishGen override that uses the cache to actually generate the structure into chunk data.
 
@@ -43,12 +49,17 @@ public:
 	class cStructure
 	{
 	public:
-		/** The origin (the coords of the gridpoint for which the structure is generated) */
+		/** The grid point for which the structure is generated. */
+		int m_GridX, m_GridZ;
+		
+		/** The origin (the coords for which the structure is generated) */
 		int m_OriginX, m_OriginZ;
 		
 		
-		/** Creates a structure that has its originset at the specified coords. */
-		cStructure (int a_OriginX, int a_OriginZ) :
+		/** Creates a structure that has its origin set at the specified coords. */
+		cStructure (int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) :
+			m_GridX(a_GridX),
+			m_GridZ(a_GridZ),
 			m_OriginX(a_OriginX),
 			m_OriginZ(a_OriginZ)
 		{
@@ -70,20 +81,30 @@ public:
 	cGridStructGen(
 		int a_Seed,
 		int a_GridSizeX, int a_GridSizeZ,
+		int a_MaxOffsetX, int a_MaxOffsetZ,
 		int a_MaxStructureSizeX, int a_MaxStructureSizeZ,
 		size_t a_MaxCacheSize
 	);
 	
 protected:
-	/** Seed for generating the semi-random grid. */
+	/** Seed for generating grid offsets and also available for descendants. */
 	int m_Seed;
 	
+	/** The noise used for generating grid offsets. */
+	cNoise m_Noise;
+	
 	/** The size of each grid's cell in the X axis */
 	int m_GridSizeX;
 	
 	/** The size of each grid's cell in the Z axis */
 	int m_GridSizeZ;
 	
+	/** The maximum offset of the structure's origin from the grid midpoint, in X coord. */
+	int m_MaxOffsetX;
+	
+	/** The maximum offset of the structure's origin from the grid midpoint, in Z coord. */
+	int m_MaxOffsetZ;
+	
 	/** Maximum theoretical size of the structure in the X axis.
 	This limits the structures considered for a single chunk, so the lesser the number, the better performance.
 	Structures large than this may get cropped. */
@@ -115,7 +136,7 @@ protected:
 	
 	// Functions for the descendants to override:
 	/** Create a new structure at the specified gridpoint */
-	virtual cStructurePtr CreateStructure(int a_OriginX, int a_OriginZ) = 0;
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) = 0;
 } ;
 
 
diff --git a/src/Generating/MineShafts.cpp b/src/Generating/MineShafts.cpp
index 81ae6481d..ab9b1aa29 100644
--- a/src/Generating/MineShafts.cpp
+++ b/src/Generating/MineShafts.cpp
@@ -248,7 +248,8 @@ public:
 
 	/** Creates and generates the entire system */
 	cMineShaftSystem(
-		int a_OriginX, int a_OriginZ, int a_GridSize, int a_MaxSystemSize, cNoise & a_Noise,
+		int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ,
+		int a_GridSize, int a_MaxSystemSize, cNoise & a_Noise,
 		int a_ProbLevelCorridor, int a_ProbLevelCrossing, int a_ProbLevelStaircase
 	);
 
@@ -278,10 +279,11 @@ public:
 // cStructGenMineShafts::cMineShaftSystem:
 
 cStructGenMineShafts::cMineShaftSystem::cMineShaftSystem(
-	int a_OriginX, int a_OriginZ, int a_GridSize, int a_MaxSystemSize, cNoise & a_Noise,
+	int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ,
+	int a_GridSize, int a_MaxSystemSize, cNoise & a_Noise,
 	int a_ProbLevelCorridor, int a_ProbLevelCrossing, int a_ProbLevelStaircase
 ) :
-	super(a_OriginX, a_OriginZ),
+	super(a_GridX, a_GridZ, a_OriginX, a_OriginZ),
 	m_GridSize(a_GridSize),
 	m_MaxRecursion(8),  // TODO: settable
 	m_ProbLevelCorridor(a_ProbLevelCorridor),
@@ -1280,10 +1282,10 @@ void cMineShaftStaircase::ProcessChunk(cChunkDesc & a_ChunkDesc)
 // cStructGenMineShafts:
 
 cStructGenMineShafts::cStructGenMineShafts(
-	int a_Seed, int a_GridSize, int a_MaxSystemSize,
+	int a_Seed, int a_GridSize, int a_MaxOffset, int a_MaxSystemSize,
 	int a_ChanceCorridor, int a_ChanceCrossing, int a_ChanceStaircase
 ) :
-	super(a_Seed, a_GridSize, a_GridSize, a_MaxSystemSize, a_MaxSystemSize, 100),
+	super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxSystemSize, a_MaxSystemSize, 100),
 	m_Noise(a_Seed),
 	m_GridSize(a_GridSize),
 	m_MaxSystemSize(a_MaxSystemSize),
@@ -1297,9 +1299,9 @@ cStructGenMineShafts::cStructGenMineShafts(
 
 
 
-cGridStructGen::cStructurePtr cStructGenMineShafts::CreateStructure(int a_OriginX, int a_OriginZ)
+cGridStructGen::cStructurePtr cStructGenMineShafts::CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ)
 {
-	return cStructurePtr(new cMineShaftSystem(a_OriginX, a_OriginZ, m_GridSize, m_MaxSystemSize, m_Noise, m_ProbLevelCorridor, m_ProbLevelCrossing, m_ProbLevelStaircase));
+	return cStructurePtr(new cMineShaftSystem(a_GridX, a_GridZ, a_OriginX, a_OriginZ, m_GridSize, m_MaxSystemSize, m_Noise, m_ProbLevelCorridor, m_ProbLevelCrossing, m_ProbLevelStaircase));
 }
 
 
diff --git a/src/Generating/MineShafts.h b/src/Generating/MineShafts.h
index c29b6cdac..2850db571 100644
--- a/src/Generating/MineShafts.h
+++ b/src/Generating/MineShafts.h
@@ -23,7 +23,7 @@ class cStructGenMineShafts :
 
 public:
 	cStructGenMineShafts(
-		int a_Seed, int a_GridSize, int a_MaxSystemSize,
+		int a_Seed, int a_GridSize, int a_MaxOffset, int a_MaxSystemSize,
 		int a_ChanceCorridor, int a_ChanceCrossing, int a_ChanceStaircase
 	);
 	
@@ -43,7 +43,7 @@ protected:
 	int    m_ProbLevelStaircase;  ///< Probability level of a branch object being the staircase, minus Crossing
 	
 	// cGridStructGen overrides:
-	virtual cStructurePtr CreateStructure(int a_OriginX, int a_OriginZ) override;
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 } ;
 
 
diff --git a/src/Generating/NetherFortGen.cpp b/src/Generating/NetherFortGen.cpp
index 3867ec80c..23fa56048 100644
--- a/src/Generating/NetherFortGen.cpp
+++ b/src/Generating/NetherFortGen.cpp
@@ -26,8 +26,8 @@ public:
 	cPlacedPieces m_Pieces;
 
 
-	cNetherFort(cNetherFortGen & a_ParentGen, int a_OriginX, int a_OriginZ, int a_GridSize, int a_MaxDepth, int a_Seed) :
-		super(a_OriginX, a_OriginZ),
+	cNetherFort(cNetherFortGen & a_ParentGen, int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ, int a_GridSize, int a_MaxDepth, int a_Seed) :
+		super(a_GridX, a_GridZ, a_OriginX, a_OriginZ),
 		m_ParentGen(a_ParentGen),
 		m_GridSize(a_GridSize),
 		m_Seed(a_Seed)
@@ -108,8 +108,8 @@ cPrefabPiecePool cNetherFortGen::m_PiecePool(g_NetherFortPrefabs, g_NetherFortPr
 
 
 
-cNetherFortGen::cNetherFortGen(int a_Seed, int a_GridSize, int a_MaxDepth) :
-	super(a_Seed, a_GridSize, a_GridSize, a_MaxDepth * 10, a_MaxDepth * 10, 200),
+cNetherFortGen::cNetherFortGen(int a_Seed, int a_GridSize, int a_MaxOffset, int a_MaxDepth) :
+	super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxDepth * 10, a_MaxDepth * 10, 200),
 	m_MaxDepth(a_MaxDepth)
 {
 	/*
@@ -124,8 +124,11 @@ cNetherFortGen::cNetherFortGen(int a_Seed, int a_GridSize, int a_MaxDepth) :
 
 
 
-cGridStructGen::cStructurePtr cNetherFortGen::CreateStructure(int a_OriginX, int a_OriginZ)
+cGridStructGen::cStructurePtr cNetherFortGen::CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ)
 {
-	return cStructurePtr(new cNetherFort(*this, a_OriginX, a_OriginZ, m_GridSizeX, m_MaxDepth, m_Seed));
+	return cStructurePtr(new cNetherFort(*this, a_GridX, a_GridZ, a_OriginX, a_OriginZ, m_GridSizeX, m_MaxDepth, m_Seed));
 }
 
+
+
+
diff --git a/src/Generating/NetherFortGen.h b/src/Generating/NetherFortGen.h
index f35801a3c..9b31aa0e2 100644
--- a/src/Generating/NetherFortGen.h
+++ b/src/Generating/NetherFortGen.h
@@ -23,7 +23,7 @@ class cNetherFortGen :
 	typedef cGridStructGen super;
 	
 public:
-	cNetherFortGen(int a_Seed, int a_GridSize, int a_MaxDepth);
+	cNetherFortGen(int a_Seed, int a_GridSize, int a_MaxOffset, int a_MaxDepth);
 	
 protected:
 	friend class cNetherFortPerfTest;  // fwd: NetherFortGen.cpp
@@ -37,7 +37,7 @@ protected:
 	
 
 	// cGridStructGen overrides:
-	virtual cStructurePtr CreateStructure(int a_OriginX, int a_OriginZ) override;
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 } ;
 
 
diff --git a/src/Generating/Prefabs/SandFlatRoofVillagePrefabs.cpp b/src/Generating/Prefabs/SandFlatRoofVillagePrefabs.cpp
index 4f0efdcc6..eb01cf59e 100644
--- a/src/Generating/Prefabs/SandFlatRoofVillagePrefabs.cpp
+++ b/src/Generating/Prefabs/SandFlatRoofVillagePrefabs.cpp
@@ -20,18 +20,18 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 32, ID 173, created by Aloe_vera
 	{
 		// Size:
-		12, 5, 10,  // SizeX = 12, SizeY = 5, SizeZ = 10
+		12, 6, 10,  // SizeX = 12, SizeY = 6, SizeZ = 10
 
 		// Hitbox (relative to bounding box):
 		0, 0, 0,  // MinX, MinY, MinZ
-		11, 4, 9,  // MaxX, MaxY, MaxZ
+		11, 5, 9,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 2\n"  /* sandstonestairs */
-		"b:128: 1\n"  /* sandstonestairs */
-		"c:128: 0\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e:128: 3\n"  /* sandstonestairs */
 		"f:171:15\n"  /* carpet */
 		"g: 64: 6\n"  /* wooddoorblock */
@@ -54,35 +54,49 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 		// Level 0
 		/* z\x*             11 */
 		/*    *   012345678901 */
-		/*  0 */ "aaaaaab....."
-		/*  1 */ "cdddddddddd."
-		/*  2 */ "cdddddddddd."
-		/*  3 */ "cdddddddddd."
-		/*  4 */ "cdddddddddd."
-		/*  5 */ "edddddddddd."
-		/*  6 */ ".dddddddddd."
-		/*  7 */ ".dddddddddd."
-		/*  8 */ ".dddddddddd."
-		/*  9 */ "............"
+		/*  0 */ "aaaaaaammmmm"
+		/*  1 */ "aaaaaaaaaaam"
+		/*  2 */ "aaaaaaaaaaam"
+		/*  3 */ "aaaaaaaaaaam"
+		/*  4 */ "aaaaaaaaaaam"
+		/*  5 */ "aaaaaaaaaaam"
+		/*  6 */ "maaaaaaaaaam"
+		/*  7 */ "maaaaaaaaaam"
+		/*  8 */ "maaaaaaaaaam"
+		/*  9 */ "mmmmmmmmmmmm"
 
 		// Level 1
 		/* z\x*             11 */
 		/*    *   012345678901 */
-		/*  0 */ "............"
-		/*  1 */ ".d....ddddd."
-		/*  2 */ "......dfffd."
-		/*  3 */ "......ghfhd."
-		/*  4 */ "......diiid."
-		/*  5 */ ".d....dhfhd."
-		/*  6 */ ".djddjdfffd."
-		/*  7 */ ".ddkkddl..d."
-		/*  8 */ ".dddddddddd."
+		/*  0 */ "bcccccd....."
+		/*  1 */ "baaaaaaaaaa."
+		/*  2 */ "baaaaaaaaaa."
+		/*  3 */ "baaaaaaaaaa."
+		/*  4 */ "baaaaaaaaaa."
+		/*  5 */ "eaaaaaaaaaa."
+		/*  6 */ ".aaaaaaaaaa."
+		/*  7 */ ".aaaaaaaaaa."
+		/*  8 */ ".aaaaaaaaaa."
 		/*  9 */ "............"
 
 		// Level 2
 		/* z\x*             11 */
 		/*    *   012345678901 */
 		/*  0 */ "............"
+		/*  1 */ ".a....aaaaa."
+		/*  2 */ "......afffa."
+		/*  3 */ "......ghfha."
+		/*  4 */ "......aiiia."
+		/*  5 */ ".a....ahfha."
+		/*  6 */ ".ajaajafffa."
+		/*  7 */ ".aakkaal..a."
+		/*  8 */ ".aaaaaaaaaa."
+		/*  9 */ "............"
+
+		// Level 3
+		/* z\x*             11 */
+		/*    *   012345678901 */
+		/*  0 */ "............"
 		/*  1 */ ".n....nn.nn."
 		/*  2 */ "......n...n."
 		/*  3 */ "......o...n."
@@ -93,36 +107,36 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 		/*  8 */ ".nnn.nnn.nn."
 		/*  9 */ "............"
 
-		// Level 3
+		// Level 4
 		/* z\x*             11 */
 		/*    *   012345678901 */
 		/*  0 */ "............"
-		/*  1 */ ".d....ddddd."
-		/*  2 */ "......d...d."
-		/*  3 */ "......d...d."
-		/*  4 */ "......dp..d."
-		/*  5 */ ".d....d...d."
-		/*  6 */ ".dqqqqd...d."
-		/*  7 */ ".d....d...d."
-		/*  8 */ ".dddddddddd."
+		/*  1 */ ".a....aaaaa."
+		/*  2 */ "......a...a."
+		/*  3 */ "......a...a."
+		/*  4 */ "......ap..a."
+		/*  5 */ ".a....a...a."
+		/*  6 */ ".aqqqqa...a."
+		/*  7 */ ".a....a...a."
+		/*  8 */ ".aaaaaaaaaa."
 		/*  9 */ "............"
 
-		// Level 4
+		// Level 5
 		/* z\x*             11 */
 		/*    *   012345678901 */
 		/*  0 */ "rsssssssssss"
-		/*  1 */ "rddddddddddt"
-		/*  2 */ "rddddddddddt"
-		/*  3 */ "rddddddddddt"
-		/*  4 */ "rddddddddddt"
-		/*  5 */ "rddddddddddt"
-		/*  6 */ "rddddddddddt"
-		/*  7 */ "rddddddddddt"
-		/*  8 */ "rddddddddddt"
+		/*  1 */ "raaaaaaaaaat"
+		/*  2 */ "raaaaaaaaaat"
+		/*  3 */ "raaaaaaaaaat"
+		/*  4 */ "raaaaaaaaaat"
+		/*  5 */ "raaaaaaaaaat"
+		/*  6 */ "raaaaaaaaaat"
+		/*  7 */ "raaaaaaaaaat"
+		/*  8 */ "raaaaaaaaaat"
 		/*  9 */ "uuuuuuuuuuut",
 
 		// Connectors:
-		"-1: 3, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 3, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -153,18 +167,18 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 31, ID 172, created by Aloe_vera
 	{
 		// Size:
-		13, 5, 9,  // SizeX = 13, SizeY = 5, SizeZ = 9
+		13, 6, 9,  // SizeX = 13, SizeY = 6, SizeZ = 9
 
 		// Hitbox (relative to bounding box):
 		0, 0, 0,  // MinX, MinY, MinZ
-		12, 4, 8,  // MaxX, MaxY, MaxZ
+		12, 5, 8,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:171: 0\n"  /* carpet */
 		"g:171:15\n"  /* carpet */
@@ -185,33 +199,46 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 		// Level 0
 		/* z\x*             111 */
 		/*    *   0123456789012 */
-		/*  0 */ "..abc........"
-		/*  1 */ ".ddddddddddd."
-		/*  2 */ ".ddddddddddd."
-		/*  3 */ ".ddddddddddd."
-		/*  4 */ ".ddddddddddd."
-		/*  5 */ ".ddddddddddd."
-		/*  6 */ ".ddddddddddd."
-		/*  7 */ ".ddddddddddd."
-		/*  8 */ "............."
+		/*  0 */ "mmaaammmmmmmm"
+		/*  1 */ "maaaaaaaaaaam"
+		/*  2 */ "maaaaaaaaaaam"
+		/*  3 */ "maaaaaaaaaaam"
+		/*  4 */ "maaaaaaaaaaam"
+		/*  5 */ "maaaaaaaaaaam"
+		/*  6 */ "maaaaaaaaaaam"
+		/*  7 */ "maaaaaaaaaaam"
+		/*  8 */ "mmmmmmmmmmmmm"
 
 		// Level 1
 		/* z\x*             111 */
 		/*    *   0123456789012 */
-		/*  0 */ "............."
-		/*  1 */ ".ddedddddddd."
-		/*  2 */ ".dffgggggffd."
-		/*  3 */ ".dfghhhhhgfd."
-		/*  4 */ ".dfghfffhgfd."
-		/*  5 */ ".dfghhhhhgfd."
-		/*  6 */ ".dffgggggffd."
-		/*  7 */ ".ddddddddddd."
+		/*  0 */ "..bcd........"
+		/*  1 */ ".aaaaaaaaaaa."
+		/*  2 */ ".aaaaaaaaaaa."
+		/*  3 */ ".aaaaaaaaaaa."
+		/*  4 */ ".aaaaaaaaaaa."
+		/*  5 */ ".aaaaaaaaaaa."
+		/*  6 */ ".aaaaaaaaaaa."
+		/*  7 */ ".aaaaaaaaaaa."
 		/*  8 */ "............."
 
 		// Level 2
 		/* z\x*             111 */
 		/*    *   0123456789012 */
 		/*  0 */ "............."
+		/*  1 */ ".aaeaaaaaaaa."
+		/*  2 */ ".affgggggffa."
+		/*  3 */ ".afghhhhhgfa."
+		/*  4 */ ".afghfffhgfa."
+		/*  5 */ ".afghhhhhgfa."
+		/*  6 */ ".affgggggffa."
+		/*  7 */ ".aaaaaaaaaaa."
+		/*  8 */ "............."
+
+		// Level 3
+		/* z\x*             111 */
+		/*    *   0123456789012 */
+		/*  0 */ "............."
 		/*  1 */ ".iiji.iii.ii."
 		/*  2 */ ".i.........i."
 		/*  3 */ ".i.........i."
@@ -221,34 +248,34 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 		/*  7 */ ".ii.ii.ii.ii."
 		/*  8 */ "............."
 
-		// Level 3
+		// Level 4
 		/* z\x*             111 */
 		/*    *   0123456789012 */
 		/*  0 */ "............."
-		/*  1 */ ".ddddddddddd."
-		/*  2 */ ".d..k..k...d."
-		/*  3 */ ".d.........d."
-		/*  4 */ ".dl.......nd."
-		/*  5 */ ".d.........d."
-		/*  6 */ ".d....o....d."
-		/*  7 */ ".ddddddddddd."
+		/*  1 */ ".aaaaaaaaaaa."
+		/*  2 */ ".a..k..k...a."
+		/*  3 */ ".a.........a."
+		/*  4 */ ".al.......na."
+		/*  5 */ ".a.........a."
+		/*  6 */ ".a....o....a."
+		/*  7 */ ".aaaaaaaaaaa."
 		/*  8 */ "............."
 
-		// Level 4
+		// Level 5
 		/* z\x*             111 */
 		/*    *   0123456789012 */
 		/*  0 */ "pqqqqqqqqqqqq"
-		/*  1 */ "pdddddddddddr"
-		/*  2 */ "pdddddddddddr"
-		/*  3 */ "pdddddddddddr"
-		/*  4 */ "pdddddddddddr"
-		/*  5 */ "pdddddddddddr"
-		/*  6 */ "pdddddddddddr"
-		/*  7 */ "pdddddddddddr"
+		/*  1 */ "paaaaaaaaaaar"
+		/*  2 */ "paaaaaaaaaaar"
+		/*  3 */ "paaaaaaaaaaar"
+		/*  4 */ "paaaaaaaaaaar"
+		/*  5 */ "paaaaaaaaaaar"
+		/*  6 */ "paaaaaaaaaaar"
+		/*  7 */ "paaaaaaaaaaar"
 		/*  8 */ "ssssssssssssr",
 
 		// Connectors:
-		"-1: 3, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 3, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -279,18 +306,18 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 25, ID 166, created by Aloe_vera
 	{
 		// Size:
-		7, 5, 6,  // SizeX = 7, SizeY = 5, SizeZ = 6
+		7, 6, 6,  // SizeX = 7, SizeY = 6, SizeZ = 6
 
 		// Hitbox (relative to bounding box):
 		0, 0, 0,  // MinX, MinY, MinZ
-		6, 4, 5,  // MaxX, MaxY, MaxZ
+		6, 5, 5,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:171: 0\n"  /* carpet */
 		"g:171:14\n"  /* carpet */
@@ -306,51 +333,60 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 		// Block data:
 		// Level 0
 		/* z\x*   0123456 */
-		/*  0 */ "..abc.."
-		/*  1 */ ".ddddd."
-		/*  2 */ ".ddddd."
-		/*  3 */ ".ddddd."
-		/*  4 */ ".ddddd."
-		/*  5 */ "......."
+		/*  0 */ "mmaaamm"
+		/*  1 */ "maaaaam"
+		/*  2 */ "maaaaam"
+		/*  3 */ "maaaaam"
+		/*  4 */ "maaaaam"
+		/*  5 */ "mmmmmmm"
 
 		// Level 1
 		/* z\x*   0123456 */
-		/*  0 */ "......."
-		/*  1 */ ".ddedd."
-		/*  2 */ ".dfgfd."
-		/*  3 */ ".dfgfd."
-		/*  4 */ ".ddddd."
+		/*  0 */ "..bcd.."
+		/*  1 */ ".aaaaa."
+		/*  2 */ ".aaaaa."
+		/*  3 */ ".aaaaa."
+		/*  4 */ ".aaaaa."
 		/*  5 */ "......."
 
 		// Level 2
 		/* z\x*   0123456 */
 		/*  0 */ "......."
+		/*  1 */ ".aaeaa."
+		/*  2 */ ".afgfa."
+		/*  3 */ ".afgfa."
+		/*  4 */ ".aaaaa."
+		/*  5 */ "......."
+
+		// Level 3
+		/* z\x*   0123456 */
+		/*  0 */ "......."
 		/*  1 */ ".hhihh."
 		/*  2 */ ".h...h."
 		/*  3 */ ".h...h."
 		/*  4 */ ".hh.hh."
 		/*  5 */ "......."
 
-		// Level 3
+		// Level 4
 		/* z\x*   0123456 */
 		/*  0 */ "......."
-		/*  1 */ ".ddddd."
-		/*  2 */ ".dj.jd."
-		/*  3 */ ".d...d."
-		/*  4 */ ".ddddd."
+		/*  1 */ ".aaaaa."
+		/*  2 */ ".aj.ja."
+		/*  3 */ ".a...a."
+		/*  4 */ ".aaaaa."
 		/*  5 */ "......."
 
-		// Level 4
+		// Level 5
 		/* z\x*   0123456 */
 		/*  0 */ "kllllln"
-		/*  1 */ "kdddddn"
-		/*  2 */ "kdddddn"
-		/*  3 */ "kdddddn"
-		/*  4 */ "kdddddn"
+		/*  1 */ "kaaaaan"
+		/*  2 */ "kaaaaan"
+		/*  3 */ "kaaaaan"
+		/*  4 */ "kaaaaan"
 		/*  5 */ "oooooon",
 
 		// Connectors:
-		"-1: 3, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 3, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -381,18 +417,18 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 26, ID 167, created by Aloe_vera
 	{
 		// Size:
-		7, 5, 7,  // SizeX = 7, SizeY = 5, SizeZ = 7
+		7, 6, 7,  // SizeX = 7, SizeY = 6, SizeZ = 7
 
 		// Hitbox (relative to bounding box):
 		0, 0, 0,  // MinX, MinY, MinZ
-		6, 4, 6,  // MaxX, MaxY, MaxZ
+		6, 5, 6,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:171: 0\n"  /* carpet */
 		"g:171:15\n"  /* carpet */
@@ -409,27 +445,37 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 		// Block data:
 		// Level 0
 		/* z\x*   0123456 */
-		/*  0 */ "..abc.."
-		/*  1 */ ".ddddd."
-		/*  2 */ ".ddddd."
-		/*  3 */ ".ddddd."
-		/*  4 */ ".ddddd."
-		/*  5 */ ".ddddd."
-		/*  6 */ "......."
+		/*  0 */ "mmaaamm"
+		/*  1 */ "maaaaam"
+		/*  2 */ "maaaaam"
+		/*  3 */ "maaaaam"
+		/*  4 */ "maaaaam"
+		/*  5 */ "maaaaam"
+		/*  6 */ "mmmmmmm"
 
 		// Level 1
 		/* z\x*   0123456 */
-		/*  0 */ "......."
-		/*  1 */ ".ddedd."
-		/*  2 */ ".dfffd."
-		/*  3 */ ".dghgd."
-		/*  4 */ ".dfffd."
-		/*  5 */ ".ddddd."
+		/*  0 */ "..bcd.."
+		/*  1 */ ".aaaaa."
+		/*  2 */ ".aaaaa."
+		/*  3 */ ".aaaaa."
+		/*  4 */ ".aaaaa."
+		/*  5 */ ".aaaaa."
 		/*  6 */ "......."
 
 		// Level 2
 		/* z\x*   0123456 */
 		/*  0 */ "......."
+		/*  1 */ ".aaeaa."
+		/*  2 */ ".afffa."
+		/*  3 */ ".aghga."
+		/*  4 */ ".afffa."
+		/*  5 */ ".aaaaa."
+		/*  6 */ "......."
+
+		// Level 3
+		/* z\x*   0123456 */
+		/*  0 */ "......."
 		/*  1 */ ".iijii."
 		/*  2 */ ".i...i."
 		/*  3 */ "......."
@@ -437,28 +483,28 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 		/*  5 */ ".ii.ii."
 		/*  6 */ "......."
 
-		// Level 3
+		// Level 4
 		/* z\x*   0123456 */
 		/*  0 */ "......."
-		/*  1 */ ".ddddd."
-		/*  2 */ ".dk.kd."
-		/*  3 */ ".d...d."
-		/*  4 */ ".d...d."
-		/*  5 */ ".ddddd."
+		/*  1 */ ".aaaaa."
+		/*  2 */ ".ak.ka."
+		/*  3 */ ".a...a."
+		/*  4 */ ".a...a."
+		/*  5 */ ".aaaaa."
 		/*  6 */ "......."
 
-		// Level 4
+		// Level 5
 		/* z\x*   0123456 */
 		/*  0 */ "lnnnnno"
-		/*  1 */ "ldddddo"
-		/*  2 */ "ldddddo"
-		/*  3 */ "ldddddo"
-		/*  4 */ "ldddddo"
-		/*  5 */ "ldddddo"
+		/*  1 */ "laaaaao"
+		/*  2 */ "laaaaao"
+		/*  3 */ "laaaaao"
+		/*  4 */ "laaaaao"
+		/*  5 */ "laaaaao"
 		/*  6 */ "ppppppo",
 
 		// Connectors:
-		"-1: 3, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 3, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -489,18 +535,18 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 27, ID 168, created by Aloe_vera
 	{
 		// Size:
-		9, 5, 7,  // SizeX = 9, SizeY = 5, SizeZ = 7
+		9, 6, 7,  // SizeX = 9, SizeY = 6, SizeZ = 7
 
 		// Hitbox (relative to bounding box):
 		0, 0, 0,  // MinX, MinY, MinZ
-		8, 4, 6,  // MaxX, MaxY, MaxZ
+		8, 5, 6,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:171:14\n"  /* carpet */
 		"g:171: 0\n"  /* carpet */
@@ -517,27 +563,37 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 		// Block data:
 		// Level 0
 		/* z\x*   012345678 */
-		/*  0 */ "..abc...."
-		/*  1 */ ".ddddddd."
-		/*  2 */ ".ddddddd."
-		/*  3 */ ".ddddddd."
-		/*  4 */ ".ddddddd."
-		/*  5 */ ".ddddddd."
-		/*  6 */ "........."
+		/*  0 */ "mmaaammmm"
+		/*  1 */ "maaaaaaam"
+		/*  2 */ "maaaaaaam"
+		/*  3 */ "maaaaaaam"
+		/*  4 */ "maaaaaaam"
+		/*  5 */ "maaaaaaam"
+		/*  6 */ "mmmmmmmmm"
 
 		// Level 1
 		/* z\x*   012345678 */
-		/*  0 */ "........."
-		/*  1 */ ".ddedddd."
-		/*  2 */ ".dfffffd."
-		/*  3 */ ".dghhhgd."
-		/*  4 */ ".dfffffd."
-		/*  5 */ ".ddddddd."
+		/*  0 */ "..bcd...."
+		/*  1 */ ".aaaaaaa."
+		/*  2 */ ".aaaaaaa."
+		/*  3 */ ".aaaaaaa."
+		/*  4 */ ".aaaaaaa."
+		/*  5 */ ".aaaaaaa."
 		/*  6 */ "........."
 
 		// Level 2
 		/* z\x*   012345678 */
 		/*  0 */ "........."
+		/*  1 */ ".aaeaaaa."
+		/*  2 */ ".afffffa."
+		/*  3 */ ".aghhhga."
+		/*  4 */ ".afffffa."
+		/*  5 */ ".aaaaaaa."
+		/*  6 */ "........."
+
+		// Level 3
+		/* z\x*   012345678 */
+		/*  0 */ "........."
 		/*  1 */ ".iiji.ii."
 		/*  2 */ ".i.....i."
 		/*  3 */ "........."
@@ -545,28 +601,28 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 		/*  5 */ ".iii.iii."
 		/*  6 */ "........."
 
-		// Level 3
+		// Level 4
 		/* z\x*   012345678 */
 		/*  0 */ "........."
-		/*  1 */ ".ddddddd."
-		/*  2 */ ".dk.k..d."
-		/*  3 */ ".d.....d."
-		/*  4 */ ".d.....d."
-		/*  5 */ ".ddddddd."
+		/*  1 */ ".aaaaaaa."
+		/*  2 */ ".ak.k..a."
+		/*  3 */ ".a.....a."
+		/*  4 */ ".a.....a."
+		/*  5 */ ".aaaaaaa."
 		/*  6 */ "........."
 
-		// Level 4
+		// Level 5
 		/* z\x*   012345678 */
 		/*  0 */ "lnnnnnnnn"
-		/*  1 */ "ldddddddo"
-		/*  2 */ "ldddddddo"
-		/*  3 */ "ldddddddo"
-		/*  4 */ "ldddddddo"
-		/*  5 */ "ldddddddo"
+		/*  1 */ "laaaaaaao"
+		/*  2 */ "laaaaaaao"
+		/*  3 */ "laaaaaaao"
+		/*  4 */ "laaaaaaao"
+		/*  5 */ "laaaaaaao"
 		/*  6 */ "ppppppppo",
 
 		// Connectors:
-		"-1: 3, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 3, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -597,18 +653,18 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 28, ID 169, created by Aloe_vera
 	{
 		// Size:
-		10, 5, 7,  // SizeX = 10, SizeY = 5, SizeZ = 7
+		10, 6, 7,  // SizeX = 10, SizeY = 6, SizeZ = 7
 
 		// Hitbox (relative to bounding box):
 		0, 0, 0,  // MinX, MinY, MinZ
-		9, 4, 6,  // MaxX, MaxY, MaxZ
+		9, 5, 6,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:171: 0\n"  /* carpet */
 		"g:171:14\n"  /* carpet */
@@ -626,29 +682,40 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 		// Level 0
 		/* z\x*              */
 		/*    *   0123456789 */
-		/*  0 */ "..abc....."
-		/*  1 */ ".dddddddd."
-		/*  2 */ ".dddddddd."
-		/*  3 */ ".dddddddd."
-		/*  4 */ ".dddddddd."
-		/*  5 */ ".dddddddd."
-		/*  6 */ ".........."
+		/*  0 */ "mmaaammmmm"
+		/*  1 */ "maaaaaaaam"
+		/*  2 */ "maaaaaaaam"
+		/*  3 */ "maaaaaaaam"
+		/*  4 */ "maaaaaaaam"
+		/*  5 */ "maaaaaaaam"
+		/*  6 */ "mmmmmmmmmm"
 
 		// Level 1
 		/* z\x*              */
 		/*    *   0123456789 */
-		/*  0 */ ".........."
-		/*  1 */ ".ddeddddd."
-		/*  2 */ ".dfghhgfd."
-		/*  3 */ ".dfhffhfd."
-		/*  4 */ ".dfghhgfd."
-		/*  5 */ ".dddddddd."
+		/*  0 */ "..bcd....."
+		/*  1 */ ".aaaaaaaa."
+		/*  2 */ ".aaaaaaaa."
+		/*  3 */ ".aaaaaaaa."
+		/*  4 */ ".aaaaaaaa."
+		/*  5 */ ".aaaaaaaa."
 		/*  6 */ ".........."
 
 		// Level 2
 		/* z\x*              */
 		/*    *   0123456789 */
 		/*  0 */ ".........."
+		/*  1 */ ".aaeaaaaa."
+		/*  2 */ ".afghhgfa."
+		/*  3 */ ".afhffhfa."
+		/*  4 */ ".afghhgfa."
+		/*  5 */ ".aaaaaaaa."
+		/*  6 */ ".........."
+
+		// Level 3
+		/* z\x*              */
+		/*    *   0123456789 */
+		/*  0 */ ".........."
 		/*  1 */ ".iijii.ii."
 		/*  2 */ ".i......i."
 		/*  3 */ ".........."
@@ -656,30 +723,30 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 		/*  5 */ ".ii.ii.ii."
 		/*  6 */ ".........."
 
-		// Level 3
+		// Level 4
 		/* z\x*              */
 		/*    *   0123456789 */
 		/*  0 */ ".........."
-		/*  1 */ ".dddddddd."
-		/*  2 */ ".dk.k...d."
-		/*  3 */ ".d......d."
-		/*  4 */ ".d......d."
-		/*  5 */ ".dddddddd."
+		/*  1 */ ".aaaaaaaa."
+		/*  2 */ ".ak.k...a."
+		/*  3 */ ".a......a."
+		/*  4 */ ".a......a."
+		/*  5 */ ".aaaaaaaa."
 		/*  6 */ ".........."
 
-		// Level 4
+		// Level 5
 		/* z\x*              */
 		/*    *   0123456789 */
 		/*  0 */ "lnnnnnnnnn"
-		/*  1 */ "lddddddddo"
-		/*  2 */ "lddddddddo"
-		/*  3 */ "lddddddddo"
-		/*  4 */ "lddddddddo"
-		/*  5 */ "lddddddddo"
+		/*  1 */ "laaaaaaaao"
+		/*  2 */ "laaaaaaaao"
+		/*  3 */ "laaaaaaaao"
+		/*  4 */ "laaaaaaaao"
+		/*  5 */ "laaaaaaaao"
 		/*  6 */ "pppppppppo",
 
 		// Connectors:
-		"-1: 3, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 3, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -710,18 +777,18 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 29, ID 170, created by Aloe_vera
 	{
 		// Size:
-		10, 5, 9,  // SizeX = 10, SizeY = 5, SizeZ = 9
+		10, 6, 9,  // SizeX = 10, SizeY = 6, SizeZ = 9
 
 		// Hitbox (relative to bounding box):
 		0, 0, 0,  // MinX, MinY, MinZ
-		9, 4, 8,  // MaxX, MaxY, MaxZ
+		9, 5, 8,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:171: 0\n"  /* carpet */
 		"g:171:14\n"  /* carpet */
@@ -741,33 +808,46 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 		// Level 0
 		/* z\x*              */
 		/*    *   0123456789 */
-		/*  0 */ "..abc....."
-		/*  1 */ ".dddddddd."
-		/*  2 */ ".dddddddd."
-		/*  3 */ ".dddddddd."
-		/*  4 */ ".dddddddd."
-		/*  5 */ ".dddddddd."
-		/*  6 */ ".dddddddd."
-		/*  7 */ ".dddddddd."
-		/*  8 */ ".........."
+		/*  0 */ "mmaaammmmm"
+		/*  1 */ "maaaaaaaam"
+		/*  2 */ "maaaaaaaam"
+		/*  3 */ "maaaaaaaam"
+		/*  4 */ "maaaaaaaam"
+		/*  5 */ "maaaaaaaam"
+		/*  6 */ "maaaaaaaam"
+		/*  7 */ "maaaaaaaam"
+		/*  8 */ "mmmmmmmmmm"
 
 		// Level 1
 		/* z\x*              */
 		/*    *   0123456789 */
-		/*  0 */ ".........."
-		/*  1 */ ".ddeddddd."
-		/*  2 */ ".dfghhgfd."
-		/*  3 */ ".dfhffhfd."
-		/*  4 */ ".dfhgghfd."
-		/*  5 */ ".dfhffhfd."
-		/*  6 */ ".dfghhgfd."
-		/*  7 */ ".dddddddd."
+		/*  0 */ "..bcd....."
+		/*  1 */ ".aaaaaaaa."
+		/*  2 */ ".aaaaaaaa."
+		/*  3 */ ".aaaaaaaa."
+		/*  4 */ ".aaaaaaaa."
+		/*  5 */ ".aaaaaaaa."
+		/*  6 */ ".aaaaaaaa."
+		/*  7 */ ".aaaaaaaa."
 		/*  8 */ ".........."
 
 		// Level 2
 		/* z\x*              */
 		/*    *   0123456789 */
 		/*  0 */ ".........."
+		/*  1 */ ".aaeaaaaa."
+		/*  2 */ ".afghhgfa."
+		/*  3 */ ".afhffhfa."
+		/*  4 */ ".afhgghfa."
+		/*  5 */ ".afhffhfa."
+		/*  6 */ ".afghhgfa."
+		/*  7 */ ".aaaaaaaa."
+		/*  8 */ ".........."
+
+		// Level 3
+		/* z\x*              */
+		/*    *   0123456789 */
+		/*  0 */ ".........."
 		/*  1 */ ".iijii.ii."
 		/*  2 */ ".i......i."
 		/*  3 */ ".i......i."
@@ -777,34 +857,34 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 		/*  7 */ ".ii.ii.ii."
 		/*  8 */ ".........."
 
-		// Level 3
+		// Level 4
 		/* z\x*              */
 		/*    *   0123456789 */
 		/*  0 */ ".........."
-		/*  1 */ ".dddddddd."
-		/*  2 */ ".d..k...d."
-		/*  3 */ ".d......d."
-		/*  4 */ ".dl....nd."
-		/*  5 */ ".d......d."
-		/*  6 */ ".d......d."
-		/*  7 */ ".dddddddd."
+		/*  1 */ ".aaaaaaaa."
+		/*  2 */ ".a..k...a."
+		/*  3 */ ".a......a."
+		/*  4 */ ".al....na."
+		/*  5 */ ".a......a."
+		/*  6 */ ".a......a."
+		/*  7 */ ".aaaaaaaa."
 		/*  8 */ ".........."
 
-		// Level 4
+		// Level 5
 		/* z\x*              */
 		/*    *   0123456789 */
 		/*  0 */ "oppppppppp"
-		/*  1 */ "oddddddddq"
-		/*  2 */ "oddddddddq"
-		/*  3 */ "oddddddddq"
-		/*  4 */ "oddddddddq"
-		/*  5 */ "oddddddddq"
-		/*  6 */ "oddddddddq"
-		/*  7 */ "oddddddddq"
+		/*  1 */ "oaaaaaaaaq"
+		/*  2 */ "oaaaaaaaaq"
+		/*  3 */ "oaaaaaaaaq"
+		/*  4 */ "oaaaaaaaaq"
+		/*  5 */ "oaaaaaaaaq"
+		/*  6 */ "oaaaaaaaaq"
+		/*  7 */ "oaaaaaaaaq"
 		/*  8 */ "rrrrrrrrrq",
 
 		// Connectors:
-		"-1: 3, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 3, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
@@ -835,18 +915,18 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 	// The data has been exported from the gallery Desert, area index 30, ID 171, created by Aloe_vera
 	{
 		// Size:
-		11, 5, 9,  // SizeX = 11, SizeY = 5, SizeZ = 9
+		11, 6, 9,  // SizeX = 11, SizeY = 6, SizeZ = 9
 
 		// Hitbox (relative to bounding box):
 		0, 0, 0,  // MinX, MinY, MinZ
-		10, 4, 8,  // MaxX, MaxY, MaxZ
+		10, 5, 8,  // MaxX, MaxY, MaxZ
 
 		// Block definitions:
 		".:  0: 0\n"  /* air */
-		"a:128: 0\n"  /* sandstonestairs */
-		"b:128: 2\n"  /* sandstonestairs */
-		"c:128: 1\n"  /* sandstonestairs */
-		"d: 24: 0\n"  /* sandstone */
+		"a: 24: 0\n"  /* sandstone */
+		"b:128: 0\n"  /* sandstonestairs */
+		"c:128: 2\n"  /* sandstonestairs */
+		"d:128: 1\n"  /* sandstonestairs */
 		"e: 64: 7\n"  /* wooddoorblock */
 		"f:171: 0\n"  /* carpet */
 		"g:171:15\n"  /* carpet */
@@ -867,33 +947,46 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 		// Level 0
 		/* z\x*             1 */
 		/*    *   01234567890 */
-		/*  0 */ "..abc......"
-		/*  1 */ ".ddddddddd."
-		/*  2 */ ".ddddddddd."
-		/*  3 */ ".ddddddddd."
-		/*  4 */ ".ddddddddd."
-		/*  5 */ ".ddddddddd."
-		/*  6 */ ".ddddddddd."
-		/*  7 */ ".ddddddddd."
-		/*  8 */ "..........."
+		/*  0 */ "mmaaammmmmm"
+		/*  1 */ "maaaaaaaaam"
+		/*  2 */ "maaaaaaaaam"
+		/*  3 */ "maaaaaaaaam"
+		/*  4 */ "maaaaaaaaam"
+		/*  5 */ "maaaaaaaaam"
+		/*  6 */ "maaaaaaaaam"
+		/*  7 */ "maaaaaaaaam"
+		/*  8 */ "mmmmmmmmmmm"
 
 		// Level 1
 		/* z\x*             1 */
 		/*    *   01234567890 */
-		/*  0 */ "..........."
-		/*  1 */ ".ddedddddd."
-		/*  2 */ ".dffgggffd."
-		/*  3 */ ".dfghhhgfd."
-		/*  4 */ ".dfghfhgfd."
-		/*  5 */ ".dfghhhgfd."
-		/*  6 */ ".dffgggffd."
-		/*  7 */ ".ddddddddd."
+		/*  0 */ "..bcd......"
+		/*  1 */ ".aaaaaaaaa."
+		/*  2 */ ".aaaaaaaaa."
+		/*  3 */ ".aaaaaaaaa."
+		/*  4 */ ".aaaaaaaaa."
+		/*  5 */ ".aaaaaaaaa."
+		/*  6 */ ".aaaaaaaaa."
+		/*  7 */ ".aaaaaaaaa."
 		/*  8 */ "..........."
 
 		// Level 2
 		/* z\x*             1 */
 		/*    *   01234567890 */
 		/*  0 */ "..........."
+		/*  1 */ ".aaeaaaaaa."
+		/*  2 */ ".affgggffa."
+		/*  3 */ ".afghhhgfa."
+		/*  4 */ ".afghfhgfa."
+		/*  5 */ ".afghhhgfa."
+		/*  6 */ ".affgggffa."
+		/*  7 */ ".aaaaaaaaa."
+		/*  8 */ "..........."
+
+		// Level 3
+		/* z\x*             1 */
+		/*    *   01234567890 */
+		/*  0 */ "..........."
 		/*  1 */ ".iijii.iii."
 		/*  2 */ ".i.......i."
 		/*  3 */ ".i.......i."
@@ -903,34 +996,34 @@ const cPrefab::sDef g_SandFlatRoofVillagePrefabs[] =
 		/*  7 */ ".ii.iii.ii."
 		/*  8 */ "..........."
 
-		// Level 3
+		// Level 4
 		/* z\x*             1 */
 		/*    *   01234567890 */
 		/*  0 */ "..........."
-		/*  1 */ ".ddddddddd."
-		/*  2 */ ".d..k....d."
-		/*  3 */ ".d.......d."
-		/*  4 */ ".dl.....nd."
-		/*  5 */ ".d.......d."
-		/*  6 */ ".d...o...d."
-		/*  7 */ ".ddddddddd."
+		/*  1 */ ".aaaaaaaaa."
+		/*  2 */ ".a..k....a."
+		/*  3 */ ".a.......a."
+		/*  4 */ ".al.....na."
+		/*  5 */ ".a.......a."
+		/*  6 */ ".a...o...a."
+		/*  7 */ ".aaaaaaaaa."
 		/*  8 */ "..........."
 
-		// Level 4
+		// Level 5
 		/* z\x*             1 */
 		/*    *   01234567890 */
 		/*  0 */ "pqqqqqqqqqq"
-		/*  1 */ "pdddddddddr"
-		/*  2 */ "pdddddddddr"
-		/*  3 */ "pdddddddddr"
-		/*  4 */ "pdddddddddr"
-		/*  5 */ "pdddddddddr"
-		/*  6 */ "pdddddddddr"
-		/*  7 */ "pdddddddddr"
+		/*  1 */ "paaaaaaaaar"
+		/*  2 */ "paaaaaaaaar"
+		/*  3 */ "paaaaaaaaar"
+		/*  4 */ "paaaaaaaaar"
+		/*  5 */ "paaaaaaaaar"
+		/*  6 */ "paaaaaaaaar"
+		/*  7 */ "paaaaaaaaar"
 		/*  8 */ "ssssssssssr",
 
 		// Connectors:
-		"-1: 3, 0, 0: 2\n"  /* Type -1, direction Z- */,
+		"-1: 3, 1, 0: 2\n"  /* Type -1, direction Z- */,
 
 		// AllowedRotations:
 		7,  /* 1, 2, 3 CCW rotation allowed */
diff --git a/src/Generating/RainbowRoadsGen.cpp b/src/Generating/RainbowRoadsGen.cpp
index d1e1f4bda..3b0ff7df8 100644
--- a/src/Generating/RainbowRoadsGen.cpp
+++ b/src/Generating/RainbowRoadsGen.cpp
@@ -29,11 +29,12 @@ class cRainbowRoadsGen::cRainbowRoads :
 public:
 	cRainbowRoads(
 		int a_Seed,
+		int a_GridX, int a_GridZ,
 		int a_OriginX, int a_OriginZ,
 		int a_MaxDepth,
 		int a_MaxSize
 	) :
-		super(a_OriginX, a_OriginZ),
+		super(a_GridX, a_GridZ, a_OriginX, a_OriginZ),
 		m_Seed(a_Seed),
 		m_Noise(a_Seed),
 		m_MaxSize(a_MaxSize),
@@ -92,8 +93,8 @@ protected:
 
 
 
-cRainbowRoadsGen::cRainbowRoadsGen(int a_Seed, int a_GridSize, int a_MaxDepth, int a_MaxSize) :
-	super(a_Seed, a_GridSize, a_GridSize, a_MaxSize, a_MaxSize, 100),
+cRainbowRoadsGen::cRainbowRoadsGen(int a_Seed, int a_GridSize, int a_MaxOffset, int a_MaxDepth, int a_MaxSize) :
+	super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxSize, a_MaxSize, 100),
 	m_Noise(a_Seed + 9000),
 	m_MaxDepth(a_MaxDepth),
 	m_MaxSize(a_MaxSize)
@@ -104,10 +105,10 @@ cRainbowRoadsGen::cRainbowRoadsGen(int a_Seed, int a_GridSize, int a_MaxDepth, i
 
 
 
-cGridStructGen::cStructurePtr cRainbowRoadsGen::CreateStructure(int a_OriginX, int a_OriginZ)
+cGridStructGen::cStructurePtr cRainbowRoadsGen::CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ)
 {
 	// Create a base based on the chosen prefabs:
-	return cStructurePtr(new cRainbowRoads(m_Seed, a_OriginX, a_OriginZ, m_MaxDepth, m_MaxSize));
+	return cStructurePtr(new cRainbowRoads(m_Seed, a_GridX, a_GridZ, a_OriginX, a_OriginZ, m_MaxDepth, m_MaxSize));
 }
 
 
diff --git a/src/Generating/RainbowRoadsGen.h b/src/Generating/RainbowRoadsGen.h
index acbd5abf9..5813e1d14 100644
--- a/src/Generating/RainbowRoadsGen.h
+++ b/src/Generating/RainbowRoadsGen.h
@@ -22,7 +22,7 @@ class cRainbowRoadsGen :
 	typedef cGridStructGen super;
 	
 public:
-	cRainbowRoadsGen(int a_Seed, int a_GridSize, int a_MaxDepth, int a_MaxSize);
+	cRainbowRoadsGen(int a_Seed, int a_GridSize, int a_MaxOffset, int a_MaxDepth, int a_MaxSize);
 
 protected:
 	class cRainbowRoads;  // fwd: RainbowRoadsGen.cpp
@@ -39,7 +39,7 @@ protected:
 
 
 	// cGridStructGen overrides:
-	virtual cStructurePtr CreateStructure(int a_OriginX, int a_OriginZ) override;
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 } ;
 
 
diff --git a/src/Generating/Ravines.cpp b/src/Generating/Ravines.cpp
index 2722e4ca3..24f2cc3ab 100644
--- a/src/Generating/Ravines.cpp
+++ b/src/Generating/Ravines.cpp
@@ -61,7 +61,7 @@ class cStructGenRavines::cRavine :
 	
 public:
 	
-	cRavine(int a_BlockX, int a_BlockZ, int a_Size, cNoise & a_Noise);
+	cRavine(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ, int a_Size, cNoise & a_Noise);
 	
 	#ifdef _DEBUG
 	/// Exports itself as a SVG line definition
@@ -81,7 +81,7 @@ protected:
 // cStructGenRavines:
 
 cStructGenRavines::cStructGenRavines(int a_Seed, int a_Size) :
-	super(a_Seed, a_Size, a_Size, a_Size * 2, a_Size * 2, 100),
+	super(a_Seed, a_Size, a_Size, a_Size, a_Size, a_Size * 2, a_Size * 2, 100),
 	m_Noise(a_Seed),
 	m_Size(a_Size)
 {
@@ -91,9 +91,9 @@ cStructGenRavines::cStructGenRavines(int a_Seed, int a_Size) :
 
 
 
-cGridStructGen::cStructurePtr cStructGenRavines::CreateStructure(int a_OriginX, int a_OriginZ)
+cGridStructGen::cStructurePtr cStructGenRavines::CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ)
 {
-	return cStructurePtr(new cRavine(a_OriginX, a_OriginZ, m_Size, m_Noise));
+	return cStructurePtr(new cRavine(a_GridX, a_GridZ, a_OriginX, a_OriginZ, m_Size, m_Noise));
 }
 
 
@@ -104,8 +104,8 @@ cGridStructGen::cStructurePtr cStructGenRavines::CreateStructure(int a_OriginX,
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // cStructGenRavines::cRavine
 
-cStructGenRavines::cRavine::cRavine(int a_OriginX, int a_OriginZ, int a_Size, cNoise & a_Noise) :
-	super(a_OriginX, a_OriginZ)
+cStructGenRavines::cRavine::cRavine(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ, int a_Size, cNoise & a_Noise) :
+	super(a_GridX, a_GridZ, a_OriginX, a_OriginZ)
 {
 	// Calculate the ravine shape-defining points:
 	GenerateBaseDefPoints(a_OriginX, a_OriginZ, a_Size, a_Noise);
diff --git a/src/Generating/Ravines.h b/src/Generating/Ravines.h
index 30b47e9ec..3e41c5ce6 100644
--- a/src/Generating/Ravines.h
+++ b/src/Generating/Ravines.h
@@ -32,7 +32,7 @@ protected:
 	
 
 	// cGridStructGen overrides:
-	virtual cStructurePtr CreateStructure(int a_OriginX, int a_OriginZ) override;
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 } ;
 
 
diff --git a/src/Generating/UnderwaterBaseGen.cpp b/src/Generating/UnderwaterBaseGen.cpp
index ff6f17dde..d3abae9b7 100644
--- a/src/Generating/UnderwaterBaseGen.cpp
+++ b/src/Generating/UnderwaterBaseGen.cpp
@@ -29,11 +29,12 @@ class cUnderwaterBaseGen::cUnderwaterBase :
 public:
 	cUnderwaterBase(
 		int a_Seed,
+		int a_GridX, int a_GridZ,
 		int a_OriginX, int a_OriginZ,
 		int a_MaxDepth,
 		int a_MaxSize
 	) :
-		super(a_OriginX, a_OriginZ),
+		super(a_GridX, a_GridZ, a_OriginX, a_OriginZ),
 		m_Seed(a_Seed),
 		m_Noise(a_Seed),
 		m_MaxSize(a_MaxSize),
@@ -92,8 +93,8 @@ protected:
 
 
 
-cUnderwaterBaseGen::cUnderwaterBaseGen(int a_Seed, int a_GridSize, int a_MaxDepth, int a_MaxSize, cBiomeGen & a_BiomeGen) :
-	super(a_Seed, a_GridSize, a_GridSize, a_MaxSize, a_MaxSize, 100),
+cUnderwaterBaseGen::cUnderwaterBaseGen(int a_Seed, int a_GridSize, int a_MaxOffset, int a_MaxDepth, int a_MaxSize, cBiomeGen & a_BiomeGen) :
+	super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxSize, a_MaxSize, 100),
 	m_Noise(a_Seed + 1000),
 	m_MaxDepth(a_MaxDepth),
 	m_MaxSize(a_MaxSize),
@@ -105,7 +106,7 @@ cUnderwaterBaseGen::cUnderwaterBaseGen(int a_Seed, int a_GridSize, int a_MaxDept
 
 
 
-cGridStructGen::cStructurePtr cUnderwaterBaseGen::CreateStructure(int a_OriginX, int a_OriginZ)
+cGridStructGen::cStructurePtr cUnderwaterBaseGen::CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ)
 {
 	// Generate the biomes for the chunk surrounding the origin:
 	int ChunkX, ChunkZ;
@@ -134,7 +135,7 @@ cGridStructGen::cStructurePtr cUnderwaterBaseGen::CreateStructure(int a_OriginX,
 	}  // for i - Biomes[]
 
 	// Create a base based on the chosen prefabs:
-	return cStructurePtr(new cUnderwaterBase(m_Seed, a_OriginX, a_OriginZ, m_MaxDepth, m_MaxSize));
+	return cStructurePtr(new cUnderwaterBase(m_Seed, a_GridX, a_GridZ, a_OriginX, a_OriginZ, m_MaxDepth, m_MaxSize));
 }
 
 
diff --git a/src/Generating/UnderwaterBaseGen.h b/src/Generating/UnderwaterBaseGen.h
index 0aefbb4c7..d6267b602 100644
--- a/src/Generating/UnderwaterBaseGen.h
+++ b/src/Generating/UnderwaterBaseGen.h
@@ -22,7 +22,7 @@ class cUnderwaterBaseGen :
 	typedef cGridStructGen super;
 	
 public:
-	cUnderwaterBaseGen(int a_Seed, int a_GridSize, int a_MaxDepth, int a_MaxSize, cBiomeGen & a_BiomeGen);
+	cUnderwaterBaseGen(int a_Seed, int a_GridSize, int a_MaxOffset, int a_MaxDepth, int a_MaxSize, cBiomeGen & a_BiomeGen);
 
 protected:
 	class cUnderwaterBase;  // fwd: UnderwaterBaseGen.cpp
@@ -42,7 +42,7 @@ protected:
 
 
 	// cGridStructGen overrides:
-	virtual cStructurePtr CreateStructure(int a_OriginX, int a_OriginZ) override;
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 } ;
 
 
diff --git a/src/Generating/VillageGen.cpp b/src/Generating/VillageGen.cpp
index 9917141ed..2b7ecc837 100644
--- a/src/Generating/VillageGen.cpp
+++ b/src/Generating/VillageGen.cpp
@@ -110,6 +110,7 @@ class cVillageGen::cVillage :
 public:
 	cVillage(
 		int a_Seed,
+		int a_GridX, int a_GridZ,
 		int a_OriginX, int a_OriginZ,
 		int a_MaxRoadDepth,
 		int a_MaxSize,
@@ -119,7 +120,7 @@ public:
 		BLOCKTYPE a_RoadBlock,
 		BLOCKTYPE a_WaterRoadBlock
 	) :
-		super(a_OriginX, a_OriginZ),
+		super(a_GridX, a_GridZ, a_OriginX, a_OriginZ),
 		m_Seed(a_Seed),
 		m_Noise(a_Seed),
 		m_MaxSize(a_MaxSize),
@@ -358,8 +359,8 @@ static cVillagePiecePool * g_PlainsVillagePools[] =
 
 
 
-cVillageGen::cVillageGen(int a_Seed, int a_GridSize, int a_MaxDepth, int a_MaxSize, int a_MinDensity, int a_MaxDensity, cBiomeGen & a_BiomeGen, cTerrainHeightGen & a_HeightGen) :
-	super(a_Seed, a_GridSize, a_GridSize, a_MaxSize, a_MaxSize, 100),
+cVillageGen::cVillageGen(int a_Seed, int a_GridSize, int a_MaxOffset, int a_MaxDepth, int a_MaxSize, int a_MinDensity, int a_MaxDensity, cBiomeGen & a_BiomeGen, cTerrainHeightGen & a_HeightGen) :
+	super(a_Seed, a_GridSize, a_GridSize, a_MaxOffset, a_MaxOffset, a_MaxSize, a_MaxSize, 100),
 	m_Noise(a_Seed + 1000),
 	m_MaxDepth(a_MaxDepth),
 	m_MaxSize(a_MaxSize),
@@ -374,7 +375,7 @@ cVillageGen::cVillageGen(int a_Seed, int a_GridSize, int a_MaxDepth, int a_MaxSi
 
 
 
-cGridStructGen::cStructurePtr cVillageGen::CreateStructure(int a_OriginX, int a_OriginZ)
+cGridStructGen::cStructurePtr cVillageGen::CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ)
 {
 	// Generate the biomes for the chunk surrounding the origin:
 	int ChunkX, ChunkZ;
@@ -435,7 +436,7 @@ cGridStructGen::cStructurePtr cVillageGen::CreateStructure(int a_OriginX, int a_
 	{
 		return cStructurePtr();
 	}
-	return cStructurePtr(new cVillage(m_Seed, a_OriginX, a_OriginZ, m_MaxDepth, m_MaxSize, Density, *VillagePrefabs, m_HeightGen, RoadBlock, WaterRoadBlock));
+	return cStructurePtr(new cVillage(m_Seed, a_GridX, a_GridZ, a_OriginX, a_OriginZ, m_MaxDepth, m_MaxSize, Density, *VillagePrefabs, m_HeightGen, RoadBlock, WaterRoadBlock));
 }
 
 
diff --git a/src/Generating/VillageGen.h b/src/Generating/VillageGen.h
index 5faaae8a6..694ea2358 100644
--- a/src/Generating/VillageGen.h
+++ b/src/Generating/VillageGen.h
@@ -21,7 +21,7 @@ class cVillageGen :
 {
 	typedef cGridStructGen super;
 public:
-	cVillageGen(int a_Seed, int a_GridSize, int a_MaxDepth, int a_MaxSize, int a_MinDensity, int a_MaxDensity, cBiomeGen & a_BiomeGen, cTerrainHeightGen & a_HeightGen);
+	cVillageGen(int a_Seed, int a_GridSize, int a_MaxOffset, int a_MaxDepth, int a_MaxSize, int a_MinDensity, int a_MaxDensity, cBiomeGen & a_BiomeGen, cTerrainHeightGen & a_HeightGen);
 
 protected:
 	class cVillage;  // fwd: VillageGen.cpp
@@ -49,7 +49,7 @@ protected:
 
 
 	// cGridStructGen overrides:
-	virtual cStructurePtr CreateStructure(int a_OriginX, int a_OriginZ) override;
+	virtual cStructurePtr CreateStructure(int a_GridX, int a_GridZ, int a_OriginX, int a_OriginZ) override;
 } ;