wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug where gifts from AIs to city-states were interpreted as gifts from human player to city-states

Browse source
This commit is contained in:
Yair Morgenstern 2019-06-24 21:53:31 +03:00
parent b2c7595fcc
commit c3efc10ea8
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/build.gradle
View file

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app"
minSdkVersion 14
targetSdkVersion 28
versionCode 262
versionName "2.17.10-patch1"
versionCode 263
versionName "2.17.10-patch2"
}
// Had to add this crap for Travis to build, it wanted to sign the app

5
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View file

@ -613,9 +613,8 @@ class CivilizationInfo {
fun giveGoldGift(otherCiv: CivilizationInfo, giftAmount: Int) {
if(!otherCiv.isCityState()) throw Exception("You can only gain influence with city states!")
val currentPlayerCiv = UnCivGame.Current.gameInfo.getCurrentPlayerCivilization()
currentPlayerCiv.gold -= giftAmount
otherCiv.getDiplomacyManager(currentPlayerCiv).influence += giftAmount/10
gold -= giftAmount
otherCiv.getDiplomacyManager(this).influence += giftAmount/10
updateStatsForNextTurn()
}