mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-26 23:58:43 +07:00
Code Issues Packages Projects Releases Wiki Activity

Culture-focused civs don't declare war

Browse Source 
Chosen free great person is victory-type-dependant
This commit is contained in:
Yair Morgenstern
2019-06-13 13:18:20 +03:00
parent ea5f649d87
commit 816196520e
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/automation/NextTurnAutomation.kt
View File

@ -298,6 +298,9 @@ class NextTurnAutomation{
private fun declareWar(civInfo: CivilizationInfo) { private fun declareWar(civInfo: CivilizationInfo) {
if (civInfo.isCityState()) return if (civInfo.isCityState()) return
if(civInfo.getNation().preferredVictoryType==VictoryType.Cultural)
return
if (civInfo.cities.isNotEmpty() && civInfo.diplomacy.isNotEmpty()) { if (civInfo.cities.isNotEmpty() && civInfo.diplomacy.isNotEmpty()) {
val ourMilitaryUnits = civInfo.getCivUnits().filter { !it.type.isCivilian() }.size val ourMilitaryUnits = civInfo.getCivUnits().filter { !it.type.isCivilian() }.size
if (!civInfo.isAtWar() && civInfo.happiness > 0 if (!civInfo.isAtWar() && civInfo.happiness > 0

12
core/src/com/unciv/logic/civilization/PolicyManager.kt
View File

@ -3,6 +3,7 @@ package com.unciv.logic.civilization
import com.unciv.Constants import com.unciv.Constants
import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.GameBasics
import com.unciv.models.gamebasics.Policy import com.unciv.models.gamebasics.Policy
import com.unciv.models.gamebasics.VictoryType
class PolicyManager { class PolicyManager {
@ -76,7 +77,16 @@ class PolicyManager {
"Free Religion" -> freePolicies++ "Free Religion" -> freePolicies++
"Liberty Complete" -> { "Liberty Complete" -> {
if (civInfo.isPlayerCivilization()) civInfo.greatPeople.freeGreatPeople++ 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)
}
} }
} }