From 05b741b3e5b71b23d2210f2ebfe45e705db0bde2 Mon Sep 17 00:00:00 2001
From: yairm210 <yairm210@hotmail.com>
Date: Wed, 3 Nov 2021 10:10:43 +0200
Subject: [PATCH] Can upgrade unit if any movement is left, as per Civ V

---
 core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
index c0ea110afe..f3ba39db08 100644
--- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
+++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
@@ -330,8 +330,9 @@ object UnitActions {
             }.takeIf {
                 isFree ||
                 (
-                    unit.civInfo.gold >= goldCostOfUpgrade && !unit.isEmbarked()
-                    && unit.currentMovement == unit.getMaxMovement().toFloat()
+                        unit.civInfo.gold >= goldCostOfUpgrade
+                                && unit.currentMovement > 0
+                                && !unit.isEmbarked()
                 )
             }
         )