From eff0a5bebb17f77a4d97817e29f4f254627f3794 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Sat, 7 Sep 2024 22:48:04 +0300 Subject: [PATCH] Moved AI unit upgrade into "use gold" function, so it is prioritized *over* purchasing new constructions --- .../unciv/logic/automation/civilization/UseGoldAutomation.kt | 4 ++++ core/src/com/unciv/logic/automation/unit/UnitAutomation.kt | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/automation/civilization/UseGoldAutomation.kt b/core/src/com/unciv/logic/automation/civilization/UseGoldAutomation.kt index ddab6fae02..e2d1a22477 100644 --- a/core/src/com/unciv/logic/automation/civilization/UseGoldAutomation.kt +++ b/core/src/com/unciv/logic/automation/civilization/UseGoldAutomation.kt @@ -1,5 +1,6 @@ package com.unciv.logic.automation.civilization +import com.unciv.logic.automation.unit.UnitAutomation import com.unciv.logic.city.City import com.unciv.logic.civilization.Civilization import com.unciv.logic.map.BFS @@ -16,6 +17,9 @@ object UseGoldAutomation { /** allow AI to spend money to purchase city-state friendship, buildings & unit */ fun useGold(civ: Civilization) { + for (unit in civ.units.getCivUnits()) + UnitAutomation.tryUpgradeUnit(unit) + if (civ.isMajorCiv()) useGoldForCityStates(civ) diff --git a/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt b/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt index 7b6160264e..fb031c4edf 100644 --- a/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt @@ -222,8 +222,6 @@ object UnitAutomation { if (tryGoToRuinAndEncampment(unit) && !unit.hasMovement()) return - if (tryUpgradeUnit(unit)) return - if (unit.health < 50 && (tryRetreat(unit) || tryHealUnit(unit))) return // do nothing but heal // If there are no enemies nearby and we can heal here, wait until we are at full health