mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-09 04:09:35 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed India's 'double unhappiness' unique

Browse Source
This commit is contained in:
Yair Morgenstern 2023-07-05 21:10:15 +03:00
parent 08a280c29d
commit 19bf15558d
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Civ V - Gods & Kings/Nations.json
View File

@ -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"],

2
android/assets/jsons/Civ V - Vanilla/Nations.json
View File

@ -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"]

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

@ -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

2
tests/src/com/unciv/logic/civilization/CityMovingTests.kt
View File

@ -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