Merge pull request #4194 from kuronekochomusuke/showMoveTypeBeforeInd…

…icators show movement mode before move indicators
MegaMek · Feb 21, 2023 · 839f1e4 · 839f1e4
2 parents 08a6df2 + 0d7c734
commit 839f1e4
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java b/megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java
@@ -1178,6 +1178,13 @@ private static StringBuilder entityValues(Entity entity) {
                 if (jumpMPModified > 0) {
                     sMove += "/" + jumpMPModified;
                 }
+            }
+
+            sMove += DOT_SPACER;
+            String sMoveMode = entity.getMovementModeAsString();
+            sMove += sMoveMode;
+
+            if ((walkMP != walkMPModified) || (runMP != runMPModified) || (jumpMP != jumpMPModified)) {
                 if (entity.getGame().getPlanetaryConditions().getGravity()  != 1.0) {
                     sMove += DOT_SPACER;
                     String sGravity =  entity.getGame().getPlanetaryConditions().getGravity() + "g";
@@ -1192,10 +1199,6 @@ private static StringBuilder entityValues(Entity entity) {
                 }
             }
 
-            sMove += DOT_SPACER;
-            String sMoveMode = entity.getMovementModeAsString();
-            sMove += sMoveMode;
-
             if (entity instanceof IBomber) {
                 int bombMod = 0;
                 bombMod = ((IBomber) entity).reduceMPByBombLoad(walkMP);