mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-13 01:08:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

Barbarians can be never defeated (#1940)

Browse Source
This commit is contained in:
JackRainy
2020-02-15 19:05:57 +02:00
committed by GitHub
parent 19cac1f7bf
commit cd3004fedb
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -279,6 +279,7 @@ class CivilizationInfo {
/** Returns true if the civ was fully initialized and has no cities or settlers remaining */ /** Returns true if the civ was fully initialized and has no cities or settlers remaining */
fun isDefeated()= cities.isEmpty() fun isDefeated()= cities.isEmpty()
&& exploredTiles.isNotEmpty() // Dirty hack: exploredTiles are empty only before starting units are placed && 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 }) && (citiesCreated > 0 || !getCivUnits().any { it.name == Constants.settler })
fun getEra(): TechEra { fun getEra(): TechEra {