diff options
Diffstat (limited to '')
-rw-r--r-- | source/Generating/BioGen.cpp (renamed from source/BioGen.cpp) | 0 | ||||
-rw-r--r-- | source/Generating/BioGen.h (renamed from source/BioGen.h) | 4 | ||||
-rw-r--r-- | source/Generating/Caves.cpp (renamed from source/Caves.cpp) | 0 | ||||
-rw-r--r-- | source/Generating/Caves.h (renamed from source/Caves.h) | 4 | ||||
-rw-r--r-- | source/Generating/ChunkGenerator.cpp (renamed from source/cChunkGenerator.cpp) | 12 | ||||
-rw-r--r-- | source/Generating/ChunkGenerator.h (renamed from source/cChunkGenerator.h) | 4 | ||||
-rw-r--r-- | source/Generating/CompoGen.cpp (renamed from source/CompoGen.cpp) | 2 | ||||
-rw-r--r-- | source/Generating/CompoGen.h (renamed from source/CompoGen.h) | 4 | ||||
-rw-r--r-- | source/Generating/FinishGen.cpp (renamed from source/FinishGen.cpp) | 4 | ||||
-rw-r--r-- | source/Generating/FinishGen.h (renamed from source/FinishGen.h) | 4 | ||||
-rw-r--r-- | source/Generating/HeiGen.cpp (renamed from source/HeiGen.cpp) | 0 | ||||
-rw-r--r-- | source/Generating/HeiGen.h (renamed from source/HeiGen.h) | 4 | ||||
-rw-r--r-- | source/Generating/Ravines.cpp (renamed from source/Ravines.cpp) | 0 | ||||
-rw-r--r-- | source/Generating/Ravines.h (renamed from source/Ravines.h) | 4 | ||||
-rw-r--r-- | source/Generating/StructGen.cpp (renamed from source/StructGen.cpp) | 12 | ||||
-rw-r--r-- | source/Generating/StructGen.h (renamed from source/StructGen.h) | 4 | ||||
-rw-r--r-- | source/Generating/Trees.cpp (renamed from source/Trees.cpp) | 2 | ||||
-rw-r--r-- | source/Generating/Trees.h (renamed from source/Trees.h) | 4 |
18 files changed, 39 insertions, 29 deletions
diff --git a/source/BioGen.cpp b/source/Generating/BioGen.cpp index a43d995df..a43d995df 100644 --- a/source/BioGen.cpp +++ b/source/Generating/BioGen.cpp diff --git a/source/BioGen.h b/source/Generating/BioGen.h index 8aaaeff4a..6cd78b7e0 100644 --- a/source/BioGen.h +++ b/source/Generating/BioGen.h @@ -14,8 +14,8 @@ Interfaces to the various biome generators: #pragma once -#include "cChunkGenerator.h" -#include "cNoise.h" +#include "ChunkGenerator.h" +#include "../cNoise.h" diff --git a/source/Caves.cpp b/source/Generating/Caves.cpp index f334023ce..f334023ce 100644 --- a/source/Caves.cpp +++ b/source/Generating/Caves.cpp diff --git a/source/Caves.h b/source/Generating/Caves.h index 8af9974fe..cc3f00a52 100644 --- a/source/Caves.h +++ b/source/Generating/Caves.h @@ -12,8 +12,8 @@ #pragma once
-#include "cChunkGenerator.h"
-#include "cNoise.h"
+#include "ChunkGenerator.h"
+#include "../cNoise.h"
diff --git a/source/cChunkGenerator.cpp b/source/Generating/ChunkGenerator.cpp index be2544541..5862c0f5f 100644 --- a/source/cChunkGenerator.cpp +++ b/source/Generating/ChunkGenerator.cpp @@ -1,17 +1,17 @@ #include "Globals.h" -#include "cChunkGenerator.h" -#include "cWorld.h" -#include "../iniFile/iniFile.h" +#include "ChunkGenerator.h" +#include "../cWorld.h" +#include "../../iniFile/iniFile.h" #include "BioGen.h" #include "HeiGen.h" #include "CompoGen.h" #include "StructGen.h" #include "FinishGen.h" -#include "cRoot.h" -#include "cPluginManager.h" -#include "cLuaChunk.h" +#include "../cRoot.h" +#include "../cPluginManager.h" +#include "../cLuaChunk.h" #include "Ravines.h" #include "Caves.h" diff --git a/source/cChunkGenerator.h b/source/Generating/ChunkGenerator.h index 2faacfd47..23cf76751 100644 --- a/source/cChunkGenerator.h +++ b/source/Generating/ChunkGenerator.h @@ -24,8 +24,8 @@ See http://forum.mc-server.org/showthread.php?tid=409 for details. #pragma once -#include "cIsThread.h" -#include "ChunkDef.h" +#include "../cIsThread.h" +#include "../ChunkDef.h" diff --git a/source/CompoGen.cpp b/source/Generating/CompoGen.cpp index e5f519611..046310d91 100644 --- a/source/CompoGen.cpp +++ b/source/Generating/CompoGen.cpp @@ -9,7 +9,7 @@ #include "Globals.h" #include "CompoGen.h" -#include "BlockID.h" +#include "../BlockID.h" diff --git a/source/CompoGen.h b/source/Generating/CompoGen.h index a7939e68d..235b9dafd 100644 --- a/source/CompoGen.h +++ b/source/Generating/CompoGen.h @@ -14,8 +14,8 @@ #pragma once -#include "cChunkGenerator.h" -#include "cNoise.h" +#include "ChunkGenerator.h" +#include "../cNoise.h" diff --git a/source/FinishGen.cpp b/source/Generating/FinishGen.cpp index 26c3a70f1..c3aedd1a0 100644 --- a/source/FinishGen.cpp +++ b/source/Generating/FinishGen.cpp @@ -10,8 +10,8 @@ #include "Globals.h" #include "FinishGen.h" -#include "cNoise.h" -#include "BlockID.h" +#include "../cNoise.h" +#include "../BlockID.h" diff --git a/source/FinishGen.h b/source/Generating/FinishGen.h index afa570fdf..f9a539572 100644 --- a/source/FinishGen.h +++ b/source/Generating/FinishGen.h @@ -13,8 +13,8 @@ -#include "cChunkGenerator.h" -#include "cNoise.h" +#include "ChunkGenerator.h" +#include "../cNoise.h" diff --git a/source/HeiGen.cpp b/source/Generating/HeiGen.cpp index ed353751c..ed353751c 100644 --- a/source/HeiGen.cpp +++ b/source/Generating/HeiGen.cpp diff --git a/source/HeiGen.h b/source/Generating/HeiGen.h index e5b20c334..42e70f2a5 100644 --- a/source/HeiGen.h +++ b/source/Generating/HeiGen.h @@ -14,8 +14,8 @@ Interfaces to the various height generators: #pragma once -#include "cChunkGenerator.h" -#include "cNoise.h" +#include "ChunkGenerator.h" +#include "../cNoise.h" diff --git a/source/Ravines.cpp b/source/Generating/Ravines.cpp index c298033f9..c298033f9 100644 --- a/source/Ravines.cpp +++ b/source/Generating/Ravines.cpp diff --git a/source/Ravines.h b/source/Generating/Ravines.h index 2f32e3edc..623986f29 100644 --- a/source/Ravines.h +++ b/source/Generating/Ravines.h @@ -9,8 +9,8 @@ #pragma once
-#include "cChunkGenerator.h"
-#include "cNoise.h"
+#include "ChunkGenerator.h"
+#include "../cNoise.h"
diff --git a/source/StructGen.cpp b/source/Generating/StructGen.cpp index ba70aa2c5..037aa46f8 100644 --- a/source/StructGen.cpp +++ b/source/Generating/StructGen.cpp @@ -3,7 +3,7 @@ #include "Globals.h" #include "StructGen.h" -#include "BlockID.h" +#include "../BlockID.h" #include "Trees.h" @@ -37,6 +37,14 @@ const int MAX_HEIGHT_LAPIS = 30; const int NUM_NESTS_LAPIS = 3; const int NEST_SIZE_LAPIS = 5; +const int MAX_HEIGHT_DIRT = 127; +const int NUM_NESTS_DIRT = 20; +const int NEST_SIZE_DIRT = 32; + +const int MAX_HEIGHT_GRAVEL = 70; +const int NUM_NESTS_GRAVEL = 15; +const int NEST_SIZE_GRAVEL = 32; + @@ -313,6 +321,8 @@ void cStructGenOreNests::GenStructures( GenerateOre(a_ChunkX, a_ChunkZ, E_BLOCK_GOLD_ORE, MAX_HEIGHT_GOLD, NUM_NESTS_GOLD, NEST_SIZE_GOLD, a_BlockTypes, 4); GenerateOre(a_ChunkX, a_ChunkZ, E_BLOCK_DIAMOND_ORE, MAX_HEIGHT_DIAMOND, NUM_NESTS_DIAMOND, NEST_SIZE_DIAMOND, a_BlockTypes, 5); GenerateOre(a_ChunkX, a_ChunkZ, E_BLOCK_LAPIS_ORE, MAX_HEIGHT_LAPIS, NUM_NESTS_LAPIS, NEST_SIZE_LAPIS, a_BlockTypes, 6); + GenerateOre(a_ChunkX, a_ChunkZ, E_BLOCK_DIRT, MAX_HEIGHT_DIRT, NUM_NESTS_DIRT, NEST_SIZE_DIRT, a_BlockTypes, 10); + GenerateOre(a_ChunkX, a_ChunkZ, E_BLOCK_GRAVEL, MAX_HEIGHT_GRAVEL, NUM_NESTS_GRAVEL, NEST_SIZE_GRAVEL, a_BlockTypes, 11); } diff --git a/source/StructGen.h b/source/Generating/StructGen.h index 0a28d84a3..8ddfdadba 100644 --- a/source/StructGen.h +++ b/source/Generating/StructGen.h @@ -13,8 +13,8 @@ #pragma once -#include "cChunkGenerator.h" -#include "cNoise.h" +#include "ChunkGenerator.h" +#include "../cNoise.h" diff --git a/source/Trees.cpp b/source/Generating/Trees.cpp index ed10a47b7..487d3e065 100644 --- a/source/Trees.cpp +++ b/source/Generating/Trees.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include "Trees.h" -#include "BlockID.h" +#include "../BlockID.h" diff --git a/source/Trees.h b/source/Generating/Trees.h index 714736013..d3e76a78c 100644 --- a/source/Trees.h +++ b/source/Generating/Trees.h @@ -17,8 +17,8 @@ logs can overwrite others(leaves), but others shouldn't overwrite logs. This is #pragma once -#include "ChunkDef.h" -#include "cNoise.h" +#include "../ChunkDef.h" +#include "../cNoise.h" |