Merge branch 'refs/heads/master' into campaignOptionsIIC

# Conflicts:
#	MekHQ/unittests/mekhq/gui/dialog/nagDialogs/UnableToAffordJumpNagDialogTest.java

MekHQ/data/scenariomodifiers/PrimaryAlliesAir.xml

@@ -1,5 +1,5 @@
 <AtBScenarioModifier>
-	<additionalBriefingText>To compensate for the presence of a large opposing force, allied units will be working alongside us on this operation.</additionalBriefingText>
+	<additionalBriefingText>Additional allied units will be working alongside us on this operation.</additionalBriefingText>
 	<benefitsPlayer>true</benefitsPlayer>
 	<eventTiming>PreForceGeneration</eventTiming>
 	<forceDefinition>
@@ -8,16 +8,16 @@
 		<allowedUnitType>-3</allowedUnitType>
 		<arrivalTurn>0</arrivalTurn>
 		<canReinforceLinked>false</canReinforceLinked>
-		<contributesToBV>false</contributesToBV>
+		<contributesToBV>true</contributesToBV>
 		<contributesToMapSize>true</contributesToMapSize>
-		<contributesToUnitCount>false</contributesToUnitCount>
+		<contributesToUnitCount>true</contributesToUnitCount>
 		<deployOffboard>false</deployOffboard>
 		<deploymentZones />
 		<destinationZone>5</destinationZone>
 		<fixedUnitCount>-1</fixedUnitCount>
 		<forceAlignment>1</forceAlignment>
 		<forceMultiplier>1.0</forceMultiplier>
-		<forceName>Allied Force</forceName>
+		<forceName>Additional Force</forceName>
 		<generationMethod>3</generationMethod>
 		<generationOrder>1</generationOrder>
 		<maxWeightClass>4</maxWeightClass>

MekHQ/data/scenariomodifiers/PrimaryAlliesGround.xml

@@ -1,5 +1,5 @@
 <AtBScenarioModifier>
-	<additionalBriefingText>To compensate for the presence of a large opposing force, allied units will be working alongside us on this operation.</additionalBriefingText>
+	<additionalBriefingText>Additional allied units will be working alongside us on this operation.</additionalBriefingText>
 	<allowedMapLocations>
 		<allowedMapLocation>AllGroundTerrain</allowedMapLocation>
 		<allowedMapLocation>SpecificGroundTerrain</allowedMapLocation>
@@ -12,16 +12,16 @@
 		<allowedUnitType>-2</allowedUnitType>
 		<arrivalTurn>0</arrivalTurn>
 		<canReinforceLinked>false</canReinforceLinked>
-		<contributesToBV>false</contributesToBV>
+		<contributesToBV>true</contributesToBV>
 		<contributesToMapSize>true</contributesToMapSize>
-		<contributesToUnitCount>false</contributesToUnitCount>
+		<contributesToUnitCount>true</contributesToUnitCount>
 		<deployOffboard>false</deployOffboard>
 		<deploymentZones />
 		<destinationZone>5</destinationZone>
 		<fixedUnitCount>-1</fixedUnitCount>
 		<forceAlignment>1</forceAlignment>
 		<forceMultiplier>1.0</forceMultiplier>
-		<forceName>Allied Force</forceName>
+		<forceName>Additional Force</forceName>
 		<generationMethod>3</generationMethod>
 		<generationOrder>1</generationOrder>
 		<maxWeightClass>4</maxWeightClass>

MekHQ/data/scenariotemplates/Frontline Disruption.xml

@@ -63,7 +63,7 @@
                 <destinationZone>6</destinationZone>
                 <fixedUnitCount>0</fixedUnitCount>
                 <forceAlignment>2</forceAlignment>
-                <forceMultiplier>2.0</forceMultiplier>
+                <forceMultiplier>1.5</forceMultiplier>
                 <forceName>OpFor</forceName>
                 <generationMethod>1</generationMethod>
                 <generationOrder>5</generationOrder>

MekHQ/data/scenariotemplates/Intercept Engagement.xml

@@ -128,10 +128,10 @@
                 </failureEffect>
             </failureEffects>
             <additionalDetails />
-            <description>Destroy or rout 50% the following force(s) and unit(s):</description>
+            <description>Destroy or rout 75% the following force(s) and unit(s):</description>
             <destinationEdge>NONE</destinationEdge>
             <objectiveCriterion>Destroy</objectiveCriterion>
-            <percentage>50</percentage>
+            <percentage>75</percentage>
             <timeLimit>0</timeLimit>
             <timeLimitAtMost>true</timeLimitAtMost>
             <timeLimitType>None</timeLimitType>

MekHQ/data/scenariotemplates/Irregular Force Assault.xml

@@ -79,8 +79,8 @@
                 <forceName>OpFor</forceName>
                 <generationMethod>1</generationMethod>
                 <generationOrder>5</generationOrder>
-                <maxWeightClass>4</maxWeightClass>
-                <minWeightClass>2</minWeightClass>
+                <maxWeightClass>3</maxWeightClass>
+                <minWeightClass>1</minWeightClass>
                 <objectiveLinkedForces />
                 <retreatThreshold>50</retreatThreshold>
                 <startingAltitude>0</startingAltitude>
@@ -107,7 +107,7 @@
                 <destinationZone>5</destinationZone>
                 <fixedUnitCount>0</fixedUnitCount>
                 <forceAlignment>2</forceAlignment>
-                <forceMultiplier>2.0</forceMultiplier>
+                <forceMultiplier>1.0</forceMultiplier>
                 <forceName>Infantry</forceName>
                 <generationMethod>2</generationMethod>
                 <generationOrder>5</generationOrder>
@@ -138,7 +138,7 @@
                 <destinationZone>5</destinationZone>
                 <fixedUnitCount>0</fixedUnitCount>
                 <forceAlignment>2</forceAlignment>
-                <forceMultiplier>2.0</forceMultiplier>
+                <forceMultiplier>1.0</forceMultiplier>
                 <forceName>Irregulars</forceName>
                 <generationMethod>2</generationMethod>
                 <generationOrder>5</generationOrder>

MekHQ/data/scenariotemplates/Irregular Force Suppression.xml

@@ -59,36 +59,6 @@
                 <useArtillery>false</useArtillery>
             </value>
         </entry>
-        <entry>
-            <key>OpFor</key>
-            <value>
-                <actualDeploymentZone>-1</actualDeploymentZone>
-                <allowAeroBombs>false</allowAeroBombs>
-                <allowedUnitType>-2</allowedUnitType>
-                <arrivalTurn>0</arrivalTurn>
-                <canReinforceLinked>true</canReinforceLinked>
-                <contributesToBV>false</contributesToBV>
-                <contributesToMapSize>true</contributesToMapSize>
-                <contributesToUnitCount>false</contributesToUnitCount>
-                <deployOffboard>false</deployOffboard>
-                <deploymentZones />
-                <destinationZone>5</destinationZone>
-                <fixedUnitCount>-1</fixedUnitCount>
-                <forceAlignment>2</forceAlignment>
-                <forceMultiplier>1.0</forceMultiplier>
-                <forceName>OpFor</forceName>
-                <generationMethod>1</generationMethod>
-                <generationOrder>5</generationOrder>
-                <maxWeightClass>4</maxWeightClass>
-                <minWeightClass>0</minWeightClass>
-                <objectiveLinkedForces />
-                <retreatThreshold>50</retreatThreshold>
-                <startingAltitude>0</startingAltitude>
-                <syncDeploymentType>OppositeEdge</syncDeploymentType>
-                <syncedForceName>Player</syncedForceName>
-                <useArtillery>false</useArtillery>
-            </value>
-        </entry>
         <entry>
             <key>Infantry</key>
             <value>
@@ -107,7 +77,7 @@
                 <destinationZone>5</destinationZone>
                 <fixedUnitCount>0</fixedUnitCount>
                 <forceAlignment>2</forceAlignment>
-                <forceMultiplier>2.0</forceMultiplier>
+                <forceMultiplier>1.0</forceMultiplier>
                 <forceName>Infantry</forceName>
                 <generationMethod>2</generationMethod>
                 <generationOrder>5</generationOrder>
@@ -138,7 +108,7 @@
                 <destinationZone>5</destinationZone>
                 <fixedUnitCount>0</fixedUnitCount>
                 <forceAlignment>2</forceAlignment>
-                <forceMultiplier>2.0</forceMultiplier>
+                <forceMultiplier>1.0</forceMultiplier>
                 <forceName>Irregulars</forceName>
                 <generationMethod>2</generationMethod>
                 <generationOrder>5</generationOrder>

MekHQ/data/scenariotemplates/Skirmish Disruption.xml

@@ -63,7 +63,7 @@
                 <destinationZone>6</destinationZone>
                 <fixedUnitCount>0</fixedUnitCount>
                 <forceAlignment>2</forceAlignment>
-                <forceMultiplier>2.0</forceMultiplier>
+                <forceMultiplier>1.5</forceMultiplier>
                 <forceName>OpFor</forceName>
                 <generationMethod>1</generationMethod>
                 <generationOrder>5</generationOrder>

MekHQ/data/scenariotemplates/Tactical Withdrawal.xml

@@ -126,7 +126,7 @@
                 <destinationZone>5</destinationZone>
                 <fixedUnitCount>0</fixedUnitCount>
                 <forceAlignment>2</forceAlignment>
-                <forceMultiplier>2.0</forceMultiplier>
+                <forceMultiplier>1.5</forceMultiplier>
                 <forceName>OpFor</forceName>
                 <generationMethod>1</generationMethod>
                 <generationOrder>5</generationOrder>

MekHQ/data/universe/academies/Prestigious Academies.xml

@@ -438,10 +438,10 @@
         <baseAcademicSkillLevel>0</baseAcademicSkillLevel>
     </academy>
     <academy>
-        <name>Allison MekWarrior Institute</name>
+        <name>Allison MechWarrior Institute</name>
         <type>Military Academy</type>
         <isMilitary>true</isMilitary>
-        <description>The Allison MekWarrior Institute stands as a premier training facility for MekWarriors, adjacent to the Lloyd Marik-Stanley Aerospace School. Producing 375 MekWarrior graduates annually, the institute fosters a spirited rivalry with neighboring aerospace cadets, characterized by athletic contests and pranks that occasionally escalate into conflicts. Admission is highly competitive, influenced by political considerations, with a portion of spots reserved for families of Dispossessed Mechwarriors to uphold loyalty.</description>
+        <description>The Allison MechWarrior Institute stands as a premier training facility for MekWarriors, adjacent to the Lloyd Marik-Stanley Aerospace School. Producing 375 MekWarrior graduates annually, the institute fosters a spirited rivalry with neighboring aerospace cadets, characterized by athletic contests and pranks that occasionally escalate into conflicts. Admission is highly competitive, influenced by political considerations, with a portion of spots reserved for families of Dispossessed Mechwarriors to uphold loyalty.</description>
         <locationSystem>New Olympia</locationSystem>
         <constructionYear>2465</constructionYear>
         <tuition>5250</tuition>
@@ -456,10 +456,10 @@
         <baseAcademicSkillLevel>0</baseAcademicSkillLevel>
     </academy>
     <academy>
-        <name>Allison MekWarrior Institute (Officer)</name>
+        <name>Allison MechWarrior Institute (Officer)</name>
         <type>Officer Academy</type>
         <isMilitary>true</isMilitary>
-        <description>The Allison MekWarrior Institute stands as a premier training facility for MekWarriors, adjacent to the Lloyd Marik-Stanley Aerospace School. Producing 375 MekWarrior graduates annually, the institute fosters a spirited rivalry with neighboring aerospace cadets, characterized by athletic contests and pranks that occasionally escalate into conflicts. Admission is highly competitive, influenced by political considerations, with a portion of spots reserved for families of Dispossessed Mechwarriors to uphold loyalty.</description>
+        <description>The Allison MechWarrior Institute stands as a premier training facility for MekWarriors, adjacent to the Lloyd Marik-Stanley Aerospace School. Producing 375 MekWarrior graduates annually, the institute fosters a spirited rivalry with neighboring aerospace cadets, characterized by athletic contests and pranks that occasionally escalate into conflicts. Admission is highly competitive, influenced by political considerations, with a portion of spots reserved for families of Dispossessed Mechwarriors to uphold loyalty.</description>
         <locationSystem>New Olympia</locationSystem>
         <constructionYear>2465</constructionYear>
         <tuition>13125</tuition>

MekHQ/data/universe/academies/Unit Education.xml

@@ -89,8 +89,7 @@
     </academy>
     <academy>
         <name>Adult Apprenticeship</name>
-        <isMilitary>true</isMilitary>
-        <isPrepSchool>true</isPrepSchool>
+        <isMilitary>false</isMilitary>
         <description>An adult apprenticeship is a hands-on training program where older recruits are integrated into a military or mercenary unit. The apprenticeship focuses heavily on learning in the field, with recruits shadowing seasoned veterans.</description>
         <isHomeSchool>true</isHomeSchool>
         <locationSystem>Terra</locationSystem>

MekHQ/data/universe/systems.xml

@@ -35472,6 +35472,10 @@ A few Stone Age tribes exist in the planet's deep deserts and jungles, far from
     <ycood>281.417</ycood>
     <spectralType source="canon">K4IV</spectralType>
     <primarySlot>3</primarySlot>
+    <hiringHall>
+      <start>2694-01-01</start>
+      <level>QUESTIONABLE</level>
+    </hiringHall>
     <planet>
       <name>Riverhead</name>
       <type>Giant Terrestrial</type>
@@ -40713,6 +40717,10 @@ Arboris has a history of fierce independence. In 2308, Arboris seceded from the
     <ycood>226.576</ycood>
     <spectralType source="canon">G3V</spectralType>
     <primarySlot>4</primarySlot>
+    <hiringHall>
+      <start>3057-01-01</start>
+      <level>STANDARD</level>
+    </hiringHall>
     <planet>
       <name>Plowden's Stand</name>
       <type>Dwarf Terrestrial</type>
@@ -48861,6 +48869,10 @@ Though a major exporter of heavy metals and radioactive elements, as well as sma
     <ycood>-315.408</ycood>
     <spectralType source="canon">G4V</spectralType>
     <primarySlot>3</primarySlot>
+    <hiringHall>
+      <start>2912-01-01</start>
+      <level>QUESTIONABLE</level>
+    </hiringHall>
     <planet>
       <name>Frey</name>
       <type>Dwarf Terrestrial</type>
@@ -221714,6 +221726,11 @@ Coalition Armory</desc>
     <ycood>-23.569</ycood>
     <spectralType source="canon">G4V</spectralType>
     <primarySlot>7</primarySlot>
+    <hiringHall>
+      <start>3058-01-01</start>
+      <end>3081-03-15</end>
+      <level>MINOR</level>
+    </hiringHall>
     <planet>
       <name>Csurgói Járás</name>
       <type>Terrestrial</type>
@@ -230631,6 +230648,10 @@ At the dawn the thirty-second century, a surgical strike from the Lyran Commonwe
     <ycood>34.077</ycood>
     <spectralType source="canon">F8II</spectralType>
     <primarySlot>6</primarySlot>
+    <hiringHall>
+      <start>2650-01-01</start>
+      <level>GREAT</level>
+    </hiringHall>
     <planet>
       <name>Skouzas's Frontier</name>
       <type>Terrestrial</type>
@@ -280553,6 +280574,10 @@ Freeport Armorworks</desc>
     <ycood>-430.11</ycood>
     <spectralType source="canon">G3IV</spectralType>
     <primarySlot>2</primarySlot>
+    <hiringHall>
+      <start>3020-01-01</start>
+      <level>MINOR</level>
+    </hiringHall>
     <planet>
       <name>Mugoma</name>
       <type>Giant Terrestrial</type>
@@ -373827,6 +373852,11 @@ Aside from the large island continent of Galapagos in the northern hemisphere of
     <ycood>18.309</ycood>
     <spectralType source="canon">G0III</spectralType>
     <primarySlot>4</primarySlot>
+    <hiringHall>
+      <start>2811-01-01</start>
+      <end>3045-01-01</end>
+      <level>MINOR</level>
+    </hiringHall>
     <planet>
       <name>Port de Nedelec</name>
       <type>Terrestrial</type>
@@ -480796,6 +480826,10 @@ Niops V and VI were settled primarily to expand the available resources to the N
     <ycood>148.073</ycood>
     <spectralType source="canon">K0V</spectralType>
     <primarySlot>3</primarySlot>
+    <hiringHall>
+      <start>3052-01-01</start>
+      <level>MINOR</level>
+    </hiringHall>
     <planet>
       <name>Kaarst</name>
       <type>Terrestrial</type>
@@ -482463,6 +482497,11 @@ During the Fourth Succession War, the Federated Suns leaked false reports of ung
     <ycood>-2.891</ycood>
     <spectralType source="canon">G2IV</spectralType>
     <primarySlot>2</primarySlot>
+    <hiringHall>
+      <start>3057-01-01</start>
+      <end>3081-03-15</end>
+      <level>GREAT</level>
+    </hiringHall>
     <planet>
       <name>Bloomsburg</name>
       <type>Giant Terrestrial</type>
@@ -498966,6 +499005,11 @@ Rim Motors</desc>
     <ycood>-34.688</ycood>
     <spectralType source="canon">K9V</spectralType>
     <primarySlot>2</primarySlot>
+    <hiringHall>
+      <start>3031-01-01</start>
+      <end>3067-10-15</end>
+      <level>GREAT</level>
+    </hiringHall>
     <planet>
       <name>Chen</name>
       <type>Dwarf Terrestrial</type>
@@ -601689,6 +601733,10 @@ During the Jihad, the Word of Blake forces invaded after they neutralized the de
     <ycood>-7.025</ycood>
     <spectralType source="canon">K1V</spectralType>
     <primarySlot>7</primarySlot>
+    <hiringHall>
+      <start>2700-01-01</start>
+      <level>MINOR</level>
+    </hiringHall>
     <planet>
       <name>Sanopi</name>
       <type>Dwarf Terrestrial</type>
@@ -701566,6 +701614,10 @@ Wei is home to one of the many Duchy RTC training facilities in the Confederatio
     <ycood>-276.084</ycood>
     <spectralType source="canon">G3V</spectralType>
     <primarySlot>2</primarySlot>
+    <hiringHall>
+      <start>3000-01-01</start>
+      <level>GREAT</level>
+    </hiringHall>
     <planet>
       <name>High Kelling</name>
       <type>Giant Terrestrial</type>

MekHQ/docs/history.txt

@@ -104,6 +104,11 @@ MEKHQ VERSION HISTORY:
 + PR #5034: New row highlights for Personnel Table: Gone, Absent, Fatigued
 + FIX #5028: Random Camo Allocation Fixes
 + PR #5036: Corrected Scenario Modifiers for HouseOfficer units
++ PR #5052: Convert the Part Quality concept into an enum
++ PR #5053: Colorise Skill Levels
++ PR #5054: Implement CamOps Contract Negotiation
++ PR #5055: Parts In Use - Filter Mothballed and Spare Part Quality
++ PR #5064: Bug fix and improvements for calculateContractDifficulty()
 
 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
@@ -298,6 +303,9 @@ MEKHQ VERSION HISTORY:
 + PR #4758: MHQ side of fix for MHQ 4755: NPE when opfor has no faction code
 + FIX #4697: Refactor salary editing logic and prevent NPE
 + PR #4690: Corrected Experience Generation Logic and Refined Campaign Options GUI
++ PR #5052: Convert the Part Quality concept into an enum
++ PR #5053: Colorise Skill Levels
++ PR #5054: Implement CamOps Contract Negotiation
 
 0.49.20 (2024-06-28 2100 UTC) (THIS IS THE LAST VERSION TO SUPPORT JAVA 11)
 + PR #4005: Code internals: DialogOptionsListener update

MekHQ/resources/mekhq/resources/Campaign.properties

@@ -39,8 +39,8 @@ LayeredForceIconLayer.LOGO.text=Logos
 LayeredForceIconLayer.LOGO.toolTipText=This tab contains canon faction logos that can be added to the center of a force icon.
 
 #### Anniversaries
-anniversaryBirthday.text=%s is %s%s%s today!
-anniversaryRecruitment.text=%s celebrates %s%s%s years with %s!
+anniversaryBirthday.text=%s is <b>%s%s%s</b> today!
+anniversaryRecruitment.text=%s celebrates <b>%s%s%s</b> years with %s!
 
 #### Personnel Removal
 personnelRemoval.text=Old personnel records have been tidied away.