AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update CivilianUnitAutomation.kt (#13503)

Browse Source
This commit is contained in:
EmperorPinguin 2025-06-23 22:18:48 +02:00 committed by GitHub
parent d18b78d5f4
commit b4bc02839f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/logic/automation/unit/CivilianUnitAutomation.kt
View File

@ -111,9 +111,9 @@ object CivilianUnitAutomation {
// TODO: This could be more complex to walk to the city state that is most beneficial to
// also have more influence.
if (unit.hasUnique(UniqueType.CanTradeWithCityStateForGoldAndInfluence)
// Don't wander around with the great merchant when at war. Barbs might also be a
// problem, but hopefully by the time we have a great merchant, they're under control.
&& !unit.civ.isAtWar()
// There's a risk our merchant gets intercepted and killed by the enemy during war.
// If such happens, it is a failure of our military unit movement to protect our merchant.
// Barbs might also be a problem, but hopefully by the time we have a great merchant, they're under control.
&& isLateGame
) {
val tradeMissionCanBeConductedEventually =