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

Resolve #11752 - fix crash in spy automation

Browse Source
This commit is contained in:
Yair Morgenstern
2024-06-15 22:35:18 +03:00
parent 5967f56f6d
commit ac54209d6b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/unciv/logic/automation/unit/EspionageAutomation.kt
View File

@ -81,13 +81,14 @@ class EspionageAutomation(val civInfo: Civilization) {
spy.moveTo(civInfo.cities.filter { spy.canMoveTo(it) }.randomOrNull()) spy.moveTo(civInfo.cities.filter { spy.canMoveTo(it) }.randomOrNull())
return spy.action == SpyAction.CounterIntelligence return spy.action == SpyAction.CounterIntelligence
} }
private fun checkIfShouldStageCoup(spy: Spy) { private fun checkIfShouldStageCoup(spy: Spy) {
if (!spy.canDoCoup()) return if (!spy.canDoCoup()) return
if (spy.getCoupChanceOfSuccess(false) < .7) return if (spy.getCoupChanceOfSuccess(false) < .7) return
val allyCiv = spy.getCity().civ.getAllyCiv()?.let { civInfo.gameInfo.getCivilization(it) } val allyCiv = spy.getCity().civ.getAllyCiv()?.let { civInfo.gameInfo.getCivilization(it) }
// Don't coup ally city-states // Don't coup city-states whose allies are out friends
if (allyCiv != null && civInfo.getDiplomacyManager(allyCiv).isRelationshipLevelGE(RelationshipLevel.Friend)) return if (allyCiv != null && civInfo.knows(allyCiv)
&& civInfo.getDiplomacyManager(allyCiv).isRelationshipLevelGE(RelationshipLevel.Friend)) return
val spies = civInfo.espionageManager.spyList val spies = civInfo.espionageManager.spyList
val randomSeed = spies.size + spies.indexOf(spy) + civInfo.gameInfo.turns val randomSeed = spies.size + spies.indexOf(spy) + civInfo.gameInfo.turns
val randomAction = Random(randomSeed).nextInt(100) val randomAction = Random(randomSeed).nextInt(100)