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

Rework Policy and Diplomacy buttons (#7027)

Browse Source 
* WordScreenTopBar rework, portrait-friendlier

* WordScreenTopBar rework, portrait-friendlier - NotificationsScroll

* WordScreenTopBar rework, portrait-friendlier - Rounded corners

* WordScreenTopBar rework, portrait-friendlier - Tweak padding

* WordScreenTopBar rework, portrait-friendlier - review

* Worldscreen reorg 1 - Tech policy Diplomacy

* Tech Policy Diplomacy buttons - postmerge fix and 7130 simpler
This commit is contained in:
SomeTroglodyte
2022-06-22 08:31:07 +02:00
committed by GitHub
parent 50e479b21d
commit a13a39293f
2 changed files with 134 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
core/src/com/unciv/ui/worldscreen/TechPolicyDiplomacyButtons.kt Normal file
View File

@ -0,0 +1,117 @@
package com.unciv.ui.worldscreen
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.ui.Button
import com.badlogic.gdx.scenes.scene2d.ui.Container
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.models.UncivSound
import com.unciv.models.translations.tr
import com.unciv.ui.images.ImageGetter
import com.unciv.ui.pickerscreens.PolicyPickerScreen
import com.unciv.ui.pickerscreens.TechButton
import com.unciv.ui.pickerscreens.TechPickerScreen
import com.unciv.ui.trade.DiplomacyScreen
import com.unciv.ui.utils.BaseScreen
import com.unciv.ui.utils.Fonts
import com.unciv.ui.utils.extensions.colorFromRGB
import com.unciv.ui.utils.extensions.onClick
import com.unciv.ui.utils.extensions.toLabel
/** A holder for Tech, Policies and Diplomacy buttons going in the top left of the WorldScreen just under WorldScreenTopBar */
class TechPolicyDiplomacyButtons(val worldScreen: WorldScreen) : Table(BaseScreen.skin) {
private val techButtonHolder = Container<Table?>()
private val pickTechButton = Table(skin)
private val pickTechLabel = "".toLabel(Color.WHITE, 30)
private val policyButtonHolder = Container<Button?>()
private val policyScreenButton = Button(skin)
private val diplomacyButtonHolder = Container<Button?>()
private val diplomacyButton = Button(skin)
private val viewingCiv = worldScreen.viewingCiv
private val game = worldScreen.game
init {
defaults().left()
add(techButtonHolder).colspan(3).row()
add(policyButtonHolder).padTop(10f).padRight(10f)
add(diplomacyButtonHolder).padTop(10f)
add().growX() // Allows Policy and Diplo buttons to keep to the left
pickTechButton.background = ImageGetter.getRoundedEdgeRectangle(colorFromRGB(7, 46, 43))
pickTechButton.defaults().pad(20f)
pickTechButton.add(pickTechLabel)
techButtonHolder.onClick(UncivSound.Paper) {
game.setScreen(TechPickerScreen(viewingCiv))
}
policyScreenButton.add(ImageGetter.getImage("PolicyIcons/Constitution")).size(30f).pad(15f)
policyButtonHolder.onClick {
game.setScreen(PolicyPickerScreen(worldScreen))
}
diplomacyButton.add(ImageGetter.getImage("OtherIcons/DiplomacyW")).size(30f).pad(15f)
diplomacyButtonHolder.onClick {
game.setScreen(DiplomacyScreen(viewingCiv))
}
}
fun update(): Boolean {
updateTechButton()
updatePolicyButton()
val result = updateDiplomacyButton()
pack()
setPosition(10f, worldScreen.topBar.y - height - 15f)
return result
}
private fun updateTechButton() {
techButtonHolder.touchable = Touchable.disabled
techButtonHolder.actor = null
if (worldScreen.gameInfo.ruleSet.technologies.isEmpty() || viewingCiv.cities.isEmpty()) return
techButtonHolder.touchable = Touchable.enabled
if (viewingCiv.tech.currentTechnology() != null) {
val currentTech = viewingCiv.tech.currentTechnologyName()!!
val innerButton = TechButton(currentTech, viewingCiv.tech)
innerButton.color = colorFromRGB(7, 46, 43)
techButtonHolder.actor = innerButton
val turnsToTech = viewingCiv.tech.turnsToTech(currentTech)
innerButton.text.setText(currentTech.tr() + "\r\n" + turnsToTech + Fonts.turn)
} else {
val canResearch = viewingCiv.tech.canResearchTech()
if (canResearch || viewingCiv.tech.researchedTechnologies.size != 0) {
val text = if (canResearch) "{Pick a tech}!" else "Technologies"
pickTechLabel.setText(text.tr())
techButtonHolder.actor = pickTechButton
}
}
}
private fun updatePolicyButton() {
// Don't show policies until they become relevant
if (viewingCiv.policies.adoptedPolicies.isNotEmpty() || viewingCiv.policies.canAdoptPolicy()) {
policyButtonHolder.touchable = Touchable.enabled
policyButtonHolder.actor = policyScreenButton
} else {
policyButtonHolder.touchable = Touchable.disabled
policyButtonHolder.actor = null
}
}
private fun updateDiplomacyButton(): Boolean {
return if (viewingCiv.isDefeated() || viewingCiv.isSpectator()
|| viewingCiv.getKnownCivs().filterNot { it == viewingCiv || it.isBarbarian() }.none()
) {
diplomacyButtonHolder.touchable = Touchable.disabled
diplomacyButtonHolder.actor = null
false
} else {
diplomacyButtonHolder.touchable = Touchable.enabled
diplomacyButtonHolder.actor = diplomacyButton
true
}
}
}

108
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View File

@ -6,10 +6,8 @@ import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.math.Vector2
import com.badlogic.gdx.scenes.scene2d.InputEvent
import com.badlogic.gdx.scenes.scene2d.InputListener
import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.actions.Actions
import com.badlogic.gdx.scenes.scene2d.actions.RepeatAction
import com.badlogic.gdx.scenes.scene2d.ui.Button
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.badlogic.gdx.utils.Align
@ -26,10 +24,8 @@ import com.unciv.logic.multiplayer.MultiplayerGameUpdated
import com.unciv.logic.multiplayer.storage.FileStorageRateLimitReached
import com.unciv.logic.trade.TradeEvaluation
import com.unciv.models.Tutorial
import com.unciv.models.UncivSound
import com.unciv.models.ruleset.tile.ResourceType
import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.translations.tr
import com.unciv.ui.cityscreen.CityScreen
import com.unciv.ui.civilopedia.CivilopediaScreen
import com.unciv.ui.images.ImageGetter
@ -41,7 +37,6 @@ import com.unciv.ui.pickerscreens.GreatPersonPickerScreen
import com.unciv.ui.pickerscreens.PantheonPickerScreen
import com.unciv.ui.pickerscreens.PolicyPickerScreen
import com.unciv.ui.pickerscreens.ReligiousBeliefsPickerScreen
import com.unciv.ui.pickerscreens.TechButton
import com.unciv.ui.pickerscreens.TechPickerScreen
import com.unciv.ui.popup.ConfirmPopup
import com.unciv.ui.popup.Popup
@ -50,12 +45,10 @@ import com.unciv.ui.popup.hasOpenPopups
import com.unciv.ui.saves.LoadGameScreen
import com.unciv.ui.saves.QuickSave
import com.unciv.ui.saves.SaveGameScreen
import com.unciv.ui.trade.DiplomacyScreen
import com.unciv.ui.utils.BaseScreen
import com.unciv.ui.utils.Fonts
import com.unciv.ui.utils.KeyCharAndCode
import com.unciv.ui.utils.extensions.centerX
import com.unciv.ui.utils.extensions.colorFromRGB
import com.unciv.ui.utils.extensions.darken
import com.unciv.ui.utils.extensions.disable
import com.unciv.ui.utils.extensions.enable
@ -114,32 +107,25 @@ class WorldScreen(
val mapHolder = WorldMapHolder(this, gameInfo.tileMap)
/** Bottom left widget holding information about a selected unit or city */
val bottomUnitTable = UnitTable(this)
private var waitingForAutosave = false
private val mapVisualization = MapVisualization(gameInfo, viewingCiv)
private val minimapWrapper = MinimapHolder(mapHolder)
private val topBar = WorldScreenTopBar(this)
private val bottomTileInfoTable = TileInfoTable(viewingCiv)
private val battleTable = BattleTable(this)
private val unitActionsTable = UnitActionsTable(this)
private val techPolicyAndVictoryHolder = Table()
private val techButtonHolder = Table()
private val diplomacyButtonHolder = Table()
// Floating Widgets going counter-clockwise
val topBar = WorldScreenTopBar(this)
private val techPolicyAndDiplomacy = TechPolicyDiplomacyButtons(this)
private val fogOfWarButton = createFogOfWarButton()
private val unitActionsTable = UnitActionsTable(this)
/** Bottom left widget holding information about a selected unit or city */
val bottomUnitTable = UnitTable(this)
private val battleTable = BattleTable(this)
private val zoomController = ZoomButtonPair(mapHolder)
private val minimapWrapper = MinimapHolder(mapHolder)
private val bottomTileInfoTable = TileInfoTable(viewingCiv)
private val notificationsScroll = NotificationsScroll(this)
private val nextTurnButton = NextTurnButton()
private val statusButtons = StatusButtons(nextTurnButton)
private val tutorialTaskTable = Table().apply { background = ImageGetter.getBackground(
ImageGetter.getBlue().darken(0.5f)) }
private val notificationsScroll = NotificationsScroll(this)
private val zoomController = ZoomButtonPair(mapHolder)
private var nextTurnUpdateJob: Job? = null
@ -158,38 +144,22 @@ class WorldScreen(
// resume music (in case choices from the menu lead to instantiation of a new WorldScreen)
UncivGame.Current.musicController.resume()
techButtonHolder.touchable = Touchable.enabled
techButtonHolder.onClick(UncivSound.Paper) {
game.pushScreen(TechPickerScreen(viewingCiv))
}
techPolicyAndVictoryHolder.add(techButtonHolder)
fogOfWarButton.isVisible = viewingCiv.isSpectator()
// Don't show policies until they become relevant
if (viewingCiv.policies.adoptedPolicies.isNotEmpty() || viewingCiv.policies.canAdoptPolicy()) {
val policyScreenButton = Button(skin)
policyScreenButton.add(ImageGetter.getImage("PolicyIcons/Constitution")).size(30f).pad(15f)
policyScreenButton.onClick { game.pushScreen(PolicyPickerScreen(this)) }
techPolicyAndVictoryHolder.add(policyScreenButton).pad(10f)
}
stage.addActor(mapHolder)
stage.scrollFocus = mapHolder
stage.addActor(notificationsScroll) // very low in z-order, so we're free to let it extend _below_ tile info and minimap if we want
stage.addActor(minimapWrapper)
stage.addActor(topBar)
stage.addActor(statusButtons)
stage.addActor(techPolicyAndVictoryHolder)
stage.addActor(techPolicyAndDiplomacy)
stage.addActor(tutorialTaskTable)
if (UncivGame.Current.settings.showZoomButtons) {
stage.addActor(zoomController)
}
diplomacyButtonHolder.defaults().pad(5f)
stage.addActor(fogOfWarButton)
stage.addActor(diplomacyButtonHolder)
stage.addActor(bottomUnitTable)
stage.addActor(bottomTileInfoTable)
battleTable.width = stage.width / 3
@ -198,9 +168,6 @@ class WorldScreen(
stage.addActor(unitActionsTable)
topBar.update(viewingCiv)
fogOfWarButton.setPosition(10f, topBar.y - fogOfWarButton.height - 10f)
val tileToCenterOn: Vector2 =
when {
viewingCiv.cities.isNotEmpty() && viewingCiv.getCapital() != null -> viewingCiv.getCapital()!!.location
@ -395,8 +362,6 @@ class WorldScreen(
updateSelectedCiv()
fogOfWarButton.isEnabled = !selectedCiv.isSpectator()
tutorialTaskTable.clear()
val tutorialTask = getCurrentTutorialTask()
if (tutorialTask == "" || !game.settings.showTutorials || viewingCiv.isDefeated()) {
@ -438,10 +403,11 @@ class WorldScreen(
topBar.update(selectedCiv)
updateTechButton()
techPolicyAndVictoryHolder.pack()
techPolicyAndVictoryHolder.setPosition(10f, topBar.y - techPolicyAndVictoryHolder.height - 5f)
updateDiplomacyButton(viewingCiv)
if (techPolicyAndDiplomacy.update())
displayTutorial(Tutorial.OtherCivEncountered)
fogOfWarButton.isEnabled = !selectedCiv.isSpectator()
fogOfWarButton.setPosition(10f, topBar.y - fogOfWarButton.height - 10f)
if (!hasOpenPopups() && isPlayersTurn) {
when {
@ -549,46 +515,6 @@ class WorldScreen(
}
}
private fun updateDiplomacyButton(civInfo: CivilizationInfo) {
diplomacyButtonHolder.clear()
if (!civInfo.isDefeated() && !civInfo.isSpectator() && civInfo.getKnownCivs()
.filterNot { it == viewingCiv || it.isBarbarian() }
.any()) {
displayTutorial(Tutorial.OtherCivEncountered)
val btn = "Diplomacy".toTextButton()
btn.onClick { game.pushScreen(DiplomacyScreen(viewingCiv)) }
btn.label.setFontSize(30)
btn.labelCell.pad(10f)
diplomacyButtonHolder.add(btn)
}
diplomacyButtonHolder.pack()
diplomacyButtonHolder.y = techPolicyAndVictoryHolder.y - 20 - diplomacyButtonHolder.height
}
private fun updateTechButton() {
if (gameInfo.ruleSet.technologies.isEmpty()) return
techButtonHolder.isVisible = viewingCiv.cities.isNotEmpty()
techButtonHolder.clearChildren()
if (viewingCiv.tech.currentTechnology() != null) {
val currentTech = viewingCiv.tech.currentTechnologyName()!!
val innerButton = TechButton(currentTech, viewingCiv.tech)
innerButton.color = colorFromRGB(7, 46, 43)
techButtonHolder.add(innerButton)
val turnsToTech = viewingCiv.tech.turnsToTech(currentTech)
innerButton.text.setText(currentTech.tr() + "\r\n" + turnsToTech + Fonts.turn)
} else if (viewingCiv.tech.canResearchTech() || viewingCiv.tech.researchedTechnologies.any()) {
val buttonPic = Table()
buttonPic.background = ImageGetter.getRoundedEdgeRectangle(colorFromRGB(7, 46, 43))
buttonPic.defaults().pad(20f)
val text = if (viewingCiv.tech.canResearchTech()) "{Pick a tech}!" else "Technologies"
buttonPic.add(text.toLabel(Color.WHITE, 30))
techButtonHolder.add(buttonPic)
}
techButtonHolder.pack()
}
private fun updateSelectedCiv() {
when {
bottomUnitTable.selectedUnit != null -> selectedCiv = bottomUnitTable.selectedUnit!!.civInfo