oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

FindSpawnPos: Let mapgens decide what spawn altitude is suitable

Browse source 
To avoid spawn search failing in new specialised mapgens
Increase spawn search range to 4000 nodes
Add getSpawnLevelAtPoint() functions to EmergeManager, class Mapgen
and all mapgens
Remove getGroundLevelAtPoint() functions from all mapgens except mgv6
(possibly to be re-added later in the correct form to return actual
ground level)
Make mgvalleys flag names consistent with other mapgens
Remove now unused 'vertical spawn range' setting
This commit is contained in:
paramat 2016-02-04 01:03:31 +00:00
parent 38e7122600
commit 4adbd69a37
19 changed files with 122 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/mapgen_valleys.cpp
View file

@ -56,8 +56,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
//Profiler *mapgen_profiler = &mapgen_prof;
static FlagDesc flagdesc_mapgen_valleys[] = {
{"altitude_chill", MG_VALLEYS_ALT_CHILL},
{"humid_rivers", MG_VALLEYS_HUMID_RIVERS},
{"altitude_chill", MGVALLEYS_ALT_CHILL},
{"humid_rivers", MGVALLEYS_HUMID_RIVERS},
{NULL, 0}
};
@ -86,8 +86,8 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *
MapgenValleysParams *sp = (MapgenValleysParams *)params->sparams;
this->spflags = sp->spflags;
this->humid_rivers = (spflags & MG_VALLEYS_HUMID_RIVERS);
this->use_altitude_chill = (spflags & MG_VALLEYS_ALT_CHILL);
this->humid_rivers = (spflags & MGVALLEYS_HUMID_RIVERS);
this->use_altitude_chill = (spflags & MGVALLEYS_ALT_CHILL);
this->altitude_chill = sp->altitude_chill;
this->humidity_adjust = params->np_biome_humidity.offset - 50.f;
@ -181,7 +181,7 @@ MapgenValleys::~MapgenValleys()
MapgenValleysParams::MapgenValleysParams()
{
spflags = MG_VALLEYS_HUMID_RIVERS | MG_VALLEYS_ALT_CHILL;
spflags = MGVALLEYS_HUMID_RIVERS | MGVALLEYS_ALT_CHILL;
altitude_chill = 90; // The altitude at which temperature drops by 20C.
large_cave_depth = -33;
@ -513,24 +513,19 @@ float MapgenValleys::adjustedTerrainLevelFromNoise(TerrainNoise *tn)
}
int MapgenValleys::getGroundLevelAtPoint(v2s16 p)
int MapgenValleys::getSpawnLevelAtPoint(v2s16 p)
{
// ***********************************
// This method (deliberately) does not
// return correct terrain values.
// ***********************************
// Since MT doesn't normally deal with rivers, check
// to make sure this isn't a request for a location
// in a river.
// Check to make sure this isn't a request for a location in a river.
float rivers = NoisePerlin2D(&noise_rivers->np, p.X, p.Y, seed);
// If it's wet, return an unusable number.
if (fabs(rivers) < river_size_factor)
return MAX_MAP_GENERATION_LIMIT;
return MAX_MAP_GENERATION_LIMIT; // Unsuitable spawn point
// Otherwise, return the real result.
return terrainLevelAtPoint(p.X, p.Y);
s16 level_at_point = terrainLevelAtPoint(p.X, p.Y);
if (level_at_point <= water_level ||
level_at_point > water_level + 16)
return MAX_MAP_GENERATION_LIMIT; // Unsuitable spawn point
else
return level_at_point;
}