Merge branch 'master' into wvr-fatigue-gone-linebkgs

MekHQ/data/universe/factions.xml

@@ -97,7 +97,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Terran Hegemony.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Inner Sphere/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Terran Hegemony.png</layeredForceIconLogoFilename>
-    <tags>is,super,playable</tags>
+    <tags>is,super,playable,generous,controlling</tags>
     <start>2315</start>
     <end>2790</end>
   </faction>
@@ -137,7 +137,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Capellan Confederation.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Inner Sphere/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Capellan Confederation.png</layeredForceIconLogoFilename>
-    <tags>is,major,playable</tags>
+    <tags>is,major,playable,stingy,controlling</tags>
     <start>2367</start>
   </faction>
   <faction>
@@ -152,7 +152,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Draconis Combine.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Inner Sphere/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Draconis Combine.png</layeredForceIconLogoFilename>
-    <tags>is,major,playable</tags>
+    <tags>is,major,playable,stingy,controlling</tags>
     <start>2319</start>
   </faction>
   <faction>
@@ -166,7 +166,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Federated Suns.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Inner Sphere/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Federated Suns.png</layeredForceIconLogoFilename>
-    <tags>is,major,playable</tags>
+    <tags>is,major,playable,generous</tags>
     <start>2317</start>
   </faction>
   <faction>
@@ -180,7 +180,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Free Worlds League.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Inner Sphere/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Free Worlds League.png</layeredForceIconLogoFilename>
-    <tags>is,major,playable</tags>
+    <tags>is,major,playable,generous,controlling</tags>
     <start>2271</start>
   </faction>
   <faction>
@@ -196,7 +196,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Lyran Commonwealth.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Inner Sphere/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Lyran Commonwealth.png</layeredForceIconLogoFilename>
-    <tags>is,major,playable</tags>
+    <tags>is,major,playable,generous,lenient</tags>
     <start>2340</start>
   </faction>
   <!-- Star League Era factions -->
@@ -470,7 +470,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Rim Worlds Republic.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Periphery/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Rim Worlds Republic.png</layeredForceIconLogoFilename>
-    <tags>periphery,playable</tags>
+    <tags>periphery,playable,stingy,controlling</tags>
     <start>2250</start>
     <end>2779</end>
   </faction>
@@ -505,7 +505,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Taurian Concordat.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Periphery/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Taurian Concordat.png</layeredForceIconLogoFilename>
-    <tags>periphery,playable</tags>
+    <tags>periphery,playable,stingy,controlling</tags>
     <start>2335</start>
   </faction>
   <faction>
@@ -518,7 +518,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Magistracy of Canopus.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Periphery/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Magistracy of Canopus.png</layeredForceIconLogoFilename>
-    <tags>periphery,playable</tags>
+    <tags>periphery,playable,generous,lenient</tags>
     <start>2530</start>
   </faction>
   <faction>
@@ -532,7 +532,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Outworlds Alliance.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Periphery/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Outworlds Alliance.png</layeredForceIconLogoFilename>
-    <tags>periphery,playable</tags>
+    <tags>periphery,playable,stingy,lenient</tags>
     <start>2413</start>
     <end>3083</end>
     <successor>RA</successor>
@@ -1038,7 +1038,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>ComStar.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Inner Sphere/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>ComStar.png</layeredForceIconLogoFilename>
-    <tags>is,inactive,major,playable</tags>
+    <tags>is,inactive,major,playable,generous,controlling</tags>
     <start>2788</start>
   </faction>
   <faction>
@@ -1054,7 +1054,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Free Worlds League.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Inner Sphere/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Duchy of Andurien.png</layeredForceIconLogoFilename>
-    <tags>is,minor</tags>
+    <tags>is,minor,stingy,lenient</tags>
     <start>3030</start>
   </faction>
   <faction>
@@ -1169,7 +1169,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Escorpion Imperio.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Clan/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Escorpion Imperio.png</layeredForceIconLogoFilename>
-    <tags>clan,deep_periphery,playable</tags>
+    <tags>clan,deep_periphery,playable,stingy,controlling</tags>
     <start>3080</start>
   </faction>
   <faction>
@@ -1186,7 +1186,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconLogoCategory>Inner Sphere/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Federated Commonwealth.png</layeredForceIconLogoFilename>
     <colorRGB>255,221,0</colorRGB>
-    <tags>is,super,playable</tags>
+    <tags>is,super,playable,generous</tags>
     <start>3028</start>
     <end>3068</end>
     <successor>FS</successor>
@@ -1219,7 +1219,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Free Rasalhague Republic.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Inner Sphere/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Free Rasalhague Republic.png</layeredForceIconLogoFilename>
-    <tags>is,minor,playable</tags>
+    <tags>is,minor,playable,generous,controlling</tags>
     <start>3034</start>
     <end>3103</end>
     <successor>RD</successor>
@@ -1272,7 +1272,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Hanseatic League.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Periphery/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Hanseatic League.png</layeredForceIconLogoFilename>
-    <tags>deep_periphery,playable</tags>
+    <tags>deep_periphery,playable,stingy,controlling</tags>
     <start>2891</start>
     <end>3141</end>
     <successor>CEI</successor>
@@ -1381,7 +1381,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Marian Hegemony.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Periphery/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Marian Hegemony.png</layeredForceIconLogoFilename>
-    <tags>periphery,playable</tags>
+    <tags>periphery,playable,stingy,controlling</tags>
     <start>2920</start>
   </faction>
   <faction>
@@ -1486,7 +1486,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Nueva Castile.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Periphery/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Nueva Castile.png</layeredForceIconLogoFilename>
-    <tags>deep_periphery,playable</tags>
+    <tags>deep_periphery,playable,stingy,controlling</tags>
     <start>2392</start>
     <end>3080</end>
     <successor>CEI</successor>
@@ -1502,7 +1502,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Oberon Confederation.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Periphery/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Oberon Confederation.png</layeredForceIconLogoFilename>
-    <tags>periphery</tags>
+    <tags>periphery,stingy,controlling</tags>
     <start>2775</start>
     <end>3049</end>
   </faction>
@@ -1589,7 +1589,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Ghost Bear Dominion.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Clan/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Rasalhague Dominion.png</layeredForceIconLogoFilename>
-    <tags>clan,is,minor,playable</tags>
+    <tags>clan,is,minor,playable,generous,controlling</tags>
     <start>3103</start>
   </faction>
   <faction>
@@ -1604,7 +1604,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Raven Alliance.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Clan/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Raven Alliance.png</layeredForceIconLogoFilename>
-    <tags>clan,periphery,playable</tags>
+    <tags>clan,periphery,playable,generous,controlling</tags>
     <start>3083</start>
   </faction>
   <faction>
@@ -1763,7 +1763,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <colorRGB>153,198,237</colorRGB>
     <layeredForceIconLogoCategory>Periphery/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>St. Ives Compact.png</layeredForceIconLogoFilename>
-    <tags>is,minor,playable</tags>
+    <tags>is,minor,playable,generous,lenient</tags>
     <start>3029</start>
     <end>3063</end>
     <successor>CC</successor>
@@ -1779,7 +1779,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Star League.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Inner Sphere/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Star League.png</layeredForceIconLogoFilename>
-    <tags>is,super,playable</tags>
+    <tags>is,super,playable,generous,controlling</tags>
     <start>2570</start>
     <end>2781</end>
   </faction>
@@ -1878,7 +1878,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <eraMods>0,0,0,0,0,0,2</eraMods>
     <nameGenerator>CC</nameGenerator>
     <colorRGB>255,160,122</colorRGB>
-    <tags>is,minor</tags>
+    <tags>is,minor,stingy,controlling</tags>
     <start>3029</start>
     <end>3031</end>
     <successor>FS</successor>
@@ -1915,7 +1915,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Word of Blake.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Inner Sphere/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Word of Blake.png</layeredForceIconLogoFilename>
-    <tags>is,minor,playable</tags>
+    <tags>is,minor,playable,controlling</tags>
     <start>3052</start>
     <end>3081</end>
   </faction>
@@ -2111,7 +2111,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Umayyad Caliphate.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Periphery/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Umayyad Caliphate.png</layeredForceIconLogoFilename>
-    <tags>deep_periphery</tags>
+    <tags>deep_periphery,stingy,controlling</tags>
     <start>2830</start>
     <end>3080</end>
     <successor>CEI</successor>
@@ -2257,7 +2257,7 @@ successor - unimplemented tag describing another faction code as the specified f
     <layeredForceIconBackgroundFilename>Aurigan Coalition.png</layeredForceIconBackgroundFilename>
     <layeredForceIconLogoCategory>Periphery/</layeredForceIconLogoCategory>
     <layeredForceIconLogoFilename>Aurigan Coalition.png</layeredForceIconLogoFilename>
-    <tags>periphery,minor,playable</tags>
+    <tags>periphery,minor,playable,generous,lenient</tags>
     <start>2910</start>
     <!-- May have collapsed sooner, but no later than start of Fourth Succession War -->
     <end>3028</end>

MekHQ/docs/history.txt

@@ -95,6 +95,10 @@ MEKHQ VERSION HISTORY:
 + PR #5002: Correct issues with fixed map generation #5002
 + PR #4992: Add Customization Option to Refit Dialog
 + PR #5030: Replaced autoAwards Award Ceremony Placeholder Image
++ PR #4967: CamOps Contract Market - Contract Generation
++ PR #5017: Display Advanced Medical Injuries in UI
++ PR #5024: Add option to show unit images in TO&E
++ PR #5025: Pin/sticky force view tab on TO&E panel
 
 0.50.0 (2024-09-01 2000 UTC) (THIS MARKS THE START OF JAVA 17 AS THE MINIMUM REQUIRED)
 + PR #4332: CI Updates for windows build and normalizing

MekHQ/resources/mekhq/resources/GUI.properties

@@ -640,6 +640,8 @@ chkCompanyGeneratorStartup.text=Company Generator Startup outside AtB (Unimpleme
 chkCompanyGeneratorStartup.toolTipText=Adds the ability to use the company generator on startup outside of AtB campaigns.
 chkShowCompanyGenerator.text=Show Company Generator
 chkShowCompanyGenerator.toolTipText=Add a company generator menu item under the Manage Campaign header on the menu bar to allow one to generate a company after startup.
+chkShowUnitPicturesOnTOE.text=Show Unit Icons in TO&E Instead of Portraits
+chkShowUnitPicturesOnTOE.toolTipText=Make the TO&E Unit List display pictures of the units themselves rather than portraits of the pilots/drivers/leaders.
 labelCommandCenterDisplay.text=Command Center Display Options
 optionCommandCenterUseUnitMarket.text=Find Units Links to Unit Market (if enabled)
 optionCommandCenterUseUnitMarket.toolTipText=The Find Units button on the Command Center will link to the Unit Market provided the Unit Market is enabled.

MekHQ/src/mekhq/MHQConstants.java

@@ -60,6 +60,7 @@ public final class MHQConstants extends SuiteConstants {
                                                            // also used as a limit in the UI
     public static final String COMPANY_GENERATOR_STARTUP = "companyGeneratorStartup";
     public static final String SHOW_COMPANY_GENERATOR = "showCompanyGenerator";
+    public static final String SHOW_UNIT_PICTURES_ON_TOE = "showUnitPicturesOnTOE";
 
     // region Command Center Tab
     public static final String COMMAND_CENTER_USE_UNIT_MARKET = "commandCenterUseUnitMarket";

MekHQ/src/mekhq/MHQOptions.java

@@ -90,6 +90,14 @@ public void setShowCompanyGenerator(final boolean value) {
         userPreferences.node(MHQConstants.DISPLAY_NODE).putBoolean(MHQConstants.SHOW_COMPANY_GENERATOR, value);
     }
 
+    public boolean getShowUnitPicturesOnTOE() {
+        return userPreferences.node(MHQConstants.DISPLAY_NODE).getBoolean(MHQConstants.SHOW_UNIT_PICTURES_ON_TOE, true);
+    }
+
+    public void setShowUnitPicturesOnTOE(final boolean value) {
+        userPreferences.node(MHQConstants.DISPLAY_NODE).putBoolean(MHQConstants.SHOW_UNIT_PICTURES_ON_TOE, value);
+    }
+
     // region Command Center Tab
     public boolean getCommandCenterUseUnitMarket() {
         return userPreferences.node(MHQConstants.DISPLAY_NODE).getBoolean(MHQConstants.COMMAND_CENTER_USE_UNIT_MARKET,

MekHQ/src/mekhq/campaign/Campaign.java

@@ -107,6 +107,7 @@
 import mekhq.campaign.universe.*;
 import mekhq.campaign.universe.Planet.PlanetaryEvent;
 import mekhq.campaign.universe.PlanetarySystem.PlanetarySystemEvent;
+import mekhq.campaign.universe.enums.HiringHallLevel;
 import mekhq.campaign.universe.eras.Era;
 import mekhq.campaign.universe.eras.Eras;
 import mekhq.campaign.universe.fameAndInfamy.BatchallFactions;
@@ -417,6 +418,16 @@ public PlanetarySystem getCurrentSystem() {
         return location.getCurrentSystem();
     }
 
+    /**
+     * Returns the Hiring Hall level from the force's current system on the current date. If there
+     * is no hiring hall present, the level is HiringHallLevel.NONE.
+     *
+     * @return The Hiring Hall level of the current system at the present date.
+     */
+    public HiringHallLevel getSystemHiringHallLevel() {
+        return getCurrentSystem().getHiringHallLevel(getLocalDate());
+    }
+
     public Money getFunds() {
         return finances.getBalance();
     }
@@ -6937,19 +6948,6 @@ public int getAtBUnitRatingMod() {
                 : reputation.getAtbModifier();
     }
 
-    /**
-     * Retrieves the unit reputation factor based on the rating method defined in the Campaign Options.
-     *
-     * @return the reputation factor for the selected unit rating method.
-     */
-    public int getReputationFactor() {
-        return switch (campaignOptions.getUnitRatingMethod()) {
-            case NONE -> 5;
-            case FLD_MAN_MERCS_REV -> getAtBUnitRatingMod() * 2;
-            case CAMPAIGN_OPS -> (int) (getReputation().getReputationModifier() * 0.2 + 0.5);
-        };
-    }
-
     /**
      * Returns the Strategy skill of the designated commander in the campaign.
      *

MekHQ/src/mekhq/campaign/market/contractMarket/AbstractContractMarket.java

@@ -78,11 +78,13 @@ public abstract class AbstractContractMarket {
     abstract public void generateContractOffers(Campaign campaign, boolean newCampaign);
 
     /**
-     * Add a followup contract to an existing contract.
-     * @param campaign
-     * @param contract
+     * Generate followup contracts and add them to the market if the currently selected market type
+     * supports them.
+     *
+     * @param campaign The current campaign.
+     * @param contract The AtBContract being completed and used as a basis for followup missions
      */
-    abstract public void addFollowup(Campaign campaign, AtBContract contract);
+    abstract public void checkForFollowup(Campaign campaign, AtBContract contract);
 
     /**
      * Calculate the total payment modifier for the contract based on the configured market method