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

Modding: "Cannot be traded" unique accepts Civ conditionals

Browse Source
This commit is contained in:
Yair Morgenstern
2024-01-15 18:48:43 +02:00
parent 6998b8d3d1
commit 0b5c2062b6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -403,7 +403,7 @@ class Civilization : IsPartOfGameInfoSerialization {
for (resourceSupply in detailedCivResources) { for (resourceSupply in detailedCivResources) {
if (resourceSupply.resource.isStockpiled()) continue if (resourceSupply.resource.isStockpiled()) continue
if (resourceSupply.resource.hasUnique(UniqueType.CannotBeTraded)) continue if (resourceSupply.resource.hasUnique(UniqueType.CannotBeTraded, StateForConditionals(this))) continue
// If we got it from another trade or from a CS, preserve the origin // If we got it from another trade or from a CS, preserve the origin
if (resourceSupply.isCityStateOrTradeOrigin()) { if (resourceSupply.isCityStateOrTradeOrigin()) {
newResourceSupplyList.add(resourceSupply.copy()) newResourceSupplyList.add(resourceSupply.copy())

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

@ -292,7 +292,7 @@ class CivInfoTransientCache(val civInfo: Civilization) {
resourceBonusPercentage += unique.params[0].toFloat() / 100 resourceBonusPercentage += unique.params[0].toFloat() / 100
for (cityStateAlly in civInfo.getKnownCivs().filter { it.getAllyCiv() == civInfo.civName }) { for (cityStateAlly in civInfo.getKnownCivs().filter { it.getAllyCiv() == civInfo.civName }) {
for (resourceSupply in cityStateAlly.cityStateFunctions.getCityStateResourcesForAlly()) { for (resourceSupply in cityStateAlly.cityStateFunctions.getCityStateResourcesForAlly()) {
if (resourceSupply.resource.hasUnique(UniqueType.CannotBeTraded)) continue if (resourceSupply.resource.hasUnique(UniqueType.CannotBeTraded, StateForConditionals(civInfo))) continue
val newAmount = (resourceSupply.amount * resourceBonusPercentage).toInt() val newAmount = (resourceSupply.amount * resourceBonusPercentage).toInt()
cityStateProvidedResources.add(resourceSupply.copy(amount = newAmount)) cityStateProvidedResources.add(resourceSupply.copy(amount = newAmount))
} }