AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 06:51:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tests fixed

Browse Source
This commit is contained in:
Yair Morgenstern 2020-08-07 13:25:51 +03:00
parent f0b041b20b
commit 9a2ec028af
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
View File

@ -344,7 +344,7 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
if (tile.isOcean && !unit.civInfo.tech.embarkedUnitsCanEnterOcean) if (tile.isOcean && !unit.civInfo.tech.embarkedUnitsCanEnterOcean)
return false return false
} }
if (tile.isOcean && unit.civInfo.tech.wayfinding) { // Apparently all Polynesian naval units can enter oceans if (tile.isOcean && !unit.civInfo.tech.wayfinding) { // Apparently all Polynesian naval units can enter oceans
if (unit.cannotEnterOceanTiles) return false if (unit.cannotEnterOceanTiles) return false
if (unit.cannotEnterOceanTilesUntilAstronomy if (unit.cannotEnterOceanTilesUntilAstronomy
&& !unit.civInfo.tech.isResearched("Astronomy")) && !unit.civInfo.tech.isResearched("Astronomy"))

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

@ -96,11 +96,11 @@ class Nation : INamed {
textList += "" textList += ""
} }
// if (uniqueName!="") { else {
// textList += uniqueName.tr() + ":" if (uniqueName != "") textList += uniqueName.tr() + ":"
// textList += " " + uniques.joinToString(", ").tr() textList += " " + uniques.joinToString(", ").tr()
// textList += "" textList += ""
// } }
if (startBias.isNotEmpty()) { if (startBias.isNotEmpty()) {
textList += "Start bias:".tr() + startBias.joinToString(", ", " ") { it.tr() } textList += "Start bias:".tr() + startBias.joinToString(", ", " ") { it.tr() }
textList += "" textList += ""