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

Fixed trades always beng denied because "our proposed trade is no longer relevant"

Browse Source
This commit is contained in:
Yair Morgenstern
2019-11-17 21:16:51 +02:00
parent 7a02019b7c
commit aa4c70f090
5 changed files with 2050 additions and 2043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/TileSets/FantasyHex/Units/Mechanized Infantry.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 289 B

After

Width:  |  Height:  |  Size: 328 B

4090
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 857 KiB

BIN
android/assets/game2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 242 KiB

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

@ -358,8 +358,9 @@ class CivilizationInfo {
for(tradeRequest in tradeRequests.toList()) { // remove trade requests where one of the sides can no longer supply
val offeringCiv = gameInfo.getCivilization(tradeRequest.requestingCiv)
if (offeringCiv.isDefeated() || !TradeEvaluation().isTradeValid(tradeRequest.trade,offeringCiv,this)) {
if (offeringCiv.isDefeated() || !TradeEvaluation().isTradeValid(tradeRequest.trade,this, offeringCiv)) {
tradeRequests.remove(tradeRequest)
// Yes, this is the right direction. I checked.
offeringCiv.addNotification("Our proposed trade is no longer relevant!", Color.GOLD)
}
}