From 9ef0966b2ea55e87940cf62a6b7ccd881031279b Mon Sep 17 00:00:00 2001 From: EmperorPinguin <99119424+EmperorPinguin@users.noreply.github.com> Date: Tue, 7 Jan 2025 19:48:56 +0100 Subject: [PATCH] Update NextTurnAutomation.kt (#12754) --- .../automation/civilization/NextTurnAutomation.kt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt index 3350baf5f2..18c30f2d7f 100644 --- a/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt +++ b/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt @@ -200,7 +200,7 @@ object NextTurnAutomation { else 0 value += ourInfluence / 10 - if (civInfo.gold < 100 && ourInfluence < 30) { + if (ourInfluence < 30) { // Consider bullying for cash value -= 5 } @@ -227,13 +227,9 @@ object NextTurnAutomation { private fun protectCityStates(civInfo: Civilization) { for (state in civInfo.getKnownCivs().filter { !it.isDefeated() && it.isCityState }) { - val diplomacyManager = state.getDiplomacyManager(civInfo.civName)!! - val isAtLeastFriend = diplomacyManager.isRelationshipLevelGE(RelationshipLevel.Friend) - if (isAtLeastFriend && state.cityStateFunctions.otherCivCanPledgeProtection(civInfo)) { - state.cityStateFunctions.addProtectorCiv(civInfo) - } else if (!isAtLeastFriend && state.cityStateFunctions.otherCivCanWithdrawProtection(civInfo)) { - state.cityStateFunctions.removeProtectorCiv(civInfo) - } + if (state.cityStateFunctions.otherCivCanPledgeProtection(civInfo)) + state.cityStateFunctions.addProtectorCiv(civInfo) + //Always pledge to protect, as it makes it harder for others to demand tribute, and grants +10 resting Influence } }