/*
Minetest
-Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2015 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
#include "mapgen.h"
#include "noise.h"
-#define AVERAGE_MUD_AMOUNT 4
+#define MGV6_AVERAGE_MUD_AMOUNT 4
+#define MGV6_DESERT_STONE_BASE -32
+#define MGV6_ICE_BASE 0
+#define MGV6_FREQ_HOT 0.4
+#define MGV6_FREQ_SNOW -0.4
+#define MGV6_FREQ_TAIGA 0.5
+#define MGV6_FREQ_JUNGLE 0.5
-/////////////////// Mapgen V6 flags
+//////////// Mapgen V6 flags
#define MGV6_JUNGLES 0x01
#define MGV6_BIOMEBLEND 0x02
#define MGV6_MUDFLOW 0x04
+#define MGV6_SNOWBIOMES 0x08
+#define MGV6_FLAT 0x10
+#define MGV6_TREES 0x20
extern FlagDesc flagdesc_mapgen_v6[];
enum BiomeV6Type
{
BT_NORMAL,
- BT_DESERT
+ BT_DESERT,
+ BT_JUNGLE,
+ BT_TUNDRA,
+ BT_TAIGA,
};
-struct MapgenV6Params : public MapgenSpecificParams {
+
+struct MapgenV6Params : public MapgenParams {
u32 spflags;
float freq_desert;
float freq_beach;
MapgenV6Params();
~MapgenV6Params() {}
- void readParams(Settings *settings);
- void writeParams(Settings *settings);
+ void readParams(const Settings *settings);
+ void writeParams(Settings *settings) const;
};
+
class MapgenV6 : public Mapgen {
public:
- EmergeManager *emerge;
+ EmergeManager *m_emerge;
int ystride;
u32 spflags;
- u32 blockseed;
v3s16 node_min;
v3s16 node_max;
v3s16 full_node_min;
Noise *noise_mud;
Noise *noise_beach;
Noise *noise_biome;
+ Noise *noise_humidity;
NoiseParams *np_cave;
NoiseParams *np_humidity;
NoiseParams *np_trees;
content_t c_water_source;
content_t c_lava_source;
content_t c_gravel;
- content_t c_cobble;
- content_t c_desert_sand;
content_t c_desert_stone;
+ content_t c_desert_sand;
+ content_t c_dirt_with_snow;
+ content_t c_snow;
+ content_t c_snowblock;
+ content_t c_ice;
+ content_t c_cobble;
content_t c_mossycobble;
- content_t c_sandbrick;
content_t c_stair_cobble;
- content_t c_stair_sandstone;
+ content_t c_stair_desert_stone;
- MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+ MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge);
~MapgenV6();
+ virtual MapgenType getType() const { return MAPGEN_V6; }
+
void makeChunk(BlockMakeData *data);
int getGroundLevelAtPoint(v2s16 p);
+ int getSpawnLevelAtPoint(v2s16 p);
float baseTerrainLevel(float terrain_base, float terrain_higher,
- float steepness, float height_select);
+ float steepness, float height_select);
virtual float baseTerrainLevelFromNoise(v2s16 p);
virtual float baseTerrainLevelFromMap(v2s16 p);
virtual float baseTerrainLevelFromMap(int index);
int generateGround();
void addMud();
void flowMud(s16 &mudflow_minpos, s16 &mudflow_maxpos);
- void addDirtGravelBlobs();
void growGrass();
void placeTreesAndJungleGrass();
virtual void generateCaves(int max_stone_y);
- virtual void generateExperimental() {}
-};
-
-struct MapgenFactoryV6 : public MapgenFactory {
- Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) {
- return new MapgenV6(mgid, params, emerge);
- };
-
- MapgenSpecificParams *createMapgenParams() {
- return new MapgenV6Params();
- };
};
#endif