MegaMek · savanik · May 14, 2025 · May 15, 2025 · May 15, 2025 · May 16, 2025
@@ -1281,6 +1281,8 @@ lblPayForHousingBox.tooltip=Each month, while not in transit, funds are deducted
 # createGeneralOptionsPanel
 lblUseLoanLimitsBox.text=Available Loans Based on Unit Reputation \u270E
 lblUseLoanLimitsBox.tooltip=Put limits on interest, collateral, and length.
+lblTrackLeasesBox.text=Leases Available for Large Craft
+lblTrackLeasesBox.tooltip=Allow leases to be obtained for Dropships and Jumpships instead of purchasing outright
 lblUsePercentageMaintenanceBox.text=Enable Percentage-Based Maintenance Costs \u270E
 lblUsePercentageMaintenanceBox.tooltip=Maintenance costs based upon the value of the unit instead\
   \ of the unit type. This makes maintenance costs more impactful.

@@ -43,6 +43,8 @@ TransactionType.FINANCIAL_TERM_END_CARRYOVER.text=Financial Term End Carryover
 TransactionType.FINANCIAL_TERM_END_CARRYOVER.toolTipText=Funds carried over from the previous financial term.
 TransactionType.FINE.text=Fine
 TransactionType.FINE.toolTipText=A financial transaction where the force pays or is paid a fine.
+TransactionType.LEASE_PAYMENT.text=Lease Payment
+TransactionType.LEASE_PAYMENT.toolTipText=A financial transaction where a lease was being paid for.
 TransactionType.LOAN_PAYMENT.text=Loan Payment
 TransactionType.LOAN_PAYMENT.toolTipText=A financial transaction where a loan was being paid for.
 TransactionType.LOAN_PRINCIPAL.text=Loan Principal
@@ -83,6 +85,8 @@ TransactionType.UNIT_PURCHASE.text=Unit Purchase(s)
 TransactionType.UNIT_PURCHASE.toolTipText=A financial transaction where a unit was or multiple units were purchased.
 TransactionType.UNIT_SALE.text=Unit Sale(s)
 TransactionType.UNIT_SALE.toolTipText=A financial transaction where a unit was or multiple units were sold.
+TransactionType.UNIT_CANCEL_LEASE.text=Cancel Unit Lease
+TransactionType.UNIT_CANCEL_LEASE.toolTipText=A financial transaction where a unit's lease was finalized.
 TransactionType.BONUS_EXCHANGE.text=Bonus Exchange
 TransactionType.BONUS_EXCHANGE.toolTipText=A financial transaction where Bonus Parts were exchanged for money.
 TransactionType.WEALTH.text=Reinvestment
@@ -109,6 +113,10 @@ Loan.title=loan payment to %s
 Loan.text=Your account has been debited for %s in loan payment to %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
+# Leases
+LeaseCosts.title=Lease payments
+LeaseCosts.text=Your account has been debited for %s in lease payments.
+LeaseCosts.insufficient.report=<b>You have insufficient funds to service your leases!</b> Funds Required: %s
 # File Export
 FinanceExport.format=%s financial transactions written to file.
 ## Unsorted General Finances

@@ -7,3 +7,4 @@ lblTonnage1.text=<html><nobr><b>Tonnage:</b></nobr></html>
 lblBV1.text=<html><nobr><b>BV:</b></nobr></html>
 lblCost1.text=<html><nobr><b>Cost:</b></nobr></html>
 lblQuirk1.text=<html><nobr><b>Quirks:</b></nobr></html>
+lblLease.text=(Monthly Lease)
@@ -41,7 +41,6 @@
 import static mekhq.campaign.CampaignOptions.S_TECH;
 import static mekhq.campaign.CampaignOptions.TRANSIT_UNIT_MONTH;
 import static mekhq.campaign.CampaignOptions.TRANSIT_UNIT_WEEK;
-import static mekhq.campaign.force.CombatTeam.getStandardForceSize;
 import static mekhq.campaign.force.CombatTeam.recalculateCombatTeams;
 import static mekhq.campaign.force.Force.FORCE_NONE;
 import static mekhq.campaign.force.Force.FORCE_ORIGIN;
@@ -1795,6 +1794,10 @@ public Unit addNewUnit(Entity en, boolean allowNewPilots, int days) {
      * @throws IllegalArgumentException If the quality is not within the valid range (0-5)
      */
     public Unit addNewUnit(Entity en, boolean allowNewPilots, int days, PartQuality quality) {
+        return addNewUnit(en, allowNewPilots, days, quality, true);
+    }
+
+    public Unit addNewUnit(Entity en, boolean allowNewPilots, int days, PartQuality quality, boolean startMothballed) {
         Unit unit = new Unit(en, this);
         unit.setMaintenanceMultiplier(getCampaignOptions().getDefaultMaintenanceTime());
         getHangar().addUnit(unit);
@@ -1815,7 +1818,7 @@ public Unit addNewUnit(Entity en, boolean allowNewPilots, int days, PartQuality
 
         unit.setDaysToArrival(days);
 
-        if (days > 0) {
+        if (days > 0 && startMothballed) {
             unit.setMothballed(campaignOptions.isMothballUnitMarketDeliveries());
         }
 
@@ -2167,8 +2170,7 @@ public boolean recruitPerson(Person person, PrisonerStatus prisonerStatus, boole
             personnel.put(person.getId(), person);
 
             if (getCampaignOptions().isUseSimulatedRelationships()) {
-                if ((prisonerStatus.isFree()) &&
-                          (!person.getOriginFaction().isClan()) &&
+                if ((prisonerStatus.isFree()) && (!person.getOriginFaction().isClan()) &&
                           // We don't simulate for civilians, otherwise MekHQ will try to simulate the entire
                           // relationship history of everyone the recruit has ever married or birthed. This will
                           // cause a StackOverflow. -- Illiani, May/21/2025
@@ -7696,29 +7698,29 @@ public TargetRoll getTargetForAcquisition(final IAcquisitionWork acquisition, fi
     }
 
     public PlanetaryConditions getCurrentPlanetaryConditions(Scenario scenario) {
-            PlanetaryConditions planetaryConditions = new PlanetaryConditions();
-            if (scenario instanceof AtBScenario atBScenario) {
-                if (getCampaignOptions().isUseLightConditions()) {
-                    planetaryConditions.setLight(atBScenario.getLight());
-                }
-                if (getCampaignOptions().isUseWeatherConditions()) {
-                    planetaryConditions.setWeather(atBScenario.getWeather());
-                    planetaryConditions.setWind(atBScenario.getWind());
-                    planetaryConditions.setFog(atBScenario.getFog());
-                    planetaryConditions.setEMI(atBScenario.getEMI());
-                    planetaryConditions.setBlowingSand(atBScenario.getBlowingSand());
-                    planetaryConditions.setTemperature(atBScenario.getModifiedTemperature());
+        PlanetaryConditions planetaryConditions = new PlanetaryConditions();
+        if (scenario instanceof AtBScenario atBScenario) {
+            if (getCampaignOptions().isUseLightConditions()) {
+                planetaryConditions.setLight(atBScenario.getLight());
+            }
+            if (getCampaignOptions().isUseWeatherConditions()) {
+                planetaryConditions.setWeather(atBScenario.getWeather());
+                planetaryConditions.setWind(atBScenario.getWind());
+                planetaryConditions.setFog(atBScenario.getFog());
+                planetaryConditions.setEMI(atBScenario.getEMI());
+                planetaryConditions.setBlowingSand(atBScenario.getBlowingSand());
+                planetaryConditions.setTemperature(atBScenario.getModifiedTemperature());
 
-                }
-                if (getCampaignOptions().isUsePlanetaryConditions()) {
-                    planetaryConditions.setAtmosphere(atBScenario.getAtmosphere());
-                    planetaryConditions.setGravity(atBScenario.getGravity());
-                }
-            } else {
-                planetaryConditions = scenario.createPlanetaryConditions();
             }
+            if (getCampaignOptions().isUsePlanetaryConditions()) {
+                planetaryConditions.setAtmosphere(atBScenario.getAtmosphere());
+                planetaryConditions.setGravity(atBScenario.getGravity());
+            }
+        } else {
+            planetaryConditions = scenario.createPlanetaryConditions();
+        }
 
-            return planetaryConditions;
+        return planetaryConditions;
 
     }
 
@@ -8851,6 +8853,7 @@ public int calculatePartTransitTime(int availability) {
 
         return Math.toIntExact(ChronoUnit.DAYS.between(getLocalDate(), arrivalDate));
     }
+
     /**
      * Calculates the transit time for the arrival of parts or supplies based on the availability of the item, a random
      * roll, and campaign-specific transit time settings.
@@ -9957,8 +9960,7 @@ public Planet getNewCampaignStartingPlanet() {
             if (faction.getShortName().equalsIgnoreCase("PIR")) {
                 List<Faction> pirateFactions = new ArrayList<>();
                 for (Faction activeFaction : factions.getActiveFactions(currentDay)) {
-                    if (activeFaction.isPirate() &&
-                              !activeFaction.getShortName().equalsIgnoreCase("PIR")) {
+                    if (activeFaction.isPirate() && !activeFaction.getShortName().equalsIgnoreCase("PIR")) {
                         pirateFactions.add(activeFaction);
                     }
                 }

@@ -468,6 +468,7 @@ public static String getTechLevelName(final int techLevel) {
     private boolean payForOverhead;
     private boolean payForMaintain;
     private boolean payForTransport;
+    private boolean trackLeases;
     private boolean sellUnits;
     private boolean sellParts;
     private boolean payForRecruitment;
@@ -1088,6 +1089,7 @@ public CampaignOptions() {
         payForOverhead = false;
         payForMaintain = false;
         payForTransport = false;
+        trackLeases = false;
         sellUnits = false;
         sellParts = false;
         payForRecruitment = false;
@@ -3294,6 +3296,14 @@ public void setPayForTransport(final boolean payForTransport) {
         this.payForTransport = payForTransport;
     }
 
+    public boolean isTrackLeases() {
+        return trackLeases;
+    }
+
+    public void setTrackLeases(final boolean trackLeases) {
+        this.trackLeases = trackLeases;
+    }
+
     public boolean isSellUnits() {
         return sellUnits;
     }
@@ -5317,6 +5327,7 @@ public void writeToXml(final PrintWriter pw, int indent) {
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "payForOverhead", payForOverhead);
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "payForMaintain", payForMaintain);
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "payForTransport", payForTransport);
+        MHQXMLUtility.writeSimpleXMLTag(pw, indent, "trackLeases", trackLeases);
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "sellUnits", sellUnits);
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "sellParts", sellParts);
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "payForRecruitment", payForRecruitment);
@@ -6313,6 +6324,8 @@ public static CampaignOptions generateCampaignOptionsFromXml(Node parentNod, Ver
                     campaignOptions.payForMaintain = Boolean.parseBoolean(nodeContents);
                 } else if (nodeName.equalsIgnoreCase("payForTransport")) {
                     campaignOptions.payForTransport = Boolean.parseBoolean(nodeContents);
+                } else if (nodeName.equalsIgnoreCase("trackLeases")) {
+                    campaignOptions.trackLeases = Boolean.parseBoolean(nodeContents);
                 } else if (nodeName.equalsIgnoreCase("sellUnits")) {
                     campaignOptions.sellUnits = Boolean.parseBoolean(nodeContents);
                 } else if (nodeName.equalsIgnoreCase("sellParts")) {
@@ -6926,19 +6939,19 @@ public boolean isTrackFactionStanding() {
     public void setTrackFactionStanding(boolean trackFactionStanding) {
         this.trackFactionStanding = trackFactionStanding;
     }
-    
+
     public boolean isAutoGenerateOpForCallsigns() {
         return autoGenerateOpForCallsigns;
     }
-    
+
     public void setAutoGenerateOpForCallsigns(boolean autoGenerateOpForCallsigns) {
         this.autoGenerateOpForCallsigns = autoGenerateOpForCallsigns;
     }
-    
+
     public SkillLevel getMinimumCallsignSkillLevel() {
         return minimumCallsignSkillLevel;
     }
-    
+
     public void setMinimumCallsignSkillLevel(SkillLevel skillLevel) {
         this.minimumCallsignSkillLevel = skillLevel;
     }