Merge branch 'master' into ReinforcmentSelection

MegaMek · Feb 13, 2025 · 5f5f8b9 · 5f5f8b9
2 parents 7cf2dc9 + 0a22304
commit 5f5f8b9
Show file tree

Hide file tree

Showing 44 changed files with 1,346 additions and 584 deletions.
diff --git a/MekHQ/data/universe/planetary_systems/system_events.xml b/MekHQ/data/universe/planetary_systems/system_events.xml
@@ -49693,6 +49693,10 @@
         <date>2690-01-01</date>
         <population source="noncanon">527861</population>
       </event>
+      <event>
+        <date>2694-01-01</date>
+        <hiringHall source="Merc Supplemental 2">QUESTIONABLE</hiringHall>
+      </event>
       <event>
         <date>2700-01-01</date>
         <population source="noncanon">950115</population>
@@ -55967,6 +55971,10 @@
         <date>3050-01-01</date>
         <population source="noncanon">2049886673</population>
       </event>
+      <event>
+        <date>3057-01-01</date>
+        <hiringHall source="Mercenary FM revised">STANDARD</hiringHall>
+      </event>
       <event>
         <date>3057-11-20</date>
         <faction source="canon">LA,CWIE</faction>
@@ -67379,6 +67387,10 @@
         <date>2910-01-01</date>
         <population source="noncanon">203935</population>
       </event>
+      <event>
+        <date>2912-01-01</date>
+        <hiringHall source="Merc Supplememntal 2">QUESTIONABLE</hiringHall>
+      </event>
       <event>
         <date>2914-01-01</date>
         <socioIndustrial source="noncanon">D-D-C-C-D</socioIndustrial>
@@ -290655,6 +290667,10 @@
         <date>3057-11-01</date>
         <faction source="canon">CM</faction>
       </event>
+      <event>
+        <date>3058-01-01</date>
+        <hiringHall source="Mercenary FM Revised">MINOR</hiringHall>
+      </event>
       <event>
         <date>3060-01-01</date>
         <population source="noncanon">1068129202</population>
@@ -290679,6 +290695,10 @@
         <date>3080-01-01</date>
         <population source="noncanon">1092871580</population>
       </event>
+      <event>
+        <date>3081-03-15</date>
+        <hiringHall source="Merc Supplemental Update">NONE</hiringHall>
+      </event>
       <event>
         <date>3081-10-16</date>
         <faction source="canon">ROS</faction>
@@ -302936,6 +302956,7 @@
       <event>
         <date>2650-01-01</date>
         <population source="noncanon">594885097</population>
+        <hiringHall source="Merc Supplemental 1">GREAT</hiringHall>
       </event>
       <event>
         <date>2660-01-01</date>
@@ -362457,6 +362478,7 @@
       <event>
         <date>3020-01-01</date>
         <population source="noncanon">252601</population>
+        <hiringHall source="Merc Supplemental 2">MINOR</hiringHall>
       </event>
       <event>
         <date>3025-01-01</date>
@@ -484649,6 +484671,10 @@
         <date>2810-01-01</date>
         <population source="noncanon">117826489</population>
       </event>
+      <event>
+        <date>2811-01-01</date>
+        <hiringHall source="Handbook House Davion">MINOR</hiringHall>
+      </event>
       <event>
         <date>2820-01-01</date>
         <population source="noncanon">110752446</population>
@@ -484757,6 +484783,10 @@
         <date>3042-01-01</date>
         <socioIndustrial source="canon">D-D-B-F-D</socioIndustrial>
       </event>
+      <event>
+        <date>3045-01-01</date>
+        <hiringHall source="Handbook House Davion">NONE</hiringHall>
+      </event>
       <event>
         <date>3050-01-01</date>
         <population source="noncanon">56349558</population>
@@ -623087,6 +623117,10 @@
         <date>3050-01-01</date>
         <population source="noncanon">167836896</population>
       </event>
+      <event>
+        <date>3052-01-01</date>
+        <hiringHall source="Merc Supplemental 2">MINOR</hiringHall>
+      </event>
       <event>
         <date>3057-09-18</date>
         <faction source="canon">LA</faction>
@@ -625447,6 +625481,10 @@
         <date>3050-01-01</date>
         <population source="noncanon">1638867276</population>
       </event>
+      <event>
+        <date>3057-01-01</date>
+        <hiringHall source="Merc Supplemental 1">STANDARD</hiringHall>
+      </event>
       <event>
         <date>3057-11-01</date>
         <faction source="canon">MERC</faction>
@@ -625471,6 +625509,10 @@
         <date>3080-01-01</date>
         <population source="noncanon">1673814775</population>
       </event>
+      <event>
+        <date>3081-03-15</date>
+        <hiringHall>NONE</hiringHall>
+      </event>
       <event>
         <date>3081-08-13</date>
         <faction source="canon">ROS</faction>
@@ -648431,6 +648473,7 @@
         <faction source="canon">MERC</faction>
         <population source="noncanon">1696188118</population>
         <socioIndustrial source="noncanon">B-B-C-B-B</socioIndustrial>
+        <hiringHall source="Merc FM Revised">GREAT</hiringHall>
       </event>
       <event>
         <date>3040-01-01</date>
@@ -648448,6 +648491,10 @@
         <date>3060-01-01</date>
         <population source="noncanon">1747320462</population>
       </event>
+      <event>
+        <date>3067-10-15</date>
+        <hiringHall>NONE</hiringHall>
+      </event>
       <event>
         <date>3067-12-26</date>
         <faction source="canon">WOB</faction>
@@ -786669,6 +786716,7 @@
       <event>
         <date>2700-01-01</date>
         <population source="noncanon">1302174644</population>
+        <hiringHall source="Merc FM Revised">MINOR</hiringHall>
       </event>
       <event>
         <date>2710-01-01</date>
@@ -916662,6 +916710,7 @@
       <event>
         <date>3000-01-01</date>
         <population source="noncanon">987050454</population>
+        <hiringHall source="Merc Supplemental 1">STANDARD</hiringHall>
       </event>
       <event>
         <date>3010-01-01</date>

diff --git a/MekHQ/data/universe/systems.xml b/MekHQ/data/universe/systems.xml
@@ -35472,10 +35472,6 @@ 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>
@@ -40717,10 +40713,6 @@ 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>
@@ -48869,10 +48861,6 @@ 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>
@@ -221726,11 +221714,6 @@ 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>
@@ -230648,10 +230631,6 @@ 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>
@@ -280574,10 +280553,6 @@ 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>
@@ -373852,11 +373827,6 @@ 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>
@@ -480826,10 +480796,6 @@ 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>
@@ -482497,11 +482463,6 @@ 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>
@@ -499005,11 +498966,6 @@ 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>
@@ -601733,10 +601689,6 @@ 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>
@@ -701619,10 +701571,6 @@ 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>

diff --git a/MekHQ/docs/history.txt b/MekHQ/docs/history.txt
@@ -23,7 +23,22 @@ MEKHQ VERSION HISTORY:
 + PR #5985: Fixed backwards "last compatible version" check
 + PR #5988: Feat: refactor flags to use EquipmentFlag instead
 + Fix #5987: local bots property empty on non-atb games #5989
-
++ Fix #5922: Fixed Off-by-One Error in Mass Training Dialog
++ PR #5993: Adjusted Gray Monday Employer Dialog to Trigger on the Correct Day
++ PR #5999: Fixed Clan Ghost Bear Greeting Keys
++ Fix #5979: Force players to use commit when deploying forces
++ PR #6001: Added Glossary Functionality to MHQDialogImmersive with Clickable Hyperlink Support
++ PR #6004: Refactored Support Point Modification Method Name
++ PR #6005: Refactored Fatigue Modification Method Name
++ PR #6006: Added Shortcut Method to Check if a Unit is Battle Armor
++ Fix #6009: Improve Stratcon deployment logic to ensure units aren't deployed twice
++ PR #6012: Fixed Multiple Resupply Bugs
++ PR #6020: Manage Scenario will now use manage scenario and not manage forces
++ PR #6019: Change xml recording of hiring halls
++ Fix #5996: Typo in cargo, fixes bolding, addresses issue #5996
++ Fix #5784: Better handling for missing parts when replacing parts via "Pod Space"
++ PR #6014: Refactored Active Personnel Retrieval Logic
++ PR #6013: Refactored Random Dependents Removal-Addition into a Seperate Class
 
 0.50.03 (2025-02-02 2030 UTC)
 + PR #5568: Spare parts rules reference adjustment

diff --git a/MekHQ/resources/mekhq/resources/AtBStratCon.properties b/MekHQ/resources/mekhq/resources/AtBStratCon.properties
@@ -13,6 +13,10 @@ lblLeadershipInstructions.Text=<html>The force commander's leadership allows the
   <br><b>Available BV:</b> %s</html
 
 lblLeadershipTransportInstructions.text=<html><b>Transport Type:</b></html>
+lblLeadershipCommitForces.text=Commit {0} and any selected auxiliary units?
+lblLeadershipCommitForces.fallback.text=Commit force?
+leadershipCommit.text=Commit
+leadershipCancel.text=Cancel
 
 selectForceForTemplate.Text=<html><b>Select a force from the list below.</b>\
   <br>\

diff --git a/MekHQ/resources/mekhq/resources/Campaign.properties b/MekHQ/resources/mekhq/resources/Campaign.properties
@@ -82,9 +82,6 @@ turnoverPersonnelKilled.text=<html>You have personnel who have left the unit or
 divorce.text=%s has divorced %s.
 
 #### Unsorted Campaign Resources
-dependentLeavesForce.text=%s %s have departed the force.
-dependentLeavesForce.dependent.singular=dependent
-dependentLeavesForce.dependent.plural=dependents
 dependentJoinsForce.text=%s has started traveling with the force.
 relativeJoinsForce.text=%s has started traveling with the force. They are %s's %s.
 relativeJoinsForceSpouse.text=spouse

diff --git a/MekHQ/resources/mekhq/resources/FameAndInfamy.properties b/MekHQ/resources/mekhq/resources/FameAndInfamy.properties
@@ -122,21 +122,21 @@ greetingCFMLevel4Type1.text=Your defenses will fuel our fire, leaving nothing bu
 greetingCFMLevel4Type2.text=We burn through all. What pathetic resistance will you offer?
 
 
-greetingCGBVersion1Level0Type0.text=We are impressed by your resolve. Identify your forces, so that we may share this Trial.
-greetingCGBVersion1Level0Type1.text=You have shown the heart of a warrior. Let us test one another in this honored battle.
-greetingCGBVersion1Level0Type2.text=Your courage is an inspiration. Together, let us make this a battle to be remembered.
-greetingCGBVersion1Level1Type0.text=We respect your strength. Declare your forces, and we will meet you in battle.
-greetingCGBVersion1Level1Type1.text=You have shown bravery. Let this be a Trial worthy of our ancestors.
-greetingCGBVersion1Level1Type2.text=We acknowledge your courage. Stand before us, and let us see who is truly strong.
-greetingCGBVersion1Level2Type0.text=Identify your forces or be forgotten.
-greetingCGBVersion1Level2Type1.text=We claim what we desire. Your stand is of little concern.
-greetingCGBVersion1Level2Type2.text=We care not for your defense. We will proceed.
-greetingCGBVersion1Level3Type0.text=We see through your weakness. Declare your forces, or be removed.
-greetingCGBVersion1Level3Type1.text=You amount to little more than a fleeting challenge. Prepare to fall.
-greetingCGBVersion1Level3Type2.text=Your efforts are inconsequential. We shall take what is ours.
-greetingCGBVersion1Level4Type0.text=We dismiss your efforts. Reveal your forces, or be swept aside.
-greetingCGBVersion1Level4Type1.text=You are nothing but prey, and we are the hunters. Identify yourselves.
-greetingCGBVersion1Level4Type2.text=Your resistance is beneath notice. Prepare to be obliterated.
+greetingCGBLevel0Type0.text=We are impressed by your resolve. Identify your forces, so that we may share this Trial.
+greetingCGBLevel0Type1.text=You have shown the heart of a warrior. Let us test one another in this honored battle.
+greetingCGBLevel0Type2.text=Your courage is an inspiration. Together, let us make this a battle to be remembered.
+greetingCGBLevel1Type0.text=We respect your strength. Declare your forces, and we will meet you in battle.
+greetingCGBLevel1Type1.text=You have shown bravery. Let this be a Trial worthy of our ancestors.
+greetingCGBLevel1Type2.text=We acknowledge your courage. Stand before us, and let us see who is truly strong.
+greetingCGBLevel2Type0.text=Identify your forces or be forgotten.
+greetingCGBLevel2Type1.text=We claim what we desire. Your stand is of little concern.
+greetingCGBLevel2Type2.text=We care not for your defense. We will proceed.
+greetingCGBLevel3Type0.text=We see through your weakness. Declare your forces, or be removed.
+greetingCGBLevel3Type1.text=You amount to little more than a fleeting challenge. Prepare to fall.
+greetingCGBLevel3Type2.text=Your efforts are inconsequential. We shall take what is ours.
+greetingCGBLevel4Type0.text=We dismiss your efforts. Reveal your forces, or be swept aside.
+greetingCGBLevel4Type1.text=You are nothing but prey, and we are the hunters. Identify yourselves.
+greetingCGBLevel4Type2.text=Your resistance is beneath notice. Prepare to be obliterated.
 
 
 greetingCGSLevel0Type0.text=You seek it as if it were your own, and we admire that strength. Together, let us see who is worthy of this prize.

diff --git a/MekHQ/resources/mekhq/resources/Glossary.properties b/MekHQ/resources/mekhq/resources/Glossary.properties
@@ -0,0 +1,12 @@
+PRISONER_CAPACITY.title=Prisoner Capacity
+PRISONER_CAPACITY.definition=Prisoner Capacity is a measure of how many prisoners your Security\
+  \ personnel can manage without potential crisis. Generally speaking, each prisoner takes up 1\
+  \ capacity; however, some events may change this.\
+  <p>For additional information on Prisoner Capacity and how to manage it, please see the\
+  \ documentation in...\
+  <br>MekHQ/docs/Stratcon and Against the Bot/Prisoners.pdf</p>
+
+REPUTATION.title=Reputation
+REPUTATION.definition=Reputation is a measure of how well known your unit is and whether people\
+  \ generally believe you can get the job done. The rules for Reputation can be found in Campaign\
+  \ Operations.
diff --git a/MekHQ/resources/mekhq/resources/RandomDependents.properties b/MekHQ/resources/mekhq/resources/RandomDependents.properties
@@ -0,0 +1,5 @@
+dependentJoinsForce.report={0} has started traveling with the force as a {0}.
+dependentLeavesForce.report={0} {1} have departed the force.
+
+dependent.singular=Dependent
+dependent.plural=Dependents