From 9a2ec028af54db232261efccb4feb141e9eb94a9 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Fri, 7 Aug 2020 13:25:51 +0300
Subject: [PATCH] Tests fixed

---
 core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt |  2 +-
 core/src/com/unciv/models/ruleset/Nation.kt            | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt b/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
index 6b469a2060..7bfc4df2e6 100644
--- a/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
+++ b/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
@@ -344,7 +344,7 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
             if (tile.isOcean && !unit.civInfo.tech.embarkedUnitsCanEnterOcean)
                 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.cannotEnterOceanTilesUntilAstronomy
                     && !unit.civInfo.tech.isResearched("Astronomy"))
diff --git a/core/src/com/unciv/models/ruleset/Nation.kt b/core/src/com/unciv/models/ruleset/Nation.kt
index 6a117cc41b..6d8ce68bf4 100644
--- a/core/src/com/unciv/models/ruleset/Nation.kt
+++ b/core/src/com/unciv/models/ruleset/Nation.kt
@@ -96,11 +96,11 @@ class Nation : INamed {
 
             textList += ""
         }
-//        if (uniqueName!="") {
-//            textList += uniqueName.tr() + ":"
-//            textList += "  " + uniques.joinToString(", ").tr()
-//            textList += ""
-//        }
+        else {
+            if (uniqueName != "") textList += uniqueName.tr() + ":"
+            textList += "  " + uniques.joinToString(", ").tr()
+            textList += ""
+        }
         if (startBias.isNotEmpty()) {
             textList += "Start bias:".tr() + startBias.joinToString(", ", " ") { it.tr() }
             textList += ""