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

Resolved #880 - Notifications for end-of-trade no longer activate after instant trade

Browse Source
This commit is contained in:
Yair Morgenstern 2019-06-19 17:48:26 +03:00
parent b0e43ace59
commit 27c83f1792
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View File

@ -219,12 +219,14 @@ class DiplomacyManager() {
fun nextTurn(){ fun nextTurn(){
for(trade in trades.toList()){ for(trade in trades.toList()){
for(offer in trade.ourOffers.union(trade.theirOffers).filter { it.duration>0 }) for(offer in trade.ourOffers.union(trade.theirOffers).filter { it.duration>0 }) {
offer.duration-- offer.duration--
if(offer.duration==0)
civInfo.addNotification("["+offer.name+"] from [$otherCivName] has ended",null, Color.GOLD)
}
if(trade.ourOffers.all { it.duration<=0 } && trade.theirOffers.all { it.duration<=0 }) { if(trade.ourOffers.all { it.duration<=0 } && trade.theirOffers.all { it.duration<=0 }) {
trades.remove(trade) trades.remove(trade)
civInfo.addNotification("One of our trades with [$otherCivName] has ended!".tr(),null, Color.YELLOW)
} }
} }
removeUntenebleTrades() removeUntenebleTrades()