From cd3004fedbd738f15fbbc52a0dfb5d28e69fb69f Mon Sep 17 00:00:00 2001 From: JackRainy Date: Sat, 15 Feb 2020 19:05:57 +0200 Subject: [PATCH] Barbarians can be never defeated (#1940) --- core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index a19d81885a..783084e1db 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -279,6 +279,7 @@ class CivilizationInfo { /** Returns true if the civ was fully initialized and has no cities or settlers remaining */ fun isDefeated()= cities.isEmpty() && exploredTiles.isNotEmpty() // Dirty hack: exploredTiles are empty only before starting units are placed + && !isBarbarian() // Barbarians can be never defeated && (citiesCreated > 0 || !getCivUnits().any { it.name == Constants.settler }) fun getEra(): TechEra {