Merge pull request #6562 from IllianiCBT/immersiveUpdate

Fixed Campaign Portrait Fallback; Updated Immersive Dialog Visuals

Author: IllianiCBT

MekHQ/src/mekhq/campaign/Campaign.java

@@ -161,8 +161,6 @@
 import mekhq.campaign.personnel.Person;
 import mekhq.campaign.personnel.PersonnelOptions;
 import mekhq.campaign.personnel.RandomDependents;
-import mekhq.campaign.personnel.skills.Skill;
-import mekhq.campaign.personnel.skills.SkillType;
 import mekhq.campaign.personnel.SpecialAbility;
 import mekhq.campaign.personnel.autoAwards.AutoAwardsController;
 import mekhq.campaign.personnel.death.RandomDeath;
@@ -1930,8 +1928,8 @@ public Person newPerson(final PersonnelRole primaryRole, final String factionCod
      * @return A new {@link Person}.
      */
     public Person newPerson(final PersonnelRole primaryRole, final PersonnelRole secondaryRole,
-                            final AbstractFactionSelector factionSelector, final AbstractPlanetSelector planetSelector,
-                            final Gender gender) {
+          final AbstractFactionSelector factionSelector, final AbstractPlanetSelector planetSelector,
+          final Gender gender) {
         return newPerson(primaryRole, secondaryRole, getPersonnelGenerator(factionSelector, planetSelector), gender);
     }
 
@@ -1958,7 +1956,7 @@ public Person newPerson(final PersonnelRole primaryRole, final AbstractPersonnel
      * @return A new {@link Person} configured using {@code personnelGenerator}.
      */
     public Person newPerson(final PersonnelRole primaryRole, final PersonnelRole secondaryRole,
-                            final AbstractPersonnelGenerator personnelGenerator, final Gender gender) {
+          final AbstractPersonnelGenerator personnelGenerator, final Gender gender) {
         final Person person = personnelGenerator.generate(this, primaryRole, secondaryRole, gender);
 
         // Assign a random portrait after we generate a new person
@@ -2320,17 +2318,20 @@ public void checkBloodnameAdd(Person person, boolean ignoreDice) {
                     switch (person.getPrimaryRole()) {
                         case GROUND_VEHICLE_DRIVER:
                             bloodnameTarget += person.hasSkill(SkillType.S_PILOT_GVEE) ?
-                                                     person.getSkill(SkillType.S_PILOT_GVEE).getFinalSkillValue(options) :
+                                                     person.getSkill(SkillType.S_PILOT_GVEE)
+                                                           .getFinalSkillValue(options) :
                                                      TargetRoll.AUTOMATIC_FAIL;
                             break;
                         case NAVAL_VEHICLE_DRIVER:
                             bloodnameTarget += person.hasSkill(SkillType.S_PILOT_NVEE) ?
-                                                     person.getSkill(SkillType.S_PILOT_NVEE).getFinalSkillValue(options) :
+                                                     person.getSkill(SkillType.S_PILOT_NVEE)
+                                                           .getFinalSkillValue(options) :
                                                      TargetRoll.AUTOMATIC_FAIL;
                             break;
                         case VTOL_PILOT:
                             bloodnameTarget += person.hasSkill(SkillType.S_PILOT_VTOL) ?
-                                                     person.getSkill(SkillType.S_PILOT_VTOL).getFinalSkillValue(options) :
+                                                     person.getSkill(SkillType.S_PILOT_VTOL)
+                                                           .getFinalSkillValue(options) :
                                                      TargetRoll.AUTOMATIC_FAIL;
                             break;
                         default:
@@ -2371,7 +2372,8 @@ public void checkBloodnameAdd(Person person, boolean ignoreDice) {
                         case VESSEL_NAVIGATOR:
                             bloodnameTarget += 2 *
                                                      (person.hasSkill(SkillType.S_NAV) ?
-                                                            person.getSkill(SkillType.S_NAV).getFinalSkillValue(options) :
+                                                            person.getSkill(SkillType.S_NAV)
+                                                                  .getFinalSkillValue(options) :
                                                             TargetRoll.AUTOMATIC_FAIL);
                             break;
                         default:
@@ -2654,7 +2656,7 @@ public AbstractPlanetSelector getPlanetSelector(final RandomOriginOptions option
      * @return An {@link AbstractPersonnelGenerator} to use when creating new personnel.
      */
     public AbstractPersonnelGenerator getPersonnelGenerator(final AbstractFactionSelector factionSelector,
-                                                            final AbstractPlanetSelector planetSelector) {
+          final AbstractPlanetSelector planetSelector) {
         final DefaultPersonnelGenerator generator = new DefaultPersonnelGenerator(factionSelector, planetSelector);
         generator.setNameGenerator(RandomNameGenerator.getInstance());
         generator.setSkillPreferences(getRandomSkillPreferences());
@@ -2829,7 +2831,7 @@ private int getDefaultStockPercent(Part part) {
      * @param ignoreSparesUnderQuality spares with a quality lower than this threshold are excluded from counting.
      */
     private void updatePartInUseData(PartInUse partInUse, Part incomingPart, boolean ignoreMothballedUnits,
-                                     PartQuality ignoreSparesUnderQuality) {
+          PartQuality ignoreSparesUnderQuality) {
         Unit unit = incomingPart.getUnit();
         if (unit != null) {
             // Ignore conventional infantry
@@ -2875,7 +2877,7 @@ private void updatePartInUseData(PartInUse partInUse, Part incomingPart, boolean
      * @param ignoreSparesUnderQuality don't count spare parts lower than this quality
      */
     public void updatePartInUse(PartInUse partInUse, boolean ignoreMothballedUnits,
-                                PartQuality ignoreSparesUnderQuality) {
+          PartQuality ignoreSparesUnderQuality) {
         partInUse.setUseCount(0);
         partInUse.setStoreCount(0);
         partInUse.setTransferCount(0);
@@ -2932,7 +2934,7 @@ public void updatePartInUse(PartInUse partInUse, boolean ignoreMothballedUnits,
      */
 
     public Set<PartInUse> getPartsInUse(boolean ignoreMothballedUnits, boolean isResupply,
-                                        PartQuality ignoreSparesUnderQuality) {
+          PartQuality ignoreSparesUnderQuality) {
         // java.util.Set doesn't supply a get(Object) method, so we have to use a
         // java.util.Map
         Map<PartInUse, PartInUse> inUse = new HashMap<>();
@@ -3290,7 +3292,8 @@ public TargetRoll getTargetFor(Person medWork, Person doctor) {
         if (getPatientsFor(doctor) > 25) {
             return new TargetRoll(TargetRoll.IMPOSSIBLE, doctor.getFullName() + " already has 25 patients.");
         }
-        TargetRoll target = new TargetRoll(skill.getFinalSkillValue(doctor.getOptions()), skill.getSkillLevel().toString());
+        TargetRoll target = new TargetRoll(skill.getFinalSkillValue(doctor.getOptions()),
+              skill.getSkillLevel().toString());
         if (target.getValue() == TargetRoll.IMPOSSIBLE) {
             return target;
         }
@@ -3789,7 +3792,7 @@ public boolean canPayFor(IAcquisitionWork acquisition) {
      * @return The result of the rolls.
      */
     public PartAcquisitionResult findContactForAcquisition(IAcquisitionWork acquisition, Person person,
-                                                           PlanetarySystem system) {
+          PlanetarySystem system) {
         TargetRoll target = getTargetForAcquisition(acquisition, person);
 
         String impossibleSentencePrefix = person == null ?
@@ -3900,7 +3903,7 @@ public boolean acquireEquipment(IAcquisitionWork acquisition, Person person) {
      *         successful.
      */
     private boolean acquireEquipment(IAcquisitionWork acquisition, Person person, PlanetarySystem system,
-                                     int transitDays) {
+          int transitDays) {
         boolean found = false;
         String report = "";
 
@@ -6322,7 +6325,7 @@ public void removeFunds(final TransactionType type, final Money quantity, @Nulla
      * @param individualPayouts Map of Person to the Money they're owed
      */
     public void payPersonnel(TransactionType type, Money quantity, String description,
-                             Map<Person, Money> individualPayouts) {
+          Map<Person, Money> individualPayouts) {
         getFinances().debit(type,
               getLocalDate(),
               quantity,
@@ -7456,7 +7459,7 @@ public TargetRoll getTargetForAcquisition(final IAcquisitionWork acquisition, fi
      *       an impossible/automatic result under specific circumstances.
      */
     public TargetRoll getTargetForAcquisition(final IAcquisitionWork acquisition, final @Nullable Person person,
-                                              final boolean checkDaysToWait) {
+          final boolean checkDaysToWait) {
         if (getCampaignOptions().getAcquisitionSkill().equals(S_AUTO)) {
             return new TargetRoll(TargetRoll.AUTOMATIC_SUCCESS, "Automatic Success");
         }
@@ -7489,7 +7492,8 @@ public TargetRoll getTargetForAcquisition(final IAcquisitionWork acquisition, fi
             return new TargetRoll(TargetRoll.IMPOSSIBLE, "It is extinct!");
         }
 
-        TargetRoll target = new TargetRoll(skill.getFinalSkillValue(person.getOptions()), skill.getSkillLevel().toString());
+        TargetRoll target = new TargetRoll(skill.getFinalSkillValue(person.getOptions()),
+              skill.getSkillLevel().toString());
         target.append(acquisition.getAllAcquisitionMods());
 
         if (getCampaignOptions().isUseAtB() && getCampaignOptions().isRestrictPartsByMission()) {
@@ -8712,7 +8716,7 @@ public Set<Unit> getTransportsByType(CampaignTransportType campaignTransportType
      * @return units that have that transport type
      */
     public Set<Unit> getTransportsByType(CampaignTransportType campaignTransportType, TransporterType transporterType,
-                                         double unitSize) {
+          double unitSize) {
         return Objects.requireNonNull(getCampaignTransporterMap(campaignTransportType))
                      .getTransportsByType(transporterType, unitSize);
     }
@@ -9540,7 +9544,7 @@ public ImageIcon getCampaignFactionIcon() {
         if (campaignIcon.getFilename() == null) {
             icon = getFactionLogo(this, getFaction().getShortName(), true);
         } else {
-            icon = new ImageIcon(campaignIcon.getFilename());
+            icon = campaignIcon.getImageIcon();
         }
         return icon;
     }

MekHQ/src/mekhq/gui/baseComponents/immersiveDialogs/ImmersiveDialogCore.java

@@ -33,6 +33,7 @@
 import static megamek.client.ui.WrapLayout.wordWrap;
 import static megamek.client.ui.swing.util.FlatLafStyleBuilder.setFontScaling;
 import static megamek.client.ui.swing.util.UIUtil.scaleForGUI;
+import static megamek.common.icons.Portrait.DEFAULT_PORTRAIT_FILENAME;
 import static mekhq.campaign.force.Force.FORCE_NONE;
 import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
@@ -42,17 +43,21 @@
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import java.awt.Image;
 import java.awt.Insets;
 import java.awt.Point;
 import java.awt.Toolkit;
+import java.awt.image.ImageObserver;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 import javax.swing.*;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkEvent.EventType;
 
 import megamek.common.annotations.Nullable;
+import megamek.common.icons.Portrait;
 import megamek.logging.MMLogger;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.force.Force;
@@ -82,7 +87,7 @@ public class ImmersiveDialogCore extends JDialog {
     private int CENTER_WIDTH = scaleForGUI(400);
 
     private final int PADDING = scaleForGUI(5);
-    protected final int IMAGE_WIDTH = 250; // This is scaled to GUI by 'scaleImageIconToWidth'
+    protected static final int IMAGE_WIDTH = scaleForGUI(200);
 
     private JPanel northPanel;
     private JPanel southPanel;
@@ -600,7 +605,7 @@ protected JPanel buildSpeakerPanel(@Nullable Person speaker, Campaign campaign)
         JPanel speakerBox = new JPanel();
         speakerBox.setLayout(new BoxLayout(speakerBox, BoxLayout.Y_AXIS));
         speakerBox.setAlignmentX(Component.CENTER_ALIGNMENT);
-        speakerBox.setMaximumSize(scaleForGUI(IMAGE_WIDTH, MAX_VALUE));
+        speakerBox.setMaximumSize(new Dimension(IMAGE_WIDTH, scaleForGUI(MAX_VALUE)));
 
         // Get speaker details
         String speakerName = campaign.getName();
@@ -704,7 +709,24 @@ public static StringBuilder getSpeakerDescription(Campaign campaign, Person spea
             return campaign.getCampaignFactionIcon();
         }
 
-        return speaker.getPortrait().getImageIcon();
+        Portrait portrait = speaker.getPortrait();
+
+        if (portrait == null || Objects.equals(portrait.getFilename(), DEFAULT_PORTRAIT_FILENAME)) {
+            return campaign.getCampaignFactionIcon();
+        }
+
+        // The following sorcery is due to the compressed manner in which personnel portraits are stored.
+        // We need to manipulate the original base image, otherwise it looks grainy and terrible.
+        ImageObserver observer = (img, infoFlags, x, y, width, height) -> true;
+
+        Image baseImage = portrait.getBaseImage();
+        int baseImageHeight = baseImage.getHeight(observer);
+        int baseImageWidth = baseImage.getWidth(observer);
+        int targetWidth = Math.max(1, IMAGE_WIDTH);
+
+        int height = (int) Math.ceil((double) targetWidth * baseImageHeight / baseImageWidth);
+
+        return new ImageIcon(baseImage.getScaledInstance(targetWidth, height, Image.SCALE_SMOOTH));
     }
 
     /**

MekHQ/src/mekhq/gui/baseComponents/immersiveDialogs/ImmersiveDialogNag.java

@@ -113,7 +113,7 @@ public static DialogChoice fromIndex(int choiceIndex) {
      *                       messages from the resource bundle.
      */
     public ImmersiveDialogNag(final Campaign campaign, final @Nullable AdministratorSpecialization specialization,
-                              final String nagConstant, final String messageKey) {
+          final String nagConstant, final String messageKey) {
         ImmersiveDialogCore dialog = constructDialog(campaign, specialization, messageKey);
         processDialogChoice(dialog.getDialogChoice(), nagConstant);
     }
@@ -135,7 +135,7 @@ public ImmersiveDialogNag(final Campaign campaign, final @Nullable Administrator
      *       button labels.
      */
     protected ImmersiveDialogCore constructDialog(Campaign campaign, AdministratorSpecialization specialization,
-                                                  String messageKey) {
+          String messageKey) {
         return new ImmersiveDialogCore(campaign,
               getSpeaker(campaign, specialization),
               null,
@@ -145,7 +145,7 @@ protected ImmersiveDialogCore constructDialog(Campaign campaign, AdministratorSp
               null,
               true,
               null,
-              campaign.getCampaignFactionIcon(),
+              null,
               true);
     }
 

MekHQ/src/mekhq/gui/baseComponents/immersiveDialogs/ImmersiveDialogSimple.java

@@ -80,9 +80,8 @@ public class ImmersiveDialogSimple extends ImmersiveDialogCore {
      *                              buttons are stacked vertically; otherwise, they are arranged side-by-side.
      */
     public ImmersiveDialogSimple(Campaign campaign, @Nullable Person leftSpeaker, @Nullable Person rightSpeaker,
-                                 String centerMessage, @Nullable List<String> buttonLabels,
-                                 @Nullable String outOfCharacterMessage, @Nullable ImageIcon imageIcon,
-                                 boolean useVerticalLayout) {
+          String centerMessage, @Nullable List<String> buttonLabels, @Nullable String outOfCharacterMessage,
+          @Nullable ImageIcon imageIcon, boolean useVerticalLayout) {
         super(campaign,
               leftSpeaker,
               rightSpeaker,
@@ -92,7 +91,7 @@ public ImmersiveDialogSimple(Campaign campaign, @Nullable Person leftSpeaker, @N
               null,
               useVerticalLayout,
               null,
-              imageIcon == null ? campaign.getCampaignFactionIcon() : imageIcon,
+              imageIcon,
               true);
     }