diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index 449fd4843a..fb1bed444d 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -34,7 +34,7 @@ class Battle(val gameInfo:GameInfo=UnCivGame.Current.gameInfo) { } } - if(enemy.getCivilization() == enemy.getCivilization().gameInfo.getBarbarianCivilization()) + if(enemy.getCivilization().isBarbarianCivilization()) modifiers["vs Barbarians"] = 0.33f if(combatant.getCivilization().happiness<0) @@ -219,6 +219,7 @@ class Battle(val gameInfo:GameInfo=UnCivGame.Current.gameInfo) { } fun captureCivilianUnit(attacker: ICombatant, defender: ICombatant){ + if(attacker.getCivilization().isBarbarianCivilization()) defender.takeDamage(100) // barbarians don't capture civilians! val capturedUnit = (defender as MapUnitCombatant).unit capturedUnit.civInfo = attacker.getCivilization() capturedUnit.owner = capturedUnit.civInfo.civName diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index 7608850efc..c18ef55551 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -41,6 +41,7 @@ class CivilizationInfo { fun getCapital()=cities.first { it.isCapital() } fun isPlayerCivilization() = gameInfo.getPlayerCivilization()==this + fun isBarbarianCivilization() = gameInfo.getBarbarianCivilization()==this // negative gold hurts science diff --git a/core/src/com/unciv/ui/VictoryScreen.kt b/core/src/com/unciv/ui/VictoryScreen.kt index b2f29e0bbc..e2b50efbec 100644 --- a/core/src/com/unciv/ui/VictoryScreen.kt +++ b/core/src/com/unciv/ui/VictoryScreen.kt @@ -80,7 +80,7 @@ class VictoryScreen : PickerScreen() { val t=Table() t.defaults().pad(5f) for (civ in civInfo.gameInfo.civilizations){ - if(civ.isPlayerCivilization() || civ == civInfo.gameInfo.getBarbarianCivilization()) continue + if(civ.isPlayerCivilization() || civ.isBarbarianCivilization()) continue t.add(getMilestone("Destroy "+civ.civName, civ.isDefeated())).row() } return t