From af19d8a1b0ebac49a6d101e44e51f2ebb0b1fc05 Mon Sep 17 00:00:00 2001
From: Amper-sandd <50962759+Amper-sandd@users.noreply.github.com>
Date: Thu, 23 May 2019 20:50:46 +0200
Subject: [PATCH] add Indian assets (#800)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* War Elephant icon

* Mughal Fort icon

* credits for Indian unique icons

* bonuses for Castle apply to Mughal Fort too

* getCityHappiness() complies with the Indian unique

* getCityHappiness() complies with the Indian

missing bracket 🙄
---
 Credits.md                                       |   2 ++
 android/Images/BuildingIcons/Mughal Fort.png     | Bin 0 -> 444 bytes
 android/Images/UnitIcons/War Elephant.png        | Bin 0 -> 305 bytes
 core/src/com/unciv/logic/city/CityStats.kt       |   8 +++++++-
 core/src/com/unciv/models/gamebasics/Building.kt |   3 ++-
 5 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 android/Images/BuildingIcons/Mughal Fort.png
 create mode 100644 android/Images/UnitIcons/War Elephant.png

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 0000000000000000000000000000000000000000..fba93cf7622e13027c01a5fcdb2f2f016712ef39
GIT binary patch
literal 444
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1SJ1AFfjuuwvr&fV21x7XdWS53l!lj@Q5sC
zU@-6kVa7uiHy$%EFvfVgIEGZ*dV9w^?}&l`>j9Hff7knzO*HLh`OJPb`fS>P*h6K~
z-hFdEPoJWy*ucsyrW3J2;6M|Y!I5wf#8_i_+2zQ^$LHfB#VeN1^l5%2Y5UJ+jkVta
zQ}G{*-(LFT{66CRi;r9Rb|?Ma_wJmfef@l+eN$Ppz4qN@Sqn5x?|4_oOn%Acb%mm;
zM{cisV(EUe{`uyA)gk%bD`Fz$r_SH8FUrf~>g72vu0}Xz&3vY_{+m$HW0QAnv&}9z
z_itFza)mo7eSMtjl0KH|s!|=r&@VdY&n^z<JvXUDM{%nE&#Y^<SEal^<h*c{0y=*B
zv-P^OcI|tad|+#|Nvzj~O>^2dBy@I!e2v_l%Tx05Yu>S2pZ`AYi+FlF@$}wDA}eM0
zJW^QsG;UT<#0H>mRY3$R_cTZV2v$z~@UiAP&<{Y-Rt8YeBph^N0Ebb6qQ-fCn}E`H
UOZ#Mnfq~E9>FVdQ&MBb@0J(?2jQ{`u

literal 0
HcmV?d00001

diff --git a/android/Images/UnitIcons/War Elephant.png b/android/Images/UnitIcons/War Elephant.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f4c16e5d2c5d13591f7eb091b367478108ba4fc
GIT binary patch
literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<q3?#jD*u{YqTYyi9>;M1%A3S)#6e8pW6k#d}
z@(cdY@N~NYh{svr5n0T@0Ad?>F&?tG@faw0*we)^#NzbRD;v2ED+sVXu;wY%oUzgQ
z;Pn^N!cWc6z4<H3uB-pS48<8)dS+fK9<!HzX*--Ru=BU$jKxMD*k>)tR`M_|Kd|7S
zDJ$<uCL4<eh29M!>XJf}L^wSTud2JqH6hN-qoUW*Mo?Qo>%#0AZpAwD?mYf|eYsHQ
z-ki81``^*NY2I2B{k~-$dNET*=P}o=sC7SW_vY1}xa)oHc~|W^vxzrbI%Axy#8!Fe
y@=eTY@i@I~e^}{~R}R;WOEj<BUONBRMgL4;q3!Od;9j727(8A5T-G@yGywpKwRkE3

literal 0
HcmV?d00001

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