#3740 Standardising on C-Bills

MegaMek · Jan 31, 2024 · 2f35c12 · 2f35c12
1 parent 08e2f2c
commit 2f35c12
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/MekHQ/src/mekhq/campaign/ResolveScenarioTracker.java b/MekHQ/src/mekhq/campaign/ResolveScenarioTracker.java
@@ -276,7 +276,7 @@ public void processGame() {
                     }
                 }
             }
-            
+
             appendKillCredit(e);
         }
 
@@ -367,7 +367,7 @@ public void processGame() {
                     potentialSalvage.add(nu);
                 }
             }
-            
+
             appendKillCredit(e);
         }
         //If a unit in a bay was destroyed, add it. We still need to deal with the crew
@@ -387,7 +387,7 @@ public void processGame() {
         }
         checkStatusOfPersonnel();
     }
-    
+
     /**
      * Worker function that, where appropriate, appends kill credit to the local killCredits tracker
      */
@@ -396,9 +396,9 @@ private void appendKillCredit(Entity e) {
         if (!e.getOwner().isEnemyOf(client.getLocalPlayer())) {
             return;
         }
-        
+
         Entity killer = victoryEvent.getEntity(e.getKillerId());
-        
+
         if ((null != killer) && !"-1".equals(killer.getExternalIdAsString())) {
             killCredits.put(e.getDisplayName(), killer.getExternalIdAsString());
         } else {
@@ -1475,7 +1475,7 @@ public void resolveScenario(ScenarioStatus resolution, String report) {
         if (prisonerRansoms.isGreaterThan(Money.zero())) {
             getCampaign().getFinances().credit(TransactionType.RANSOM, getCampaign().getLocalDate(),
                     prisonerRansoms, "Prisoner ransoms for " + getScenario().getName());
-            getCampaign().addReport(prisonerRansoms.toAmountAndNameString()
+            getCampaign().addReport(prisonerRansoms.toAmountAndSymbolString()
                     + " has been credited to your account for prisoner ransoms following "
                     + getScenario().getName() + ".");
         }
@@ -1575,7 +1575,7 @@ public void resolveScenario(ScenarioStatus resolution, String report) {
             if (unitRansoms.isGreaterThan(Money.zero())) {
                 getCampaign().getFinances().credit(TransactionType.SALVAGE, getCampaign().getLocalDate(),
                         unitRansoms, "Unit ransoms for " + getScenario().getName());
-                getCampaign().addReport(unitRansoms.toAmountAndNameString()
+                getCampaign().addReport(unitRansoms.toAmountAndSymbolString()
                         + " has been credited to your account from unit ransoms following "
                         + getScenario().getName() + ".");
                 if (isContract) {

diff --git a/MekHQ/src/mekhq/campaign/finances/Finances.java b/MekHQ/src/mekhq/campaign/finances/Finances.java
@@ -452,7 +452,7 @@ public String exportFinancesToCSV(String path, String format) {
                         transaction.getType(),
                         transaction.getDescription(),
                         transaction.getAmount(),
-                        runningTotal.toAmountAndNameString());
+                        runningTotal.toAmountAndSymbolString());
             }
 
             csvPrinter.flush();

diff --git a/MekHQ/src/mekhq/campaign/finances/Money.java b/MekHQ/src/mekhq/campaign/finances/Money.java
@@ -154,6 +154,7 @@ public String toAmountAndSymbolString() {
         return CurrencyManager.getInstance().getUiAmountAndSymbolPrinter().print(getWrapped().toMoney(RoundingMode.HALF_EVEN));
     }
 
+    @Deprecated
     public String toAmountAndNameString() {
         return CurrencyManager.getInstance().getUiAmountAndNamePrinter().print(getWrapped().toMoney(RoundingMode.HALF_EVEN));
     }