From 8e3d2a1b878ab7f99de69592b3fe694d08b547ba Mon Sep 17 00:00:00 2001
From: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Date: Tue, 28 Sep 2021 21:44:54 +0200
Subject: [PATCH] Fix Polynesian vision when embarked (#5325)

* fix polynesia unique

* fix polynesia unique

* Update MapUnit.kt
---
 core/src/com/unciv/logic/map/MapUnit.kt | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt
index d2e6cc115c..a038cb770e 100644
--- a/core/src/com/unciv/logic/map/MapUnit.kt
+++ b/core/src/com/unciv/logic/map/MapUnit.kt
@@ -324,11 +324,16 @@ class MapUnit {
      * @return Maximum distance of tiles this unit may possibly see
      */
     private fun getVisibilityRange(): Int {
-        if (isEmbarked() && !hasUnique("Normal vision when embarked"))
-            return 1
-
         var visibilityRange = 2
 
+        if (isEmbarked() && !hasUnique("Normal vision when embarked")) {
+            visibilityRange = 1
+            for (unique in getMatchingUniques("[] Sight for all [] units"))
+                if (unique.params[1] == "Embarked") // only count bonuses explicitly for embarked units
+                    visibilityRange += unique.params[0].toInt()
+            return visibilityRange
+        }
+        
         for (unique in getMatchingUniques("[] Sight for all [] units"))
             if (matchesFilter(unique.params[1]))
                 visibilityRange += unique.params[0].toInt()