From 19bf15558d039edbd82c0470e32c218c376fe728 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 5 Jul 2023 21:10:15 +0300 Subject: [PATCH] Fixed India's 'double unhappiness' unique --- android/assets/jsons/Civ V - Gods & Kings/Nations.json | 2 +- android/assets/jsons/Civ V - Vanilla/Nations.json | 2 +- core/src/com/unciv/logic/map/tile/Tile.kt | 2 ++ tests/src/com/unciv/logic/civilization/CityMovingTests.kt | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/android/assets/jsons/Civ V - Gods & Kings/Nations.json b/android/assets/jsons/Civ V - Gods & Kings/Nations.json index beebd7b64d..a59361ecd5 100644 --- a/android/assets/jsons/Civ V - Gods & Kings/Nations.json +++ b/android/assets/jsons/Civ V - Gods & Kings/Nations.json @@ -358,7 +358,7 @@ "favoredReligion": "Hinduism", "uniqueName": "Population Growth", - "uniques": ["[+100]% unhappiness from the number of Cities", "[-50]% Unhappiness from [Population] [in all cities]"], + "uniques": ["[+100]% unhappiness from the number of cities", "[-50]% Unhappiness from [Population] [in all cities]"], "cities": ["Delhi","Mumbai","Vijayanagara","Pataliputra","Varanasi","Agra","Calcutta","Lahore","Bangalore","Hyderabad","Madurai","Ahmedabad", "Kolhapur","Prayaga","Ayodhya","Indraprastha","Mathura","Ujjain","Gulbarga","Jaunpur","Rajagriha","Sravasti","Tiruchirapalli","Thanjavur", "Bodhgaya","Kushinagar","Amaravati","Gaur","Gwalior","Jaipur","Karachi"], diff --git a/android/assets/jsons/Civ V - Vanilla/Nations.json b/android/assets/jsons/Civ V - Vanilla/Nations.json index 29aadc87b7..1c71070077 100644 --- a/android/assets/jsons/Civ V - Vanilla/Nations.json +++ b/android/assets/jsons/Civ V - Vanilla/Nations.json @@ -331,7 +331,7 @@ "innerColor": [255, 163, 71], "uniqueName": "Population Growth", - "uniques": ["[+100]% unhappiness from the number of Cities", "[-50]% Unhappiness from [Population] [in all cities]"], + "uniques": ["[+100]% unhappiness from the number of cities", "[-50]% Unhappiness from [Population] [in all cities]"], "cities": ["Delhi","Mumbai","Vijayanagara","Pataliputra","Varanasi","Agra","Calcutta","Lahore","Bangalore","Hyderabad","Madurai","Ahmedabad", "Kolhapur","Prayaga","Ayodhya","Indraprastha","Mathura","Ujjain","Gulbarga","Jaunpur","Rajagriha","Sravasti","Tiruchirapalli","Thanjavur", "Bodhgaya","Kushinagar","Amaravati","Gaur","Gwalior","Jaipur","Karachi"] diff --git a/core/src/com/unciv/logic/map/tile/Tile.kt b/core/src/com/unciv/logic/map/tile/Tile.kt index 71741734f2..70128dbc74 100644 --- a/core/src/com/unciv/logic/map/tile/Tile.kt +++ b/core/src/com/unciv/logic/map/tile/Tile.kt @@ -532,9 +532,11 @@ open class Tile : IsPartOfGameInfoSerialization { naturalWonder -> true "Open terrain" -> !isRoughTerrain() "Rough terrain" -> isRoughTerrain() + "Foreign Land", "Foreign" -> observingCiv != null && !isFriendlyTerritory(observingCiv) "Friendly Land", "Friendly" -> observingCiv != null && isFriendlyTerritory(observingCiv) "Enemy Land", "Enemy" -> observingCiv != null && isEnemyTerritory(observingCiv) + resource -> observingCiv != null && hasViewableResource(observingCiv) "Water resource" -> isWater && observingCiv != null && hasViewableResource(observingCiv) "Natural Wonder" -> naturalWonder != null diff --git a/tests/src/com/unciv/logic/civilization/CityMovingTests.kt b/tests/src/com/unciv/logic/civilization/CityMovingTests.kt index 01919f92df..2018459535 100644 --- a/tests/src/com/unciv/logic/civilization/CityMovingTests.kt +++ b/tests/src/com/unciv/logic/civilization/CityMovingTests.kt @@ -9,7 +9,7 @@ import org.junit.Test import org.junit.runner.RunWith @RunWith(GdxTestRunner::class) -class UnitMovementTests { +class CityMovingTests { private lateinit var civInfo: Civilization private lateinit var enemy: Civilization