Campaign Options IIC - Test Branch

MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties

@@ -982,9 +982,9 @@ chkAeroRecruitsHaveUnits.toolTipText=Aerospace pilot recruits can have fighters,
 
 ## Button Panel
 btnOkay.text=Confirm
-btnSavePreset.text=Confirm and Save as Preset
+btnSavePreset.text=Save Preset
 btnSavePreset.toolTipText=Confirm the changes in the dialog and save it as a Campaign Preset.
-btnLoadPreset.text=Load a Preset
+btnLoadPreset.text=Load Preset
 btnLoadPreset.toolTipText=Load a Campaign Preset and apply it to the current dialog. If it is during startup, it will apply all values outside of starting planet, contract count, and game options. Otherwise, it will only apply continuous preset values outside of game options.
 ##end Button Panel
 

MekHQ/resources/mekhq/resources/GUI.properties

@@ -1328,8 +1328,6 @@ btnLoadStoryArc.text=Load a Story Arc
 #### RankSystemsPane Class
 ### Rank System
 rankSystemPanel.title=Rank System
-txtInstructionsRanks.title=Customizing Ranks
-txtInstructionsRanks.text=You can use the table here to assign ranks for your campaign. You can use one of the preset rank systems from the pull-down menu, or you can design your own by creating a custom rank system. \nYou can save a single rank system as part of the campaign, with any additional custom rank systems to be saved in the user data file instead. Any additional campaign rank systems will be deleted. \nYou can also assign custom multipliers for salary. These multipliers don't need to take into account the officer multiplier which is addressed elsewhere. \n\nWARNING: \n1) This dialog doesn't warn about the deletion of any campaign custom rank systems that aren't the selected rank system for the campaign at this time. \n2) All personnel ranks will be revalidated when this is changed, to migrate them to the proper setup for their new rank system. \n3) This dialog does not validate the data at this time, so be careful with circular logic and ensure you have a valid E0 rank (one MUST be a name like "None" or "Grunt", with "None" specifically handled in code to show as a blank string when the rank name is displayed).
 lblRankSystem.text=Rank System
 lblRankSystem.toolTipText=This is the standard rank system used in this campaign.
 comboRankSystemType.toolTipText=This is the type of rank system selected, which is where the information about the rank system is stored.

MekHQ/src/mekhq/Utilities.java

@@ -32,7 +32,7 @@
 import megamek.common.options.OptionsConstants;
 import megamek.logging.MMLogger;
 import mekhq.campaign.Campaign;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.finances.Money;
 import mekhq.campaign.mission.IPlayerSettings;
 import mekhq.campaign.personnel.Person;

MekHQ/src/mekhq/campaign/Campaign.java

@@ -47,6 +47,7 @@
 import mekhq.Utilities;
 import mekhq.campaign.Quartermaster.PartAcquisitionResult;
 import mekhq.campaign.againstTheBot.AtBConfiguration;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.event.*;
 import mekhq.campaign.finances.*;
 import mekhq.campaign.finances.enums.TransactionType;

MekHQ/src/mekhq/campaign/Quartermaster.java

@@ -23,6 +23,7 @@
 import megamek.common.annotations.Nullable;
 import megamek.common.weapons.infantry.InfantryWeapon;
 import mekhq.MekHQ;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.event.PartArrivedEvent;
 import mekhq.campaign.event.PartChangedEvent;
 import mekhq.campaign.finances.Money;

MekHQ/src/mekhq/campaign/RandomSkillPreferences.java

@@ -20,15 +20,15 @@
  */
 package mekhq.campaign;
 
-import java.io.PrintWriter;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
 import megamek.Version;
 import megamek.logging.MMLogger;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.enums.PersonnelRole;
 import mekhq.utilities.MHQXMLUtility;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.io.PrintWriter;
 
 /**
  * @author Jay Lawson

MekHQ/src/mekhq/campaign/CampaignOptions.java → MekHQ/src/mekhq/campaign/campaignOptions/CampaignOptions.java

@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with MekHQ. If not, see <http://www.gnu.org/licenses/>.
  */
-package mekhq.campaign;
+package mekhq.campaign.campaignOptions;
 
 import megamek.Version;
 import megamek.codeUtilities.MathUtility;
@@ -27,6 +27,7 @@
 import megamek.logging.MMLogger;
 import mekhq.MekHQ;
 import mekhq.Utilities;
+import mekhq.campaign.RandomOriginOptions;
 import mekhq.campaign.enums.PlanetaryAcquisitionFactionLimit;
 import mekhq.campaign.finances.Money;
 import mekhq.campaign.finances.enums.FinancialYearDuration;
@@ -4274,18 +4275,22 @@ public void setUseStratCon(final boolean useStratCon) {
  this.useStratCon = useStratCon;
  }
 
+ @Deprecated
  public boolean isUseAero() {
- return useAero;
+ return true;
  }
 
+ @Deprecated
  public void setUseAero(final boolean useAero) {
  this.useAero = useAero;
  }
 
+ @Deprecated
  public boolean isUseVehicles() {
- return useVehicles;
+ return true;
  }
 
+ @Deprecated
  public void setUseVehicles(final boolean useVehicles) {
  this.useVehicles = useVehicles;
  }

MekHQ/src/mekhq/campaign/CampaignPreset.java → MekHQ/src/mekhq/campaign/campaignOptions/CampaignPreset.java

@@ -26,6 +26,7 @@
 import megamek.utilities.xml.MMXMLUtility;
 import mekhq.MHQConstants;
 import mekhq.MekHQ;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.event.OptionsChangedEvent;
 import mekhq.campaign.personnel.PersonnelOptions;
 import mekhq.campaign.personnel.SkillType;

MekHQ/src/mekhq/campaign/event/OptionsChangedEvent.java

@@ -18,10 +18,10 @@
  */
 package mekhq.campaign.event;
 
-import java.util.Objects;
-
 import mekhq.campaign.Campaign;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
+
+import java.util.Objects;
 
 /**
  * An event thrown after the campaign options were changed. The event handlers aren't supposed

MekHQ/src/mekhq/campaign/finances/Accountant.java

@@ -20,17 +20,17 @@
  */
 package mekhq.campaign.finances;
 
-import java.util.UUID;
-
 import megamek.common.Entity;
 import mekhq.campaign.Campaign;
-import mekhq.campaign.CampaignOptions;
 import mekhq.campaign.Hangar;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.parts.Part;
 import mekhq.campaign.personnel.Person;
 import mekhq.campaign.personnel.enums.PersonnelRole;
 import mekhq.campaign.unit.Unit;
 
+import java.util.UUID;
+
 /**
  * Provides accounting for a Campaign.
  */

MekHQ/src/mekhq/campaign/finances/FinancialReport.java

@@ -20,7 +20,7 @@
 
 import megamek.common.*;
 import mekhq.campaign.Campaign;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.mission.Contract;
 
 import java.util.stream.Collectors;

MekHQ/src/mekhq/campaign/io/CampaignXmlParser.java

@@ -33,14 +33,15 @@
 import mekhq.Utilities;
 import mekhq.campaign.*;
 import mekhq.campaign.againstTheBot.AtBConfiguration;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.finances.Finances;
 import mekhq.campaign.force.Force;
 import mekhq.campaign.force.Lance;
 import mekhq.campaign.icons.UnitIcon;
-import mekhq.campaign.market.contractMarket.AbstractContractMarket;
-import mekhq.campaign.market.contractMarket.AtbMonthlyContractMarket;
 import mekhq.campaign.market.PersonnelMarket;
 import mekhq.campaign.market.ShoppingList;
+import mekhq.campaign.market.contractMarket.AbstractContractMarket;
+import mekhq.campaign.market.contractMarket.AtbMonthlyContractMarket;
 import mekhq.campaign.mission.AtBContract;
 import mekhq.campaign.mission.Mission;
 import mekhq.campaign.mission.Scenario;

MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java

@@ -36,8 +36,8 @@
 import mekhq.MHQConstants;
 import mekhq.MekHQ;
 import mekhq.campaign.Campaign;
-import mekhq.campaign.CampaignOptions;
 import mekhq.campaign.againstTheBot.AtBConfiguration;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.force.Force;
 import mekhq.campaign.mission.AtBDynamicScenario.BenchedEntityData;
 import mekhq.campaign.mission.ScenarioForceTemplate.ForceAlignment;

MekHQ/src/mekhq/campaign/personnel/Award.java

@@ -23,7 +23,7 @@
 import jakarta.xml.bind.annotation.XmlElement;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import mekhq.MekHQ;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.utilities.MHQXMLUtility;
 
 import java.io.PrintWriter;

MekHQ/src/mekhq/campaign/personnel/Person.java

@@ -35,8 +35,8 @@
 import mekhq.MekHQ;
 import mekhq.Utilities;
 import mekhq.campaign.Campaign;
-import mekhq.campaign.CampaignOptions;
 import mekhq.campaign.ExtraData;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.event.PersonChangedEvent;
 import mekhq.campaign.event.PersonStatusChangedEvent;
 import mekhq.campaign.finances.Money;

MekHQ/src/mekhq/campaign/personnel/SpecialAbility.java

@@ -53,7 +53,7 @@
 import megamek.common.weapons.infantry.InfantryWeapon;
 import megamek.logging.MMLogger;
 import mekhq.Utilities;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.enums.PersonnelRole;
 import mekhq.utilities.MHQXMLUtility;
 

MekHQ/src/mekhq/campaign/personnel/death/AbstractDeath.java

@@ -26,7 +26,7 @@
 import mekhq.MHQConstants;
 import mekhq.MekHQ;
 import mekhq.campaign.Campaign;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.Person;
 import mekhq.campaign.personnel.enums.AgeGroup;
 import mekhq.campaign.personnel.enums.PersonnelStatus;

MekHQ/src/mekhq/campaign/personnel/death/AgeRangeRandomDeath.java

@@ -20,7 +20,7 @@
 
 import megamek.common.Compute;
 import megamek.common.enums.Gender;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.enums.RandomDeathMethod;
 import mekhq.campaign.personnel.enums.TenYearAgeRange;
 

MekHQ/src/mekhq/campaign/personnel/death/DisabledRandomDeath.java

@@ -19,7 +19,7 @@
 package mekhq.campaign.personnel.death;
 
 import megamek.common.enums.Gender;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.enums.RandomDeathMethod;
 
 public class DisabledRandomDeath extends AbstractDeath {

MekHQ/src/mekhq/campaign/personnel/death/ExponentialRandomDeath.java

@@ -20,7 +20,7 @@
 
 import megamek.common.Compute;
 import megamek.common.enums.Gender;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.enums.RandomDeathMethod;
 
 public class ExponentialRandomDeath extends AbstractDeath {

MekHQ/src/mekhq/campaign/personnel/death/PercentageRandomDeath.java

@@ -20,7 +20,7 @@
 
 import megamek.common.Compute;
 import megamek.common.enums.Gender;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.enums.RandomDeathMethod;
 
 public class PercentageRandomDeath extends AbstractDeath {

MekHQ/src/mekhq/campaign/personnel/divorce/AbstractDivorce.java

@@ -22,7 +22,7 @@
 import megamek.common.annotations.Nullable;
 import mekhq.MekHQ;
 import mekhq.campaign.Campaign;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.event.PersonChangedEvent;
 import mekhq.campaign.log.PersonalLogger;
 import mekhq.campaign.personnel.Person;

MekHQ/src/mekhq/campaign/personnel/divorce/DisabledRandomDivorce.java

@@ -18,7 +18,7 @@
  */
 package mekhq.campaign.personnel.divorce;
 
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.enums.RandomDivorceMethod;
 
 public class DisabledRandomDivorce extends AbstractDivorce {

MekHQ/src/mekhq/campaign/personnel/divorce/RandomDivorce.java

@@ -19,7 +19,7 @@
 package mekhq.campaign.personnel.divorce;
 
 import megamek.common.Compute;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.enums.RandomDivorceMethod;
 
 /**

MekHQ/src/mekhq/campaign/personnel/education/EducationController.java

@@ -22,7 +22,7 @@
 import megamek.logging.MMLogger;
 import mekhq.MekHQ;
 import mekhq.campaign.Campaign;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.event.PersonChangedEvent;
 import mekhq.campaign.finances.Money;
 import mekhq.campaign.finances.enums.TransactionType;

MekHQ/src/mekhq/campaign/personnel/enums/RandomDeathMethod.java

@@ -19,7 +19,7 @@
 package mekhq.campaign.personnel.enums;
 
 import mekhq.MekHQ;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.death.*;
 
 import java.util.ResourceBundle;

MekHQ/src/mekhq/campaign/personnel/enums/RandomDivorceMethod.java

@@ -19,7 +19,7 @@
 package mekhq.campaign.personnel.enums;
 
 import mekhq.MekHQ;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.divorce.AbstractDivorce;
 import mekhq.campaign.personnel.divorce.DisabledRandomDivorce;
 import mekhq.campaign.personnel.divorce.RandomDivorce;

MekHQ/src/mekhq/campaign/personnel/enums/RandomMarriageMethod.java

@@ -19,7 +19,7 @@
 package mekhq.campaign.personnel.enums;
 
 import mekhq.MekHQ;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.marriage.AbstractMarriage;
 import mekhq.campaign.personnel.marriage.DisabledRandomMarriage;
 import mekhq.campaign.personnel.marriage.RandomMarriage;

MekHQ/src/mekhq/campaign/personnel/enums/RandomProcreationMethod.java

@@ -19,7 +19,7 @@
 package mekhq.campaign.personnel.enums;
 
 import mekhq.MekHQ;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.procreation.AbstractProcreation;
 import mekhq.campaign.personnel.procreation.DisabledRandomProcreation;
 import mekhq.campaign.personnel.procreation.RandomProcreation;

MekHQ/src/mekhq/campaign/personnel/marriage/AbstractMarriage.java

@@ -24,7 +24,7 @@
 import megamek.common.enums.Gender;
 import mekhq.MekHQ;
 import mekhq.campaign.Campaign;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.event.PersonChangedEvent;
 import mekhq.campaign.log.PersonalLogger;
 import mekhq.campaign.personnel.Person;

MekHQ/src/mekhq/campaign/personnel/marriage/DisabledRandomMarriage.java

@@ -18,7 +18,7 @@
  */
 package mekhq.campaign.personnel.marriage;
 
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.enums.RandomMarriageMethod;
 
 public class DisabledRandomMarriage extends AbstractMarriage {

MekHQ/src/mekhq/campaign/personnel/marriage/RandomMarriage.java

@@ -19,7 +19,7 @@
 package mekhq.campaign.personnel.marriage;
 
 import megamek.common.Compute;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.enums.RandomMarriageMethod;
 
 /**

MekHQ/src/mekhq/campaign/personnel/procreation/AbstractProcreation.java

@@ -26,9 +26,9 @@
 import mekhq.MHQConstants;
 import mekhq.MekHQ;
 import mekhq.campaign.Campaign;
-import mekhq.campaign.CampaignOptions;
 import mekhq.campaign.ExtraData.IntKey;
 import mekhq.campaign.ExtraData.StringKey;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.log.MedicalLogger;
 import mekhq.campaign.log.PersonalLogger;
 import mekhq.campaign.personnel.Person;

MekHQ/src/mekhq/campaign/personnel/procreation/DisabledRandomProcreation.java

@@ -18,7 +18,7 @@
  */
 package mekhq.campaign.personnel.procreation;
 
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.Person;
 import mekhq.campaign.personnel.enums.RandomProcreationMethod;
 

MekHQ/src/mekhq/campaign/personnel/procreation/RandomProcreation.java

@@ -19,7 +19,7 @@
 package mekhq.campaign.personnel.procreation;
 
 import megamek.common.Compute;
-import mekhq.campaign.CampaignOptions;
+import mekhq.campaign.campaignOptions.CampaignOptions;
 import mekhq.campaign.personnel.Person;
 import mekhq.campaign.personnel.enums.RandomProcreationMethod;