AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #4921 - can gift improvements to city states also on water tiles and when other improvements have been built on top of the resource

Browse Source
This commit is contained in:
yairm210 2021-12-09 21:58:57 +02:00
parent 3872a46519
commit 23bad8d961
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View File

@ -457,8 +457,8 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo): BaseScreen() {
} }
fun getImprovableResourceTiles(otherCiv:CivilizationInfo) = otherCiv.getCapital().getTiles() fun getImprovableResourceTiles(otherCiv:CivilizationInfo) = otherCiv.getCapital().getTiles()
.filter { it.hasViewableResource(otherCiv) && it.improvement == null .filter { it.hasViewableResource(otherCiv) && it.tileResource.resourceType!=ResourceType.Bonus
&& it.tileResource.resourceType!=ResourceType.Bonus } && it.tileResource.improvement != it.improvement }
private fun getImprovementGiftTable(otherCiv: CivilizationInfo): Table { private fun getImprovementGiftTable(otherCiv: CivilizationInfo): Table {
val improvementGiftTable = getCityStateDiplomacyTableHeader(otherCiv) val improvementGiftTable = getCityStateDiplomacyTableHeader(otherCiv)
@ -466,12 +466,12 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo): BaseScreen() {
val improvableResourceTiles = getImprovableResourceTiles(otherCiv) val improvableResourceTiles = getImprovableResourceTiles(otherCiv)
val tileImprovements = val tileImprovements =
otherCiv.gameInfo.ruleSet.tileImprovements.filter { it.value.turnsToBuild != 0 } otherCiv.gameInfo.ruleSet.tileImprovements
for (improvableTile in improvableResourceTiles) { for (improvableTile in improvableResourceTiles) {
for (tileImprovement in tileImprovements.values) { for (tileImprovement in tileImprovements.values) {
if (improvableTile.canBuildImprovement(tileImprovement, otherCiv) && if (improvableTile.tileResource.improvement == tileImprovement.name
improvableTile.tileResource.improvement == tileImprovement.name && improvableTile.canBuildImprovement(tileImprovement, otherCiv)
) { ) {
val improveTileButton = val improveTileButton =
"Build [${tileImprovement}] on [${improvableTile.tileResource}] (200 Gold)".toTextButton() "Build [${tileImprovement}] on [${improvableTile.tileResource}] (200 Gold)".toTextButton()