diff --git a/android/assets/jsons/Terrains.json b/android/assets/jsons/Terrains.json index 9307267e45..c3bb8b43a0 100644 --- a/android/assets/jsons/Terrains.json +++ b/android/assets/jsons/Terrains.json @@ -59,7 +59,8 @@ production:2, movementCost:2, defenceBonus: 0.25, - RGB: [74,81,40] + RGB: [74,81,40], + rough: true }, { name:"Mountain", @@ -87,7 +88,8 @@ overrideStats:true, unbuildable:true, defenceBonus: 0.25, - occursOn:["Tundra","Plains","Grassland","Hill"] + occursOn:["Tundra","Plains","Grassland","Hill"], + rough: true }, { name:"Jungle", @@ -97,7 +99,8 @@ overrideStats:true, unbuildable:true, defenceBonus: 0.25, - occursOn:["Plains","Grassland"] + occursOn:["Plains","Grassland"], + rough: true }, { name:"Marsh", diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 621e12ac5f..950f774c4a 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -3310,6 +3310,10 @@ Portuguese:"Custo de movimento" } + "Rough Terrain":{ + German: "Unwegsames Gelände" + } + " for ":{ //for example:+1 Gold for Gems,Gold,Silver Italian:" per " Simplified_Chinese:",当建造在拥有下列资源的地块上时:" diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index fd400c1e33..1d18152466 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -243,7 +243,7 @@ open class TileInfo { return listOf(abs(xDelta),abs(yDelta), abs(xDelta-yDelta)).max()!!.toInt() } - fun isRoughTerrain() = baseTerrain == Constants.hill || terrainFeature == Constants.forest || terrainFeature == Constants.jungle + fun isRoughTerrain() = getBaseTerrain().rough || getTerrainFeature()?.rough == true override fun toString(): String { val lineList = ArrayList() // more readable than StringBuilder, with same performance for our use-case diff --git a/core/src/com/unciv/models/gamebasics/tile/Terrain.kt b/core/src/com/unciv/models/gamebasics/tile/Terrain.kt index 71080cb75e..afbe6b541a 100644 --- a/core/src/com/unciv/models/gamebasics/tile/Terrain.kt +++ b/core/src/com/unciv/models/gamebasics/tile/Terrain.kt @@ -33,6 +33,9 @@ class Terrain : NamedStats(), ICivilopedia { sb.appendln("{Defence bonus}: ".tr()+(defenceBonus*100).toInt()+"%") } + if(rough) + sb.appendln("Rough Terrain".tr()) + return sb.toString() } lateinit var type: TerrainType @@ -62,6 +65,7 @@ class Terrain : NamedStats(), ICivilopedia { var movementCost = 1 var defenceBonus:Float = 0f var impassable = false + var rough = false fun getColor(): Color = colorFromRGB(RGB!![0], RGB!![1], RGB!![2]) } \ No newline at end of file