Skip to content

Commit

Permalink
Mgv6: Add stairs to desert stone dungeons
Browse files Browse the repository at this point in the history
As with the other mapgens, now that wide stairs in dungeons are
possible we can now finally add stairs to desert stone dungeons.
Re-order some lines.
  • Loading branch information
paramat committed Feb 4, 2017
1 parent 2d03cfd commit 8e4c114
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 11 deletions.
26 changes: 15 additions & 11 deletions src/mapgen_v6.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,10 @@ MapgenV6::MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge)
c_snowblock = ndef->getId("mapgen_snowblock");
c_ice = ndef->getId("mapgen_ice");

c_cobble = ndef->getId("mapgen_cobble");
c_stair_cobble = ndef->getId("mapgen_stair_cobble");
c_mossycobble = ndef->getId("mapgen_mossycobble");

if (c_desert_sand == CONTENT_IGNORE)
c_desert_sand = c_sand;
if (c_desert_stone == CONTENT_IGNORE)
c_desert_stone = c_stone;
if (c_mossycobble == CONTENT_IGNORE)
c_mossycobble = c_cobble;
if (c_stair_cobble == CONTENT_IGNORE)
c_stair_cobble = c_cobble;
if (c_desert_sand == CONTENT_IGNORE)
c_desert_sand = c_sand;
if (c_dirt_with_snow == CONTENT_IGNORE)
c_dirt_with_snow = c_dirt_with_grass;
if (c_snow == CONTENT_IGNORE)
Expand All @@ -119,6 +111,18 @@ MapgenV6::MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge)
c_snowblock = c_dirt_with_grass;
if (c_ice == CONTENT_IGNORE)
c_ice = c_water_source;

c_cobble = ndef->getId("mapgen_cobble");
c_mossycobble = ndef->getId("mapgen_mossycobble");
c_stair_cobble = ndef->getId("mapgen_stair_cobble");
c_stair_desert_stone = ndef->getId("mapgen_stair_desert_stone");

if (c_mossycobble == CONTENT_IGNORE)
c_mossycobble = c_cobble;
if (c_stair_cobble == CONTENT_IGNORE)
c_stair_cobble = c_cobble;
if (c_stair_desert_stone == CONTENT_IGNORE)
c_stair_desert_stone = c_desert_stone;
}


Expand Down Expand Up @@ -571,7 +575,7 @@ void MapgenV6::makeChunk(BlockMakeData *data)
if (getBiome(0, v2s16(node_min.X, node_min.Z)) == BT_DESERT) {
dp.c_wall = c_desert_stone;
dp.c_alt_wall = CONTENT_IGNORE;
dp.c_stair = c_desert_stone;
dp.c_stair = c_stair_desert_stone;

dp.diagonal_dirs = true;
dp.holesize = v3s16(2, 3, 2);
Expand Down
1 change: 1 addition & 0 deletions src/mapgen_v6.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ class MapgenV6 : public Mapgen {
content_t c_cobble;
content_t c_mossycobble;
content_t c_stair_cobble;
content_t c_stair_desert_stone;

MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge);
~MapgenV6();
Expand Down

0 comments on commit 8e4c114

Please sign in to comment.