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

Resolved #9954 - clarify when trade decision is made for new players

Browse Source
This commit is contained in:
Yair Morgenstern 2023-08-29 14:57:30 +03:00
parent 014dea246f
commit 1fa2d945c3
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/assets/jsons/translations/template.properties
View File

@ -265,6 +265,7 @@ Sum: =
Trade = Trade =
Offer trade = Offer trade =
They'll decide on their turn =
Retract offer = Retract offer =
What do you have in mind? = What do you have in mind? =
Our items = Our items =

14
core/src/com/unciv/ui/screens/diplomacyscreen/TradeTable.kt
View File

@ -7,10 +7,10 @@ import com.unciv.logic.trade.TradeLogic
import com.unciv.logic.trade.TradeRequest import com.unciv.logic.trade.TradeRequest
import com.unciv.logic.trade.TradeType import com.unciv.logic.trade.TradeType
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
import com.unciv.ui.screens.basescreen.BaseScreen
import com.unciv.ui.components.extensions.isEnabled import com.unciv.ui.components.extensions.isEnabled
import com.unciv.ui.components.input.onClick
import com.unciv.ui.components.extensions.toTextButton import com.unciv.ui.components.extensions.toTextButton
import com.unciv.ui.components.input.onClick
import com.unciv.ui.screens.basescreen.BaseScreen
class TradeTable( class TradeTable(
private val otherCivilization: Civilization, private val otherCivilization: Civilization,
@ -18,17 +18,19 @@ class TradeTable(
): Table(BaseScreen.skin) { ): Table(BaseScreen.skin) {
private val currentPlayerCiv = otherCivilization.gameInfo.getCurrentPlayerCivilization() private val currentPlayerCiv = otherCivilization.gameInfo.getCurrentPlayerCivilization()
internal val tradeLogic = TradeLogic(currentPlayerCiv, otherCivilization) internal val tradeLogic = TradeLogic(currentPlayerCiv, otherCivilization)
internal val offerColumnsTable = OfferColumnsTable(tradeLogic, diplomacyScreen , currentPlayerCiv, otherCivilization) { onChange() } internal val offerColumnsTable = OfferColumnsTable(tradeLogic, diplomacyScreen , currentPlayerCiv, otherCivilization) { onChange() }
// This is so that after a trade has been traded, we can switch out the offersToDisplay to start anew - this is the easiest way // This is so that after a trade has been traded, we can switch out the offersToDisplay to start anew - this is the easiest way
private val offerColumnsTableWrapper = Table() private val offerColumnsTableWrapper = Table()
private val offerButton = "Offer trade".toTextButton()
val offerTradeText = "{Offer trade}\n({They'll decide on their turn})"
private val offerButton = offerTradeText.toTextButton()
private fun isTradeOffered() = otherCivilization.tradeRequests.any { it.requestingCiv == currentPlayerCiv.civName } private fun isTradeOffered() = otherCivilization.tradeRequests.any { it.requestingCiv == currentPlayerCiv.civName }
private fun retractOffer() { private fun retractOffer() {
otherCivilization.tradeRequests.removeAll { it.requestingCiv == currentPlayerCiv.civName } otherCivilization.tradeRequests.removeAll { it.requestingCiv == currentPlayerCiv.civName }
currentPlayerCiv.cache.updateCivResources() currentPlayerCiv.cache.updateCivResources()
offerButton.setText("Offer trade".tr()) offerButton.setText(offerTradeText.tr())
} }
init { init {
@ -44,7 +46,7 @@ class TradeTable(
} }
if (isTradeOffered()) offerButton.setText("Retract offer".tr()) if (isTradeOffered()) offerButton.setText("Retract offer".tr())
else offerButton.apply { isEnabled = false }.setText("Offer trade".tr()) else offerButton.apply { isEnabled = false }.setText(offerTradeText.tr())
offerButton.onClick { offerButton.onClick {
if (isTradeOffered()) { if (isTradeOffered()) {