mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-31 15:19:29 +07:00
Code Issues Packages Projects Releases Wiki Activity

Solved #420 - viewable tiles not updated when trading cities, kudos zivvel!

Browse Source
This commit is contained in:
Yair Morgenstern
2019-01-19 23:49:46 +02:00
parent 2ca894b05f
commit fa8f9deb2c
4 changed files with 5 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/trade/TradeLogic.kt
View File

@ -188,6 +188,8 @@ class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: Ci
val city = from.cities.first { it.name==offer.name }
city.moveToCiv(to)
city.getCenterTile().getUnits().forEach { it.movementAlgs().teleportToClosestMoveableTile() }
to.updateViewableTiles()
from.updateViewableTiles()
}
if(offer.type== TradeType.Treaty){
if(offer.name=="Peace Treaty"){

5
core/src/com/unciv/ui/cityscreen/CityScreen.kt
View File

@ -49,8 +49,6 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
buildingsTableContainer.setPosition(stage.width - buildingsTableContainer.width-5,
stage.height - buildingsTableContainer.height-5)
//constructionsTable.background = ImageGetter.getBackground(tableBackgroundColor)
//val constructionsTableWithBorder = con
stage.addActor(constructionsTable)
stage.addActor(goToWorldButton)
stage.addActor(cityPickerTable)
@ -322,5 +320,4 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() {
@Transient var cityTilesX = 0f
@Transient var cityTilesY = 0f
}
}
}

92
core/src/com/unciv/ui/pickerscreens/ConstructionPickerScreen.kt
View File

@ -1,92 +0,0 @@
package com.unciv.ui.pickerscreens
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.Button
import com.badlogic.gdx.scenes.scene2d.ui.Label
import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup
import com.unciv.logic.city.CityInfo
import com.unciv.logic.city.SpecialConstruction
import com.unciv.models.gamebasics.GameBasics
import com.unciv.models.gamebasics.tr
import com.unciv.ui.cityscreen.CityScreen
import com.unciv.ui.utils.ImageGetter
import com.unciv.ui.utils.onClick
import com.unciv.ui.utils.setFontColor
class ConstructionPickerScreen(val city: CityInfo) : PickerScreen() {
private var selectedProduction: String? = null
private var buySelectedProductionButton = TextButton("BUY ME!",skin)
private fun getProductionButton(production: String, buttonText: String,
description: String?, rightSideButtonText: String): Button {
val productionTextButton = Button(skin)
productionTextButton.add(ImageGetter.getConstructionImage(production)).size(40f).padRight(5f)
productionTextButton.add(Label(buttonText,skin).setFontColor(Color.WHITE))
productionTextButton.onClick {
selectedProduction = production
pick(rightSideButtonText)
descriptionLabel.setText(description)
}
if(production==city.cityConstructions.currentConstruction) productionTextButton.color= Color.GREEN
return productionTextButton
}
init {
val currentPlayerCiv = game.gameInfo.getCurrentPlayerCivilization()
closeButton.onClick {
game.screen = CityScreen(this@ConstructionPickerScreen.city)
dispose()
}
onBackButtonClicked {
game.screen = CityScreen(this@ConstructionPickerScreen.city)
dispose()
}
rightSideButton.setText("Pick construction".tr())
rightSideButton.onClick {
city.cityConstructions.currentConstruction = selectedProduction!!
city.cityStats.update() // Because maybe we set/removed the science or gold production options.
game.screen = CityScreen(this@ConstructionPickerScreen.city)
dispose()
}
val cityConstructions = city.cityConstructions
val regularBuildings = VerticalGroup().space(10f)
val wonders = VerticalGroup().space(10f)
val units = VerticalGroup().space(10f)
val specials = VerticalGroup().space(10f)
for (unit in GameBasics.Units.values.filter { it.isBuildable(cityConstructions)}) {
units.addActor(getProductionButton(unit.name,
unit.name + "\r\n" + cityConstructions.turnsToConstruction(unit.name) + " {turns}".tr(),
unit.getDescription(true), "Train [${unit.name}]".tr()))
}
for (building in GameBasics.Buildings.values) {
if (!building.isBuildable(cityConstructions) && building.name!=cityConstructions.currentConstruction) continue
val productionTextButton = getProductionButton(building.name,
building.name + "\r\n" + cityConstructions.turnsToConstruction(building.name) + " {turns}".tr(),
building.getDescription(true, currentPlayerCiv.policies.getAdoptedPolicies()),
"Build [${building.name}]".tr())
if (building.isWonder)
wonders.addActor(productionTextButton)
else
regularBuildings.addActor(productionTextButton)
}
for(specialConstruction in SpecialConstruction.getSpecialConstructions().filter { it.isBuildable(cityConstructions) }){
specials.addActor(getProductionButton(specialConstruction.name, "Produce [${specialConstruction.name}]".tr(),
specialConstruction.description, "Produce [${specialConstruction.name}]".tr()))
}
topTable.add(units)
topTable.add(regularBuildings)
topTable.add(wonders)
topTable.add(specials)
}
}