AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-22 10:54:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Non-integer resource modifier now applied to the civ-wide scope (#8592)

Browse Source
This commit is contained in:
Gualdimar 2023-02-06 21:14:40 +02:00 committed by GitHub
parent d73814263f
commit bbcf2d99e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,7 +167,7 @@ class City : IsPartOfGameInfoSerialization {
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) * civ.getResourceModifier(resource) val amount = getTileResourceAmount(tileInfo)
if (amount > 0) cityResources.add(resource, "Tiles", amount) if (amount > 0) cityResources.add(resource, "Tiles", amount)
} }
@ -179,7 +179,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() * civ.getResourceModifier(resource) unique.params[0].toInt()
) )
} }
for (unique in tileImprovement.getMatchingUniques(UniqueType.ConsumesResources, stateForConditionals)) { for (unique in tileImprovement.getMatchingUniques(UniqueType.ConsumesResources, stateForConditionals)) {
@ -203,7 +203,7 @@ class City : IsPartOfGameInfoSerialization {
?: continue ?: continue
cityResources.add( cityResources.add(
resource, "Buildings", resource, "Buildings",
unique.params[0].toInt() * civ.getResourceModifier(resource) unique.params[0].toInt()
) )
} }

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

@ -410,7 +410,7 @@ class Civilization : IsPartOfGameInfoSerialization {
return hashMap return hashMap
} }
fun getResourceModifier(resource: TileResource): Int { fun getResourceModifier(resource: TileResource): Float {
var resourceModifier = 1f var resourceModifier = 1f
for (unique in getMatchingUniques(UniqueType.DoubleResourceProduced)) for (unique in getMatchingUniques(UniqueType.DoubleResourceProduced))
if (unique.params[0] == resource.name) if (unique.params[0] == resource.name)
@ -420,7 +420,7 @@ class Civilization : IsPartOfGameInfoSerialization {
.map { it.params[0].toFloat() / 100f }.sum() .map { it.params[0].toFloat() / 100f }.sum()
} }
return resourceModifier.toInt() return resourceModifier
} }
fun hasResource(resourceName: String): Boolean = getCivResourcesByName()[resourceName]!! > 0 fun hasResource(resourceName: String): Boolean = getCivResourcesByName()[resourceName]!! > 0

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

@ -255,6 +255,10 @@ 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()