diff --git a/android/assets/jsons/Civ V - Vanilla/Nations.json b/android/assets/jsons/Civ V - Vanilla/Nations.json index 1de6c12fbd..f3e87f7c9e 100644 --- a/android/assets/jsons/Civ V - Vanilla/Nations.json +++ b/android/assets/jsons/Civ V - Vanilla/Nations.json @@ -469,7 +469,7 @@ "outerColor": [225,105,0], "innerColor": [255,255,78], "uniqueName": "Wayfinding", - "uniques": ["Can embark and move over Coasts and Oceans immediately", "+1 Sight when embarked", "+[10]% Strength if within [2] tiles of a [Moai]"], + "uniques": ["Can embark and move over Coasts and Oceans immediately", "+[1] Sight for all [Embarked] units", "+[10]% Strength if within [2] tiles of a [Moai]"], "cities": ["Honolulu","Samoa","Tonga","Nuku Hiva","Raiatea","Aotearoa","Tahiti","Hilo","Te Wai Pounamu","Rapa Nui", "Tuamotu","Rarotonga","Tuvalu","Tubuai","Mangareva","Oahu","Kiritimati","Ontong Java","Niue","Rekohu", "Rakahanga","Bora Bora","Kailua","Uvea","Futuna","Rotuma","Tokelau","Lahaina","Bellona","Mungava","Tikopia", diff --git a/android/assets/jsons/Civ V - Vanilla/Units.json b/android/assets/jsons/Civ V - Vanilla/Units.json index f20944e4bc..92d1a98334 100644 --- a/android/assets/jsons/Civ V - Vanilla/Units.json +++ b/android/assets/jsons/Civ V - Vanilla/Units.json @@ -1174,7 +1174,7 @@ "requiredTech": "Pharmaceuticals", "attackSound": "shot", "promotions": ["Amphibious"], - "uniques": ["[+1] Sight when [Embarked]", "Defense bonus when embarked"] + "uniques": ["[+1] Sight for all [Embarked] units", "Defense bonus when embarked"] }, { "name": "Machine Gun", diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index 0effc519dc..1ca32e3a98 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -214,6 +214,7 @@ class MapUnit { visibilityRange += unique.params[0].toInt() if (hasUnique("+2 Visibility Range")) visibilityRange += 2 // This shouldn't be stackable if (hasUnique("Limited Visibility")) visibilityRange -= 1 + // Deprecated since 3.15.1 if (civInfo.hasUnique("+1 Sight for all land military units") && type.isMilitary() && type.isLandUnit()) visibilityRange += 1 @@ -221,11 +222,7 @@ class MapUnit { if (type.isMilitary() && type.isWaterUnit() && civInfo.hasUnique("All military naval units receive +1 movement and +1 sight")) visibilityRange += 1 // - - for (unique in civInfo.getMatchingUniques("[] Sight when []")) - if (matchesFilter(unique.params[1])) - visibilityRange += unique.params[0].toInt() val tile = getTile() for (unique in tile.getAllTerrains().flatMap { it.uniqueObjects }) if (unique.placeholderText == "[] Sight for [] units" && matchesFilter(unique.params[1])) diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt index 35f729a31e..e33985f22d 100644 --- a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt @@ -241,6 +241,7 @@ class BaseUnit : INamed, IConstruction { "Air", "air units" -> unitType.isAirUnit() "non-air" -> !unitType.isAirUnit() "Military", "military units" -> unitType.isMilitary() + // Deprecated as of 3.15.2 "military water" -> unitType.isMilitary() && unitType.isWaterUnit() else -> false }