More detailed formatting

MegaMek · Sep 24, 2024 · ce80e92 · ce80e92
1 parent fca90f5
commit ce80e92
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 45 deletions.
diff --git a/megamek/src/megamek/common/Aero.java b/megamek/src/megamek/common/Aero.java
@@ -1566,16 +1566,6 @@ public int getHeatCapacity(boolean includeRadicalHeatSink) {
         return capacity;
     }
 
-    @Override
-    public String formatHeat() {
-        int capacity = (getHeatSinks() * (getHeatType() + 1));
-        if (hasWorkingMisc(MiscType.F_RADICAL_HEATSINK)) {
-            return "%d [%d]".formatted(capacity, capacity + getHeatSinks());
-        } else {
-            return Integer.toString(capacity);
-        }
-    }
-
     // If the aero is in the water, it is dead so no worries
     @Override
     public int getHeatCapacityWithWater() {
@@ -1814,7 +1804,7 @@ public int getCriticalEffect(int roll, int target) {
     }
 
     /**
-
+    
      */
     @Override
     public void setOmni(boolean omni) {

diff --git a/megamek/src/megamek/common/Entity.java b/megamek/src/megamek/common/Entity.java
@@ -4834,7 +4834,42 @@ public int getHeatCapacity() {
      * @return The formatted heat capacity
      */
     public String formatHeat() {
-        return Integer.toString(getHeatCapacity(true));
+        int sinks;
+        if (this instanceof Mek m) {
+            sinks = m.getActiveSinks();
+        } else if (this instanceof Aero a) {
+            sinks = a.getHeatSinks();
+        } else {
+            return "(none)";
+        }
+
+        StringBuilder sb = new StringBuilder();
+        int capacity = getHeatCapacity(false);
+        sb.append(capacity);
+
+        // Radical Heat Sinks
+        if (hasWorkingMisc(MiscType.F_RADICAL_HEATSINK)) {
+            capacity += sinks;
+            sb.append(", ").append(capacity).append(" with RHS");
+        }
+
+        // Coolant Pod
+        for (AmmoMounted m : getAmmo()) {
+            if (m.getType().ammoType == AmmoType.T_COOLANT_POD) {
+                capacity += sinks;
+                sb.append(", ").append(capacity).append(" with Coolant Pod");
+                break;
+            }
+        }
+
+        // RISC ECS
+        for (MiscMounted m : getMisc()) {
+            if (m.getType().hasFlag(MiscType.F_EMERGENCY_COOLANT_SYSTEM)) {
+                sb.append(", +MoS with RISC ECS");
+            }
+        }
+
+        return sb.toString();
     }
 
     /**

diff --git a/megamek/src/megamek/common/Mek.java b/megamek/src/megamek/common/Mek.java
@@ -34,7 +34,6 @@
 import megamek.common.cost.MekCostCalculator;
 import megamek.common.enums.AimingMode;
 import megamek.common.enums.MPBoosters;
-import megamek.common.equipment.AmmoMounted;
 import megamek.common.equipment.MiscMounted;
 import megamek.common.loaders.MtfFile;
 import megamek.common.options.IBasicOption;
@@ -1638,36 +1637,6 @@ && hasWorkingMisc(MiscType.F_RADICAL_HEATSINK)) {
         return Math.max(capacity, 0);
     }
 
-    @Override
-    public String formatHeat() {
-        StringBuilder sb = new StringBuilder();
-        int capacity = getHeatCapacity(true, false);
-        sb.append(capacity);
-
-        // Radical Heatsinks
-        if (hasWorkingMisc(MiscType.F_RADICAL_HEATSINK)) {
-            capacity += getActiveSinks();
-            sb.append(" [").append(capacity).append("]");
-        }
-
-        // Coolant Pod
-        for (AmmoMounted m : getAmmo()) {
-            if (m.getType().ammoType == AmmoType.T_COOLANT_POD) {
-                capacity += getActiveSinks();
-                sb.append(" [").append(capacity).append("]");
-                break;
-            }
-        }
-
-        for (MiscMounted m : getMisc()) {
-            if (m.getType().hasFlag(MiscType.F_EMERGENCY_COOLANT_SYSTEM)) {
-                sb.append(" [+MoS]");
-            }
-        }
-
-        return sb.toString();
-    }
-
     /**
      * Returns the about of heat that the entity can sink each turn, factoring
      * for water.

diff --git a/megamek/src/megamek/common/MekView.java b/megamek/src/megamek/common/MekView.java
@@ -450,7 +450,7 @@ public MekView(final Entity entity, final boolean showDetail, final boolean useA
                 hsString.append(" (").append(a.getPodHeatSinks()).append(" ")
                         .append(Messages.getString("MekView.Pod")).append(")");
             }
-            if (a.getHeatCapacity() > a.getHeatSinks()) {
+            if (!a.formatHeat().equals(Integer.toString(a.getHeatSinks()))) {
                 hsString.append(" [")
                         .append(a.formatHeat()).append("]");
             }
@@ -468,7 +468,7 @@ public MekView(final Entity entity, final boolean showDetail, final boolean useA
             Mek aMek = (Mek) entity;
             StringBuilder hsString = new StringBuilder();
             hsString.append(aMek.heatSinks());
-            if (aMek.getHeatCapacity() > aMek.heatSinks()) {
+            if (!aMek.formatHeat().equals(Integer.toString(aMek.heatSinks()))) {
                 hsString.append(" [").append(aMek.formatHeat()).append("]");
             }
             if (aMek.damagedHeatSinks() > 0) {