Skip to content

Commit 6ce0985

Browse files
paramatparamat
committedMar 12, 2015
Mgv5/mgv7: Add desert temples if desert stone detected in mapchunk
·
5.11.00.4.13
1 parent 140245a commit 6ce0985

File tree

4 files changed

+99
-12
lines changed

4 files changed

+99
-12
lines changed
 

Diff for: ‎src/mapgen_v5.cpp

+40-5
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
8989
c_gravel = ndef->getId("mapgen_gravel");
9090
c_cobble = ndef->getId("mapgen_cobble");
9191
c_ice = ndef->getId("default:ice");
92+
c_desert_stone = ndef->getId("mapgen_desert_stone");
9293
c_mossycobble = ndef->getId("mapgen_mossycobble");
9394
c_sandbrick = ndef->getId("mapgen_sandstonebrick");
9495
c_stair_cobble = ndef->getId("mapgen_stair_cobble");
@@ -238,15 +239,43 @@ void MapgenV5::makeChunk(BlockMakeData *data)
238239
noise_humidity->result, heightmap, biomemap);
239240

240241
// Actually place the biome-specific nodes
241-
generateBiomes(noise_heat->result, noise_humidity->result);
242+
bool desert_stone = generateBiomes(noise_heat->result, noise_humidity->result);
242243

243244
// Generate caves
244245
if ((flags & MG_CAVES) && (stone_surface_max_y >= node_min.Y))
245246
generateCaves(stone_surface_max_y);
246247

247248
// Generate dungeons and desert temples
248249
if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
249-
DungeonGen dgen(this, NULL);
250+
DungeonParams dp;
251+
252+
dp.np_rarity = nparams_dungeon_rarity;
253+
dp.np_density = nparams_dungeon_density;
254+
dp.np_wetness = nparams_dungeon_wetness;
255+
dp.c_water = c_water_source;
256+
if (desert_stone) {
257+
dp.c_cobble = c_sandbrick;
258+
dp.c_moss = c_sandbrick; // should make this 'cracked sandstone' later
259+
dp.c_stair = c_stair_sandstone;
260+
261+
dp.diagonal_dirs = true;
262+
dp.mossratio = 0.0;
263+
dp.holesize = v3s16(2, 3, 2);
264+
dp.roomsize = v3s16(2, 5, 2);
265+
dp.notifytype = GENNOTIFY_TEMPLE;
266+
} else {
267+
dp.c_cobble = c_cobble;
268+
dp.c_moss = c_mossycobble;
269+
dp.c_stair = c_stair_cobble;
270+
271+
dp.diagonal_dirs = false;
272+
dp.mossratio = 3.0;
273+
dp.holesize = v3s16(1, 2, 1);
274+
dp.roomsize = v3s16(0, 0, 0);
275+
dp.notifytype = GENNOTIFY_DUNGEON;
276+
}
277+
278+
DungeonGen dgen(this, &dp);
250279
dgen.generate(blockseed, full_node_min, full_node_max);
251280
}
252281

@@ -357,17 +386,18 @@ int MapgenV5::generateBaseTerrain()
357386
}
358387

359388

360-
void MapgenV5::generateBiomes(float *heat_map, float *humidity_map)
389+
bool MapgenV5::generateBiomes(float *heat_map, float *humidity_map)
361390
{
362391
if (node_max.Y < water_level)
363-
return;
392+
return false;
364393

365394
MapNode n_air(CONTENT_AIR);
366395
MapNode n_stone(c_stone);
367396
MapNode n_water(c_water_source);
368397

369398
v3s16 em = vm->m_area.getExtent();
370399
u32 index = 0;
400+
bool desert_stone = false;
371401

372402
for (s16 z = node_min.Z; z <= node_max.Z; z++)
373403
for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
@@ -392,6 +422,9 @@ void MapgenV5::generateBiomes(float *heat_map, float *humidity_map)
392422
y0_top = biome->depth_top;
393423
y0_filler = biome->depth_top + dfiller;
394424
depth_water_top = biome->depth_water_top;
425+
426+
if (biome->c_stone == c_desert_stone)
427+
desert_stone = true;
395428
}
396429

397430
if (c == c_stone && have_air) {
@@ -424,7 +457,7 @@ void MapgenV5::generateBiomes(float *heat_map, float *humidity_map)
424457
} else if (c == c_water_source) {
425458
have_air = true;
426459
nplaced = 0;
427-
if(y > water_level - depth_water_top)
460+
if (y > water_level - depth_water_top)
428461
vm->m_data[i] = MapNode(biome->c_water_top);
429462
else
430463
vm->m_data[i] = MapNode(biome->c_water);
@@ -436,6 +469,8 @@ void MapgenV5::generateBiomes(float *heat_map, float *humidity_map)
436469
vm->m_area.add_y(em, i, -1);
437470
}
438471
}
472+
473+
return desert_stone;
439474
}
440475

441476

Diff for: ‎src/mapgen_v5.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class MapgenV5 : public Mapgen {
9393
int getGroundLevelAtPoint(v2s16 p);
9494
void calculateNoise();
9595
int generateBaseTerrain();
96-
void generateBiomes(float *heat_map, float *humidity_map);
96+
bool generateBiomes(float *heat_map, float *humidity_map);
9797
void generateCaves(int max_stone_y);
9898
void dustTopNodes();
9999
};

Diff for: ‎src/mapgen_v7.cpp

+53-5
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,22 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
9696
c_water_source = ndef->getId("mapgen_water_source");
9797
c_lava_source = ndef->getId("mapgen_lava_source");
9898
c_ice = ndef->getId("default:ice");
99+
c_cobble = ndef->getId("mapgen_cobble");
100+
c_desert_stone = ndef->getId("mapgen_desert_stone");
101+
c_mossycobble = ndef->getId("mapgen_mossycobble");
102+
c_sandbrick = ndef->getId("mapgen_sandstonebrick");
103+
c_stair_cobble = ndef->getId("mapgen_stair_cobble");
104+
c_stair_sandstone = ndef->getId("mapgen_stair_sandstone");
99105
if (c_ice == CONTENT_IGNORE)
100106
c_ice = CONTENT_AIR;
107+
if (c_mossycobble == CONTENT_IGNORE)
108+
c_mossycobble = c_cobble;
109+
if (c_sandbrick == CONTENT_IGNORE)
110+
c_sandbrick = c_desert_stone;
111+
if (c_stair_cobble == CONTENT_IGNORE)
112+
c_stair_cobble = c_cobble;
113+
if (c_stair_sandstone == CONTENT_IGNORE)
114+
c_stair_sandstone = c_sandbrick;
101115
}
102116

103117

@@ -248,13 +262,41 @@ void MapgenV7::makeChunk(BlockMakeData *data)
248262
noise_humidity->result, heightmap, biomemap);
249263

250264
// Actually place the biome-specific nodes
251-
generateBiomes(noise_heat->result, noise_humidity->result);
265+
bool desert_stone = generateBiomes(noise_heat->result, noise_humidity->result);
252266

253267
if (flags & MG_CAVES)
254268
generateCaves(stone_surface_max_y);
255269

256270
if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
257-
DungeonGen dgen(this, NULL);
271+
DungeonParams dp;
272+
273+
dp.np_rarity = nparams_dungeon_rarity;
274+
dp.np_density = nparams_dungeon_density;
275+
dp.np_wetness = nparams_dungeon_wetness;
276+
dp.c_water = c_water_source;
277+
if (desert_stone) {
278+
dp.c_cobble = c_sandbrick;
279+
dp.c_moss = c_sandbrick; // should make this 'cracked sandstone' later
280+
dp.c_stair = c_stair_sandstone;
281+
282+
dp.diagonal_dirs = true;
283+
dp.mossratio = 0.0;
284+
dp.holesize = v3s16(2, 3, 2);
285+
dp.roomsize = v3s16(2, 5, 2);
286+
dp.notifytype = GENNOTIFY_TEMPLE;
287+
} else {
288+
dp.c_cobble = c_cobble;
289+
dp.c_moss = c_mossycobble;
290+
dp.c_stair = c_stair_cobble;
291+
292+
dp.diagonal_dirs = false;
293+
dp.mossratio = 3.0;
294+
dp.holesize = v3s16(1, 2, 1);
295+
dp.roomsize = v3s16(0, 0, 0);
296+
dp.notifytype = GENNOTIFY_DUNGEON;
297+
}
298+
299+
DungeonGen dgen(this, &dp);
258300
dgen.generate(blockseed, full_node_min, full_node_max);
259301
}
260302

@@ -536,17 +578,18 @@ void MapgenV7::generateRidgeTerrain()
536578
}
537579

538580

539-
void MapgenV7::generateBiomes(float *heat_map, float *humidity_map)
581+
bool MapgenV7::generateBiomes(float *heat_map, float *humidity_map)
540582
{
541583
if (node_max.Y < water_level)
542-
return;
584+
return false;
543585

544586
MapNode n_air(CONTENT_AIR);
545587
MapNode n_stone(c_stone);
546588
MapNode n_water(c_water_source);
547589

548590
v3s16 em = vm->m_area.getExtent();
549591
u32 index = 0;
592+
bool desert_stone = false;
550593

551594
for (s16 z = node_min.Z; z <= node_max.Z; z++)
552595
for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
@@ -581,6 +624,9 @@ void MapgenV7::generateBiomes(float *heat_map, float *humidity_map)
581624
y0_top = biome->depth_top;
582625
y0_filler = biome->depth_top + dfiller;
583626
depth_water_top = biome->depth_water_top;
627+
628+
if (biome->c_stone == c_desert_stone)
629+
desert_stone = true;
584630
}
585631

586632
if (c == c_stone && have_air) {
@@ -613,7 +659,7 @@ void MapgenV7::generateBiomes(float *heat_map, float *humidity_map)
613659
} else if (c == c_water_source) {
614660
have_air = true;
615661
nplaced = 0;
616-
if(y > water_level - depth_water_top)
662+
if (y > water_level - depth_water_top)
617663
vm->m_data[i] = MapNode(biome->c_water_top);
618664
else
619665
vm->m_data[i] = MapNode(biome->c_water);
@@ -625,6 +671,8 @@ void MapgenV7::generateBiomes(float *heat_map, float *humidity_map)
625671
vm->m_area.add_y(em, i, -1);
626672
}
627673
}
674+
675+
return desert_stone;
628676
}
629677

630678

Diff for: ‎src/mapgen_v7.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ class MapgenV7 : public Mapgen {
9494
content_t c_cobble;
9595
content_t c_desert_sand;
9696
content_t c_desert_stone;
97+
content_t c_mossycobble;
98+
content_t c_sandbrick;
99+
content_t c_stair_cobble;
100+
content_t c_stair_sandstone;
97101

98102
MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
99103
~MapgenV7();
@@ -114,7 +118,7 @@ class MapgenV7 : public Mapgen {
114118
int generateMountainTerrain(int ymax);
115119
void generateRidgeTerrain();
116120

117-
void generateBiomes(float *heat_map, float *humidity_map);
121+
bool generateBiomes(float *heat_map, float *humidity_map);
118122
void dustTopNodes();
119123

120124
//void addTopNodes();

0 commit comments

Comments
 (0)
Please sign in to comment.