Resolved #1007 - trades and alerts now work again, which means they'll also work in multiplayer =)

This commit is contained in:
Yair Morgenstern 2019-08-21 23:44:28 +03:00
parent 03228a6546
commit c685e0f528
3 changed files with 17 additions and 4 deletions

View File

@ -1650,7 +1650,7 @@
Simplified_Chinese:"恭喜!你赢得了征服胜利!"
Portuguese:"Você ganhou uma vitória de dominação!"
}
"You have achieved victory through the awesome power of your Culture. Your civilization's greatness - the magnificence of its monuments and the power of its artists - have astounded the world! Poets will honor you as long as beauty brings gladness to a weary heart.":{
}

View File

@ -91,6 +91,8 @@ class CivilizationInfo {
toReturn.exploredTiles.addAll(gameInfo.tileMap.values.asSequence().map { it.position }.filter { it in exploredTiles })
toReturn.notifications.addAll(notifications)
toReturn.citiesCreated = citiesCreated
toReturn.popupAlerts.addAll(popupAlerts)
toReturn.tradeRequests.addAll(tradeRequests)
return toReturn
}

View File

@ -41,6 +41,17 @@ class Trade{
}
class TradeRequest(val requestingCiv:String,
/** Their offers are what they offer us, and our offers are what they want in return */
val trade: Trade)
class TradeRequest {
lateinit var requestingCiv: String
/** Their offers are what they offer us, and our offers are what they want in return */
lateinit var trade: Trade
constructor() // for json serialization
constructor(requestingCiv: String, trade: Trade) {
this.requestingCiv = requestingCiv
this.trade = trade
}
}