PowerOlive
/
spheretest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mapgen v5/6/7: Cleanup node resolver and aliases

master
paramat 2015-05-12 02:20:18 +01:00
parent 82e35edff5
commit 02805af36e
6 changed files with 95 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/mapgen_v5.cpp
View File

@ -79,30 +79,28 @@ MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
//// Resolve nodes to be used //// Resolve nodes to be used
INodeDefManager *ndef = emerge->ndef; INodeDefManager *ndef = emerge->ndef;
c_stone = ndef->getId("mapgen_stone"); c_stone = ndef->getId("mapgen_stone");
c_dirt = ndef->getId("mapgen_dirt"); c_water_source = ndef->getId("mapgen_water_source");
c_dirt_with_grass = ndef->getId("mapgen_dirt_with_grass"); c_lava_source = ndef->getId("mapgen_lava_source");
c_sand = ndef->getId("mapgen_sand"); c_desert_stone = ndef->getId("mapgen_desert_stone");
c_water_source = ndef->getId("mapgen_water_source"); c_ice = ndef->getId("mapgen_ice");
c_lava_source = ndef->getId("mapgen_lava_source");
c_gravel = ndef->getId("mapgen_gravel"); c_cobble = ndef->getId("mapgen_cobble");
c_cobble = ndef->getId("mapgen_cobble"); c_stair_cobble = ndef->getId("mapgen_stair_cobble");
c_ice = ndef->getId("default:ice"); c_mossycobble = ndef->getId("mapgen_mossycobble");
c_desert_stone = ndef->getId("mapgen_desert_stone"); c_sandstonebrick = ndef->getId("mapgen_sandstonebrick");
c_mossycobble = ndef->getId("mapgen_mossycobble"); c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
c_sandbrick = ndef->getId("mapgen_sandstonebrick");
c_stair_cobble = ndef->getId("mapgen_stair_cobble");
c_stair_sandstone = ndef->getId("mapgen_stair_sandstone");
if (c_ice == CONTENT_IGNORE) if (c_ice == CONTENT_IGNORE)
c_ice = CONTENT_AIR; c_ice = CONTENT_AIR;
if (c_mossycobble == CONTENT_IGNORE) if (c_mossycobble == CONTENT_IGNORE)
c_mossycobble = c_cobble; c_mossycobble = c_cobble;
if (c_sandbrick == CONTENT_IGNORE)
c_sandbrick = c_desert_stone;
if (c_stair_cobble == CONTENT_IGNORE) if (c_stair_cobble == CONTENT_IGNORE)
c_stair_cobble = c_cobble; c_stair_cobble = c_cobble;
if (c_stair_sandstone == CONTENT_IGNORE) if (c_sandstonebrick == CONTENT_IGNORE)
c_stair_sandstone = c_sandbrick; c_sandstonebrick = c_desert_stone;
if (c_stair_sandstonebrick == CONTENT_IGNORE)
c_stair_sandstonebrick = c_sandstonebrick;
} }
@ -251,27 +249,27 @@ void MapgenV5::makeChunk(BlockMakeData *data)
dp.np_rarity = nparams_dungeon_rarity; dp.np_rarity = nparams_dungeon_rarity;
dp.np_density = nparams_dungeon_density; dp.np_density = nparams_dungeon_density;
dp.np_wetness = nparams_dungeon_wetness; dp.np_wetness = nparams_dungeon_wetness;
dp.c_water = c_water_source; dp.c_water = c_water_source;
if (desert_stone) { if (desert_stone) {
dp.c_cobble = c_sandbrick; dp.c_cobble = c_desert_stone;
dp.c_moss = c_sandbrick; // should make this 'cracked sandstone' later dp.c_moss = c_desert_stone;
dp.c_stair = c_stair_sandstone; dp.c_stair = c_desert_stone;
dp.diagonal_dirs = true; dp.diagonal_dirs = true;
dp.mossratio = 0.0; dp.mossratio = 0.0;
dp.holesize = v3s16(2, 3, 2); dp.holesize = v3s16(2, 3, 2);
dp.roomsize = v3s16(2, 5, 2); dp.roomsize = v3s16(2, 5, 2);
dp.notifytype = GENNOTIFY_TEMPLE; dp.notifytype = GENNOTIFY_TEMPLE;
} else { } else {
dp.c_cobble = c_cobble; dp.c_cobble = c_cobble;
dp.c_moss = c_mossycobble; dp.c_moss = c_mossycobble;
dp.c_stair = c_stair_cobble; dp.c_stair = c_stair_cobble;
dp.diagonal_dirs = false; dp.diagonal_dirs = false;
dp.mossratio = 3.0; dp.mossratio = 3.0;
dp.holesize = v3s16(1, 2, 1); dp.holesize = v3s16(1, 2, 1);
dp.roomsize = v3s16(0, 0, 0); dp.roomsize = v3s16(0, 0, 0);
dp.notifytype = GENNOTIFY_DUNGEON; dp.notifytype = GENNOTIFY_DUNGEON;
} }
DungeonGen dgen(this, &dp); DungeonGen dgen(this, &dp);

16
src/mapgen_v5.h
View File

@ -73,20 +73,16 @@ public:
Noise *noise_humidity; Noise *noise_humidity;
content_t c_stone; content_t c_stone;
content_t c_dirt;
content_t c_dirt_with_grass;
content_t c_sand;
content_t c_water_source; content_t c_water_source;
content_t c_lava_source; content_t c_lava_source;
content_t c_ice;
content_t c_gravel;
content_t c_cobble;
content_t c_desert_sand;
content_t c_desert_stone; content_t c_desert_stone;
content_t c_mossycobble; content_t c_ice;
content_t c_sandbrick;
content_t c_cobble;
content_t c_stair_cobble; content_t c_stair_cobble;
content_t c_stair_sandstone; content_t c_mossycobble;
content_t c_sandstonebrick;
content_t c_stair_sandstonebrick;
MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge); MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge);
~MapgenV5(); ~MapgenV5();

43
src/mapgen_v6.cpp
View File

@ -89,30 +89,25 @@ MapgenV6::MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge)
c_water_source = ndef->getId("mapgen_water_source"); c_water_source = ndef->getId("mapgen_water_source");
c_lava_source = ndef->getId("mapgen_lava_source"); c_lava_source = ndef->getId("mapgen_lava_source");
c_gravel = ndef->getId("mapgen_gravel"); c_gravel = ndef->getId("mapgen_gravel");
c_cobble = ndef->getId("mapgen_cobble");
c_desert_sand = ndef->getId("mapgen_desert_sand");
c_desert_stone = ndef->getId("mapgen_desert_stone"); c_desert_stone = ndef->getId("mapgen_desert_stone");
c_desert_sand = ndef->getId("mapgen_desert_sand");
c_dirt_with_snow = ndef->getId("mapgen_dirt_with_snow"); c_dirt_with_snow = ndef->getId("mapgen_dirt_with_snow");
c_snow = ndef->getId("mapgen_snow"); c_snow = ndef->getId("mapgen_snow");
c_snowblock = ndef->getId("mapgen_snowblock"); c_snowblock = ndef->getId("mapgen_snowblock");
c_ice = ndef->getId("mapgen_ice"); c_ice = ndef->getId("mapgen_ice");
c_mossycobble = ndef->getId("mapgen_mossycobble"); c_cobble = ndef->getId("mapgen_cobble");
c_sandbrick = ndef->getId("mapgen_sandstonebrick");
c_stair_cobble = ndef->getId("mapgen_stair_cobble"); c_stair_cobble = ndef->getId("mapgen_stair_cobble");
c_stair_sandstone = ndef->getId("mapgen_stair_sandstone"); c_mossycobble = ndef->getId("mapgen_mossycobble");
if (c_desert_sand == CONTENT_IGNORE) if (c_desert_sand == CONTENT_IGNORE)
c_desert_sand = c_sand; c_desert_sand = c_sand;
if (c_desert_stone == CONTENT_IGNORE) if (c_desert_stone == CONTENT_IGNORE)
c_desert_stone = c_stone; c_desert_stone = c_stone;
if (c_mossycobble == CONTENT_IGNORE) if (c_mossycobble == CONTENT_IGNORE)
c_mossycobble = c_cobble; c_mossycobble = c_cobble;
if (c_sandbrick == CONTENT_IGNORE)
c_sandbrick = c_desert_stone;
if (c_stair_cobble == CONTENT_IGNORE) if (c_stair_cobble == CONTENT_IGNORE)
c_stair_cobble = c_cobble; c_stair_cobble = c_cobble;
if (c_stair_sandstone == CONTENT_IGNORE)
c_stair_sandstone = c_sandbrick;
} }
@ -543,27 +538,27 @@ void MapgenV6::makeChunk(BlockMakeData *data)
dp.np_rarity = nparams_dungeon_rarity; dp.np_rarity = nparams_dungeon_rarity;
dp.np_density = nparams_dungeon_density; dp.np_density = nparams_dungeon_density;
dp.np_wetness = nparams_dungeon_wetness; dp.np_wetness = nparams_dungeon_wetness;
dp.c_water = c_water_source; dp.c_water = c_water_source;
if (getBiome(0, v2s16(node_min.X, node_min.Z)) == BT_DESERT) { if (getBiome(0, v2s16(node_min.X, node_min.Z)) == BT_DESERT) {
dp.c_cobble = c_sandbrick; dp.c_cobble = c_desert_stone;
dp.c_moss = c_sandbrick; // should make this 'cracked sandstone' later dp.c_moss = c_desert_stone;
dp.c_stair = c_stair_sandstone; dp.c_stair = c_desert_stone;
dp.diagonal_dirs = true; dp.diagonal_dirs = true;
dp.mossratio = 0.0; dp.mossratio = 0.0;
dp.holesize = v3s16(2, 3, 2); dp.holesize = v3s16(2, 3, 2);
dp.roomsize = v3s16(2, 5, 2); dp.roomsize = v3s16(2, 5, 2);
dp.notifytype = GENNOTIFY_TEMPLE; dp.notifytype = GENNOTIFY_TEMPLE;
} else { } else {
dp.c_cobble = c_cobble; dp.c_cobble = c_cobble;
dp.c_moss = c_mossycobble; dp.c_moss = c_mossycobble;
dp.c_stair = c_stair_cobble; dp.c_stair = c_stair_cobble;
dp.diagonal_dirs = false; dp.diagonal_dirs = false;
dp.mossratio = 3.0; dp.mossratio = 3.0;
dp.holesize = v3s16(1, 2, 1); dp.holesize = v3s16(1, 2, 1);
dp.roomsize = v3s16(0, 0, 0); dp.roomsize = v3s16(0, 0, 0);
dp.notifytype = GENNOTIFY_DUNGEON; dp.notifytype = GENNOTIFY_DUNGEON;
} }
DungeonGen dgen(this, &dp); DungeonGen dgen(this, &dp);

6
src/mapgen_v6.h
View File

@ -111,18 +111,16 @@ public:
content_t c_water_source; content_t c_water_source;
content_t c_lava_source; content_t c_lava_source;
content_t c_gravel; content_t c_gravel;
content_t c_cobble;
content_t c_desert_sand;
content_t c_desert_stone; content_t c_desert_stone;
content_t c_desert_sand;
content_t c_dirt_with_snow; content_t c_dirt_with_snow;
content_t c_snow; content_t c_snow;
content_t c_snowblock; content_t c_snowblock;
content_t c_ice; content_t c_ice;
content_t c_cobble;
content_t c_mossycobble; content_t c_mossycobble;
content_t c_sandbrick;
content_t c_stair_cobble; content_t c_stair_cobble;
content_t c_stair_sandstone;
MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge); MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge);
~MapgenV6(); ~MapgenV6();

63
src/mapgen_v7.cpp
View File

@ -88,29 +88,28 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
//// Resolve nodes to be used //// Resolve nodes to be used
INodeDefManager *ndef = emerge->ndef; INodeDefManager *ndef = emerge->ndef;
c_stone = ndef->getId("mapgen_stone"); c_stone = ndef->getId("mapgen_stone");
c_dirt = ndef->getId("mapgen_dirt"); c_water_source = ndef->getId("mapgen_water_source");
c_dirt_with_grass = ndef->getId("mapgen_dirt_with_grass"); c_lava_source = ndef->getId("mapgen_lava_source");
c_sand = ndef->getId("mapgen_sand"); c_desert_stone = ndef->getId("mapgen_desert_stone");
c_water_source = ndef->getId("mapgen_water_source"); c_ice = ndef->getId("mapgen_ice");
c_lava_source = ndef->getId("mapgen_lava_source");
c_ice = ndef->getId("default:ice"); c_cobble = ndef->getId("mapgen_cobble");
c_cobble = ndef->getId("mapgen_cobble"); c_stair_cobble = ndef->getId("mapgen_stair_cobble");
c_desert_stone = ndef->getId("mapgen_desert_stone"); c_mossycobble = ndef->getId("mapgen_mossycobble");
c_mossycobble = ndef->getId("mapgen_mossycobble"); c_sandstonebrick = ndef->getId("mapgen_sandstonebrick");
c_sandbrick = ndef->getId("mapgen_sandstonebrick"); c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");
c_stair_cobble = ndef->getId("mapgen_stair_cobble");
c_stair_sandstone = ndef->getId("mapgen_stair_sandstone");
if (c_ice == CONTENT_IGNORE) if (c_ice == CONTENT_IGNORE)
c_ice = CONTENT_AIR; c_ice = CONTENT_AIR;
if (c_mossycobble == CONTENT_IGNORE) if (c_mossycobble == CONTENT_IGNORE)
c_mossycobble = c_cobble; c_mossycobble = c_cobble;
if (c_sandbrick == CONTENT_IGNORE)
c_sandbrick = c_desert_stone;
if (c_stair_cobble == CONTENT_IGNORE) if (c_stair_cobble == CONTENT_IGNORE)
c_stair_cobble = c_cobble; c_stair_cobble = c_cobble;
if (c_stair_sandstone == CONTENT_IGNORE) if (c_sandstonebrick == CONTENT_IGNORE)
c_stair_sandstone = c_sandbrick; c_sandstonebrick = c_desert_stone;
if (c_stair_sandstonebrick == CONTENT_IGNORE)
c_stair_sandstonebrick = c_sandstonebrick;
} }
@ -272,27 +271,27 @@ void MapgenV7::makeChunk(BlockMakeData *data)
dp.np_rarity = nparams_dungeon_rarity; dp.np_rarity = nparams_dungeon_rarity;
dp.np_density = nparams_dungeon_density; dp.np_density = nparams_dungeon_density;
dp.np_wetness = nparams_dungeon_wetness; dp.np_wetness = nparams_dungeon_wetness;
dp.c_water = c_water_source; dp.c_water = c_water_source;
if (desert_stone) { if (desert_stone) {
dp.c_cobble = c_sandbrick; dp.c_cobble = c_desert_stone;
dp.c_moss = c_sandbrick; // should make this 'cracked sandstone' later dp.c_moss = c_desert_stone;
dp.c_stair = c_stair_sandstone; dp.c_stair = c_desert_stone;
dp.diagonal_dirs = true; dp.diagonal_dirs = true;
dp.mossratio = 0.0; dp.mossratio = 0.0;
dp.holesize = v3s16(2, 3, 2); dp.holesize = v3s16(2, 3, 2);
dp.roomsize = v3s16(2, 5, 2); dp.roomsize = v3s16(2, 5, 2);
dp.notifytype = GENNOTIFY_TEMPLE; dp.notifytype = GENNOTIFY_TEMPLE;
} else { } else {
dp.c_cobble = c_cobble; dp.c_cobble = c_cobble;
dp.c_moss = c_mossycobble; dp.c_moss = c_mossycobble;
dp.c_stair = c_stair_cobble; dp.c_stair = c_stair_cobble;
dp.diagonal_dirs = false; dp.diagonal_dirs = false;
dp.mossratio = 3.0; dp.mossratio = 3.0;
dp.holesize = v3s16(1, 2, 1); dp.holesize = v3s16(1, 2, 1);
dp.roomsize = v3s16(0, 0, 0); dp.roomsize = v3s16(0, 0, 0);
dp.notifytype = GENNOTIFY_DUNGEON; dp.notifytype = GENNOTIFY_DUNGEON;
} }
DungeonGen dgen(this, &dp); DungeonGen dgen(this, &dp);

16
src/mapgen_v7.h
View File

@ -84,20 +84,16 @@ public:
Noise *noise_humidity; Noise *noise_humidity;
content_t c_stone; content_t c_stone;
content_t c_dirt;
content_t c_dirt_with_grass;
content_t c_sand;
content_t c_water_source; content_t c_water_source;
content_t c_lava_source; content_t c_lava_source;
content_t c_ice;
content_t c_gravel;
content_t c_cobble;
content_t c_desert_sand;
content_t c_desert_stone; content_t c_desert_stone;
content_t c_mossycobble; content_t c_ice;
content_t c_sandbrick;
content_t c_cobble;
content_t c_stair_cobble; content_t c_stair_cobble;
content_t c_stair_sandstone; content_t c_mossycobble;
content_t c_sandstonebrick;
content_t c_stair_sandstonebrick;
MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge); MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
~MapgenV7(); ~MapgenV7();