mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2024-12-22 23:34:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #12409 - Don't assume the city-state ally knows the civ that attacked the city-state

Browse Source
This commit is contained in:
yairm210 2024-11-07 12:33:39 +02:00
parent 3ee4cf03fa
commit c5cab907c1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -682,7 +682,7 @@ class CityStateFunctions(val civInfo: Civilization) {
// Even if we aren't *technically* protectors, we *can* still be pissed you attacked our allies*
val allyCivName = civInfo.getAllyCiv()
val allyCiv = if (allyCivName != null) civInfo.gameInfo.getCivilization(allyCivName) else null
if (allyCiv != null && allyCiv !in civInfo.cityStateFunctions.getProtectorCivs()){
if (allyCiv != null && allyCiv !in civInfo.cityStateFunctions.getProtectorCivs() && allyCiv.knows(attacker)){
val allyDiplomacy = allyCiv.getDiplomacyManager(attacker)!!
// Less than if we were protectors
allyDiplomacy.addModifier(DiplomaticModifiers.AttackedAlliedMinor, -10f)