AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore(purity): CityStats 1

Browse Source 
Need to separate update from calculation for the rest
This commit is contained in:
yairm210 2025-08-11 19:25:27 +03:00
parent 2e8a41211c
commit 6a984fe1ad
2 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
core/src/com/unciv/logic/city/CityStats.kt
View File

@ -16,6 +16,8 @@ import com.unciv.models.stats.Stats
import com.unciv.ui.components.extensions.toPercent
import com.unciv.utils.DebugUtils
import yairm210.purity.annotations.InternalState
import yairm210.purity.annotations.LocalState
import yairm210.purity.annotations.Pure
import yairm210.purity.annotations.Readonly
import kotlin.math.min
@ -34,7 +36,9 @@ class StatTreeNode {
else innerStats!!.add(stats) // What happens if we add 2 stats to the same leaf?
}
fun addStats(newStats: Stats, vararg hierarchyList: String) {
fun addStats(newStats: Stats?, vararg hierarchyList: String) {
if (newStats == null) return
if (newStats.isEmpty()) return
if (hierarchyList.isEmpty()) {
addInnerStats(newStats)
return
@ -111,14 +115,15 @@ class CityStats(val city: City) {
return stats
}
private fun getStatsFromProduction(production: Float): Stats {
val stats = Stats()
@Readonly
private fun getStatsFromProduction(production: Float): Stats? {
if (city.cityConstructions.currentConstructionFromQueue in Stat.statsWithCivWideField.map { it.name }) {
val stats = Stats()
val stat = Stat.valueOf(city.cityConstructions.currentConstructionFromQueue)
stats[stat] = production * getStatConversionRate(stat)
return stats
}
return stats
return null
}
@Readonly
@ -131,33 +136,23 @@ class CityStats(val city: City) {
return conversionRate
}
private fun getStatPercentBonusesFromRailroad(): Stats {
val stats = Stats()
@Readonly
private fun getStatPercentBonusesFromRailroad(): Stats? {
val railroadImprovement = city.getRuleset().railroadImprovement
?: return stats // for mods
?: return null // for mods
val techEnablingRailroad = railroadImprovement.techRequired
// If we conquered enemy cities connected by railroad, but we don't yet have that tech,
// we shouldn't get bonuses, it's as if the tracks are laid out but we can't operate them.
if ( (techEnablingRailroad == null || city.civ.tech.isResearched(techEnablingRailroad))
&& (city.isCapital() || isConnectedToCapital(RoadStatus.Railroad)))
stats.production += 25f
return stats
return Stats(production = 25f)
return null
}
private fun addStatPercentBonusesFromBuildings(statPercentBonusTree: StatTreeNode) {
val localUniqueCache = LocalUniqueCache()
for (building in city.cityConstructions.getBuiltBuildings())
statPercentBonusTree.addStats(building.getStatPercentageBonuses(city, localUniqueCache),
"Buildings", building.name)
}
private fun getStatPercentBonusesFromPuppetCity(): Stats {
val stats = Stats()
if (city.isPuppet) {
stats.science -= 25f
stats.culture -= 25f
}
return stats
@Readonly
private fun getStatPercentBonusesFromPuppetCity(): Stats? {
if (!city.isPuppet) return null
return Stats(science = -25f, culture = -25f)
}
fun getGrowthBonus(totalFood: Float): StatMap {
@ -182,10 +177,11 @@ class CityStats(val city: City) {
&& !city.containsBuildingUnique(UniqueType.RemovesAnnexUnhappiness)
}
@Readonly
fun getStatsOfSpecialist(specialistName: String, localUniqueCache: LocalUniqueCache = LocalUniqueCache(false)): Stats {
val specialist = city.getRuleset().specialists[specialistName]
?: return Stats()
val stats = specialist.cloneStats()
@LocalState val stats = specialist.cloneStats()
for (unique in localUniqueCache.forCityGetMatchingUniques(city, UniqueType.StatsFromSpecialist))
if (city.matchesFilter(unique.params[1]))
stats.add(unique.stats)
@ -195,6 +191,7 @@ class CityStats(val city: City) {
return stats
}
@Readonly
private fun getStatsFromSpecialists(specialists: Counter<String>): Stats {
val stats = Stats()
val localUniqueCache = LocalUniqueCache()
@ -204,6 +201,7 @@ class CityStats(val city: City) {
}
@Readonly @Suppress("purity") // stats[] *= fails
private fun getStatsFromUniquesBySource(): StatTreeNode {
val sourceToStats = StatTreeNode()
@ -237,13 +235,10 @@ class CityStats(val city: City) {
return sourceToStats
}
private fun getStatPercentBonusesFromGoldenAge(isGoldenAge: Boolean): Stats {
val stats = Stats()
if (isGoldenAge) {
stats.production += 20f
stats.culture += 20f
}
return stats
@Pure
private fun getStatPercentBonusesFromGoldenAge(isGoldenAge: Boolean): Stats? {
if (!isGoldenAge) return null
return Stats(production = 20f, culture = 20f)
}
@Readonly
@ -303,12 +298,11 @@ class CityStats(val city: City) {
}
@Readonly
private fun getStatPercentBonusesFromUnitSupply(): Stats {
val stats = Stats()
private fun getStatPercentBonusesFromUnitSupply(): Stats? {
val supplyDeficit = city.civ.stats.getUnitSupplyDeficit()
if (supplyDeficit > 0)
stats.production = city.civ.stats.getUnitSupplyProductionPenalty()
return stats
return Stats(production = city.civ.stats.getUnitSupplyProductionPenalty())
return null
}
@Readonly
@ -462,26 +456,33 @@ class CityStats(val city: City) {
newBaseStatTree.add(getStatsFromUniquesBySource())
baseStatTree = newBaseStatTree
}
private fun updateStatPercentBonusList(currentConstruction: IConstruction) {
@Readonly
private fun getStatPercentBonusList(currentConstruction: IConstruction): StatTreeNode {
val newStatsBonusTree = StatTreeNode()
newStatsBonusTree.addStats(getStatPercentBonusesFromGoldenAge(city.civ.goldenAges.isGoldenAge()),"Golden Age")
addStatPercentBonusesFromBuildings(newStatsBonusTree)
newStatsBonusTree.addStats(getStatPercentBonusesFromRailroad(), "Railroad")
newStatsBonusTree.addStats(getStatPercentBonusesFromPuppetCity(), "Puppet City")
newStatsBonusTree.addStats(getStatPercentBonusesFromUnitSupply(), "Unit Supply")
newStatsBonusTree.add(getStatsPercentBonusesFromUniquesBySource(currentConstruction))
val localUniqueCache = LocalUniqueCache()
for (building in city.cityConstructions.getBuiltBuildings())
newStatsBonusTree.addStats(building.getStatPercentageBonuses(city, localUniqueCache),
"Buildings", building.name)
if (DebugUtils.SUPERCHARGED) {
val stats = Stats()
for (stat in Stat.entries) stats[stat] = 10000f
newStatsBonusTree.addStats(stats, "Supercharged")
}
statPercentBonusTree = newStatsBonusTree
return newStatsBonusTree
}
private fun updateStatPercentBonusList(currentConstruction: IConstruction){
statPercentBonusTree = getStatPercentBonusList(currentConstruction)
}
fun update(currentConstruction: IConstruction = city.cityConstructions.getCurrentConstruction(),
@ -521,7 +522,7 @@ class CityStats(val city: City) {
// We only add the 'extra stats from production' AFTER we calculate the production INCLUDING BONUSES
val statsFromProduction = getStatsFromProduction(newFinalStatList.values.map { it.production }.sum())
if (!statsFromProduction.isEmpty()) {
if (statsFromProduction != null && !statsFromProduction.isEmpty()) {
baseStatTree = StatTreeNode().apply {
children.putAll(baseStatTree.children)
addStats(statsFromProduction, "Production")
@ -616,6 +617,7 @@ class CityStats(val city: City) {
finalStatList = newFinalStatList
}
@Readonly
fun canConvertFoodToProduction(food: Float, currentConstruction: IConstruction): Boolean {
return (food > 0
&& currentConstruction is INonPerpetualConstruction
@ -629,6 +631,7 @@ class CityStats(val city: City) {
* See for details: https://civilization.fandom.com/wiki/Settler_(Civ5)
* @see calcFoodEaten as well for Food consumed this turn
*/
@Pure
fun getProductionFromExcessiveFood(food : Float): Float {
return if (food >= 4.0f ) 2.0f + (food / 4.0f).toInt()
else if (food >= 2.0f ) 2.0f
@ -636,6 +639,7 @@ class CityStats(val city: City) {
else 0.0f
}
@Readonly
private fun calcFoodEaten(): Float {
var foodEaten = city.population.population.toFloat() * 2
var foodEatenBySpecialists = 2f * city.population.getNumberOfSpecialists()

2
core/src/com/unciv/models/stats/Stats.kt
View File

@ -123,7 +123,7 @@ open class Stats(
/** **Non-Mutating function**
* @return a new [Stats] instance with the result of multiplying each value of this instance by [number] as a new instance */
operator fun times(number: Int) = times(number.toFloat())
@Readonly operator fun times(number: Int) = times(number.toFloat())
/** **Non-Mutating function**
* @return a new [Stats] instance with the result of multiplying each value of this instance by [number] as a new instance */