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

Defeated civilizations don't use spies (#11785)

Browse Source 
* Fixed a crash when rigging a city-state election the turn before meeting them

* Civilizations move their spies back to the hideout when defeated

* Players can't move spies when defeated

* Removed some weird indents
This commit is contained in:
Oskar Niesen
2024-06-19 09:23:42 -05:00
committed by GitHub
parent f52245865c
commit dff8133a7a
4 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/civilization/Civilization.kt
View File

@ -909,6 +909,8 @@ class Civilization : IsPartOfGameInfoSerialization {
for (tradeRequest in diplomacyManager.otherCiv().tradeRequests.filter { it.requestingCiv == civName })
diplomacyManager.otherCiv().tradeRequests.remove(tradeRequest) // it would be really weird to get a trade request from a dead civ
}
if (gameInfo.isEspionageEnabled())
espionageManager.removeAllSpies()
}
fun updateProximity(otherCiv: Civilization, preCalculated: Proximity? = null): Proximity = cache.updateProximity(otherCiv, preCalculated)

2
core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt
View File

@ -77,7 +77,7 @@ class CityStateFunctions(val civInfo: Civilization) {
fun getVotesFromSpy(spy: Spy?): Float {
if (spy == null) return 20f
var votes = (civInfo.getDiplomacyManager(spy.civInfo)!!.influence / 2)
var votes = (civInfo.getDiplomacyManagerOrMeet(spy.civInfo).influence / 2)
votes += (spy.getSkillModifierPercent() * spy.getEfficiencyModifier()).toFloat() // ranges from 30 to 90
return votes
}

11
core/src/com/unciv/logic/civilization/managers/EspionageManager.kt
View File

@ -45,7 +45,8 @@ class EspionageManager : IsPartOfGameInfoSerialization {
fun getSpyName(): String {
val usedSpyNames = spyList.map { it.name }.toHashSet()
val validSpyNames = civInfo.nation.spyNames.filter { it !in usedSpyNames }
return validSpyNames.randomOrNull() ?: "Spy ${spyList.size+1}" // +1 as non-programmers count from 1
return validSpyNames.randomOrNull()
?: "Spy ${spyList.size + 1}" // +1 as non-programmers count from 1
}
fun addSpy(): Spy {
@ -100,4 +101,12 @@ class EspionageManager : IsPartOfGameInfoSerialization {
fun getIdleSpies(): List<Spy> {
return spyList.filterTo(mutableListOf()) { it.isIdle() }
}
/**
* Takes all spies away from their cities.
* Called when the civ is destroyed.
*/
fun removeAllSpies() {
spyList.forEach { it.moveTo(null) }
}
}

4
core/src/com/unciv/ui/screens/overviewscreen/EspionageOverviewScreen.kt
View File

@ -97,7 +97,7 @@ class EspionageOverviewScreen(val civInfo: Civilization, val worldScreen: WorldS
moveSpyButton.onRightClick {
onSpyRightClicked(spy)
}
if (!worldScreen.canChangeState || !spy.isAlive()) {
if (!worldScreen.canChangeState || !spy.isAlive() || civInfo.isDefeated()) {
// Spectators aren't allowed to move the spies of the Civs they are viewing
moveSpyButton.disable()
}
@ -193,7 +193,7 @@ class EspionageOverviewScreen(val civInfo: Civilization, val worldScreen: WorldS
add(starTable).center().padLeft(-4f)
// Spectators aren't allowed to move the spies of the Civs they are viewing
if (worldScreen.canChangeState && spy.isAlive()) {
if (worldScreen.canChangeState && spy.isAlive() && !civInfo.isDefeated()) {
onClick {
onSpyClicked(moveSpyButtons[spy]!!, spy)
}