From 6a833ae89a906401d51e6f3f20b91557eaa63ebb Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 6 Mar 2019 20:39:53 +0200 Subject: [PATCH] Resolved #514 - enemy civ is defeated even when he has settlers left, as per original Civ --- core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index 5ffe801b61..1e7fee6637 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -301,7 +301,8 @@ class CivilizationInfo { override fun toString(): String {return civName} // for debug - fun isDefeated()= cities.isEmpty() && !getCivUnits().any{it.name=="Settler"} + fun isDefeated()= cities.isEmpty() && citiesCreated > 0 + fun getEra(): TechEra { val maxEraOfTech = tech.researchedTechnologies .asSequence()