Merge branch 'MegaMek:master' into wvr-refit-and-customize

MegaMek · Oct 5, 2024 · eb78f70 · eb78f70
2 parents de4c76b + 976204b
commit eb78f70
Show file tree

Hide file tree

Showing 13 changed files with 493 additions and 364 deletions.
diff --git a/MekHQ/docs/history.txt b/MekHQ/docs/history.txt
@@ -89,6 +89,9 @@ MEKHQ VERSION HISTORY:
 + FIX #4918: Updated OpFor Skill Generator and Added Skilled Level Parser
 + FIX #4929: Prevent Battle Armor allocation in TORNADO_F4 wind scenarios
 + PR #4931: Reworked AtB Bonus Rolls, Fixed Bug in Bulk Hire
++ PR #4981: Implemented Campaign Options IIC Preset Picker #4981
++ PR #4984: Refactored Daily Personnel Processing Logic.
++ PR #4989: Adaptation to MM #6068 Replace Manual GUI scaling with FlatLaf Scaling
 
 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

diff --git a/MekHQ/resources/mekhq/resources/GUI.properties b/MekHQ/resources/mekhq/resources/GUI.properties
@@ -433,9 +433,6 @@ btnNewYear.toolTipText=Advance to the first day of the next year (e.g., 01-JAN-3
 btnNewQuinquennial.text=New Quinquennial
 btnNewQuinquennial.toolTipText=<html>Advance to the first day of the next quinquennial (e.g., 01-JAN-3025, 01-JAN-3030). <br>WARNING: This will take a large amount of RAM to run, and may cause MekHQ to crash if there is not enough allocated.</html>
 
-### CampaignPresetSelectionDialog Class
-CampaignPresetSelectionDialog.title=Select Campaign Preset
-
 ### StoryArcSelectionDialog Class
 StoryArcSelectionDialog.title=Select a Story Arc
 

diff --git a/MekHQ/resources/mekhq/resources/NEWCampaignOptionsDialog.properties b/MekHQ/resources/mekhq/resources/NEWCampaignOptionsDialog.properties
@@ -0,0 +1,11 @@
+## SelectPresetDialog Class
+# SelectPresetDialog
+presetDialog.title=Select a Campaign Preset
+presetDialog.description=Choose a preset to tailor your experience. Each option provides a\
+  \ well-balanced challenge, suitable for both newcomers and seasoned players.
+presetDialogSelect.name=Confirm
+presetDialogSelect.tooltip=Confirm the currently selected preset.
+presetDialogCustomize.name=Customize
+presetDialogCustomize.tooltip=Select a preset, then open the campaign options menu.
+presetDialogCancel.name=Cancel
+presetDialogCancel.tooltip=Return to the prior screen.
diff --git a/MekHQ/src/mekhq/campaign/Campaign.java b/MekHQ/src/mekhq/campaign/Campaign.java
diff --git a/MekHQ/src/mekhq/campaign/CampaignPreset.java b/MekHQ/src/mekhq/campaign/CampaignPreset.java
@@ -18,33 +18,6 @@
  */
 package mekhq.campaign;
 
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.nio.charset.StandardCharsets;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.ResourceBundle;
-import java.util.stream.Collectors;
-
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
 import megamek.Version;
 import megamek.common.annotations.Nullable;
 import megamek.common.options.GameOptions;
@@ -64,15 +37,26 @@
 import mekhq.campaign.universe.Systems;
 import mekhq.campaign.universe.companyGeneration.CompanyGenerationOptions;
 import mekhq.utilities.MHQXMLUtility;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.swing.*;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * This is an object which holds a set of objects that collectively define the
  * initial options setup for a campaign.
- *
+ * <p>
  * It includes both startup values, which are only used on initial startup (the
  * date, starting planet, and rank system), and continuous options, which can be
  * applied at any time (campaign options, skills, SPAs).
- *
+ * <p>
  * It also includes a short title and description that allows one to create and
  * save different presets. The goal is to allow users to create and load various
  * different presets.
@@ -162,6 +146,13 @@ public boolean isUserData() {
         return userData;
     }
 
+    /**
+     * @return the title of the {@link CampaignPreset}
+     */
+    public String getTitle() {
+        return title;
+    }
+
     public void setTitle(final String title) {
         this.title = title;
     }

diff --git a/MekHQ/src/mekhq/campaign/market/PersonnelMarket.java b/MekHQ/src/mekhq/campaign/market/PersonnelMarket.java
@@ -151,8 +151,12 @@ public void generatePersonnelForDay(Campaign campaign) {
                 stringBuilder.append(':');
                 Person person = personnel.get(0);
                 String expLevel = SkillType.getExperienceLevelName(person.getExperienceLevel(campaign, false));
-                stringBuilder.append("<br>A ")
-                    .append("<b> ")
+                if (expLevel.equals("Elite") || expLevel.equals("Ultra-Green")) {
+                    stringBuilder.append("<br>An ");
+                } else {
+                    stringBuilder.append("<br>A ");
+                }
+                stringBuilder.append("<b> ")
                     .append(expLevel)
                     .append(' ')
                     .append(person.getPrimaryRole().toString())

diff --git a/MekHQ/src/mekhq/gui/CampaignGUI.java b/MekHQ/src/mekhq/gui/CampaignGUI.java
@@ -74,6 +74,7 @@
 import mekhq.gui.dialog.reportDialogs.*;
 import mekhq.gui.enums.MHQTabType;
 import mekhq.gui.model.PartsTableModel;
+import mekhq.gui.panes.campaignOptions.SelectPresetDialog;
 import mekhq.io.FileType;
 import mekhq.utilities.MHQXMLUtility;
 import org.w3c.dom.Document;
@@ -95,6 +96,8 @@
 import java.util.stream.IntStream;
 import java.util.zip.GZIPOutputStream;
 
+import static mekhq.gui.panes.campaignOptions.SelectPresetDialog.PRESET_SELECTION_CANCELLED;
+
 /**
  * The application's main frame.
  */
@@ -307,7 +310,7 @@ private void setUserPreferences() {
      * as they are both accessed through the same GUI page.
      * The following mnemonic keys are being used as of 30-MAR-2020:
      * A, B, C, E, F, H, I, L, M, N, O, P, R, S, T, V, W, /
-     *
+     * <p>
      * Note 1: the slash is used for the help, as it is normally the same key as the
      * ?
      * Note 2: the A mnemonic is used for the Advance Day button
@@ -376,9 +379,9 @@ private void initMenu() {
         miImportCampaignPreset.setMnemonic(KeyEvent.VK_C);
         miImportCampaignPreset.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.ALT_DOWN_MASK));
         miImportCampaignPreset.addActionListener(evt -> {
-            final CampaignPresetSelectionDialog campaignPresetSelectionDialog = new CampaignPresetSelectionDialog(
-                    getFrame());
-            if (!campaignPresetSelectionDialog.showDialog().isConfirmed()) {
+            final SelectPresetDialog campaignPresetSelectionDialog =
+                new SelectPresetDialog(getFrame(), true, false);
+            if (campaignPresetSelectionDialog.getReturnState() == PRESET_SELECTION_CANCELLED) {
                 return;
             }
             final CampaignPreset preset = campaignPresetSelectionDialog.getSelectedPreset();
@@ -1545,7 +1548,7 @@ private void menuOptionsActionPerformed(final ActionEvent evt) {
             getCampaign().getUnitMarket().setOffers(unitMarket.getOffers());
             miUnitMarket.setVisible(!getCampaign().getUnitMarket().getMethod().isNone());
         }
-        
+
         AbstractContractMarket contractMarket = getCampaign().getContractMarket();
         if (contractMarket.getMethod() != newOptions.getContractMarketMethod()) {
             getCampaign().setContractMarket(newOptions.getContractMarketMethod().getContractMarket());

diff --git a/MekHQ/src/mekhq/gui/dialog/CampaignOptionsDialog.java b/MekHQ/src/mekhq/gui/dialog/CampaignOptionsDialog.java
@@ -28,12 +28,15 @@
 import mekhq.gui.FileDialogs;
 import mekhq.gui.baseComponents.AbstractMHQValidationButtonDialog;
 import mekhq.gui.panes.CampaignOptionsPane;
+import mekhq.gui.panes.campaignOptions.SelectPresetDialog;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.util.ResourceBundle;
 
+import static mekhq.gui.panes.campaignOptions.SelectPresetDialog.PRESET_SELECTION_CANCELLED;
+
 /**
  * @author Jay Lawson (jaylawson39 at yahoo.com) (Original Version, now largely CampaignOptionsPane)
  * @author Justin 'Windchild' Bowen (Current Version)
@@ -105,8 +108,9 @@ protected JPanel createButtonPanel() {
 
         panel.add(new MMButton("btnLoadPreset", resources, "btnLoadPreset.text",
                 "btnLoadPreset.toolTipText", evt -> {
-            final CampaignPresetSelectionDialog presetSelectionDialog = new CampaignPresetSelectionDialog(getFrame());
-            if (presetSelectionDialog.showDialog().isConfirmed()) {
+            final SelectPresetDialog presetSelectionDialog =
+                new SelectPresetDialog(getFrame(), true, false);
+            if (presetSelectionDialog.getReturnState() != PRESET_SELECTION_CANCELLED) {
                 applyPreset(presetSelectionDialog.getSelectedPreset());
             }
         }));

diff --git a/MekHQ/src/mekhq/gui/dialog/CampaignPresetSelectionDialog.java b/MekHQ/src/mekhq/gui/dialog/CampaignPresetSelectionDialog.java
diff --git a/MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java b/MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java
@@ -18,23 +18,6 @@
  */
 package mekhq.gui.dialog;
 
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.io.FileInputStream;
-import java.time.LocalDate;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
-
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JProgressBar;
-import javax.swing.SwingWorker;
-
 import megamek.client.generator.RandomCallsignGenerator;
 import megamek.client.generator.RandomNameGenerator;
 import megamek.client.ui.swing.util.UIUtil;
@@ -66,6 +49,21 @@
 import mekhq.campaign.universe.Systems;
 import mekhq.campaign.universe.eras.Eras;
 import mekhq.gui.baseComponents.AbstractMHQDialog;
+import mekhq.gui.panes.campaignOptions.SelectPresetDialog;
+
+import javax.swing.*;
+import java.awt.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.io.FileInputStream;
+import java.time.LocalDate;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+
+import static mekhq.gui.panes.campaignOptions.SelectPresetDialog.PRESET_SELECTION_CANCELLED;
+import static mekhq.gui.panes.campaignOptions.SelectPresetDialog.PRESET_SELECTION_CUSTOMIZE;
+import static mekhq.gui.panes.campaignOptions.SelectPresetDialog.PRESET_SELECTION_SELECT;
 
 public class DataLoadingDialog extends AbstractMHQDialog implements PropertyChangeListener {
     private static final MMLogger logger = MMLogger.create(DataLoadingDialog.class);
@@ -290,12 +288,23 @@ public Campaign doInBackground() throws Exception {
                 campaign = new Campaign();
 
                 // Campaign Preset
-                final CampaignPresetSelectionDialog presetSelectionDialog = new CampaignPresetSelectionDialog(dialog,
-                        getFrame());
-                if (presetSelectionDialog.showDialog().isCancelled()) {
-                    return null;
+                final SelectPresetDialog presetSelectionDialog =
+                    new SelectPresetDialog(getFrame(), true, true);
+                CampaignPreset preset;
+                boolean isSelect = false;
+
+                switch (presetSelectionDialog.getReturnState()) {
+                    case PRESET_SELECTION_CANCELLED -> {
+                        return null;
+                    }
+                    case PRESET_SELECTION_SELECT -> {
+                        preset = presetSelectionDialog.getSelectedPreset();
+                        isSelect = true;
+                    }
+                    case PRESET_SELECTION_CUSTOMIZE -> preset = presetSelectionDialog.getSelectedPreset();
+                    default -> throw new IllegalStateException("Unexpected value in mekhq/gui/dialog/DataLoadingDialog.java/Step 6: "
+                        + presetSelectionDialog.getReturnState());
                 }
-                final CampaignPreset preset = presetSelectionDialog.getSelectedPreset();
 
                 // Date
                 final LocalDate date = ((preset == null) || (preset.getDate() == null))
@@ -319,11 +328,15 @@ public Campaign doInBackground() throws Exception {
                 setVisible(false);
 
                 // Campaign Options
-                CampaignOptionsDialog optionsDialog = new CampaignOptionsDialog(dialog, getFrame(), campaign, true);
-                optionsDialog.setLocationRelativeTo(getFrame());
-                optionsDialog.applyPreset(preset);
-                if (optionsDialog.showDialog().isCancelled()) {
-                    return null;
+                if (isSelect && preset != null) {
+                    preset.applyContinuousToCampaign(campaign);
+                } else {
+                    CampaignOptionsDialog optionsDialog = new CampaignOptionsDialog(dialog, getFrame(), campaign, true);
+                    optionsDialog.setLocationRelativeTo(getFrame());
+                    optionsDialog.applyPreset(preset);
+                    if (optionsDialog.showDialog().isCancelled()) {
+                        return null;
+                    }
                 }
 
                 // initialize reputation