Fixed open terrain bonus working in rough terrain (#4219)

* Fixed open terrain bonus working in rough terrain

Fixed #4139 - The open terrain combat bonus no longer works in rough
terrain.

Deprecated "Open terrain" and "Rough terrain" uniques and undeprecated
"rough" property of terrains.

* Minor simplification

* Replaced "rough" with "Rough terrain" unique

* Empty commit to re-run the build checks
This commit is contained in:
Arthur van der Staaij
2021-06-23 08:41:55 +02:00
committed by GitHub
parent 300eb6f726
commit e10c52efc1
4 changed files with 25 additions and 17 deletions

View File

@ -21,7 +21,7 @@
"food": 2,
"movementCost": 1,
"RGB": [97,171,58],
"uniques": ["Occurs at temperature between [-0.4] and [0.8] and humidity between [0.5] and [1]", "Open terrain"]
"uniques": ["Occurs at temperature between [-0.4] and [0.8] and humidity between [0.5] and [1]"]
},
{
"name": "Plains",
@ -31,7 +31,7 @@
"movementCost": 1,
"RGB": [168,185,102],
"uniques": ["Occurs at temperature between [-0.4] and [0.8] and humidity between [0] and [0.5]",
"Occurs at temperature between [0.8] and [1] and humidity between [0.7] and [1]", "Open terrain"]
"Occurs at temperature between [0.8] and [1] and humidity between [0.7] and [1]"]
},
{
"name": "Tundra",
@ -39,14 +39,14 @@
"food": 1,
"movementCost": 1,
"RGB": [189,204,191],
"uniques": ["Occurs at temperature between [-1] and [-0.4] and humidity between [0.5] and [1]", "Open terrain"]
"uniques": ["Occurs at temperature between [-1] and [-0.4] and humidity between [0.5] and [1]"]
},
{
"name": "Desert",
"type": "Land",
"movementCost": 1,
"RGB": [ 230, 230, 113],
"uniques": ["Occurs at temperature between [0.8] and [1] and humidity between [0] and [0.7]", "Open terrain"]
"uniques": ["Occurs at temperature between [0.8] and [1] and humidity between [0] and [0.7]"]
},
{
"name": "Lakes",
@ -62,14 +62,14 @@
"impassable": true,
"defenceBonus": 0.25,
"RGB": [120, 120, 120],
"uniques":["Has an elevation of [4] for visibility calculations"]
"uniques":["Rough terrain", "Has an elevation of [4] for visibility calculations"]
},
{
"name": "Snow",
"type": "Land",
"movementCost": 1,
"RGB": [231, 242, 249],
"uniques": ["Occurs at temperature between [-1] and [-0.4] and humidity between [0] and [0.5]", "Open terrain"]
"uniques": ["Occurs at temperature between [-1] and [-0.4] and humidity between [0] and [0.5]"]
},
// Terrain features
@ -95,7 +95,7 @@
"unbuildable": true,
"defenceBonus": 0.25,
"occursOn": ["Tundra","Plains","Grassland","Hill"],
"uniques": ["Provides a one-time Production bonus to the closest city when cut down", "Rough terrain",
"uniques": ["Rough terrain", "Provides a one-time Production bonus to the closest city when cut down",
"Blocks line-of-sight from tiles at same elevation"]
},
{
@ -147,7 +147,6 @@
"movementCost": 1,
"defenceBonus": -0.1,
"occursOn": ["Desert"]
"uniques":["Open terrain"]
},
{
"name": "Ice",