From 451a95a86c4ebbdd12c51ffa89e3a824d00f5331 Mon Sep 17 00:00:00 2001
From: Duan Tao <duantao@live.cn>
Date: Fri, 8 Mar 2019 22:37:26 +0800
Subject: [PATCH] Better defeat condition.

---
 core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
index d1fd2cd75d..2359121484 100644
--- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
+++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt
@@ -302,7 +302,7 @@ class CivilizationInfo {
 
     override fun toString(): String {return civName} // for debug
 
-    fun isDefeated()= cities.isEmpty() && citiesCreated > 0
+    fun isDefeated()= cities.isEmpty() && (citiesCreated > 0 || !getCivUnits().any{it.name=="Settler"})
 
     fun getEra(): TechEra {
         val maxEraOfTech =  tech.researchedTechnologies
@@ -490,4 +490,4 @@ class CivilizationInfo {
     }
 
     //endregion
-}
\ No newline at end of file
+}