From 0c84b9561455286518c45505d4a7e36095a49861 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 10 Aug 2020 23:44:10 +0300 Subject: [PATCH] Tests are sometimes ridiculous. --- core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index b43ce0e2..929d7bb9 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -274,7 +274,7 @@ class CivilizationInfo { /** Returns true if the civ was fully initialized and has no cities remaining */ fun isDefeated(): Boolean { // Dirty hack: exploredTiles are empty only before starting units are placed - if (isBarbarian() || isSpectator() || exploredTiles.isEmpty()) return false + if (exploredTiles.isEmpty() || isBarbarian() || isSpectator()) return false // Scenarios are 'to the death'... for now if (gameInfo.gameParameters.victoryTypes.contains(VictoryType.Scenario)) return cities.isEmpty() && getCivUnits().none()