diff options
| author | Paramat <paramat@users.noreply.github.com> | 2019-07-16 20:39:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-16 20:39:58 +0100 |
| commit | 458f6175753314583637006f00c426ba22ba86d7 (patch) | |
| tree | 8688e943dfc635a053ce9fd6db0e1fb37e5969c1 /src/mapgen/mapgen_v6.cpp | |
| parent | 47492386ece5b016a7a0ed06d6a44cc7d60adb55 (diff) | |
| download | minetest-458f6175753314583637006f00c426ba22ba86d7.tar.gz minetest-458f6175753314583637006f00c426ba22ba86d7.tar.bz2 minetest-458f6175753314583637006f00c426ba22ba86d7.zip | |
Dungeons: Make multiple large rooms possible (#8678)
Re-add the random size range for large rooms.
Remove 'first_room_large' bool.
Add 'large_room_chance' parameter that can disable large rooms,
specify 1 large room, or specify a chance for large rooms.
If 1 or a chance is specified, the first generated room is large,
to take advantage of the intersection checks that are done for the
1st room only.
Diffstat (limited to 'src/mapgen/mapgen_v6.cpp')
| -rw-r--r-- | src/mapgen/mapgen_v6.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mapgen/mapgen_v6.cpp b/src/mapgen/mapgen_v6.cpp index 23de9bae5..ae87b094d 100644 --- a/src/mapgen/mapgen_v6.cpp +++ b/src/mapgen/mapgen_v6.cpp @@ -572,13 +572,13 @@ void MapgenV6::makeChunk(BlockMakeData *data) DungeonParams dp; - dp.seed = seed; - dp.num_dungeons = num_dungeons; - dp.only_in_ground = true; - dp.corridor_len_min = 1; - dp.corridor_len_max = 13; - dp.num_rooms = ps.range(2, 16); - dp.first_room_large = ps.range(1, 4) == 1; + dp.seed = seed; + dp.num_dungeons = num_dungeons; + dp.only_in_ground = true; + dp.corridor_len_min = 1; + dp.corridor_len_max = 13; + dp.num_rooms = ps.range(2, 16); + dp.large_room_chance = (ps.range(1, 4) == 1) ? 1 : 0; dp.np_alt_wall = NoiseParams(-0.4, 1.0, v3f(40.0, 40.0, 40.0), 32474, 6, 1.1, 2.0); @@ -592,8 +592,8 @@ void MapgenV6::makeChunk(BlockMakeData *data) dp.holesize = v3s16(2, 3, 2); dp.room_size_min = v3s16(6, 9, 6); dp.room_size_max = v3s16(10, 11, 10); - dp.room_size_large = v3s16( - ps.range(10, 18), ps.range(13, 21), ps.range(10, 18)); + dp.room_size_large_min = v3s16(10, 13, 10); + dp.room_size_large_max = v3s16(18, 21, 18); dp.notifytype = GENNOTIFY_TEMPLE; } else { dp.c_wall = c_cobble; @@ -604,8 +604,8 @@ void MapgenV6::makeChunk(BlockMakeData *data) dp.holesize = v3s16(1, 2, 1); dp.room_size_min = v3s16(4, 4, 4); dp.room_size_max = v3s16(8, 6, 8); - dp.room_size_large = v3s16( - ps.range(8, 16), ps.range(8, 16), ps.range(8, 16)); + dp.room_size_large_min = v3s16(8, 8, 8); + dp.room_size_large_max = v3s16(16, 16, 16); dp.notifytype = GENNOTIFY_DUNGEON; } |