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

Trade table separated into a distict entity, allows us to put the trade into other screens

Browse Source
This commit is contained in:
Yair Morgenstern 2018-08-01 13:00:06 +03:00
parent d8daf6dc88
commit 04c0c87d7c
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/ui/OffersList.kt
View File

@ -23,7 +23,7 @@ class OffersList(val offers: TradeOffersList, val correspondingOffers: TradeOffe
fun update() {
table.clear()
for(offer in offers.sortedBy { it.type }) {
var buttonText = offer.name
var buttonText = offer.name.tr()
if(offer.type !in listOf(TradeType.Technology, TradeType.City)) buttonText+=" ("+offer.amount+")"
if(offer.duration>1) buttonText+="\n"+offer.duration+" {turns}".tr()
val tb = TextButton(buttonText, CameraStageBaseScreen.skin)

39
core/src/com/unciv/ui/TradeScreen.kt
View File

@ -6,12 +6,15 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.unciv.UnCivGame
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.trade.TradeLogic
import com.unciv.ui.utils.*
import com.unciv.ui.utils.CameraStageBaseScreen
import com.unciv.ui.utils.addClickListener
import com.unciv.ui.utils.center
import com.unciv.ui.utils.tr
class TradeScreen(otherCivilization: CivilizationInfo) : CameraStageBaseScreen(){
val tradeLogic = TradeLogic(otherCivilization)
val table = Table(skin)
val tradeTable = Table(skin)
val tradeText = Label("What do you have in mind?".tr(),skin)
val offerButton = TextButton("Offer trade".tr(),skin)
@ -32,11 +35,24 @@ class TradeScreen(otherCivilization: CivilizationInfo) : CameraStageBaseScreen()
tradeLogic.ourAvailableOffers, tradeLogic.currentTrade.ourOffers) { onChange() }
init {
val generalTable = Table()
val closeButton = TextButton("Close".tr(), skin)
closeButton.addClickListener { UnCivGame.Current.setWorldScreen() }
closeButton.y = stage.height - closeButton.height - 5
stage.addActor(closeButton)
stage.addActor(table)
tradeTable.add("Our items".tr())
tradeTable.add("Our trade offer".tr())
tradeTable.add("[${otherCivilization.civName}]'s trade offer".tr())
tradeTable.add("[${otherCivilization.civName}]'s items".tr()).row()
tradeTable.add(ourAvailableOffersTable).size(stage.width/5,stage.height*0.8f)
tradeTable.add(ourOffersTable).size(stage.width/5,stage.height*0.8f)
tradeTable.add(theirOffersTable).size(stage.width/5,stage.height*0.8f)
tradeTable.add(theirAvailableOffersTable).size(stage.width/5,stage.height*0.8f)
tradeTable.pack()
generalTable.add(tradeTable).row()
val lowerTable = Table().apply { defaults().pad(10f) }
@ -67,22 +83,13 @@ class TradeScreen(otherCivilization: CivilizationInfo) : CameraStageBaseScreen()
lowerTable.add(offerButton)
lowerTable.pack()
lowerTable.centerX(stage)
lowerTable.y = 10f
stage.addActor(lowerTable)
generalTable.add(lowerTable)
generalTable.pack()
generalTable.center(stage)
stage.addActor(generalTable)
table.add("Our items".tr())
table.add("Our trade offer".tr())
table.add("[${otherCivilization.civName}]'s trade offer".tr())
table.add("[${otherCivilization.civName}]'s items".tr()).row()
table.add(ourAvailableOffersTable).size(stage.width/4,stage.width/2)
table.add(ourOffersTable).size(stage.width/4,stage.width/2)
table.add(theirOffersTable).size(stage.width/4,stage.width/2)
table.add(theirAvailableOffersTable).size(stage.width/4,stage.width/2)
table.pack()
table.center(stage)
update()
}