Merge pull request #7305 from IllianiBird/heroicPlusAssignment

Fix: #7287 Unable to Assign Heroic+ Personnel

Author: IllianiBird

MekHQ/src/mekhq/gui/menus/AssignUnitToPersonMenu.java

@@ -40,7 +40,15 @@
 import java.util.stream.Stream;
 import javax.swing.JMenuItem;
 
-import megamek.common.*;
+import megamek.common.Aero;
+import megamek.common.ConvFighter;
+import megamek.common.Entity;
+import megamek.common.Jumpship;
+import megamek.common.Mek;
+import megamek.common.ProtoMek;
+import megamek.common.SmallCraft;
+import megamek.common.Tank;
+import megamek.common.VTOL;
 import megamek.common.enums.SkillLevel;
 import megamek.logging.MMLogger;
 import mekhq.campaign.Campaign;
@@ -354,6 +362,8 @@ private void createPersonAssignmentMenus(final Campaign campaign, final Unit...
                         }
                     }
 
+                    pilotMenu.add(legendaryMenu);
+                    pilotMenu.add(heroicMenu);
                     pilotMenu.add(eliteMenu);
                     pilotMenu.add(veteranMenu);
                     pilotMenu.add(regularMenu);
@@ -433,6 +443,8 @@ private void createPersonAssignmentMenus(final Campaign campaign, final Unit...
                         }
                     }
 
+                    driverMenu.add(legendaryMenu);
+                    driverMenu.add(heroicMenu);
                     driverMenu.add(eliteMenu);
                     driverMenu.add(veteranMenu);
                     driverMenu.add(regularMenu);
@@ -523,6 +535,8 @@ private void createPersonAssignmentMenus(final Campaign campaign, final Unit...
                     }
                 }
 
+                gunnerMenu.add(legendaryMenu);
+                gunnerMenu.add(heroicMenu);
                 gunnerMenu.add(eliteMenu);
                 gunnerMenu.add(veteranMenu);
                 gunnerMenu.add(regularMenu);
@@ -599,6 +613,8 @@ private void createPersonAssignmentMenus(final Campaign campaign, final Unit...
                     }
                 }
 
+                crewmemberMenu.add(legendaryMenu);
+                crewmemberMenu.add(heroicMenu);
                 crewmemberMenu.add(eliteMenu);
                 crewmemberMenu.add(veteranMenu);
                 crewmemberMenu.add(regularMenu);
@@ -721,6 +737,8 @@ private void createPersonAssignmentMenus(final Campaign campaign, final Unit...
                     }
                 }
 
+                soldierMenu.add(legendaryMenu);
+                soldierMenu.add(heroicMenu);
                 soldierMenu.add(eliteMenu);
                 soldierMenu.add(veteranMenu);
                 soldierMenu.add(regularMenu);
@@ -793,6 +811,8 @@ private void createPersonAssignmentMenus(final Campaign campaign, final Unit...
                     }
                 }
 
+                navigatorMenu.add(legendaryMenu);
+                navigatorMenu.add(heroicMenu);
                 navigatorMenu.add(eliteMenu);
                 navigatorMenu.add(veteranMenu);
                 navigatorMenu.add(regularMenu);

MekHQ/src/mekhq/gui/menus/AssignUnitToTechMenu.java

@@ -144,6 +144,8 @@ private void initialize(final Campaign campaign, final Unit... units) {
                 }
             }
 
+            add(legendaryMenu);
+            add(heroicMenu);
             add(eliteMenu);
             add(veteranMenu);
             add(regularMenu);