From a74e7c0a6a80ce5350010cfeaf7305ffd0f8cff3 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Tue, 27 Jul 2021 06:43:11 +0300
Subject: [PATCH] Resolved #4648 - city states no longer great Great Prophets
 when religion is not enabled

---
 core/src/com/unciv/logic/city/CityStats.kt            | 6 ------
 core/src/com/unciv/logic/civilization/CivInfoStats.kt | 4 ----
 core/src/com/unciv/logic/civilization/QuestManager.kt | 6 ++----
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt
index 93ab169e17..7ff08ef7de 100644
--- a/core/src/com/unciv/logic/city/CityStats.kt
+++ b/core/src/com/unciv/logic/city/CityStats.kt
@@ -525,12 +525,6 @@ class CityStats {
             buildingsMaintenance *= (1f - unique.params[0].toFloat() / 100)
         }
 
-        // Deprecated since 3.15
-            for (unique in cityInfo.getMatchingUniques("-[]% building maintenance costs []", citySpecificUniques)) {
-                buildingsMaintenance *= (1f - unique.params[0].toFloat() / 100)
-            }
-        //
-
         return buildingsMaintenance
     }
 
diff --git a/core/src/com/unciv/logic/civilization/CivInfoStats.kt b/core/src/com/unciv/logic/civilization/CivInfoStats.kt
index ca4d12b480..aa05c86fc5 100644
--- a/core/src/com/unciv/logic/civilization/CivInfoStats.kt
+++ b/core/src/com/unciv/logic/civilization/CivInfoStats.kt
@@ -136,10 +136,6 @@ class CivInfoStats(val civInfo: CivilizationInfo) {
         var happinessPerUniqueLuxury = 4f + civInfo.getDifficulty().extraHappinessPerLuxury
         for (unique in civInfo.getMatchingUniques("+[] happiness from each type of luxury resource"))
             happinessPerUniqueLuxury += unique.params[0].toInt()
-        // Deprecated since 3.14.17
-            for (unique in civInfo.getMatchingUniques("+1 happiness from each type of luxury resource"))
-                happinessPerUniqueLuxury += 1
-        //
         
         val ownedLuxuries = civInfo.getCivResources().map { it.resource }.filter { it.resourceType == ResourceType.Luxury }
         
diff --git a/core/src/com/unciv/logic/civilization/QuestManager.kt b/core/src/com/unciv/logic/civilization/QuestManager.kt
index 214b8a3ba1..1643c89eb8 100644
--- a/core/src/com/unciv/logic/civilization/QuestManager.kt
+++ b/core/src/com/unciv/logic/civilization/QuestManager.kt
@@ -509,12 +509,10 @@ class QuestManager {
     private fun getGreatPersonForQuest(challenger: CivilizationInfo): BaseUnit? {
         val ruleSet = civInfo.gameInfo.ruleSet
 
-        val challengerGreatPeople = challenger.getCivGreatPeople().map { it.baseUnit.getReplacedUnit(ruleSet) }
+        val challengerGreatPeople = challenger.getGreatPeople()getCivGreatPeople().map { it.baseUnit.getReplacedUnit(ruleSet) }
         val cityStateGreatPeople = civInfo.getCivGreatPeople().map { it.baseUnit.getReplacedUnit(ruleSet) }
 
-        val greatPeople = ruleSet.units.values
-                .asSequence()
-                .filter { it.isGreatPerson() }
+        val greatPeople = challenger.getGreatPeople()
                 .map { it.getReplacedUnit(ruleSet) }
                 .distinct()
                 .filter { !challengerGreatPeople.contains(it) && !cityStateGreatPeople.contains(it) }