diff --git a/megameklab/src/megameklab/ui/battleArmor/BAStatusBar.java b/megameklab/src/megameklab/ui/battleArmor/BAStatusBar.java
index 25b129bb1..317a9dc64 100644
--- a/megameklab/src/megameklab/ui/battleArmor/BAStatusBar.java
+++ b/megameklab/src/megameklab/ui/battleArmor/BAStatusBar.java
@@ -103,7 +103,6 @@ public void refresh() {
final double maxKilos = getBattleArmor().getTrooperWeight() * 1000;
double currentKilos;
final int bv = getBattleArmor().calculateBattleValue();
- final long currentCost = Math.round(getBattleArmor().getCost(false));
TestBattleArmor testBA = new TestBattleArmor(getBattleArmor(), entityVerifier.baOption,
null);
@@ -126,7 +125,10 @@ public void refresh() {
move.setText("Movement: " + walk + "/" + jump);
move.setToolTipText("Walk/Jump MP");
- cost.setText("Squad Cost: " + formatter.format(currentCost) + " C-bills");
+ cost.setText("Dry Cost: " + formatter.format(Math.round(getEntity().getCost(true))) + " C-bills");
+ cost.setToolTipText("The dry cost of the unit (without ammo). The unit's full cost is "
+ + formatter.format(Math.round(getEntity().getCost(false))) + " C-bills.");
+
StringBuffer sb = new StringBuffer();
invalid.setVisible(!testBA.correctEntity(sb));
invalid.setToolTipText("" + sb.toString().replaceAll("\n", "
") + "");
diff --git a/megameklab/src/megameklab/ui/combatVehicle/CVStatusBar.java b/megameklab/src/megameklab/ui/combatVehicle/CVStatusBar.java
index 5c2c9a456..eb13648ac 100644
--- a/megameklab/src/megameklab/ui/combatVehicle/CVStatusBar.java
+++ b/megameklab/src/megameklab/ui/combatVehicle/CVStatusBar.java
@@ -134,7 +134,6 @@ public void refresh() {
currentTonnage = testEntity.calculateWeight();
currentTonnage += UnitUtil.getUnallocatedAmmoTonnage(getTank());
- long currentCost = Math.round(getTank().getCost(false));
tons.setText(String.format("Tonnage: %.1f/%.1f (%.1f Remaining)", currentTonnage, tonnage, tonnage - currentTonnage));
tons.setToolTipText("Current Tonnage/Max Tonnage");
@@ -155,7 +154,9 @@ public void refresh() {
bvLabel.setText("BV: " + bv);
bvLabel.setToolTipText("BV 2.0");
- cost.setText("Cost: " + formatter.format(currentCost) + " C-bills");
+ cost.setText("Dry Cost: " + formatter.format(Math.round(getEntity().getCost(true))) + " C-bills");
+ cost.setToolTipText("The dry cost of the unit (without ammo). The unit's full cost is "
+ + formatter.format(Math.round(getEntity().getCost(false))) + " C-bills.");
move.setText("Movement: " + walk + "/" + run + "/" + jump);
move.setToolTipText("Walk/Run/Jump MP");
diff --git a/megameklab/src/megameklab/ui/fighterAero/ASStatusBar.java b/megameklab/src/megameklab/ui/fighterAero/ASStatusBar.java
index 0475677f1..477603a23 100644
--- a/megameklab/src/megameklab/ui/fighterAero/ASStatusBar.java
+++ b/megameklab/src/megameklab/ui/fighterAero/ASStatusBar.java
@@ -78,7 +78,6 @@ public void refresh() {
double tonnage = getAero().getWeight();
double currentTonnage;
int bv = getAero().calculateBattleValue();
- long currentCost = Math.round(getAero().getCost(false));
TestAero testAero = new TestAero(getAero(), entityVerifier.aeroOption, null);
@@ -107,7 +106,10 @@ public void refresh() {
bvLabel.setText("BV: " + bv);
bvLabel.setToolTipText("BV 2.0");
- cost.setText("Cost: " + formatter.format(currentCost) + " C-bills");
+ cost.setText("Dry Cost: " + formatter.format(Math.round(getEntity().getCost(true))) + " C-bills");
+ cost.setToolTipText("The dry cost of the unit (without ammo). The unit's full cost is "
+ + formatter.format(Math.round(getEntity().getCost(false))) + " C-bills.");
+
StringBuffer sb = new StringBuffer();
invalid.setVisible(!testAero.correctEntity(sb));
invalid.setToolTipText("" + sb.toString().replaceAll("\n", "
") + "");
diff --git a/megameklab/src/megameklab/ui/infantry/CIStatusBar.java b/megameklab/src/megameklab/ui/infantry/CIStatusBar.java
index 59f417f3c..51e00520d 100644
--- a/megameklab/src/megameklab/ui/infantry/CIStatusBar.java
+++ b/megameklab/src/megameklab/ui/infantry/CIStatusBar.java
@@ -83,7 +83,6 @@ public void refresh() {
DecimalFormat roundFormat = new DecimalFormat("#.##");
double currentTonnage;
int bv = getInfantry().calculateBattleValue();
- long currentCost = Math.round(getInfantry().getCost(false));
currentTonnage = getInfantry().getWeight();
@@ -96,7 +95,10 @@ public void refresh() {
bvLabel.setText("BV: " + bv);
bvLabel.setToolTipText("BV 2.0");
- cost.setText("Cost: " + formatter.format(currentCost) + " C-bills");
+ cost.setText("Dry Cost: " + formatter.format(Math.round(getEntity().getCost(true))) + " C-bills");
+ cost.setToolTipText("The dry cost of the unit (without ammo). The unit's full cost is "
+ + formatter.format(Math.round(getEntity().getCost(false))) + " C-bills.");
+
String str = UnitUtil.validateUnit(getInfantry());
invalid.setVisible(!str.isEmpty());
invalid.setToolTipText("" + str.replaceAll("\n", "
") + "");
diff --git a/megameklab/src/megameklab/ui/largeAero/DSStatusBar.java b/megameklab/src/megameklab/ui/largeAero/DSStatusBar.java
index 8bba95a16..04d36423d 100644
--- a/megameklab/src/megameklab/ui/largeAero/DSStatusBar.java
+++ b/megameklab/src/megameklab/ui/largeAero/DSStatusBar.java
@@ -82,7 +82,6 @@ public void refresh() {
double tonnage = getSmallCraft().getWeight();
double currentTonnage;
int bv = getSmallCraft().calculateBattleValue();
- long currentCost = Math.round(getSmallCraft().getCost(false));
TestSmallCraft testSmallCraft = new TestSmallCraft(getSmallCraft(), entityVerifier.aeroOption, null);
@@ -111,7 +110,10 @@ public void refresh() {
bvLabel.setText("BV: " + bv);
bvLabel.setToolTipText("BV 2.0");
- cost.setText("Cost: " + formatter.format(currentCost) + " C-bills");
+ cost.setText("Dry Cost: " + formatter.format(Math.round(getEntity().getCost(true))) + " C-bills");
+ cost.setToolTipText("The dry cost of the unit (without ammo). The unit's full cost is "
+ + formatter.format(Math.round(getEntity().getCost(false))) + " C-bills.");
+
StringBuffer sb = new StringBuffer();
invalid.setVisible(!testSmallCraft.correctEntity(sb));
invalid.setToolTipText("" + sb.toString().replaceAll("\n", "
") + "");
diff --git a/megameklab/src/megameklab/ui/largeAero/WSStatusBar.java b/megameklab/src/megameklab/ui/largeAero/WSStatusBar.java
index 7e7c66b3f..964ae5d5e 100644
--- a/megameklab/src/megameklab/ui/largeAero/WSStatusBar.java
+++ b/megameklab/src/megameklab/ui/largeAero/WSStatusBar.java
@@ -84,8 +84,7 @@ public void refresh() {
double tonnage = getJumpship().getWeight();
double currentTonnage;
int bv = getJumpship().calculateBattleValue();
- long currentCost = Math.round(getJumpship().getCost(false));
-
+
TestAdvancedAerospace testAdvAero = new TestAdvancedAerospace(getJumpship(), entityVerifier.aeroOption, null);
currentTonnage = testAdvAero.calculateWeight();
currentTonnage += UnitUtil.getUnallocatedAmmoTonnage(getJumpship());
@@ -116,7 +115,10 @@ public void refresh() {
bvLabel.setText("BV: " + bv);
bvLabel.setToolTipText("BV 2.0");
- cost.setText("Cost: " + formatter.format(currentCost) + " C-bills");
+ cost.setText("Dry Cost: " + formatter.format(Math.round(getEntity().getCost(true))) + " C-bills");
+ cost.setToolTipText("The dry cost of the unit (without ammo). The unit's full cost is "
+ + formatter.format(Math.round(getEntity().getCost(false))) + " C-bills.");
+
StringBuffer sb = new StringBuffer();
invalid.setVisible(!testAdvAero.correctEntity(sb));
invalid.setToolTipText("" + sb.toString().replaceAll("\n", "
") + "");
diff --git a/megameklab/src/megameklab/ui/mek/BMStatusBar.java b/megameklab/src/megameklab/ui/mek/BMStatusBar.java
index 1b6eeb950..57e82dcd7 100644
--- a/megameklab/src/megameklab/ui/mek/BMStatusBar.java
+++ b/megameklab/src/megameklab/ui/mek/BMStatusBar.java
@@ -88,7 +88,6 @@ public void refresh() {
maxCrits = 78;
}
int currentCrits = UnitUtil.countUsedCriticals(getMech());
- long currentCost = Math.round(getMech().getCost(false));
testEntity = new TestMech(getMech(), entityVerifier.mechOption, null);
@@ -106,7 +105,9 @@ public void refresh() {
bvLabel.setText("BV: " + bv);
bvLabel.setToolTipText("BV 2.0");
- cost.setText("Cost: " + formatter.format(currentCost) + " C-bills");
+ cost.setText("Dry Cost: " + formatter.format(Math.round(getEntity().getCost(true))) + " C-bills");
+ cost.setToolTipText("The dry cost of the unit (without ammo). The unit's full cost is "
+ + formatter.format(Math.round(getEntity().getCost(false))) + " C-bills.");
crits.setText("Criticals: " + currentCrits + " / " + maxCrits);
crits.setForeground(currentCrits > maxCrits ? GUIPreferences.getInstance().getWarningColor() : null);
diff --git a/megameklab/src/megameklab/ui/protoMek/PMStatusBar.java b/megameklab/src/megameklab/ui/protoMek/PMStatusBar.java
index a550cf2a7..734c059f7 100644
--- a/megameklab/src/megameklab/ui/protoMek/PMStatusBar.java
+++ b/megameklab/src/megameklab/ui/protoMek/PMStatusBar.java
@@ -84,7 +84,6 @@ public void refresh() {
}
long currentCrits = getProtomech().getEquipment().stream()
.filter(m -> TestProtomech.requiresSlot(m.getType())).count();
- long currentCost = Math.round(getProtomech().getCost(false));
currentTonnage = testEntity.calculateWeight() * 1000;
@@ -99,7 +98,9 @@ public void refresh() {
bvLabel.setText("BV: " + bv);
bvLabel.setToolTipText("BV 2.0");
- cost.setText("Cost: " + formatter.format(currentCost) + " C-bills");
+ cost.setText("Dry Cost: " + formatter.format(Math.round(getEntity().getCost(true))) + " C-bills");
+ cost.setToolTipText("The dry cost of the unit (without ammo). The unit's full cost is "
+ + formatter.format(Math.round(getEntity().getCost(false))) + " C-bills.");
crits.setText("Criticals: " + currentCrits + "/" + maxCrits);
if(currentCrits > maxCrits) {
diff --git a/megameklab/src/megameklab/ui/supportVehicle/SVStatusBar.java b/megameklab/src/megameklab/ui/supportVehicle/SVStatusBar.java
index bc367fec5..736eed561 100644
--- a/megameklab/src/megameklab/ui/supportVehicle/SVStatusBar.java
+++ b/megameklab/src/megameklab/ui/supportVehicle/SVStatusBar.java
@@ -131,7 +131,6 @@ public void refresh() {
currentTonnage = testEntity.calculateWeight();
currentTonnage += UnitUtil.getUnallocatedAmmoTonnage(eSource.getEntity());
- long currentCost = Math.round(eSource.getEntity().getCost(false));
if (eSource.getEntity().getWeightClass() == EntityWeightClass.WEIGHT_SMALL_SUPPORT) {
tons.setText(String.format("Tonnage: %.0f/%.0f (%.0f Remaining)",
@@ -158,7 +157,9 @@ public void refresh() {
bvLabel.setText("BV: " + bv);
bvLabel.setToolTipText("BV 2.0");
- cost.setText("Cost: " + formatter.format(currentCost) + " C-bills");
+ cost.setText("Dry Cost: " + formatter.format(Math.round(getEntity().getCost(true))) + " C-bills");
+ cost.setToolTipText("The dry cost of the unit (without ammo). The unit's full cost is "
+ + formatter.format(Math.round(getEntity().getCost(false))) + " C-bills.");
move.setText("Movement: " + walk + "/" + run + "/" + jump);
move.setToolTipText("Walk/Run/Jump MP");