mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-12 16:59:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Religion beliefs are private, uniques are cached

Browse Source
This commit is contained in:
yairm210
2024-06-26 18:38:02 +03:00
parent 7beb5f34c0
commit 1da5410324
10 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/unciv/logic/automation/civilization/ReligionAutomation.kt
View File

@ -339,16 +339,14 @@ object ReligionAutomation {
else 1f
UniqueType.BuyUnitsForAmountStat, UniqueType.BuyBuildingsForAmountStat ->
if (civInfo.religionManager.religion != null
&& civInfo.religionManager.religion!!.getFollowerUniques()
.any { it.type == unique.type }
&& civInfo.religionManager.religion!!.followerBeliefUniqueMap.getUniques(unique.type).any()
) 0f
// This is something completely different from the original, but I have no idea
// what happens over there
else civInfo.stats.statsForNextTurn[Stat.valueOf(unique.params[2])] * 5f / unique.params[1].toFloat()
UniqueType.BuyUnitsWithStat, UniqueType.BuyBuildingsWithStat ->
if (civInfo.religionManager.religion != null
&& civInfo.religionManager.religion!!.getFollowerUniques()
.any { it.type == unique.type }
&& civInfo.religionManager.religion!!.followerBeliefUniqueMap.getUniques(unique.type).any()
) 0f
// This is something completely different from the original, but I have no idea
// what happens over there
@ -473,7 +471,7 @@ object ReligionAutomation {
&& it.getMatchingUniques(UniqueType.OnlyAvailable, StateForConditionals.IgnoreConditionals)
.none { unique -> !unique.conditionalsApply(civInfo) }
}
.maxByOrNull { ReligionAutomation.rateBelief(civInfo, it) }
.maxByOrNull { rateBelief(civInfo, it) }
}

4
core/src/com/unciv/logic/city/City.kt
View File

@ -482,7 +482,7 @@ class City : IsPartOfGameInfoSerialization, INamed {
getLocalMatchingUniques(uniqueType, stateForConditionals)
else (
cityConstructions.builtBuildingUniqueMap.getUniques(uniqueType)
+ religion.getUniques().filter { it.type == uniqueType }
+ religion.getUniques(uniqueType)
).filter {
!it.isTimedTriggerable && it.conditionalsApply(stateForConditionals)
}.flatMap { it.getMultiplied(stateForConditionals) }
@ -491,7 +491,7 @@ class City : IsPartOfGameInfoSerialization, INamed {
// Uniques special to this city
fun getLocalMatchingUniques(uniqueType: UniqueType, stateForConditionals: StateForConditionals = StateForConditionals(this)): Sequence<Unique> {
val uniques = cityConstructions.builtBuildingUniqueMap.getUniques(uniqueType).filter { it.isLocalEffect } +
religion.getUniques().filter { it.type == uniqueType }
religion.getUniques(uniqueType)
return if (uniques.any()) uniques.filter { !it.isTimedTriggerable && it.conditionalsApply(stateForConditionals) }
.flatMap { it.getMultiplied(stateForConditionals) }
else uniques

4
core/src/com/unciv/logic/city/managers/CityReligionManager.kt
View File

@ -57,9 +57,9 @@ class CityReligionManager : IsPartOfGameInfoSerialization {
getAffectedBySurroundingCities()
}
fun getUniques(): Sequence<Unique> {
fun getUniques(uniqueType: UniqueType): Sequence<Unique> {
val majorityReligion = getMajorityReligion() ?: return sequenceOf()
return majorityReligion.getFollowerUniques()
return majorityReligion.followerBeliefUniqueMap.getUniques(uniqueType)
}

7
core/src/com/unciv/logic/civilization/Civilization.kt
View File

@ -514,8 +514,7 @@ class Civilization : IsPartOfGameInfoSerialization {
yieldAll(getEra().getMatchingUniques(uniqueType, stateForConditionals))
yieldAll(cityStateFunctions.getUniquesProvidedByCityStates(uniqueType, stateForConditionals))
if (religionManager.religion != null)
yieldAll(religionManager.religion!!.getFounderUniques()
.filter { !it.isTimedTriggerable && it.type == uniqueType && it.conditionalsApply(stateForConditionals) })
yieldAll(religionManager.religion!!.founderBeliefUniqueMap.getMatchingUniques(uniqueType, stateForConditionals))
yieldAll(getCivResourceSupply().asSequence()
.filter { it.amount > 0 }
@ -534,9 +533,7 @@ class Civilization : IsPartOfGameInfoSerialization {
.flatMap { city -> city.cityConstructions.builtBuildingUniqueMap.getTriggeredUniques(trigger, stateForConditionals) }
)
if (religionManager.religion != null)
yieldAll(religionManager.religion!!.getFounderUniques()
.filter { unique -> unique.conditionals.any { it.type == trigger }
&& unique.conditionalsApply(stateForConditionals) })
yieldAll(religionManager.religion!!.founderBeliefUniqueMap.getMatchingUniques(trigger, stateForConditionals))
yieldAll(policies.policyUniques.getTriggeredUniques(trigger, stateForConditionals))
yieldAll(tech.techUniques.getTriggeredUniques(trigger, stateForConditionals))
yieldAll(getEra().uniqueMap.getTriggeredUniques (trigger, stateForConditionals))

14
core/src/com/unciv/logic/civilization/managers/ReligionManager.kt
View File

@ -375,16 +375,7 @@ class ReligionManager : IsPartOfGameInfoSerialization {
if (religionState == ReligionState.None)
foundPantheon(beliefs[0].name, useFreeBeliefs) // makes religion non-null
// add beliefs (religion exists at this point)
religion!!.followerBeliefs.addAll(
beliefs
.filter { it.type == BeliefType.Pantheon || it.type == BeliefType.Follower }
.map { it.name }
)
religion!!.founderBeliefs.addAll(
beliefs
.filter { it.type == BeliefType.Founder || it.type == BeliefType.Enhancer }
.map { it.name }
)
religion!!.addBeliefs(beliefs)
when (religionState) {
ReligionState.None -> {
@ -423,8 +414,7 @@ class ReligionManager : IsPartOfGameInfoSerialization {
val newReligion = Religion(name, civInfo.gameInfo, civInfo.civName)
newReligion.displayName = displayName
if (religion != null) {
newReligion.followerBeliefs.addAll(religion!!.followerBeliefs)
newReligion.founderBeliefs.addAll(religion!!.founderBeliefs)
newReligion.addBeliefs(religion!!.getAllBeliefsOrdered().asIterable())
}
religion = newReligion

32
core/src/com/unciv/logic/civilization/transients/CivInfoStatsForNextTurn.kt
View File

@ -284,21 +284,23 @@ class CivInfoStatsForNextTurn(val civInfo: Civilization) {
private fun getGlobalStatsFromUniques():StatMap {
val statMap = StatMap()
if (civInfo.religionManager.religion != null) {
for (unique in civInfo.religionManager.religion!!.getFounderUniques()) {
if (unique.type == UniqueType.StatsFromGlobalCitiesFollowingReligion) {
statMap.add(
"Religion",
unique.stats * civInfo.religionManager.numberOfCitiesFollowingThisReligion()
)
}
if (unique.type == UniqueType.StatsFromGlobalFollowers)
statMap.add(
"Religion",
unique.stats * civInfo.religionManager.numberOfFollowersFollowingThisReligion(
unique.params[2]
).toFloat() / unique.params[1].toFloat()
)
}
for (unique in civInfo.religionManager.religion!!.founderBeliefUniqueMap.getMatchingUniques(
UniqueType.StatsFromGlobalCitiesFollowingReligion, StateForConditionals(civInfo)
))
statMap.add(
"Religion",
unique.stats * civInfo.religionManager.numberOfCitiesFollowingThisReligion()
)
for (unique in civInfo.religionManager.religion!!.founderBeliefUniqueMap.getMatchingUniques(
UniqueType.StatsFromGlobalFollowers, StateForConditionals(civInfo)
))
statMap.add(
"Religion",
unique.stats * civInfo.religionManager.numberOfFollowersFollowingThisReligion(
unique.params[2]
).toFloat() / unique.params[1].toFloat()
)
}
for (unique in civInfo.getMatchingUniques(UniqueType.StatsPerPolicies)) {

51
core/src/com/unciv/models/Religion.kt
View File

@ -4,7 +4,7 @@ import com.unciv.logic.GameInfo
import com.unciv.logic.IsPartOfGameInfoSerialization
import com.unciv.models.ruleset.Belief
import com.unciv.models.ruleset.BeliefType
import com.unciv.models.ruleset.unique.Unique
import com.unciv.models.ruleset.unique.UniqueMap
import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.stats.INamed
@ -15,8 +15,13 @@ class Religion() : INamed, IsPartOfGameInfoSerialization {
var displayName: String? = null
lateinit var foundingCivName: String
var founderBeliefs: HashSet<String> = hashSetOf()
var followerBeliefs: HashSet<String> = hashSetOf()
private var founderBeliefs: HashSet<String> = hashSetOf()
private var followerBeliefs: HashSet<String> = hashSetOf()
@Transient
var founderBeliefUniqueMap = UniqueMap()
@Transient
var followerBeliefUniqueMap = UniqueMap()
@Transient
lateinit var gameInfo: GameInfo
@ -42,6 +47,23 @@ class Religion() : INamed, IsPartOfGameInfoSerialization {
fun setTransients(gameInfo: GameInfo) {
this.gameInfo = gameInfo
updateUniqueMaps()
}
private fun updateUniqueMaps(){
followerBeliefUniqueMap = UniqueMap(mapToExistingBeliefs(followerBeliefs).flatMap { it.uniqueObjects })
founderBeliefUniqueMap = UniqueMap(mapToExistingBeliefs(founderBeliefs).flatMap { it.uniqueObjects })
}
fun addBeliefs(beliefs: Iterable<Belief>){
for (belief in beliefs){
when (belief.type){
BeliefType.Founder, BeliefType.Enhancer -> founderBeliefs.add(belief.name)
BeliefType.Pantheon, BeliefType.Follower -> followerBeliefs.add(belief.name)
else -> continue // 'None' and 'Any' are not valid for beliefs, they're used for internal purposes
}
}
updateUniqueMaps()
}
fun getIconName() =
@ -52,9 +74,9 @@ class Religion() : INamed, IsPartOfGameInfoSerialization {
if (displayName != null) displayName!!
else name
private fun mapToExistingBeliefs(beliefs: HashSet<String>): List<Belief> {
private fun mapToExistingBeliefs(beliefs: Set<String>): Sequence<Belief> {
val rulesetBeliefs = gameInfo.ruleset.beliefs
return beliefs.mapNotNull {
return beliefs.asSequence().mapNotNull {
if (it !in rulesetBeliefs) null
else rulesetBeliefs[it]!!
}
@ -62,7 +84,7 @@ class Religion() : INamed, IsPartOfGameInfoSerialization {
fun getBeliefs(beliefType: BeliefType): Sequence<Belief> {
if (beliefType == BeliefType.Any)
return mapToExistingBeliefs((founderBeliefs + followerBeliefs).toHashSet()).asSequence()
return mapToExistingBeliefs((founderBeliefs + followerBeliefs).toHashSet())
val beliefs =
when {
@ -72,25 +94,16 @@ class Religion() : INamed, IsPartOfGameInfoSerialization {
}
return mapToExistingBeliefs(beliefs)
.asSequence()
.filter { it.type == beliefType }
}
fun getAllBeliefsOrdered(): Sequence<Belief> {
return mapToExistingBeliefs(followerBeliefs).asSequence().filter { it.type == BeliefType.Pantheon } +
mapToExistingBeliefs(founderBeliefs).asSequence().filter { it.type == BeliefType.Founder } +
mapToExistingBeliefs(followerBeliefs).asSequence().filter { it.type == BeliefType.Follower } +
mapToExistingBeliefs(founderBeliefs).asSequence().filter { it.type == BeliefType.Enhancer }
return mapToExistingBeliefs(followerBeliefs).filter { it.type == BeliefType.Pantheon } +
mapToExistingBeliefs(founderBeliefs).filter { it.type == BeliefType.Founder } +
mapToExistingBeliefs(followerBeliefs).filter { it.type == BeliefType.Follower } +
mapToExistingBeliefs(founderBeliefs).filter { it.type == BeliefType.Enhancer }
}
private fun getUniquesOfBeliefs(beliefs: HashSet<String>): Sequence<Unique> {
return mapToExistingBeliefs(beliefs).asSequence().flatMap { it.uniqueObjects }
}
fun getFollowerUniques() = getUniquesOfBeliefs(followerBeliefs)
fun getFounderUniques() = getUniquesOfBeliefs(founderBeliefs)
fun hasBelief(belief: String) = followerBeliefs.contains(belief) || founderBeliefs.contains(belief)
fun isPantheon() = getBeliefs(BeliefType.Pantheon).any() && !isMajorReligion()

4
tests/src/com/unciv/logic/civilization/diplomacy/DiplomacyManagerTests.kt
View File

@ -299,7 +299,7 @@ class DiplomacyManagerTests {
val religion = testGame.addReligion(a)
val belief = testGame.createBelief(BeliefType.Founder, "[+1 Food] from every [Shrine]")
religion.founderBeliefs.add(belief.name)
religion.addBeliefs(listOf(belief))
cityStateCapital.religion.addPressure(religion.name, 1000)
cityState.getDiplomacyManager(a)!!.addInfluence(30f)
@ -340,7 +340,7 @@ class DiplomacyManagerTests {
val religion = testGame.addReligion(a)
val belief = testGame.createBelief(BeliefType.Founder, "[+1 Food] from every [Shrine]")
religion.founderBeliefs.add(belief.name)
religion.addBeliefs(listOf(belief))
cityStateCapital.religion.addPressure(religion.name, 1000)
cityState.getDiplomacyManager(a)!!.addInfluence(-30f)

8
tests/src/com/unciv/uniques/GlobalUniquesTests.kt
View File

@ -220,7 +220,7 @@ class GlobalUniquesTests {
val civ1 = game.addCiv()
val religion = game.addReligion(civ1)
val belief = game.createBelief(BeliefType.Founder, "[+30 Science] for each global city following this religion")
religion.founderBeliefs.add(belief.name)
religion.addBeliefs(listOf(belief))
val civ2 = game.addCiv()
val tile = game.getTile(Vector2.Zero)
val cityOfCiv2 = game.addCity(civ2, tile, initialPopulation = 1) // Need someone to be converted
@ -238,7 +238,7 @@ class GlobalUniquesTests {
val civ1 = game.addCiv()
val religion = game.addReligion(civ1)
val belief = game.createBelief(BeliefType.Founder, "[+42 Happiness] for each global city following this religion")
religion.founderBeliefs.add(belief.name)
religion.addBeliefs(listOf(belief))
val civ2 = game.addCiv()
val tile = game.getTile(Vector2.Zero)
val cityOfCiv2 = game.addCity(civ2, tile, initialPopulation = 1) // Need someone to be converted
@ -256,7 +256,7 @@ class GlobalUniquesTests {
val civ1 = game.addCiv()
val religion = game.addReligion(civ1)
val belief = game.createBelief(BeliefType.Founder, "[+30 Science] from every [3] global followers [in all cities]")
religion.founderBeliefs.add(belief.name)
religion.addBeliefs(listOf(belief))
val civ2 = game.addCiv()
val tile = game.getTile(Vector2.Zero)
val cityOfCiv2 = game.addCity(civ2, tile, initialPopulation = 9) // Need people to be converted
@ -350,7 +350,7 @@ class GlobalUniquesTests {
val city = game.addCity(civInfo, game.getTile(Vector2.Zero), true, 1)
val religion = game.addReligion(civInfo)
val belief = game.createBelief(BeliefType.Follower, "[+10]% [Faith] from every follower, up to [42]%")
religion.followerBeliefs.add(belief.name)
religion.addBeliefs(listOf(belief))
city.religion.addPressure(religion.name, 1000000000)

2
tests/src/com/unciv/uniques/ResourceTests.kt
View File

@ -240,7 +240,7 @@ class ResourceTests {
// given
val religion = game.addReligion(civInfo)
val belief = game.createBelief(BeliefType.Follower, "Provides [1] [Iron]")
religion.followerBeliefs.add(belief.name)
religion.addBeliefs(listOf(belief))
city.population.setPopulation(1)
city.religion.addPressure(religion.name, 1000)
val otherCity = civInfo.addCity(Vector2(2f,2f)) // NOT religionized