mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 17:59:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed broken tests

Browse Source
This commit is contained in:
Yair Morgenstern
2020-11-26 14:27:14 +02:00
parent b54fec05f1
commit c86d6e7b69
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/translations/Italian.properties
View File

@ -2380,7 +2380,7 @@ What do I see before me? Another beating heart for my sacrificial fire. = Alt! C
Accept this agreement or suffer the consequences. = Accetta questo scambio, o pagane le conseguenze. Accept this agreement or suffer the consequences. = Accetta questo scambio, o pagane le conseguenze.
Welcome, friend. = Benvenuto, amico. Welcome, friend. = Benvenuto, amico.
Sacrificial Captives = Vittime sacrificali Sacrificial Captives = Vittime sacrificali
Earn [amount]% of [param] opponent's [param2] as [stat] for kills = Ogni unità [param] nemica eliminata ti frutta [stat] pari alla sua [param2] Earn [amount]% of [param] opponent's [param2] as [stat] for kills =
Tenochtitlan = Tenochtitlan Tenochtitlan = Tenochtitlan
Teotihuacan = Teotihuacan Teotihuacan = Teotihuacan
Tlatelolco = Tlatelolco Tlatelolco = Tlatelolco

2
android/assets/jsons/translations/Polish.properties
View File

@ -448,7 +448,7 @@ Our proposed trade request is no longer relevant! = Nasza oferta handlowa nie je
# Requires translation! # Requires translation!
Clearing a [forest] has created [amount] Production for [cityName] = Clearing a [forest] has created [amount] Production for [cityName] =
[civName] assigned you a new quest: [questName]. = Cywilizacja [civName] przydzieliła Ci nowe zadanie: [questName]. [civName] assigned you a new quest: [questName]. = Cywilizacja [civName] przydzieliła Ci nowe zadanie: [questName].
[civName] rewarded you with [influence] influence for completing the [questName] quest. = Cywilizacja [civName] nagrodziła Cie [influence] wpływu za wykonanie zadania: [questname]. [civName] rewarded you with [influence] influence for completing the [questName] quest. = Cywilizacja [civName] nagrodziła Cie [influence] wpływu za wykonanie zadania: [questName].
The resistance in [cityName] has ended! = Opór w [cityName] dobiegł końca! The resistance in [cityName] has ended! = Opór w [cityName] dobiegł końca!
# Requires translation! # Requires translation!
Our [name] took [tileDamage] tile damage and was destroyed = Our [name] took [tileDamage] tile damage and was destroyed =

6
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -105,7 +105,11 @@ open class TileInfo {
fun getCity(): CityInfo? = owningCity fun getCity(): CityInfo? = owningCity
fun getLastTerrain(): Terrain = if (terrainFeature != null) getTerrainFeature()!! else if (naturalWonder != null) getNaturalWonder() else getBaseTerrain() fun getLastTerrain(): Terrain = when {
terrainFeature != null -> getTerrainFeature()!!
naturalWonder != null -> getNaturalWonder()
else -> getBaseTerrain()
}
fun getTileResource(): TileResource = fun getTileResource(): TileResource =
if (resource == null) throw Exception("No resource exists for this tile!") if (resource == null) throw Exception("No resource exists for this tile!")

9
core/src/com/unciv/models/ruleset/Nation.kt
View File

@ -73,12 +73,9 @@ class Nation : INamed {
if (innerColor == null) innerColorObject = Color.BLACK if (innerColor == null) innerColorObject = Color.BLACK
else innerColorObject = colorFromRGB(innerColor!!) else innerColorObject = colorFromRGB(innerColor!!)
if (uniques.contains("All units move through Forest and Jungle Tiles in friendly territory as if they have roads. These tiles can be used to establish City Connections upon researching the Wheel.")) forestsAndJunglesAreRoads = uniques.contains("All units move through Forest and Jungle Tiles in friendly territory as if they have roads. These tiles can be used to establish City Connections upon researching the Wheel.")
forestsAndJunglesAreRoads = true ignoreHillMovementCost = uniques.contains("Units ignore terrain costs when moving into any tile with Hills")
if (uniques.contains("Units ignore terrain costs when moving into any tile with Hills")) embarkDisembarkCosts1 = uniques.contains("Units pay only 1 movement point to embark and disembark")
ignoreHillMovementCost = true
if (uniques.contains("Units pay only 1 movement point to embark and disembark"))
embarkDisembarkCosts1 = true
} }
lateinit var cities: ArrayList<String> lateinit var cities: ArrayList<String>