dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweak the dispersed spreading a bit more

Browse Source
This commit is contained in:
Andreas Schmitt
2021-06-17 19:09:11 +02:00
committed by Jonathan G Rennison
parent f944c9e7ba
commit d719b09cf0
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tree_cmd.cpp
View File

@@ -316,7 +316,7 @@ static TileIndex FindTreePositionAtSameHeight(TileIndex tile, uint steps)
*/ */
static void PlantTreeAtSameHeight(TileIndex tile) static void PlantTreeAtSameHeight(TileIndex tile)
{ {
const auto new_tile = FindTreePositionAtSameHeight(tile, 4); const auto new_tile = FindTreePositionAtSameHeight(tile, 1);
if (new_tile != INVALID_TILE) { if (new_tile != INVALID_TILE) {
PlantTreesOnTile(new_tile, GetTreeType(tile), 0, 0); PlantTreesOnTile(new_tile, GetTreeType(tile), 0, 0);
@@ -556,7 +556,7 @@ CommandCost CmdPlantTree(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
/* no more space for trees? */ /* no more space for trees? */
if (_settings_game.game_creation.tree_placer == TP_PERFECT) { if (_settings_game.game_creation.tree_placer == TP_PERFECT) {
if (GetTreeCount(tile) >= 4 || ((int)GetTreeCount(tile) >= MaxTreeCount(tile))) { if (GetTreeCount(tile) >= 4 || ((GetTreeType(tile) != TREE_CACTUS) && ((int)GetTreeCount(tile) >= MaxTreeCount(tile)))) {
if (GetTreeGrowth(tile) < 3) { if (GetTreeGrowth(tile) < 3) {
grow_existing_tree_instead = true; grow_existing_tree_instead = true;
} else { } else {
@@ -945,7 +945,7 @@ static void TileLoop_Trees(TileIndex tile)
case 1: { // add a tree case 1: { // add a tree
if (_settings_game.game_creation.tree_placer == TP_PERFECT) { if (_settings_game.game_creation.tree_placer == TP_PERFECT) {
if ((GetTreeCount(tile) < 4) && (GetTreeType(tile) != TREE_CACTUS) && ((int)GetTreeCount(tile) < MaxTreeCount(tile))) { if ((GetTreeCount(tile) < 4) && ((GetTreeType(tile) == TREE_CACTUS) || ((int)GetTreeCount(tile) < MaxTreeCount(tile)))) {
AddTreeCount(tile, 1); AddTreeCount(tile, 1);
SetTreeGrowth(tile, 0); SetTreeGrowth(tile, 0);
break; break;
@@ -966,7 +966,9 @@ static void TileLoop_Trees(TileIndex tile)
(GetTreeType(tile) == TREE_CACTUS) || (GetTreeType(tile) == TREE_CACTUS) ||
(_settings_game.game_creation.landscape == LT_ARCTIC && GetTileZ(tile) >= _settings_game.game_creation.snow_line_height + _settings_game.construction.trees_around_snow_line_range / 3))) { (_settings_game.game_creation.landscape == LT_ARCTIC && GetTileZ(tile) >= _settings_game.game_creation.snow_line_height + _settings_game.construction.trees_around_snow_line_range / 3))) {
// On lower levels we spread more randomly to not bunch up. // On lower levels we spread more randomly to not bunch up.
PlantTreeAtSameHeight(tile); if (GetTreeType(tile) != TREE_CACTUS || (RandomRange(100) < 50)) {
PlantTreeAtSameHeight(tile);
}
} else { } else {
const TreeType tree_type = GetTreeType(tile); const TreeType tree_type = GetTreeType(tile);