From 58def8f7df8a01fe5a194cad9f47f1c96033c687 Mon Sep 17 00:00:00 2001 From: mBornand <63592189+mBornand@users.noreply.github.com> Date: Sat, 14 Nov 2020 13:24:31 +0100 Subject: Fix flower and foliage generation (#4723) * fix flower generation - remove wrong mushroom and flower generation + add "tiny" mushrooms in Mushrooms biomes + add "tiny" mushrooms in Mega Taiga and variants + add tulip generation for plains biomes * Turn numbers into constants - Remove duplication of grass generation - Remove fern in inappropriate biomes * added roofed forest flowers to ini file * fixed crash with biMesaPlateuM + Use empty() + Emplace directly + Avoid a string copy in BiomeName + Alias BiomeIndex to avoid multiple casts Co-authored-by: 12xx12 <12xx12100@gmail.com> Co-authored-by: Tiger Wang --- src/Generating/FinishGen.h | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) (limited to 'src/Generating/FinishGen.h') diff --git a/src/Generating/FinishGen.h b/src/Generating/FinishGen.h index c12bc2392..d6458e4fc 100644 --- a/src/Generating/FinishGen.h +++ b/src/Generating/FinishGen.h @@ -123,7 +123,7 @@ public: static void ParseConfigurationString(const AString & a_String, std::vector & a_Output); /** Parses an inifile in search for all clumps */ - static std::vector ParseIniFile(cIniFile & a_IniFile, AString a_ClumpPrefix); + static std::vector ParseIniFile(cIniFile & a_IniFile, const AString & a_ClumpPrefix); protected: cNoise m_Noise; @@ -132,7 +132,7 @@ protected: /** The maximum number of foliage per clump */ const int MAX_NUM_FOLIAGE = 8; - /** The mininum number of foliage per clump */ + /** The minimum number of foliage per clump */ const int MIN_NUM_FOLIAGE = 4; /** The maximum range a foliage can be placed from the center of the clump */ @@ -181,35 +181,9 @@ protected: // cFinishGen override: virtual void GenFinish(cChunkDesc & a_ChunkDesc) override; - int GetBiomeDensity(EMCSBiome a_Biome) - { - switch (a_Biome) - { - case biSavanna: - case biSavannaM: - case biSavannaPlateau: - case biSavannaPlateauM: - case biPlains: - { - return 70; - } - - case biExtremeHillsEdge: - case biExtremeHillsPlus: - case biExtremeHills: - case biExtremeHillsPlusM: - case biExtremeHillsM: - case biIceMountains: - { - return 3; - } - - default: - { - return 20; - } - } - } + static bool CanFernGrow(EMCSBiome a_Biome); + static bool CanLargeFernGrow(EMCSBiome a_Biome); + static int GetBiomeDensity(EMCSBiome a_Biome); }; -- cgit v1.2.3