diff --git a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt index 7ab755170c..bd03597f5b 100644 --- a/core/src/com/unciv/logic/automation/NextTurnAutomation.kt +++ b/core/src/com/unciv/logic/automation/NextTurnAutomation.kt @@ -298,6 +298,9 @@ class NextTurnAutomation{ private fun declareWar(civInfo: CivilizationInfo) { if (civInfo.isCityState()) return + if(civInfo.getNation().preferredVictoryType==VictoryType.Cultural) + return + if (civInfo.cities.isNotEmpty() && civInfo.diplomacy.isNotEmpty()) { val ourMilitaryUnits = civInfo.getCivUnits().filter { !it.type.isCivilian() }.size if (!civInfo.isAtWar() && civInfo.happiness > 0 diff --git a/core/src/com/unciv/logic/civilization/PolicyManager.kt b/core/src/com/unciv/logic/civilization/PolicyManager.kt index 4c899dea29..c48424b6b6 100644 --- a/core/src/com/unciv/logic/civilization/PolicyManager.kt +++ b/core/src/com/unciv/logic/civilization/PolicyManager.kt @@ -3,6 +3,7 @@ package com.unciv.logic.civilization import com.unciv.Constants import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.Policy +import com.unciv.models.gamebasics.VictoryType class PolicyManager { @@ -76,7 +77,16 @@ class PolicyManager { "Free Religion" -> freePolicies++ "Liberty Complete" -> { if (civInfo.isPlayerCivilization()) civInfo.greatPeople.freeGreatPeople++ - else civInfo.addGreatPerson(GameBasics.Units.keys.filter { it.startsWith("Great") }.random()) + else { + val preferredVictoryType = civInfo.getNation().preferredVictoryType + val greatPerson = when(preferredVictoryType) { + VictoryType.Cultural -> "Great Artist" + VictoryType.Scientific -> "Great Scientist" + VictoryType.Domination,VictoryType.Neutral -> + GameBasics.Units.keys.filter { it.startsWith("Great") }.random() + } + civInfo.addGreatPerson(greatPerson) + } } }