mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-10 02:47:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix resources subtracting in an incorrect manner when they have the same source (#9858)

Browse Source
This commit is contained in:
SeventhM 2023-07-30 07:38:00 -07:00 committed by GitHub
parent bb7c75840e
commit ae7ac6a063
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,10 +202,14 @@ class City : IsPartOfGameInfoSerialization {
fun getCityResources(): ResourceSupplyList { fun getCityResources(): ResourceSupplyList {
val cityResources = ResourceSupplyList() val cityResources = ResourceSupplyList()
val resourceModifer = HashMap<String,Float>()
for (resource in civ.gameInfo.ruleset.tileResources.values)
resourceModifer[resource.name] = civ.getResourceModifier(resource)
for (tileInfo in getTiles().filter { it.resource != null }) { for (tileInfo in getTiles().filter { it.resource != null }) {
val resource = tileInfo.tileResource val resource = tileInfo.tileResource
val amount = getTileResourceAmount(tileInfo) val amount = getTileResourceAmount(tileInfo) * resourceModifer[resource.name]!!
if (amount > 0) cityResources.add(resource, "Tiles", amount) if (amount > 0) cityResources.add(resource, "Tiles", amount.toInt())
} }
for (tileInfo in getTiles()) { for (tileInfo in getTiles()) {
@ -216,7 +220,7 @@ class City : IsPartOfGameInfoSerialization {
val resource = getRuleset().tileResources[unique.params[1]] ?: continue val resource = getRuleset().tileResources[unique.params[1]] ?: continue
cityResources.add( cityResources.add(
resource, "Improvements", resource, "Improvements",
unique.params[0].toInt() (unique.params[0].toFloat() * resourceModifer[resource.name]!!).toInt()
) )
} }
for (unique in tileImprovement.getMatchingUniques(UniqueType.ConsumesResources, stateForConditionals)) { for (unique in tileImprovement.getMatchingUniques(UniqueType.ConsumesResources, stateForConditionals)) {
@ -240,7 +244,7 @@ class City : IsPartOfGameInfoSerialization {
?: continue ?: continue
cityResources.add( cityResources.add(
resource, "Buildings", resource, "Buildings",
unique.params[0].toInt() (unique.params[0].toFloat() * resourceModifer[resource.name]!!).toInt()
) )
} }

9
core/src/com/unciv/logic/civilization/transients/CivInfoTransientCache.kt
View File

@ -284,10 +284,6 @@ class CivInfoTransientCache(val civInfo: Civilization) {
val newDetailedCivResources = ResourceSupplyList() val newDetailedCivResources = ResourceSupplyList()
for (city in civInfo.cities) newDetailedCivResources.add(city.getCityResources()) for (city in civInfo.cities) newDetailedCivResources.add(city.getCityResources())
for (resourceSupply in newDetailedCivResources)
if (resourceSupply.amount > 0)
resourceSupply.amount = (resourceSupply.amount * civInfo.getResourceModifier(resourceSupply.resource)).toInt()
if (!civInfo.isCityState()) { if (!civInfo.isCityState()) {
// First we get all these resources of each city state separately // First we get all these resources of each city state separately
val cityStateProvidedResources = ResourceSupplyList() val cityStateProvidedResources = ResourceSupplyList()
@ -306,10 +302,11 @@ class CivInfoTransientCache(val civInfo: Civilization) {
for (unique in civInfo.getMatchingUniques(UniqueType.ProvidesResources)) { for (unique in civInfo.getMatchingUniques(UniqueType.ProvidesResources)) {
if (unique.sourceObjectType == UniqueTarget.Building || unique.sourceObjectType == UniqueTarget.Wonder) continue // already calculated in city if (unique.sourceObjectType == UniqueTarget.Building || unique.sourceObjectType == UniqueTarget.Wonder) continue // already calculated in city
val resource = civInfo.gameInfo.ruleset.tileResources[unique.params[1]]!!
newDetailedCivResources.add( newDetailedCivResources.add(
civInfo.gameInfo.ruleset.tileResources[unique.params[1]]!!, resource,
unique.sourceObjectType?.name ?: "", unique.sourceObjectType?.name ?: "",
unique.params[0].toInt() (unique.params[0].toFloat() * civInfo.getResourceModifier(resource)).toInt()
) )
} }