AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-30 15:30:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

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

15
core/src/com/unciv/logic/trade/Trade.kt
View File

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