diff --git a/Credits.md b/Credits.md index 37ede81a53..f9ec18f4f1 100644 --- a/Credits.md +++ b/Credits.md @@ -25,6 +25,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Fishing Vessel](https://thenounproject.com/term/fishing-vessel/23815/) By Luis Prado for Work Boats * [Greek Trireme](https://thenounproject.com/search/?q=ancient%20boat&i=1626303) By Zachary McCune for Trireme * [Chariot](https://thenounproject.com/search/?q=Chariot&i=1189930) By Andrew Doane for Chariot Archer +* [Elephant](https://thenounproject.com/Luis/uploads/?i=14048) By Luis Prado, US for War Elephant * [Spear](https://thenounproject.com/search/?q=Spear&i=11432) By Stephen Copinger for Spearman * [Greek shield](https://thenounproject.com/search/?q=hoplite&i=440135) for Hoplite @@ -175,6 +176,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Chichen Itza](https://thenounproject.com/term/chichen-itza/668065/) By Hea Poh Lin * [Christian Church](https://thenounproject.com/term/christian-church/1174183/) By Andrejs Kirma for Monastery * [Castle](https://thenounproject.com/search/?q=castle&i=390189) By Mint Shirt +* [Red Fort](https://thenounproject.com/arunabh.jain.0fficial/collection/famous-indian-monuments/?i=2092466), [Gateway of India](https://thenounproject.com/arunabh.jain.0fficial/collection/famous-indian-monuments/?i=2092468) By Arunabh Jain, IN for Mughal Fort * [Cambodia](https://thenounproject.com/term/cambodia/1809152/) By Wichai Wi for Angkor Wat * [Alhambra](https://thenounproject.com/search/?q=alhambra&i=403759) By parkjisun * [Books](https://thenounproject.com/term/books/1140218/) By Abir Alward for Oxford University diff --git a/android/Images/BuildingIcons/Mughal Fort.png b/android/Images/BuildingIcons/Mughal Fort.png new file mode 100644 index 0000000000..fba93cf762 Binary files /dev/null and b/android/Images/BuildingIcons/Mughal Fort.png differ diff --git a/android/Images/UnitIcons/War Elephant.png b/android/Images/UnitIcons/War Elephant.png new file mode 100644 index 0000000000..1f4c16e5d2 Binary files /dev/null and b/android/Images/UnitIcons/War Elephant.png differ diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index e26fd77598..1f8879f51c 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -175,8 +175,12 @@ class CityStats { var unhappinessModifier = civInfo.getDifficulty().unhappinessModifier if(!civInfo.isPlayerCivilization()) unhappinessModifier *= civInfo.gameInfo.getDifficulty().aiUnhappinessModifier + + var unhappinessFromCity=-3f + if (civInfo.getNation().unique=="Unhappiness from number of Cities doubled, Unhappiness from number of Citizens halved.") + unhappinessFromCity*=2f//doubled for the Indian - newHappinessList ["Cities"] = -3f * unhappinessModifier + newHappinessList ["Cities"] = unhappinessFromCity * unhappinessModifier var unhappinessFromCitizens = cityInfo.population.population.toFloat() if (civInfo.policies.isAdopted("Democracy")) @@ -185,6 +189,8 @@ class CityStats { unhappinessFromCitizens *= 0.9f if (civInfo.policies.isAdopted("Meritocracy")) unhappinessFromCitizens *= 0.95f + if (civInfo.getNation().unique=="Unhappiness from number of Cities doubled, Unhappiness from number of Citizens halved.") + unhappinessFromCitizens *= 0.5f //halved for the Indian newHappinessList["Population"] = -unhappinessFromCitizens * unhappinessModifier diff --git a/core/src/com/unciv/models/gamebasics/Building.kt b/core/src/com/unciv/models/gamebasics/Building.kt index c0b7cc782f..1a295e05d6 100644 --- a/core/src/com/unciv/models/gamebasics/Building.kt +++ b/core/src/com/unciv/models/gamebasics/Building.kt @@ -151,7 +151,8 @@ class Building : NamedStats(), IConstruction{ if (adoptedPolicies.contains("Autocracy Complete") && cityStrength > 0) stats.happiness += 1 - if (name == "Castle" && civInfo.getBuildingUniques().contains("+1 happiness, +2 culture and +3 gold from every Castle")){ + if (hashSetOf("Castle", "Mughal Fort").contains(name) + && civInfo.getBuildingUniques().contains("+1 happiness, +2 culture and +3 gold from every Castle")){ stats.happiness+=1 stats.culture+=2 stats.gold+=3