From 5a53b4d846e3780cdd922fc4b45c321a8b0f33a7 Mon Sep 17 00:00:00 2001 From: reldred Date: Fri, 19 Nov 2021 12:29:20 +1030 Subject: [PATCH] Additional tweaks to allow rivers to spawn in deserts (causing aditional tropic biome to spawn around them). This piggybacks off of the 'allow lakes in deserts' setting, renaming it to cover both. The actual setting name itself internally hasn't changed. --- src/landscape.cpp | 4 ++-- src/lang/english.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/landscape.cpp b/src/landscape.cpp index 70b06161b4..795055a04a 100644 --- a/src/landscape.cpp +++ b/src/landscape.cpp @@ -1055,7 +1055,7 @@ static bool FindSpring(TileIndex tile, void *user_data) if (!IsTileFlat(tile, &referenceHeight) || IsWaterTile(tile)) return false; /* In the tropics rivers start in the rainforest. */ - if (_settings_game.game_creation.landscape == LT_TROPIC && GetTropicZone(tile) != TROPICZONE_RAINFOREST) return false; + if (_settings_game.game_creation.landscape == LT_TROPIC && GetTropicZone(tile) != TROPICZONE_RAINFOREST && !_settings_game.game_creation.lakes_allowed_in_deserts) return false; /* Are there enough higher tiles to warrant a 'spring'? */ uint num = 0; @@ -1100,7 +1100,7 @@ static bool MakeLake(TileIndex tile, void *user_data) { const MakeLakeData *data = (const MakeLakeData *)user_data; if (!IsValidTile(tile) || TileHeight(tile) != data->height || !IsTileFlat(tile)) return false; - if (_settings_game.game_creation.landscape == LT_TROPIC && GetTropicZone(tile) == TROPICZONE_DESERT) return false; + if (_settings_game.game_creation.landscape == LT_TROPIC && GetTropicZone(tile) == TROPICZONE_DESERT && !_settings_game.game_creation.lakes_allowed_in_deserts) return false; /* Offset from centre tile */ const int64 x_delta = (int)TileX(tile) - (int)TileX(data->centre); diff --git a/src/lang/english.txt b/src/lang/english.txt index 6fc7c7ae0c..8b37fa0f78 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1639,8 +1639,8 @@ STR_CONFIG_SETTING_LAKE_SIZE :Size of lakes: STR_CONFIG_SETTING_LAKE_SIZE_HELPTEXT :Controls the size of lakes that are generated along rivers. STR_CONFIG_SETTING_LAKE_SIZE_VALUE :{NUM} STR_CONFIG_SETTING_LAKE_SIZE_ZERO :No lakes -STR_CONFIG_SETTING_LAKES_ALLOWED_IN_DESERTS :Lakes can be generated in sub-tropic climate deserts: {STRING} -STR_CONFIG_SETTING_LAKES_ALLOWED_IN_DESERTS_HELPTEXT :Choose whether the lakes that spawn along rivers are allowed in deserts. +STR_CONFIG_SETTING_LAKES_ALLOWED_IN_DESERTS :Lakes and rivers can be generated in sub-tropic climate deserts: {STRING} +STR_CONFIG_SETTING_LAKES_ALLOWED_IN_DESERTS_HELPTEXT :Choose whether lakes and rivers are allowed to spawn in sub-tropic climate deserts. STR_CONFIG_SETTING_RIVER_AMOUNT :River amount: {STRING2} STR_CONFIG_SETTING_RIVER_AMOUNT_HELPTEXT :Choose how many rivers to generate STR_CONFIG_SETTING_ROCKS_AMOUNT :Size of rocky patches: {STRING}