mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 09:48:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

Exploring units no longer auto-enter city states

Browse Source
This commit is contained in:
Yair Morgenstern
2020-01-23 20:50:53 +02:00
parent e419443eb6
commit c29ccadc60
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Nations/Nations.json
View File

@ -114,7 +114,7 @@
"declaringWar": "You are but a pest on this Earth, prepare to be eliminated!", "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!", "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.", "introduction": "Greetings, I am Ramesses the god. I am the living embodiment of Egypt, mother and father of all civilizations.",
"neutralHello": "Good day.", "neutralHello": "Good day.",

1
core/src/com/unciv/logic/automation/UnitAutomation.kt
View File

@ -389,6 +389,7 @@ class UnitAutomation {
.filter { .filter {
unit.movement.canMoveTo(it) && it.position !in unit.civInfo.exploredTiles unit.movement.canMoveTo(it) && it.position !in unit.civInfo.exploredTiles
&& unit.movement.canReach(it) && unit.movement.canReach(it)
&& (it.getOwner()==null || !it.getOwner()!!.isCityState())
} }
if (unexploredTilesAtDistance.isNotEmpty()) { if (unexploredTilesAtDistance.isNotEmpty()) {
unit.movement.headTowards(unexploredTilesAtDistance.random()) unit.movement.headTowards(unexploredTilesAtDistance.random())