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

Fixed bug where if you discovered and enemy and traded ith him and your trade finished without leaving and reentering the game, the game would crash (but would be okay on reload)

Browse source
This commit is contained in:
Yair Morgenstern 2018-07-08 18:40:26 +03:00
parent 1c304da9d1
commit 4d43b8d226
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -253,8 +253,8 @@ class CivilizationInfo {
for(otherCiv in viewedCivs)
if(!diplomacy.containsKey(otherCiv.civName)){
diplomacy[otherCiv.civName] = DiplomacyManager().apply { otherCivName=otherCiv.civName }
otherCiv.diplomacy[civName] = DiplomacyManager().apply { otherCivName=civName }
diplomacy[otherCiv.civName] = DiplomacyManager(this@CivilizationInfo,otherCiv.civName)
otherCiv.diplomacy[civName] = DiplomacyManager(otherCiv,civName)
addNotification("We have encountered ["+otherCiv.civName+"]!".tr(),null, Color.GOLD)
}
@ -270,7 +270,6 @@ class CivilizationInfo {
fun isDefeated()= cities.isEmpty() && !getCivUnits().any{it.name=="Settler"}
fun getEra(): TechEra {
val maxEraOfTech = tech.techsResearched.map { GameBasics.Technologies[it]!! }
.map { it.era() }
.max()
@ -284,9 +283,14 @@ enum class DiplomaticStatus{
War
}
class DiplomacyManager {
class DiplomacyManager() {
@Transient lateinit var civInfo:CivilizationInfo
lateinit var otherCivName:String
constructor(civilizationInfo: CivilizationInfo, OtherCivName:String) : this() {
civInfo=civilizationInfo
otherCivName=OtherCivName
}
// var status:DiplomaticStatus = DiplomaticStatus.War
var trades = ArrayList<Trade>()
@ -315,7 +319,7 @@ class DiplomacyManager {
}
}
fun otherCiv() = civInfo.gameInfo.civilizations.first{it.civName==otherCivName}
//fun otherCiv() = civInfo.gameInfo.civilizations.first{it.civName==otherCivName}
// fun declareWar(){
// status = DiplomaticStatus.War
// otherCiv().diplomacy[civInfo.civName]!!.status = DiplomaticStatus.War