[CSM] Add flavour limits controlled by server (#5930)

[minetest.git] / src / mapgen_v7.h

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index eb46c371b2683d6cf0cc9284681612f8b2430ead..7b4364ef1772010e0fe2f0f991dc5db7df9a7ac3 100644 (file)
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -1,6 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2013-2016 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2014-2017 paramat
 
 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
@@ -22,17 +23,30 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "mapgen.h"
 
-/////////////////// Mapgen V7 flags
-#define MGV7_MOUNTAINS   0x01
-#define MGV7_RIDGES      0x02
+//////////// Mapgen V7 flags
+#define MGV7_MOUNTAINS  0x01
+#define MGV7_RIDGES     0x02
+#define MGV7_FLOATLANDS 0x04
+#define MGV7_CAVERNS    0x08
 
 class BiomeManager;
 
 extern FlagDesc flagdesc_mapgen_v7[];
 
 
-struct MapgenV7Params : public MapgenSpecificParams {
-       u32 spflags;
+struct MapgenV7Params : public MapgenParams {
+       u32 spflags = MGV7_MOUNTAINS | MGV7_RIDGES | MGV7_CAVERNS;
+       float cave_width = 0.09f;
+       s16 large_cave_depth = -33;
+       s16 lava_depth = -256;
+       float float_mount_density = 0.6f;
+       float float_mount_height = 128.0f;
+       s16 floatland_level = 1280;
+       s16 shadow_limit = 1024;
+       s16 cavern_limit = -256;
+       s16 cavern_taper = 256;
+       float cavern_threshold = 0.7f;
+
        NoiseParams np_terrain_base;
        NoiseParams np_terrain_alt;
        NoiseParams np_terrain_persist;
@@ -40,8 +54,11 @@ struct MapgenV7Params : public MapgenSpecificParams {
        NoiseParams np_filler_depth;
        NoiseParams np_mount_height;
        NoiseParams np_ridge_uwater;
+       NoiseParams np_floatland_base;
+       NoiseParams np_float_base_height;
        NoiseParams np_mountain;
        NoiseParams np_ridge;
+       NoiseParams np_cavern;
        NoiseParams np_cave1;
        NoiseParams np_cave2;
 
@@ -52,87 +69,43 @@ struct MapgenV7Params : public MapgenSpecificParams {
        void writeParams(Settings *settings) const;
 };
 
-class MapgenV7 : public Mapgen {
+class MapgenV7 : public MapgenBasic {
 public:
-       EmergeManager *m_emerge;
-       BiomeManager *bmgr;
+       MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge);
+       ~MapgenV7();
+
+       virtual MapgenType getType() const { return MAPGEN_V7; }
 
-       int ystride;
-       int zstride;
-       u32 spflags;
+       virtual void makeChunk(BlockMakeData *data);
+       int getSpawnLevelAtPoint(v2s16 p);
 
-       v3s16 node_min;
-       v3s16 node_max;
-       v3s16 full_node_min;
-       v3s16 full_node_max;
+       float baseTerrainLevelAtPoint(s16 x, s16 z);
+       float baseTerrainLevelFromMap(int index);
+       bool getMountainTerrainAtPoint(s16 x, s16 y, s16 z);
+       bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y);
+       bool getFloatlandMountainFromMap(int idx_xyz, int idx_xz, s16 y);
+       void floatBaseExtentFromMap(s16 *float_base_min, s16 *float_base_max, int idx_xz);
 
-       s16 *ridge_heightmap;
+       int generateTerrain();
+       void generateRidgeTerrain();
+
+private:
+       s16 large_cave_depth;
+       float float_mount_density;
+       float float_mount_height;
+       s16 floatland_level;
+       s16 shadow_limit;
 
        Noise *noise_terrain_base;
        Noise *noise_terrain_alt;
        Noise *noise_terrain_persist;
        Noise *noise_height_select;
-       Noise *noise_filler_depth;
        Noise *noise_mount_height;
        Noise *noise_ridge_uwater;
+       Noise *noise_floatland_base;
+       Noise *noise_float_base_height;
        Noise *noise_mountain;
        Noise *noise_ridge;
-       Noise *noise_cave1;
-       Noise *noise_cave2;
-
-       Noise *noise_heat;
-       Noise *noise_humidity;
-
-       content_t c_stone;
-       content_t c_water_source;
-       content_t c_lava_source;
-       content_t c_desert_stone;
-       content_t c_ice;
-       content_t c_sandstone;
-
-       content_t c_cobble;
-       content_t c_stair_cobble;
-       content_t c_mossycobble;
-       content_t c_sandstonebrick;
-       content_t c_stair_sandstonebrick;
-
-       MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
-       ~MapgenV7();
-
-       virtual void makeChunk(BlockMakeData *data);
-       int getGroundLevelAtPoint(v2s16 p);
-       Biome *getBiomeAtPoint(v3s16 p);
-
-       float baseTerrainLevelAtPoint(int x, int z);
-       float baseTerrainLevelFromMap(int index);
-       bool getMountainTerrainAtPoint(int x, int y, int z);
-       bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, int y);
-
-       void calculateNoise();
-
-       virtual int generateTerrain();
-       int generateBaseTerrain();
-       int generateMountainTerrain(int ymax);
-       void generateRidgeTerrain();
-
-       MgStoneType generateBiomes(float *heat_map, float *humidity_map);
-       void dustTopNodes();
-
-       //void addTopNodes();
-
-       void generateCaves(int max_stone_y);
-};
-
-struct MapgenFactoryV7 : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-       {
-               return new MapgenV7(mgid, params, emerge);
-       };
-
-       MapgenSpecificParams *createMapgenParams()
-       {
-               return new MapgenV7Params();
-       };
 };
 
 #endif