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

Merge branch 'desert-tweaks' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-03-06 19:38:18 +00:00
parent e5a421b65a 39d39a5c61
commit 60a33feac8
6 changed files with 161 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

226
src/table/genland.h
View File

@@ -7,160 +7,82 @@
/** @file genland.h Table used to generate deserts and/or rain forests. */
#define M(x, y) {x, y}
#define R(x1, x2, y1, y2) {x1, y1, x2, y2}
static const TileIndexDiffC _make_desert_or_rainforest_data[] = {
M(-5, -5),
M(-4, -5),
M(-3, -5),
M(-2, -5),
M(-1, -5),
M( 0, -5),
M( 1, -5),
M( 2, -5),
M( 3, -5),
M( 4, -5),
M( 5, -5),
M(-5, -4),
M(-4, -4),
M(-3, -4),
M(-2, -4),
M(-1, -4),
M( 0, -4),
M( 1, -4),
M( 2, -4),
M( 3, -4),
M( 4, -4),
M( 5, -4),
M(-5, -3),
M(-4, -3),
M(-3, -3),
M(-2, -3),
M(-1, -3),
M( 0, -3),
M( 1, -3),
M( 2, -3),
M( 3, -3),
M( 4, -3),
M( 5, -3),
M(-5, -2),
M(-4, -2),
M(-3, -2),
M(-2, -2),
M(-1, -2),
M( 0, -2),
M( 1, -2),
M( 2, -2),
M( 3, -2),
M( 4, -2),
M( 5, -2),
M(-5, -1),
M(-4, -1),
M(-3, -1),
M(-2, -1),
M(-1, -1),
M( 0, -1),
M( 1, -1),
M( 2, -1),
M( 3, -1),
M( 4, -1),
M( 5, -1),
M(-5, 0),
M(-4, 0),
M(-3, 0),
M(-2, 0),
M(-1, 0),
M( 0, 0),
M( 1, 0),
M( 2, 0),
M( 3, 0),
M( 4, 0),
M( 5, 0),
M(-5, 1),
M(-4, 1),
M(-3, 1),
M(-2, 1),
M(-1, 1),
M( 0, 1),
M( 1, 1),
M( 2, 1),
M( 3, 1),
M( 4, 1),
M( 5, 1),
M(-5, 2),
M(-4, 2),
M(-3, 2),
M(-2, 2),
M(-1, 2),
M( 0, 2),
M( 1, 2),
M( 2, 2),
M( 3, 2),
M( 4, 2),
M( 5, 2),
M(-5, 3),
M(-4, 3),
M(-3, 3),
M(-2, 3),
M(-1, 3),
M( 0, 3),
M( 1, 3),
M( 2, 3),
M( 3, 3),
M( 4, 3),
M( 5, 3),
M(-5, 4),
M(-4, 4),
M(-3, 4),
M(-2, 4),
M(-1, 4),
M( 0, 4),
M( 1, 4),
M( 2, 4),
M( 3, 4),
M( 4, 4),
M( 5, 4),
M(-5, 5),
M(-4, 5),
M(-3, 5),
M(-2, 5),
M(-1, 5),
M( 0, 5),
M( 1, 5),
M( 2, 5),
M( 3, 5),
M( 4, 5),
M( 5, 5),
M( 6, -3),
M(-6, -3),
M(-3, 6),
M(-3, -6),
M( 6, -2),
M(-6, -2),
M(-2, 6),
M(-2, -6),
M( 6, -1),
M(-6, -1),
M(-1, 6),
M(-1, -6),
M( 6, 0),
M(-6, 0),
M( 0, 6),
M( 0, -6),
M( 6, 1),
M(-6, 1),
M( 1, 6),
M( 1, -6),
M( 6, 2),
M(-6, 2),
M( 2, 6),
M( 2, -6),
M( 6, 3),
M(-6, 3),
M( 3, 6),
M( 3, -6)
// This default array draws a filled circle 13 tiles in diameter
static const Rect16 _make_desert_or_rainforest_data[] = {
R(-5, 5, -5, 5),
R( 6, 6, -3, 3),
R(-6, -6, -3, 3),
R(-3, 3, 6, 6),
R(-3, 3, -6, -6)
};
// This array draws a filled circle 19 tiles in diameter
static const Rect16 _make_desert_or_rainforest_data_medium[] = {
R(-3, 3, -9, -9),
R(-5, 5, -8, -8),
R(-6, 6, -7, -7),
R(-7, 7, -6, -6),
R(-8, 8, -5, -4),
R(-9, 9, -3, 3),
R(-8, 8, 4, 5),
R(-7, 7, 6, 6),
R(-6, 6, 7, 7),
R(-5, 5, 8, 8),
R(-3, 3, 9, 9)
};
// This array draws a filled circle 25 tiles in diameter
static const Rect16 _make_desert_or_rainforest_data_large[] = {
R( -3, 3, -12, -12),
R( -5, 5, -11, -11),
R( -7, 7, -10, -10),
R( -8, 8, -9, -9),
R( -9, 9, -8, -8),
R(-10, 10, -7, -6),
R(-11, 11, -5, -4),
R(-12, 12, -3, 3),
R(-11, 11, 4, 5),
R(-10, 10, 6, 7),
R( -9, 9, 8, 8),
R( -8, 8, 9, 9),
R( -7, 7, 10, 10),
R( -5, 5, 11, 11),
R( -3, 3, 12, 12)
};
#undef M
// This array draws a filled circle 51 tiles in diameter.
static const Rect16 _make_desert_or_rainforest_data_extralarge[] = {
R( -5, 5, -25, -25),
R( -8, 8, -24, -24),
R(-11, 11, -23, -23),
R(-12, 12, -22, -22),
R(-14, 14, -21, -21),
R(-15, 15, -20, -20),
R(-17, 17, -19, -19),
R(-18, 18, -18, -18),
R(-19, 19, -17, -16),
R(-20, 20, -15, -15),
R(-21, 21, -14, -13),
R(-22, 22, -12, -12),
R(-23, 23, -11, -9),
R(-24, 24, -8, -6),
R(-25, 25, -5, 5),
R(-24, 24, 6, 8),
R(-23, 23, 9, 11),
R(-22, 22, 12, 12),
R(-21, 21, 13, 14),
R(-20, 20, 15, 15),
R(-19, 19, 16, 17),
R(-18, 18, 18, 18),
R(-17, 17, 19, 19),
R(-15, 15, 20, 20),
R(-14, 14, 21, 21),
R(-12, 12, 22, 22),
R(-11, 11, 23, 23),
R( -8, 8, 24, 24),
R( -5, 5, 25, 25)
};
#undef R

32
src/table/settings/settings.ini
View File

@@ -3881,8 +3881,8 @@ var = game_creation.river_tropics_width
type = SLE_UINT8
flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO
def = 5
min = 1
max = 12
min = 2
max = 51
interval = 1
str = STR_CONFIG_SETTING_RIVER_TROPICS_WIDTH
strhelp = STR_CONFIG_SETTING_RIVER_TROPICS_WIDTH_HELPTEXT
@@ -3890,6 +3890,34 @@ strval = STR_JUST_COMMA
cat = SC_BASIC
patxname = ""rivers.game_creation.river_tropics_width""
[SDT_VAR]
var = game_creation.lake_tropics_width
type = SLE_UINT8
flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO
def = 5
min = 2
max = 51
interval = 1
str = STR_CONFIG_SETTING_LAKE_TROPICS_WIDTH
strhelp = STR_CONFIG_SETTING_LAKE_TROPICS_WIDTH_HELPTEXT
strval = STR_JUST_COMMA
cat = SC_BASIC
patxname = ""rivers.game_creation.lake_tropics_width""
[SDT_VAR]
var = game_creation.coast_tropics_width
type = SLE_UINT8
flags = SF_GUI_DROPDOWN | SF_NEWGAME_ONLY
def = 0
min = 0
max = 3
interval = 1
str = STR_CONFIG_SETTING_COAST_TROPICS_WIDTH
strhelp = STR_CONFIG_SETTING_COAST_TROPICS_WIDTH_HELPTEXT
strval = STR_CONFIG_SETTING_COAST_TROPICS_WIDTH_DEFAULT
cat = SC_BASIC
patxname = ""rivers.game_creation.coast_tropics_width""
[SDT_VAR]
var = game_creation.lake_size
type = SLE_UINT8