#include "mapgen.h"
#include "voxel.h"
-#include "content_mapnode.h"
#include "noise.h"
#include "mapblock.h"
#include "map.h"
-#include "mineral.h"
//#include "serverobject.h"
#include "content_sao.h"
-#include "mapnode_contentfeatures.h"
+#include "nodedef.h"
+#include "content_mapnode.h" // For content_mapnode_get_new_name
namespace mapgen
{
{
MapNode &n = vmanip.m_data[i];
if(content_walkable(n.d)
- && n.getContent() != CONTENT_TREE
- && n.getContent() != CONTENT_LEAVES)
+ && n.getContent() != LEGN(ndef, "CONTENT_TREE")
+ && n.getContent() != LEGN(ndef, "CONTENT_LEAVES"))
break;
vmanip.m_area.add_y(em, i, -1);
}
#endif
-void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0, bool is_apple_tree)
+void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0,
+ bool is_apple_tree, INodeDefManager *ndef)
{
- MapNode treenode(CONTENT_TREE);
- MapNode leavesnode(CONTENT_LEAVES);
- MapNode applenode(CONTENT_APPLE);
+ MapNode treenode(LEGN(ndef, "CONTENT_TREE"));
+ MapNode leavesnode(LEGN(ndef, "CONTENT_LEAVES"));
+ MapNode applenode(LEGN(ndef, "CONTENT_APPLE"));
s16 trunk_h = myrand_range(4, 5);
v3s16 p1 = p0;
}
}
-static void make_jungletree(VoxelManipulator &vmanip, v3s16 p0)
+static void make_jungletree(VoxelManipulator &vmanip, v3s16 p0,
+ INodeDefManager *ndef)
{
- MapNode treenode(CONTENT_JUNGLETREE);
- MapNode leavesnode(CONTENT_LEAVES);
+ MapNode treenode(LEGN(ndef, "CONTENT_JUNGLETREE"));
+ MapNode leavesnode(LEGN(ndef, "CONTENT_LEAVES"));
for(s16 x=-1; x<=1; x++)
for(s16 z=-1; z<=1; z++)
}
}
-void make_papyrus(VoxelManipulator &vmanip, v3s16 p0)
+void make_papyrus(VoxelManipulator &vmanip, v3s16 p0,
+ INodeDefManager *ndef)
{
- MapNode papyrusnode(CONTENT_PAPYRUS);
+ MapNode papyrusnode(LEGN(ndef, "CONTENT_PAPYRUS"));
s16 trunk_h = myrand_range(2, 3);
v3s16 p1 = p0;
}
}
-void make_cactus(VoxelManipulator &vmanip, v3s16 p0)
+void make_cactus(VoxelManipulator &vmanip, v3s16 p0,
+ INodeDefManager *ndef)
{
- MapNode cactusnode(CONTENT_CACTUS);
+ MapNode cactusnode(LEGN(ndef, "CONTENT_CACTUS"));
s16 trunk_h = 3;
v3s16 p1 = p0;
#if 0
static void make_randomstone(VoxelManipulator &vmanip, v3s16 p0)
{
- MapNode stonenode(CONTENT_STONE);
+ MapNode stonenode(LEGN(ndef, "CONTENT_STONE"));
s16 size = myrand_range(3, 6);
#if 0
static void make_largestone(VoxelManipulator &vmanip, v3s16 p0)
{
- MapNode stonenode(CONTENT_STONE);
+ MapNode stonenode(LEGN(ndef, "CONTENT_STONE"));
s16 size = myrand_range(8, 16);
#define VMANIP_FLAG_DUNGEON_UNTOUCHABLE (\
VMANIP_FLAG_DUNGEON_INSIDE|VMANIP_FLAG_DUNGEON_PRESERVE)
-static void make_room1(VoxelManipulator &vmanip, v3s16 roomsize, v3s16 roomplace)
+static void make_room1(VoxelManipulator &vmanip, v3s16 roomsize, v3s16 roomplace,
+ INodeDefManager *ndef)
{
// Make +-X walls
for(s16 z=0; z<roomsize.Z; z++)
u32 vi = vmanip.m_area.index(p);
if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
continue;
- vmanip.m_data[vi] = MapNode(CONTENT_COBBLE);
+ vmanip.m_data[vi] = MapNode(LEGN(ndef, "CONTENT_COBBLE"));
}
{
v3s16 p = roomplace + v3s16(roomsize.X-1,y,z);
u32 vi = vmanip.m_area.index(p);
if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
continue;
- vmanip.m_data[vi] = MapNode(CONTENT_COBBLE);
+ vmanip.m_data[vi] = MapNode(LEGN(ndef, "CONTENT_COBBLE"));
}
}
u32 vi = vmanip.m_area.index(p);
if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
continue;
- vmanip.m_data[vi] = MapNode(CONTENT_COBBLE);
+ vmanip.m_data[vi] = MapNode(LEGN(ndef, "CONTENT_COBBLE"));
}
{
v3s16 p = roomplace + v3s16(x,y,roomsize.Z-1);
u32 vi = vmanip.m_area.index(p);
if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
continue;
- vmanip.m_data[vi] = MapNode(CONTENT_COBBLE);
+ vmanip.m_data[vi] = MapNode(LEGN(ndef, "CONTENT_COBBLE"));
}
}
u32 vi = vmanip.m_area.index(p);
if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
continue;
- vmanip.m_data[vi] = MapNode(CONTENT_COBBLE);
+ vmanip.m_data[vi] = MapNode(LEGN(ndef, "CONTENT_COBBLE"));
}
{
v3s16 p = roomplace + v3s16(x,roomsize.Y-1,z);
u32 vi = vmanip.m_area.index(p);
if(vmanip.m_flags[vi] & VMANIP_FLAG_DUNGEON_UNTOUCHABLE)
continue;
- vmanip.m_data[vi] = MapNode(CONTENT_COBBLE);
+ vmanip.m_data[vi] = MapNode(LEGN(ndef, "CONTENT_COBBLE"));
}
}
}
}
-static void make_hole1(VoxelManipulator &vmanip, v3s16 place)
+static void make_hole1(VoxelManipulator &vmanip, v3s16 place,
+ INodeDefManager *ndef)
{
make_fill(vmanip, place, v3s16(1,2,1), 0, MapNode(CONTENT_AIR),
VMANIP_FLAG_DUNGEON_INSIDE);
}
-static void make_door1(VoxelManipulator &vmanip, v3s16 doorplace, v3s16 doordir)
+static void make_door1(VoxelManipulator &vmanip, v3s16 doorplace, v3s16 doordir,
+ INodeDefManager *ndef)
{
- make_hole1(vmanip, doorplace);
+ make_hole1(vmanip, doorplace, ndef);
// Place torch (for testing)
- //vmanip.m_data[vmanip.m_area.index(doorplace)] = MapNode(CONTENT_TORCH);
+ //vmanip.m_data[vmanip.m_area.index(doorplace)] = MapNode(LEGN(ndef, "CONTENT_TORCH"));
}
static v3s16 rand_ortho_dir(PseudoRandom &random)
static void make_corridor(VoxelManipulator &vmanip, v3s16 doorplace,
v3s16 doordir, v3s16 &result_place, v3s16 &result_dir,
- PseudoRandom &random)
+ PseudoRandom &random, INodeDefManager *ndef)
{
- make_hole1(vmanip, doorplace);
+ make_hole1(vmanip, doorplace, ndef);
v3s16 p0 = doorplace;
v3s16 dir = doordir;
u32 length;
if(make_stairs)
{
make_fill(vmanip, p+v3s16(-1,-1,-1), v3s16(3,5,3),
- VMANIP_FLAG_DUNGEON_UNTOUCHABLE, MapNode(CONTENT_COBBLE), 0);
+ VMANIP_FLAG_DUNGEON_UNTOUCHABLE, MapNode(LEGN(ndef, "CONTENT_COBBLE")), 0);
make_fill(vmanip, p, v3s16(1,2,1), 0, MapNode(CONTENT_AIR),
VMANIP_FLAG_DUNGEON_INSIDE);
make_fill(vmanip, p-dir, v3s16(1,2,1), 0, MapNode(CONTENT_AIR),
else
{
make_fill(vmanip, p+v3s16(-1,-1,-1), v3s16(3,4,3),
- VMANIP_FLAG_DUNGEON_UNTOUCHABLE, MapNode(CONTENT_COBBLE), 0);
- make_hole1(vmanip, p);
+ VMANIP_FLAG_DUNGEON_UNTOUCHABLE, MapNode(LEGN(ndef, "CONTENT_COBBLE")), 0);
+ make_hole1(vmanip, p, ndef);
/*make_fill(vmanip, p, v3s16(1,2,1), 0, MapNode(CONTENT_AIR),
VMANIP_FLAG_DUNGEON_INSIDE);*/
}
{
public:
- RoomWalker(VoxelManipulator &vmanip_, v3s16 pos, PseudoRandom &random):
+ RoomWalker(VoxelManipulator &vmanip_, v3s16 pos, PseudoRandom &random,
+ INodeDefManager *ndef):
vmanip(vmanip_),
m_pos(pos),
- m_random(random)
+ m_random(random),
+ m_ndef(ndef)
{
randomizeDir();
}
continue;
}
if(vmanip.getNodeNoExNoEmerge(p).getContent()
- == CONTENT_COBBLE
+ == LEGN(m_ndef, "CONTENT_COBBLE")
&& vmanip.getNodeNoExNoEmerge(p1).getContent()
- == CONTENT_COBBLE)
+ == LEGN(m_ndef, "CONTENT_COBBLE"))
{
// Found wall, this is a good place!
result_place = p;
*/
// Jump one up if the actual space is there
if(vmanip.getNodeNoExNoEmerge(p+v3s16(0,0,0)).getContent()
- == CONTENT_COBBLE
+ == LEGN(m_ndef, "CONTENT_COBBLE")
&& vmanip.getNodeNoExNoEmerge(p+v3s16(0,1,0)).getContent()
- == CONTENT_AIR
+ == LEGN(m_ndef, "CONTENT_AIR")
&& vmanip.getNodeNoExNoEmerge(p+v3s16(0,2,0)).getContent()
- == CONTENT_AIR)
+ == LEGN(m_ndef, "CONTENT_AIR"))
p += v3s16(0,1,0);
// Jump one down if the actual space is there
if(vmanip.getNodeNoExNoEmerge(p+v3s16(0,1,0)).getContent()
- == CONTENT_COBBLE
+ == LEGN(m_ndef, "CONTENT_COBBLE")
&& vmanip.getNodeNoExNoEmerge(p+v3s16(0,0,0)).getContent()
- == CONTENT_AIR
+ == LEGN(m_ndef, "CONTENT_AIR")
&& vmanip.getNodeNoExNoEmerge(p+v3s16(0,-1,0)).getContent()
- == CONTENT_AIR)
+ == LEGN(m_ndef, "CONTENT_AIR"))
p += v3s16(0,-1,0);
// Check if walking is now possible
if(vmanip.getNodeNoExNoEmerge(p).getContent()
- != CONTENT_AIR
+ != LEGN(m_ndef, "CONTENT_AIR")
|| vmanip.getNodeNoExNoEmerge(p+v3s16(0,1,0)).getContent()
- != CONTENT_AIR)
+ != LEGN(m_ndef, "CONTENT_AIR"))
{
// Cannot continue walking here
randomizeDir();
v3s16 m_pos;
v3s16 m_dir;
PseudoRandom &m_random;
+ INodeDefManager *m_ndef;
};
-static void make_dungeon1(VoxelManipulator &vmanip, PseudoRandom &random)
+static void make_dungeon1(VoxelManipulator &vmanip, PseudoRandom &random,
+ INodeDefManager *ndef)
{
v3s16 areasize = vmanip.m_area.getExtent();
v3s16 roomsize;
for(u32 i=0; i<room_count; i++)
{
// Make a room to the determined place
- make_room1(vmanip, roomsize, roomplace);
+ make_room1(vmanip, roomsize, roomplace, ndef);
v3s16 room_center = roomplace + v3s16(roomsize.X/2,1,roomsize.Z/2);
// Place torch at room center (for testing)
- //vmanip.m_data[vmanip.m_area.index(room_center)] = MapNode(CONTENT_TORCH);
+ //vmanip.m_data[vmanip.m_area.index(room_center)] = MapNode(LEGN(ndef, "CONTENT_TORCH"));
// Quit if last room
if(i == room_count-1)
}
// Create walker and find a place for a door
- RoomWalker walker(vmanip, walker_start_place, random);
+ RoomWalker walker(vmanip, walker_start_place, random, ndef);
v3s16 doorplace;
v3s16 doordir;
bool r = walker.findPlaceForDoor(doorplace, doordir);
if(random.range(0,1)==0)
// Make the door
- make_door1(vmanip, doorplace, doordir);
+ make_door1(vmanip, doorplace, doordir, ndef);
else
// Don't actually make a door
doorplace -= doordir;
v3s16 corridor_end;
v3s16 corridor_end_dir;
make_corridor(vmanip, doorplace, doordir, corridor_end,
- corridor_end_dir, random);
+ corridor_end_dir, random, ndef);
// Find a place for a random sized room
roomsize = v3s16(random.range(4,8),random.range(4,6),random.range(4,8));
if(random.range(0,1)==0)
// Make the door
- make_door1(vmanip, doorplace, doordir);
+ make_door1(vmanip, doorplace, doordir, ndef);
else
// Don't actually make a door
roomplace -= doordir;
}
}
-static void make_nc(VoxelManipulator &vmanip, PseudoRandom &random)
+static void make_nc(VoxelManipulator &vmanip, PseudoRandom &random,
+ INodeDefManager *ndef)
{
v3s16 dir;
u8 facedir_i = 0;
16+random.range(0,15),
16+random.range(0,15),
16+random.range(0,15));
- vmanip.m_data[vmanip.m_area.index(p)] = MapNode(CONTENT_NC, facedir_i);
+ vmanip.m_data[vmanip.m_area.index(p)] = MapNode(LEGN(ndef, "CONTENT_NC"), facedir_i);
u32 length = random.range(3,15);
for(u32 j=0; j<length; j++)
{
p -= dir;
- vmanip.m_data[vmanip.m_area.index(p)] = MapNode(CONTENT_NC_RB);
+ vmanip.m_data[vmanip.m_area.index(p)] = MapNode(LEGN(ndef, "CONTENT_NC_RB"));
}
}
MapNode n = block->getNodeNoEx(p);
if(n.getContent() == CONTENT_IGNORE)
continue;
- if(content_features(n).liquid_type != LIQUID_NONE)
+ if(data->nodedef->get(n)->liquid_type != LIQUID_NONE)
continue;
- if(content_features(n).walkable)
+ if(data->nodedef->get(n)->walkable)
{
last_node_walkable = true;
continue;
last_node_walkable = false;
}
}
- block->setChangedFlag();
+ block->raiseModified(MOD_STATE_WRITE_NEEDED, "mapgen::add_random_objects");
#endif
}
return;
}
+ assert(data->vmanip);
+ assert(data->nodedef);
+
+ INodeDefManager *ndef = data->nodedef;
+
v3s16 blockpos = data->blockpos;
/*dstream<<"makeBlock(): ("<<blockpos.X<<","<<blockpos.Y<<","
// Maximum amount of ground above the bottom of the central block
s16 maximum_ground_depth = maximum_groundlevel - node_min.Y;
- #if 0
+ #if 1
/*
Special case for high air or water: Just fill with air and water.
*/
if(vmanip.m_data[i].getContent() == CONTENT_IGNORE)
{
if(y <= WATER_LEVEL)
- vmanip.m_data[i] = MapNode(CONTENT_WATERSOURCE);
+ vmanip.m_data[i] = MapNode(LEGN(ndef, "CONTENT_WATERSOURCE"));
else
vmanip.m_data[i] = MapNode(CONTENT_AIR);
}
maxpos_f.X, maxpos_f.Y+5, maxpos_f.Z,
sl.X, sl.Y, sl.Z);
}
-
+
+ /*
+ Cache some ground type values for speed
+ */
+
+// Creates variables c_name=id and n_name=node
+#define CONTENT_VARIABLE(ndef, name)\
+ content_t c_##name = ndef->getId(#name);\
+ MapNode n_##name(c_##name);
+
+ CONTENT_VARIABLE(ndef, stone);
+ CONTENT_VARIABLE(ndef, air);
+ CONTENT_VARIABLE(ndef, water_source);
+ CONTENT_VARIABLE(ndef, dirt);
+ CONTENT_VARIABLE(ndef, sand);
+ CONTENT_VARIABLE(ndef, gravel);
+ CONTENT_VARIABLE(ndef, clay);
+ CONTENT_VARIABLE(ndef, lava_source);
+ CONTENT_VARIABLE(ndef, cobble);
+ CONTENT_VARIABLE(ndef, mossycobble);
+ CONTENT_VARIABLE(ndef, dirt_with_grass);
+ CONTENT_VARIABLE(ndef, junglegrass);
+ CONTENT_VARIABLE(ndef, stone_with_coal);
+ CONTENT_VARIABLE(ndef, stone_with_iron);
+ CONTENT_VARIABLE(ndef, mese);
+
/*
Make base ground level
*/
v3s16(x,y,z), data->seed) == false)
{
if(y <= WATER_LEVEL)
- vmanip.m_data[i] = MapNode(CONTENT_WATERSOURCE);
+ vmanip.m_data[i] = n_water_source;
else
- vmanip.m_data[i] = MapNode(CONTENT_AIR);
+ vmanip.m_data[i] = n_air;
}
else if(noisebuf_cave.get(x,y,z) > CAVE_NOISE_THRESHOLD)
- vmanip.m_data[i] = MapNode(CONTENT_AIR);
+ vmanip.m_data[i] = n_air;
else
- vmanip.m_data[i] = MapNode(CONTENT_STONE);
+ vmanip.m_data[i] = n_stone;
}
data->vmanip->m_area.add_y(em, i, 1);
}
}
- /*
- Add minerals
- */
-
- {
- PseudoRandom mineralrandom(blockseed);
-
- /*
- Add meseblocks
- */
- for(s16 i=0; i<approx_ground_depth/4; i++)
- {
- if(mineralrandom.next()%50 == 0)
- {
- s16 x = mineralrandom.range(node_min.X+1, node_max.X-1);
- s16 y = mineralrandom.range(node_min.Y+1, node_max.Y-1);
- s16 z = mineralrandom.range(node_min.Z+1, node_max.Z-1);
- for(u16 i=0; i<27; i++)
- {
- v3s16 p = v3s16(x,y,z) + g_27dirs[i];
- u32 vi = vmanip.m_area.index(p);
- if(vmanip.m_data[vi].getContent() == CONTENT_STONE)
- if(mineralrandom.next()%8 == 0)
- vmanip.m_data[vi] = MapNode(CONTENT_MESE);
- }
-
- }
- }
- /*
- Add others
- */
- {
- u16 a = mineralrandom.range(0,15);
- a = a*a*a;
- u16 amount = 20 * a/1000;
- for(s16 i=0; i<amount; i++)
- {
- s16 x = mineralrandom.range(node_min.X+1, node_max.X-1);
- s16 y = mineralrandom.range(node_min.Y+1, node_max.Y-1);
- s16 z = mineralrandom.range(node_min.Z+1, node_max.Z-1);
-
- u8 base_content = CONTENT_STONE;
- MapNode new_content(CONTENT_IGNORE);
- u32 sparseness = 6;
-
- if(noisebuf_ground_crumbleness.get(x,y+5,z) < -0.1)
- {
- new_content = MapNode(CONTENT_STONE, MINERAL_COAL);
- }
- else
- {
- if(noisebuf_ground_wetness.get(x,y+5,z) > 0.0)
- new_content = MapNode(CONTENT_STONE, MINERAL_IRON);
- /*if(noisebuf_ground_wetness.get(x,y,z) > 0.0)
- vmanip.m_data[i] = MapNode(CONTENT_MUD);
- else
- vmanip.m_data[i] = MapNode(CONTENT_SAND);*/
- }
- /*else if(noisebuf_ground_crumbleness.get(x,y,z) > 0.1)
- {
- }*/
-
- if(new_content.getContent() != CONTENT_IGNORE)
- {
- for(u16 i=0; i<27; i++)
- {
- v3s16 p = v3s16(x,y,z) + g_27dirs[i];
- u32 vi = vmanip.m_area.index(p);
- if(vmanip.m_data[vi].getContent() == base_content)
- {
- if(mineralrandom.next()%sparseness == 0)
- vmanip.m_data[vi] = new_content;
- }
- }
- }
- }
- }
- /*
- Add coal
- */
- //for(s16 i=0; i < MYMAX(0, 50 - abs(node_min.Y+8 - (-30))); i++)
- //for(s16 i=0; i<50; i++)
- u16 coal_amount = 30;
- u16 coal_rareness = 60 / coal_amount;
- if(coal_rareness == 0)
- coal_rareness = 1;
- if(mineralrandom.next()%coal_rareness == 0)
- {
- u16 a = mineralrandom.next() % 16;
- u16 amount = coal_amount * a*a*a / 1000;
- for(s16 i=0; i<amount; i++)
- {
- s16 x = mineralrandom.range(node_min.X+1, node_max.X-1);
- s16 y = mineralrandom.range(node_min.Y+1, node_max.Y-1);
- s16 z = mineralrandom.range(node_min.Z+1, node_max.Z-1);
- for(u16 i=0; i<27; i++)
- {
- v3s16 p = v3s16(x,y,z) + g_27dirs[i];
- u32 vi = vmanip.m_area.index(p);
- if(vmanip.m_data[vi].getContent() == CONTENT_STONE)
- if(mineralrandom.next()%8 == 0)
- vmanip.m_data[vi] = MapNode(CONTENT_STONE, MINERAL_COAL);
- }
- }
- }
- /*
- Add iron
- */
- u16 iron_amount = 8;
- u16 iron_rareness = 60 / iron_amount;
- if(iron_rareness == 0)
- iron_rareness = 1;
- if(mineralrandom.next()%iron_rareness == 0)
- {
- u16 a = mineralrandom.next() % 16;
- u16 amount = iron_amount * a*a*a / 1000;
- for(s16 i=0; i<amount; i++)
- {
- s16 x = mineralrandom.range(node_min.X+1, node_max.X-1);
- s16 y = mineralrandom.range(node_min.Y+1, node_max.Y-1);
- s16 z = mineralrandom.range(node_min.Z+1, node_max.Z-1);
- for(u16 i=0; i<27; i++)
- {
- v3s16 p = v3s16(x,y,z) + g_27dirs[i];
- u32 vi = vmanip.m_area.index(p);
- if(vmanip.m_data[vi].getContent() == CONTENT_STONE)
- if(mineralrandom.next()%8 == 0)
- vmanip.m_data[vi] = MapNode(CONTENT_STONE, MINERAL_IRON);
- }
- }
- }
- }
-
/*
Add mud and sand and others underground (in place of stone)
*/
u32 i = vmanip.m_area.index(v3s16(p2d.X, node_max.Y, p2d.Y));
for(s16 y=node_max.Y; y>=node_min.Y; y--)
{
- if(vmanip.m_data[i].getContent() == CONTENT_STONE)
+ if(vmanip.m_data[i].getContent() == c_stone)
{
if(noisebuf_ground_crumbleness.get(x,y,z) > 1.3)
{
if(noisebuf_ground_wetness.get(x,y,z) > 0.0)
- vmanip.m_data[i] = MapNode(CONTENT_MUD);
+ vmanip.m_data[i] = n_dirt;
else
- vmanip.m_data[i] = MapNode(CONTENT_SAND);
+ vmanip.m_data[i] = n_sand;
}
else if(noisebuf_ground_crumbleness.get(x,y,z) > 0.7)
{
if(noisebuf_ground_wetness.get(x,y,z) < -0.6)
- vmanip.m_data[i] = MapNode(CONTENT_GRAVEL);
+ vmanip.m_data[i] = n_gravel;
}
else if(noisebuf_ground_crumbleness.get(x,y,z) <
-3.0 + MYMIN(0.1 * sqrt((float)MYMAX(0, -y)), 1.5))
{
- vmanip.m_data[i] = MapNode(CONTENT_LAVASOURCE);
+ vmanip.m_data[i] = n_lava_source;
for(s16 x1=-1; x1<=1; x1++)
for(s16 y1=-1; y1<=1; y1++)
for(s16 z1=-1; z1<=1; z1++)
{
if(vmanip.m_data[i].getContent() == CONTENT_AIR)
vmanip.m_flags[i] |= VMANIP_FLAG_DUNGEON_PRESERVE;
- else if(vmanip.m_data[i].getContent() == CONTENT_WATERSOURCE)
+ else if(vmanip.m_data[i].getContent() == c_water_source)
vmanip.m_flags[i] |= VMANIP_FLAG_DUNGEON_PRESERVE;
data->vmanip->m_area.add_y(em, i, -1);
}
PseudoRandom random(blockseed+2);
// Add it
- make_dungeon1(vmanip, random);
+ make_dungeon1(vmanip, random, ndef);
// Convert some cobble to mossy cobble
for(s16 x=full_node_min.X; x<=full_node_max.X; x++)
double d = noise3d_perlin((float)x/2.5,
(float)y/2.5,(float)z/2.5,
blockseed, 2, 1.4);
- if(vmanip.m_data[i].getContent() == CONTENT_COBBLE)
+ if(vmanip.m_data[i].getContent() == c_cobble)
{
if(d < wetness/3.0)
{
- vmanip.m_data[i].setContent(CONTENT_MOSSYCOBBLE);
+ vmanip.m_data[i].setContent(c_mossycobble);
}
}
/*else if(vmanip.m_flags[i] & VMANIP_FLAG_DUNGEON_INSIDE)
{
if(wetness > 1.2)
- vmanip.m_data[i].setContent(CONTENT_MUD);
+ vmanip.m_data[i].setContent(c_dirt);
}*/
data->vmanip->m_area.add_y(em, i, -1);
}
PseudoRandom ncrandom(blockseed+9324342);
if(ncrandom.range(0, 1000) == 0 && blockpos.Y <= -3)
{
- make_nc(vmanip, ncrandom);
+ make_nc(vmanip, ncrandom, ndef);
}
}
{
if(water_found == false)
{
- if(vmanip.m_data[i].getContent() == CONTENT_WATERSOURCE)
+ if(vmanip.m_data[i].getContent() == c_water_source)
{
v3s16 p = v3s16(p2d.X, y, p2d.Y);
data->transforming_liquid.push_back(p);
// This can be done because water_found can only
// turn to true and end up here after going through
// a single block.
- if(vmanip.m_data[i+1].getContent() != CONTENT_WATERSOURCE)
+ if(vmanip.m_data[i+1].getContent() != c_water_source)
{
v3s16 p = v3s16(p2d.X, y+1, p2d.Y);
data->transforming_liquid.push_back(p);
u32 i = vmanip.m_area.index(v3s16(p2d.X, start_y, p2d.Y));
for(s16 y=start_y; y>=node_min.Y-3; y--)
{
- if(vmanip.m_data[i].getContent() == CONTENT_WATERSOURCE)
+ if(vmanip.m_data[i].getContent() == c_water_source)
water_detected = true;
if(vmanip.m_data[i].getContent() == CONTENT_AIR)
air_detected = true;
- if((vmanip.m_data[i].getContent() == CONTENT_STONE
- || vmanip.m_data[i].getContent() == CONTENT_GRASS
- || vmanip.m_data[i].getContent() == CONTENT_MUD
- || vmanip.m_data[i].getContent() == CONTENT_SAND
- || vmanip.m_data[i].getContent() == CONTENT_GRAVEL
+ if((vmanip.m_data[i].getContent() == c_stone
+ || vmanip.m_data[i].getContent() == c_dirt_with_grass
+ || vmanip.m_data[i].getContent() == c_dirt
+ || vmanip.m_data[i].getContent() == c_sand
+ || vmanip.m_data[i].getContent() == c_gravel
) && (air_detected || water_detected))
{
if(current_depth == 0 && y <= WATER_LEVEL+2
((claynoise > 0) && (claynoise < 0.12) && (current_depth == 1))
);
if (have_clay)
- vmanip.m_data[i] = MapNode(CONTENT_CLAY);
+ vmanip.m_data[i] = MapNode(c_clay);
else
- vmanip.m_data[i] = MapNode(CONTENT_SAND);
+ vmanip.m_data[i] = MapNode(c_sand);
}
#if 1
else if(current_depth==0 && !water_detected
&& y >= WATER_LEVEL && air_detected)
- vmanip.m_data[i] = MapNode(CONTENT_GRASS);
+ vmanip.m_data[i] = MapNode(c_dirt_with_grass);
#endif
else
- vmanip.m_data[i] = MapNode(CONTENT_MUD);
+ vmanip.m_data[i] = MapNode(c_dirt);
}
else
{
- if(vmanip.m_data[i].getContent() == CONTENT_MUD
- || vmanip.m_data[i].getContent() == CONTENT_GRASS)
- vmanip.m_data[i] = MapNode(CONTENT_STONE);
+ if(vmanip.m_data[i].getContent() == c_dirt
+ || vmanip.m_data[i].getContent() == c_dirt_with_grass)
+ vmanip.m_data[i] = MapNode(c_stone);
}
current_depth++;
{
u32 i = data->vmanip->m_area.index(p);
MapNode *n = &data->vmanip->m_data[i];
- if(n->getContent() != CONTENT_AIR && n->getContent() != CONTENT_WATERSOURCE && n->getContent() != CONTENT_IGNORE)
+ if(n->getContent() != CONTENT_AIR && n->getContent() != c_water_source && n->getContent() != CONTENT_IGNORE)
{
found = true;
break;
u32 i = data->vmanip->m_area.index(p);
MapNode *n = &data->vmanip->m_data[i];
- if(n->getContent() != CONTENT_MUD && n->getContent() != CONTENT_GRASS && n->getContent() != CONTENT_SAND)
+ if(n->getContent() != c_dirt && n->getContent() != c_dirt_with_grass && n->getContent() != c_sand)
continue;
// Papyrus grows only on mud and in water
- if(n->getContent() == CONTENT_MUD && y <= WATER_LEVEL)
+ if(n->getContent() == c_dirt && y <= WATER_LEVEL)
{
p.Y++;
- make_papyrus(vmanip, p);
+ make_papyrus(vmanip, p, ndef);
}
// Trees grow only on mud and grass, on land
- else if((n->getContent() == CONTENT_MUD || n->getContent() == CONTENT_GRASS) && y > WATER_LEVEL + 2)
+ else if((n->getContent() == c_dirt || n->getContent() == c_dirt_with_grass) && y > WATER_LEVEL + 2)
{
p.Y++;
//if(surface_humidity_2d(data->seed, v2s16(x, y)) < 0.5)
is_apple_tree = noise2d_perlin(
0.5+(float)p.X/100, 0.5+(float)p.Z/100,
data->seed+342902, 3, 0.45) > 0.2;
- make_tree(vmanip, p, is_apple_tree);
+ make_tree(vmanip, p, is_apple_tree, ndef);
}
else
- make_jungletree(vmanip, p);
+ make_jungletree(vmanip, p, ndef);
}
// Cactii grow only on sand, on land
- else if(n->getContent() == CONTENT_SAND && y > WATER_LEVEL + 2)
+ else if(n->getContent() == c_sand && y > WATER_LEVEL + 2)
{
p.Y++;
- make_cactus(vmanip, p);
+ make_cactus(vmanip, p, ndef);
}
}
}
{
u32 i = data->vmanip->m_area.index(p);
MapNode *n = &data->vmanip->m_data[i];
- if(content_features(*n).is_ground_content
- || n->getContent() == CONTENT_JUNGLETREE)
+ if(data->nodedef->get(*n).is_ground_content)
{
found = true;
break;
continue;
/*p.Y--;
if(vmanip.m_area.contains(p))
- vmanip.m_data[vmanip.m_area.index(p)] = CONTENT_MUD;
+ vmanip.m_data[vmanip.m_area.index(p)] = c_dirt;
p.Y++;*/
if(vmanip.m_area.contains(p))
- vmanip.m_data[vmanip.m_area.index(p)] = CONTENT_JUNGLEGRASS;
+ vmanip.m_data[vmanip.m_area.index(p)] = c_junglegrass;
}
}
/*{
u32 i = data->vmanip->m_area.index(v3s16(p));
MapNode *n = &data->vmanip->m_data[i];
- if(n->getContent() != CONTENT_MUD && n->getContent() != CONTENT_GRASS)
+ if(n->getContent() != c_dirt && n->getContent() != c_dirt_with_grass)
continue;
}*/
// Will be placed one higher
/*{
u32 i = data->vmanip->m_area.index(v3s16(p));
MapNode *n = &data->vmanip->m_data[i];
- if(n->getContent() != CONTENT_MUD && n->getContent() != CONTENT_GRASS)
+ if(n->getContent() != c_dirt && n->getContent() != c_dirt_with_grass)
continue;
}*/
// Will be placed one lower
#endif
}
+ /*
+ Add minerals
+ */
+
+ {
+ PseudoRandom mineralrandom(blockseed);
+
+ /*
+ Add meseblocks
+ */
+ for(s16 i=0; i<approx_ground_depth/4; i++)
+ {
+ if(mineralrandom.next()%50 == 0)
+ {
+ s16 x = mineralrandom.range(node_min.X+1, node_max.X-1);
+ s16 y = mineralrandom.range(node_min.Y+1, node_max.Y-1);
+ s16 z = mineralrandom.range(node_min.Z+1, node_max.Z-1);
+ for(u16 i=0; i<27; i++)
+ {
+ v3s16 p = v3s16(x,y,z) + g_27dirs[i];
+ u32 vi = vmanip.m_area.index(p);
+ if(vmanip.m_data[vi].getContent() == c_stone)
+ if(mineralrandom.next()%8 == 0)
+ vmanip.m_data[vi] = MapNode(c_mese);
+ }
+
+ }
+ }
+ /*
+ Add others
+ */
+ {
+ u16 a = mineralrandom.range(0,15);
+ a = a*a*a;
+ u16 amount = 20 * a/1000;
+ for(s16 i=0; i<amount; i++)
+ {
+ s16 x = mineralrandom.range(node_min.X+1, node_max.X-1);
+ s16 y = mineralrandom.range(node_min.Y+1, node_max.Y-1);
+ s16 z = mineralrandom.range(node_min.Z+1, node_max.Z-1);
+
+ u8 base_content = c_stone;
+ MapNode new_content(CONTENT_IGNORE);
+ u32 sparseness = 6;
+
+ if(noisebuf_ground_crumbleness.get(x,y+5,z) < -0.1)
+ {
+ new_content = MapNode(c_stone_with_coal);
+ }
+ else
+ {
+ if(noisebuf_ground_wetness.get(x,y+5,z) > 0.0)
+ new_content = MapNode(c_stone_with_iron);
+ /*if(noisebuf_ground_wetness.get(x,y,z) > 0.0)
+ vmanip.m_data[i] = MapNode(c_dirt);
+ else
+ vmanip.m_data[i] = MapNode(c_sand);*/
+ }
+ /*else if(noisebuf_ground_crumbleness.get(x,y,z) > 0.1)
+ {
+ }*/
+
+ if(new_content.getContent() != CONTENT_IGNORE)
+ {
+ for(u16 i=0; i<27; i++)
+ {
+ v3s16 p = v3s16(x,y,z) + g_27dirs[i];
+ u32 vi = vmanip.m_area.index(p);
+ if(vmanip.m_data[vi].getContent() == base_content)
+ {
+ if(mineralrandom.next()%sparseness == 0)
+ vmanip.m_data[vi] = new_content;
+ }
+ }
+ }
+ }
+ }
+ /*
+ Add coal
+ */
+ //for(s16 i=0; i < MYMAX(0, 50 - abs(node_min.Y+8 - (-30))); i++)
+ //for(s16 i=0; i<50; i++)
+ u16 coal_amount = 30;
+ u16 coal_rareness = 60 / coal_amount;
+ if(coal_rareness == 0)
+ coal_rareness = 1;
+ if(mineralrandom.next()%coal_rareness == 0)
+ {
+ u16 a = mineralrandom.next() % 16;
+ u16 amount = coal_amount * a*a*a / 1000;
+ for(s16 i=0; i<amount; i++)
+ {
+ s16 x = mineralrandom.range(node_min.X+1, node_max.X-1);
+ s16 y = mineralrandom.range(node_min.Y+1, node_max.Y-1);
+ s16 z = mineralrandom.range(node_min.Z+1, node_max.Z-1);
+ for(u16 i=0; i<27; i++)
+ {
+ v3s16 p = v3s16(x,y,z) + g_27dirs[i];
+ u32 vi = vmanip.m_area.index(p);
+ if(vmanip.m_data[vi].getContent() == c_stone)
+ if(mineralrandom.next()%8 == 0)
+ vmanip.m_data[vi] = MapNode(c_stone_with_coal);
+ }
+ }
+ }
+ /*
+ Add iron
+ */
+ u16 iron_amount = 8;
+ u16 iron_rareness = 60 / iron_amount;
+ if(iron_rareness == 0)
+ iron_rareness = 1;
+ if(mineralrandom.next()%iron_rareness == 0)
+ {
+ u16 a = mineralrandom.next() % 16;
+ u16 amount = iron_amount * a*a*a / 1000;
+ for(s16 i=0; i<amount; i++)
+ {
+ s16 x = mineralrandom.range(node_min.X+1, node_max.X-1);
+ s16 y = mineralrandom.range(node_min.Y+1, node_max.Y-1);
+ s16 z = mineralrandom.range(node_min.Z+1, node_max.Z-1);
+ for(u16 i=0; i<27; i++)
+ {
+ v3s16 p = v3s16(x,y,z) + g_27dirs[i];
+ u32 vi = vmanip.m_area.index(p);
+ if(vmanip.m_data[vi].getContent() == c_stone)
+ if(mineralrandom.next()%8 == 0)
+ vmanip.m_data[vi] = MapNode(c_stone_with_iron);
+ }
+ }
+ }
+ }
+
}
BlockMakeData::BlockMakeData():
no_op(false),
vmanip(NULL),
- seed(0)
+ seed(0),
+ nodedef(NULL)
{}
BlockMakeData::~BlockMakeData()