From c29ccadc60f00c2f98c67e6c274d850afca75c60 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 23 Jan 2020 20:50:53 +0200 Subject: [PATCH] Exploring units no longer auto-enter city states --- android/assets/jsons/Nations/Nations.json | 2 +- core/src/com/unciv/logic/automation/UnitAutomation.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/android/assets/jsons/Nations/Nations.json b/android/assets/jsons/Nations/Nations.json index bc89fe9ce3..22dfecf9c6 100644 --- a/android/assets/jsons/Nations/Nations.json +++ b/android/assets/jsons/Nations/Nations.json @@ -114,7 +114,7 @@ "declaringWar": "You are but a pest on this Earth, prepare to be eliminated!", "attacked": "You are a fool who evokes pity. You have brought my hostility upon yourself and your repulsive civilization!", - "defeated": "Strike me down and my soul will torment yours forever – you have won nothing.", + "defeated": "Strike me down and my soul will torment yours forever, you have won nothing.", "introduction": "Greetings, I am Ramesses the god. I am the living embodiment of Egypt, mother and father of all civilizations.", "neutralHello": "Good day.", diff --git a/core/src/com/unciv/logic/automation/UnitAutomation.kt b/core/src/com/unciv/logic/automation/UnitAutomation.kt index 122fff434d..79b6191d84 100644 --- a/core/src/com/unciv/logic/automation/UnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/UnitAutomation.kt @@ -389,6 +389,7 @@ class UnitAutomation { .filter { unit.movement.canMoveTo(it) && it.position !in unit.civInfo.exploredTiles && unit.movement.canReach(it) + && (it.getOwner()==null || !it.getOwner()!!.isCityState()) } if (unexploredTilesAtDistance.isNotEmpty()) { unit.movement.headTowards(unexploredTilesAtDistance.random())