MegaMek · SJuliez · Jun 8, 2024 · Jun 6, 2024 · Jun 6, 2024 · Jun 6, 2024
diff --git a/MekHQ/resources/mekhq/resources/AtBStratCon.properties b/MekHQ/resources/mekhq/resources/AtBStratCon.properties
@@ -1,6 +1,6 @@
 supportPoint.text=Support Point
 supportPointConvert.text=Will convert VP from SP
-reinforcementRoll.Text=<span color="red">Reinforcement Roll</span>
+reinforcementRoll.Text=Reinforcement Roll
 fromChainedScenario.text=Lance already deployed
 lanceInFightRole.text=Fight-Role Reinforcement Roll
 

diff --git a/MekHQ/resources/mekhq/resources/Finances.properties b/MekHQ/resources/mekhq/resources/Finances.properties
@@ -107,7 +107,7 @@ Overhead.text=Your account has been debited for %s in overhead expenses
 # Loans
 Loan.title=loan payment to %s
 Loan.text=Your account has been debited for %s in loan payment to %s
-Loan.insufficient.report=<font color='red'><b>You have insufficient funds to service the debt on loan %s!</b></font> Funds required: %s
+Loan.insufficient.report=<b>You have insufficient funds to service the debt on loan %s!</b>%s Funds required: %s
 Loan.paid.report=You have fully paid off loan %s
 
 # File Export
@@ -121,6 +121,6 @@ MonthlyContractPayment.text=Monthly payment for %s
 ContractPaymentCredit.text=Your account has been credited for %s for the monthly payout from contract %s
 ContractSharePayment.text=Shares payments for %s
 DistributedShares.text=%s have been distributed as shares.
-NotImplemented.text=<font color='red'><b>You cannot afford to pay %s!</b></font> Lucky for you that personnel morale is not yet implemented.
+NotImplemented.text=<b>You cannot afford to pay %s!</b>%s Lucky for you that personnel morale is not yet implemented.
 AssetPayment.finances=Income from %s
 AssetPayment.report=Your account has been credited for %s from %s
diff --git a/MekHQ/resources/mekhq/resources/GUI.properties b/MekHQ/resources/mekhq/resources/GUI.properties
@@ -251,7 +251,7 @@ miProcureAllItemsImmediately.toolTipText=This immediately attempts to acquire al
 miAddAllItemsImmediately.text=Add All Items Immediately
 miAddAllItemsImmediately.toolTipText=This immediately adds all items for the selected rows to the campaign.
 ProcurementTableMouseAdapter.ProcuredItem.report=<font color='Green'><b>Procured %s</b></font>
-ProcurementTableMouseAdapter.CannotAffordToPurchaseItem.report=<font color='red'><b>You cannot afford to purchase %s</b></font>
+ProcurementTableMouseAdapter.CannotAffordToPurchaseItem.report=<b>You cannot afford to purchase %s</b></font>
 ProcurementTableMouseAdapter.GMAdded.report=<font color='Green'><b>GM Added %s</b></font>
 
 #### UnitTableMouseAdapter Class - TODO : unfinished, with cleanup required
@@ -1285,8 +1285,8 @@ lblCostPercentageThreshold.text=% of market value or lower
 ### Black Market Panel
 lblBlackMarketWarning.text=<html><i>The black market carries risk of being cheated.</i></html>
 ### Reports
-UnitMarketPane.BlackMarketSwindled.report=<font color='red'>Swindled! Money was paid, but no unit was ever delivered.</font>
-UnitMarketPane.CannotAfford.report=<font color='red'><b>You cannot afford %s. Transaction cancelled.</b></font>
+UnitMarketPane.BlackMarketSwindled.report=Swindled! Money was paid, but no unit was ever delivered.
+UnitMarketPane.CannotAfford.report=<b>You cannot afford %s. Transaction cancelled.</b>
 UnitMarketPane.UnitDeliveryLength.report=<font color='green'>Unit will be delivered in %s days.</font>
 ### Financial Statements
 UnitMarketPane.PurchasedUnit.finances=Purchased %s

diff --git a/MekHQ/src/mekhq/Utilities.java b/MekHQ/src/mekhq/Utilities.java
@@ -1291,10 +1291,10 @@ public static List<String> generateEntityStub(List<Entity> entities) {
         List<String> stub = new ArrayList<>();
         for (Entity en : entities) {
             if (null == en) {
-                stub.add("<html><font color='red'>No random assignment table found for faction</font></html>");
+                stub.add("<html><font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'>No random assignment table found for faction</font></html>");
             } else {
                 stub.add("<html>" + en.getCrew().getName() + " (" +
-                        en.getCrew().getGunnery() + "/" +
+                        en.getCrew().getGunnery() + '/' +
                         en.getCrew().getPiloting() + "), " +
                         "<i>" + en.getShortName() + "</i>" +
                         "</html>");

diff --git a/MekHQ/src/mekhq/campaign/Campaign.java b/MekHQ/src/mekhq/campaign/Campaign.java
@@ -602,7 +602,7 @@ private void processShipSearch() {
             report.append(getAtBConfig().shipSearchCostPerWeek().toAmountAndSymbolString())
                     .append(" deducted for ship search.");
         } else {
-            addReport("<font color=\"red\">Insufficient funds for ship search.</font>");
+            addReport("<font color=" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + ">Insufficient funds for ship search.</font>");
             setShipSearchStart(null);
             return;
         }
@@ -633,7 +633,7 @@ private void processShipSearch() {
                             .append(" until ")
                             .append(MekHQ.getMHQOptions().getDisplayFormattedDate(getShipSearchExpiration()));
                 } else {
-                    report.append(" <font color=\"red\">Could not determine ship type.</font>");
+                    report.append(" <font color=" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + ">Could not determine ship type.</font>");
                 }
             } else {
                 report.append("<br/>Ship search unsuccessful.");
@@ -645,14 +645,14 @@ private void processShipSearch() {
     public void purchaseShipSearchResult() {
         MechSummary ms = MechSummaryCache.getInstance().getMech(getShipSearchResult());
         if (ms == null) {
-            LogManager.getLogger().error("Cannot find entry for " + getShipSearchResult());
+            LogManager.getLogger().error("Cannot find entry for {}", getShipSearchResult());
             return;
         }
 
         Money cost = Money.of(ms.getCost());
 
         if (getFunds().isLessThan(cost)) {
-            addReport("<font color='red'><b> You cannot afford this unit. Transaction cancelled</b>.</font>");
+            addReport("<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'><b> You cannot afford this unit. Transaction cancelled</b>.</font>");
             return;
         }
 
@@ -669,7 +669,7 @@ public void purchaseShipSearchResult() {
                 : calculatePartTransitTime(Compute.d6(2) - 2);
 
         getFinances().debit(TransactionType.UNIT_PURCHASE, getLocalDate(), cost, "Purchased " + en.getShortName());
-        addNewUnit(en, true, transitDays, 3);
+        addNewUnit(en, true, transitDays);
         if (!getCampaignOptions().isInstantUnitMarketDelivery()) {
             addReport("<font color='green'>Unit will be delivered in " + transitDays + " days.</font>");
         }
@@ -761,7 +761,7 @@ public boolean applyRetirement(Money totalPayout, Map<UUID, UUID> unitAssignment
                 return true;
             }
         } else {
-            addReport("<font color='red'>You cannot afford to make the final payments.</font>");
+            addReport("<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'>You cannot afford to make the final payments.</font>");
             return false;
         }
 
@@ -1460,7 +1460,7 @@ public boolean recruitPerson(Person p, PrisonerStatus prisonerStatus, boolean gm
                 && !gmAdd && prisonerStatus.isFree()) {
             if (!getFinances().debit(TransactionType.RECRUITMENT, getLocalDate(),
                     p.getSalary(this).multipliedBy(2), "Recruitment of " + p.getFullName())) {
-                addReport("<font color='red'><b>Insufficient funds to recruit "
+                addReport("<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'><b>Insufficient funds to recruit "
                         + p.getFullName() + "</b></font>");
                 return false;
             }
@@ -2441,7 +2441,7 @@ && acquireEquipment(shoppingItem, person, system, transitTime)) {
                         // if we can't afford it, then don't keep searching for it on other planets
                         if (!canPayFor(shoppingItem)) {
                             if (!getCampaignOptions().isPlanetAcquisitionVerbose()) {
-                                addReport("<font color='red'><b>You cannot afford to purchase another "
+                                addReport("<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'><b>You cannot afford to purchase another "
                                         + shoppingItem.getAcquisitionName() + "</b></font>");
                             }
                             shelvedItems.add(shoppingItem);
@@ -2525,7 +2525,7 @@ public PartAcquisitionResult findContactForAcquisition(IAcquisitionWork acquisit
         // if it's already impossible, don't bother with the rest
         if (target.getValue() == TargetRoll.IMPOSSIBLE) {
             if (getCampaignOptions().isPlanetAcquisitionVerbose()) {
-                addReport("<font color='red'><b>" + impossibleSentencePrefix + acquisition.getAcquisitionName()
+                addReport("<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'><b>" + impossibleSentencePrefix + acquisition.getAcquisitionName()
                         + " on " + system.getPrintableName(getLocalDate()) + " because:</b></font> " + target.getDesc());
             }
             return PartAcquisitionResult.PartInherentFailure;
@@ -2536,15 +2536,15 @@ public PartAcquisitionResult findContactForAcquisition(IAcquisitionWork acquisit
 
         if (target.getValue() == TargetRoll.IMPOSSIBLE) {
             if (getCampaignOptions().isPlanetAcquisitionVerbose()) {
-                addReport("<font color='red'><b>" + impossibleSentencePrefix + acquisition.getAcquisitionName()
+                addReport("<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'><b>" + impossibleSentencePrefix + acquisition.getAcquisitionName()
                         + " on " + system.getPrintableName(getLocalDate()) + " because:</b></font> " + target.getDesc());
             }
             return PartAcquisitionResult.PlanetSpecificFailure;
         }
         if (Compute.d6(2) < target.getValue()) {
             // no contacts on this planet, move along
             if (getCampaignOptions().isPlanetAcquisitionVerbose()) {
-                addReport("<font color='red'><b>" + failedSentencePrefix + acquisition.getAcquisitionName()
+                addReport("<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'><b>" + failedSentencePrefix + acquisition.getAcquisitionName()
                         + " on " + system.getPrintableName(getLocalDate()) + "</b></font>");
             }
             return PartAcquisitionResult.PlanetSpecificFailure;
@@ -2599,7 +2599,7 @@ private boolean acquireEquipment(IAcquisitionWork acquisition, Person person, Pl
 
         // if impossible then return
         if (target.getValue() == TargetRoll.IMPOSSIBLE) {
-            report += ":<font color='red'><b> " + target.getDesc() + "</b></font>";
+            report += ":<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'><b> " + target.getDesc() + "</b></font>";
             if (!getCampaignOptions().isUsePlanetaryAcquisition() || getCampaignOptions().isPlanetAcquisitionVerbose()) {
                 addReport(report);
             }
@@ -6516,7 +6516,7 @@ public void payOffLoan(Loan loan) {
             finances.removeLoan(loan);
             MekHQ.triggerEvent(new LoanPaidEvent(loan));
         } else {
-            addReport("<font color='red'>You do not have enough funds to pay off " + loan + "</font>");
+            addReport("<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'>You do not have enough funds to pay off " + loan + "</font>");
         }
     }
 
@@ -6587,7 +6587,7 @@ public void doMaintenance(Unit u) {
             if (campaignOptions.isPayForMaintain()) {
                 if (!(finances.debit(TransactionType.MAINTENANCE, getLocalDate(), u.getMaintenanceCost(),
                         "Maintenance for " + u.getName()))) {
-                    addReport("<font color='red'><b>You cannot afford to pay maintenance costs for "
+                    addReport("<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'><b>You cannot afford to pay maintenance costs for "
                             + u.getHyperlinkedName() + "!</b></font>");
                     paidMaintenance = false;
                 }
@@ -6647,7 +6647,7 @@ public void doMaintenance(Unit u) {
                         + Part.getQualityName(qualityOrig, reverse) + " to " + Part.getQualityName(quality, reverse)
                         + "</font>";
             } else if (quality < qualityOrig) {
-                qualityString = "<font color='red'>Overall quality declines from "
+                qualityString = "<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'>Overall quality declines from "
                         + Part.getQualityName(qualityOrig, reverse) + " to " + Part.getQualityName(quality, reverse)
                         + "</font>";
             } else {
@@ -6661,12 +6661,12 @@ public void doMaintenance(Unit u) {
                 damageString += nDestroy + " parts were destroyed.";
             }
             if (!damageString.isEmpty()) {
-                damageString = "<b><font color='red'>" + damageString + "</b></font> [<a href='REPAIR|" + u.getId()
+                damageString = "<b><font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'>" + damageString + "</b></font> [<a href='REPAIR|" + u.getId()
                         + "'>Repair bay</a>]";
             }
             String paidString = "";
             if (!paidMaintenance) {
-                paidString = "<font color='red'>Could not afford maintenance costs, so check is at a penalty.</font>";
+                paidString = "<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'>Could not afford maintenance costs, so check is at a penalty.</font>";
             }
             addReport(techNameLinked + " performs maintenance on " + u.getHyperlinkedName() + ". " + paidString
                     + qualityString + ". " + damageString + " [<a href='MAINTENANCE|" + u.getId()
@@ -6781,15 +6781,15 @@ private String doMaintenanceOnUnitPart(Unit u, Part p, Map<Part, Integer> partsT
         if (p.getQuality() > oldQuality) {
             partReport += ": <font color='green'>new quality is " + p.getQualityName() + "</font>";
         } else if (p.getQuality() < oldQuality) {
-            partReport += ": <font color='red'>new quality is " + p.getQualityName() + "</font>";
+            partReport += ": <font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'>new quality is " + p.getQualityName() + "</font>";
         } else {
             partReport += ": quality remains " + p.getQualityName();
         }
         if (null != partsToDamage.get(p)) {
             if (partsToDamage.get(p) > 3) {
-                partReport += ", <font color='red'><b>part destroyed</b></font>";
+                partReport += ", <font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'><b>part destroyed</b></font>";
             } else {
-                partReport += ", <font color='red'><b>part damaged</b></font>";
+                partReport += ", <font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'><b>part damaged</b></font>";
             }
         }
 

diff --git a/MekHQ/src/mekhq/campaign/CurrentLocation.java b/MekHQ/src/mekhq/campaign/CurrentLocation.java
@@ -219,7 +219,7 @@ public void newDay(Campaign campaign) {
                                     true, campaign.getCampaignOptions().isEquipmentContractBase()),
                             "Jump from " + currentSystem.getName(campaign.getLocalDate())
                                     + " to " + jumpPath.get(1).getName(campaign.getLocalDate()))) {
-                        campaign.addReport("<font color='red'><b>You cannot afford to make the jump!</b></font>");
+                        campaign.addReport("<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'><b>You cannot afford to make the jump!</b></font>");
                         return;
                     }
                 }

diff --git a/MekHQ/src/mekhq/campaign/ResolveScenarioTracker.java b/MekHQ/src/mekhq/campaign/ResolveScenarioTracker.java
@@ -2055,7 +2055,7 @@ public String getDesc(boolean printSellValue) {
                         color = "orange";
                         break;
                     case Entity.DMG_CRIPPLED:
-                        color = "red";
+                        color = MekHQ.getMHQOptions().getFontColorNegativeHexColor();
                         break;
                 }
             }