Skip to content

Commit 71a2801

Browse files
IllianiBirdIllianiBird
committed
Moved Skill Classes to Dedicated Package
- Moved all skill-related classes into a discrete package
1 parent 899eefe commit 71a2801

File tree

136 files changed

+1244
-1055
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+1244
-1055
lines changed

‎MekHQ/src/mekhq/CampaignPreset.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
import mekhq.campaign.RandomSkillPreferences;
6060
import mekhq.campaign.event.OptionsChangedEvent;
6161
import mekhq.campaign.personnel.PersonnelOptions;
62-
import mekhq.campaign.personnel.SkillType;
6362
import mekhq.campaign.personnel.SpecialAbility;
6463
import mekhq.campaign.personnel.ranks.RankSystem;
64+
import mekhq.campaign.personnel.skills.SkillType;
6565
import mekhq.campaign.universe.Faction;
6666
import mekhq.campaign.universe.Factions;
6767
import mekhq.campaign.universe.Planet;

‎MekHQ/src/mekhq/Utilities.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import mekhq.campaign.finances.Money;
4646
import mekhq.campaign.mission.IPlayerSettings;
4747
import mekhq.campaign.personnel.Person;
48-
import mekhq.campaign.personnel.SkillType;
48+
import mekhq.campaign.personnel.skills.SkillType;
4949
import mekhq.campaign.personnel.enums.PersonnelRole;
5050
import mekhq.campaign.personnel.enums.Phenotype;
5151
import mekhq.campaign.unit.CrewType;
@@ -69,7 +69,7 @@
6969
import java.util.function.Consumer;
7070

7171
import static java.lang.Math.max;
72-
import static mekhq.campaign.personnel.SkillType.*;
72+
import static mekhq.campaign.personnel.skills.SkillType.*;
7373

7474
public class Utilities {
7575
private static final MMLogger logger = MMLogger.create(Utilities.class);

‎MekHQ/src/mekhq/campaign/Campaign.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,6 @@
160160
import mekhq.campaign.personnel.Person;
161161
import mekhq.campaign.personnel.PersonnelOptions;
162162
import mekhq.campaign.personnel.RandomDependents;
163-
import mekhq.campaign.personnel.Skill;
164-
import mekhq.campaign.personnel.SkillType;
165163
import mekhq.campaign.personnel.SpecialAbility;
166164
import mekhq.campaign.personnel.autoAwards.AutoAwardsController;
167165
import mekhq.campaign.personnel.death.RandomDeath;
@@ -191,6 +189,8 @@
191189
import mekhq.campaign.personnel.ranks.RankSystem;
192190
import mekhq.campaign.personnel.ranks.RankValidator;
193191
import mekhq.campaign.personnel.ranks.Ranks;
192+
import mekhq.campaign.personnel.skills.Skill;
193+
import mekhq.campaign.personnel.skills.SkillType;
194194
import mekhq.campaign.personnel.turnoverAndRetention.RetirementDefectionTracker;
195195
import mekhq.campaign.randomEvents.GrayMonday;
196196
import mekhq.campaign.randomEvents.RandomEventLibraries;

‎MekHQ/src/mekhq/campaign/CampaignOptions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
import mekhq.campaign.market.enums.UnitMarketMethod;
6363
import mekhq.campaign.mission.enums.CombatRole;
6464
import mekhq.campaign.parts.enums.PartRepairType;
65-
import mekhq.campaign.personnel.Skills;
6665
import mekhq.campaign.personnel.enums.*;
66+
import mekhq.campaign.personnel.skills.Skills;
6767
import mekhq.campaign.randomEvents.prisoners.enums.PrisonerCaptureStyle;
6868
import mekhq.campaign.rating.UnitRatingMethod;
6969
import mekhq.gui.campaignOptions.enums.ProcurementPersonnelPick;

‎MekHQ/src/mekhq/campaign/CampaignSummary.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import mekhq.campaign.mission.Mission;
5252
import mekhq.campaign.mission.enums.MissionStatus;
5353
import mekhq.campaign.personnel.Person;
54-
import mekhq.campaign.personnel.SkillType;
54+
import mekhq.campaign.personnel.skills.SkillType;
5555
import mekhq.campaign.unit.CargoStatistics;
5656
import mekhq.campaign.unit.HangarStatistics;
5757
import mekhq.campaign.unit.Unit;

‎MekHQ/src/mekhq/campaign/MercRosterAccess.java

+16-9
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,31 @@
2727
*/
2828
package mekhq.campaign;
2929

30+
import java.sql.Connection;
31+
import java.sql.Date;
32+
import java.sql.DriverManager;
33+
import java.sql.PreparedStatement;
34+
import java.sql.ResultSet;
35+
import java.sql.ResultSetMetaData;
36+
import java.sql.SQLException;
37+
import java.sql.Statement;
38+
import java.util.HashMap;
39+
import java.util.Map;
40+
import java.util.Properties;
41+
import java.util.UUID;
42+
import javax.swing.SwingWorker;
43+
3044
import megamek.common.UnitType;
3145
import megamek.logging.MMLogger;
3246
import mekhq.campaign.force.Force;
3347
import mekhq.campaign.personnel.Person;
34-
import mekhq.campaign.personnel.Skill;
35-
import mekhq.campaign.personnel.SkillType;
3648
import mekhq.campaign.personnel.enums.PersonnelRole;
3749
import mekhq.campaign.personnel.enums.Profession;
3850
import mekhq.campaign.personnel.ranks.Rank;
51+
import mekhq.campaign.personnel.skills.Skill;
52+
import mekhq.campaign.personnel.skills.SkillType;
3953
import mekhq.campaign.unit.Unit;
4054

41-
import javax.swing.*;
42-
import java.sql.*;
43-
import java.util.HashMap;
44-
import java.util.Map;
45-
import java.util.Properties;
46-
import java.util.UUID;
47-
4855
public class MercRosterAccess extends SwingWorker<Void, Void> {
4956
private static final MMLogger logger = MMLogger.create(MercRosterAccess.class);
5057

‎MekHQ/src/mekhq/campaign/againstTheBot/AtBConfiguration.java

+19-10
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,32 @@
2828
*/
2929
package mekhq.campaign.againstTheBot;
3030

31-
import megamek.common.*;
31+
import java.io.FileInputStream;
32+
import java.io.FileNotFoundException;
33+
import java.io.InputStream;
34+
import java.time.LocalDate;
35+
import java.util.ArrayList;
36+
import java.util.Enumeration;
37+
import java.util.HashMap;
38+
import java.util.List;
39+
import java.util.ResourceBundle;
40+
import java.util.function.Function;
41+
import javax.xml.parsers.DocumentBuilder;
42+
43+
import megamek.common.Compute;
44+
import megamek.common.EntityWeightClass;
45+
import megamek.common.MekSummary;
46+
import megamek.common.MekSummaryCache;
47+
import megamek.common.TargetRoll;
48+
import megamek.common.UnitType;
3249
import megamek.common.annotations.Nullable;
3350
import megamek.logging.MMLogger;
3451
import mekhq.MekHQ;
3552
import mekhq.campaign.Campaign;
3653
import mekhq.campaign.finances.Money;
3754
import mekhq.campaign.personnel.Person;
38-
import mekhq.campaign.personnel.SkillType;
3955
import mekhq.campaign.personnel.enums.PersonnelRole;
56+
import mekhq.campaign.personnel.skills.SkillType;
4057
import mekhq.campaign.rating.IUnitRating;
4158
import mekhq.campaign.universe.Faction;
4259
import mekhq.utilities.MHQXMLUtility;
@@ -45,14 +62,6 @@
4562
import org.w3c.dom.Node;
4663
import org.w3c.dom.NodeList;
4764

48-
import javax.xml.parsers.DocumentBuilder;
49-
import java.io.FileInputStream;
50-
import java.io.FileNotFoundException;
51-
import java.io.InputStream;
52-
import java.time.LocalDate;
53-
import java.util.*;
54-
import java.util.function.Function;
55-
5665
/**
5766
* @author Neoancient
5867
*

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import static mekhq.campaign.force.CombatTeam.recalculateCombatTeams;
3131
import static mekhq.campaign.force.Force.FORCE_NONE;
32-
import static mekhq.campaign.personnel.SkillDeprecationTool.DEPRECATED_SKILLS;
32+
import static mekhq.campaign.personnel.skills.SkillDeprecationTool.DEPRECATED_SKILLS;
3333
import static org.apache.commons.lang3.ObjectUtils.firstNonNull;
3434

3535
import java.io.File;
@@ -108,13 +108,13 @@
108108
import mekhq.campaign.parts.equipment.MissingMASC;
109109
import mekhq.campaign.personnel.Person;
110110
import mekhq.campaign.personnel.PersonnelOptions;
111-
import mekhq.campaign.personnel.SkillDeprecationTool;
112-
import mekhq.campaign.personnel.SkillType;
113111
import mekhq.campaign.personnel.SpecialAbility;
114112
import mekhq.campaign.personnel.education.EducationController;
115113
import mekhq.campaign.personnel.enums.FamilialRelationshipType;
116114
import mekhq.campaign.personnel.ranks.RankSystem;
117115
import mekhq.campaign.personnel.ranks.RankValidator;
116+
import mekhq.campaign.personnel.skills.SkillDeprecationTool;
117+
import mekhq.campaign.personnel.skills.SkillType;
118118
import mekhq.campaign.personnel.turnoverAndRetention.RetirementDefectionTracker;
119119
import mekhq.campaign.rating.CamOpsReputation.ReputationController;
120120
import mekhq.campaign.storyarc.StoryArc;

‎MekHQ/src/mekhq/campaign/market/PersonnelMarket.java

+15-6
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,21 @@
2828
*/
2929
package mekhq.campaign.market;
3030

31+
import java.io.PrintWriter;
32+
import java.time.LocalDate;
33+
import java.util.ArrayList;
34+
import java.util.Collections;
35+
import java.util.LinkedHashMap;
36+
import java.util.List;
37+
import java.util.Map;
38+
import java.util.UUID;
39+
3140
import megamek.Version;
32-
import megamek.common.*;
41+
import megamek.common.Entity;
42+
import megamek.common.MekFileParser;
43+
import megamek.common.MekSummary;
44+
import megamek.common.MekSummaryCache;
45+
import megamek.common.TargetRoll;
3346
import megamek.common.event.Subscribe;
3447
import megamek.common.loaders.EntityLoadingException;
3548
import megamek.logging.MMLogger;
@@ -38,8 +51,8 @@
3851
import mekhq.campaign.event.MarketNewPersonnelEvent;
3952
import mekhq.campaign.event.OptionsChangedEvent;
4053
import mekhq.campaign.personnel.Person;
41-
import mekhq.campaign.personnel.SkillType;
4254
import mekhq.campaign.personnel.enums.PersonnelRole;
55+
import mekhq.campaign.personnel.skills.SkillType;
4356
import mekhq.campaign.rating.IUnitRating;
4457
import mekhq.campaign.unit.HangarStatistics;
4558
import mekhq.campaign.universe.PlanetarySystem;
@@ -49,10 +62,6 @@
4962
import org.w3c.dom.Node;
5063
import org.w3c.dom.NodeList;
5164

52-
import java.io.PrintWriter;
53-
import java.time.LocalDate;
54-
import java.util.*;
55-
5665
public class PersonnelMarket {
5766
private static final MMLogger logger = MMLogger.create(PersonnelMarket.class);
5867

‎MekHQ/src/mekhq/campaign/market/contractMarket/AtbMonthlyContractMarket.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
import mekhq.campaign.mission.enums.AtBContractType;
5555
import mekhq.campaign.mission.enums.ContractCommandRights;
5656
import mekhq.campaign.personnel.Person;
57-
import mekhq.campaign.personnel.SkillType;
5857
import mekhq.campaign.personnel.enums.PersonnelRole;
58+
import mekhq.campaign.personnel.skills.SkillType;
5959
import mekhq.campaign.rating.CamOpsReputation.ReputationController;
6060
import mekhq.campaign.rating.IUnitRating;
6161
import mekhq.campaign.universe.Faction;

‎MekHQ/src/mekhq/campaign/market/contractMarket/CamOpsContractMarket.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import mekhq.campaign.mission.enums.AtBContractType;
5050
import mekhq.campaign.mission.enums.ContractCommandRights;
5151
import mekhq.campaign.personnel.Person;
52-
import mekhq.campaign.personnel.SkillType;
52+
import mekhq.campaign.personnel.skills.SkillType;
5353
import mekhq.campaign.rating.CamOpsReputation.ReputationController;
5454
import mekhq.campaign.rating.IUnitRating;
5555
import mekhq.campaign.universe.Faction;

‎MekHQ/src/mekhq/campaign/mission/AtBDynamicScenario.java

+15-10
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,20 @@
2727
*/
2828
package mekhq.campaign.mission;
2929

30+
import static mekhq.campaign.mission.AtBDynamicScenarioFactory.getPlanetOwnerAlignment;
31+
import static mekhq.campaign.mission.AtBDynamicScenarioFactory.getPlanetOwnerFaction;
32+
import static mekhq.campaign.mission.ScenarioForceTemplate.ForceAlignment.Allied;
33+
import static mekhq.campaign.mission.ScenarioForceTemplate.ForceAlignment.PlanetOwner;
34+
35+
import java.io.PrintWriter;
36+
import java.text.ParseException;
37+
import java.util.ArrayList;
38+
import java.util.Collections;
39+
import java.util.HashMap;
40+
import java.util.List;
41+
import java.util.Map;
42+
import java.util.UUID;
43+
3044
import megamek.Version;
3145
import megamek.common.Entity;
3246
import megamek.common.annotations.Nullable;
@@ -39,7 +53,7 @@
3953
import mekhq.campaign.mission.ScenarioForceTemplate.ForceGenerationMethod;
4054
import mekhq.campaign.mission.atb.AtBScenarioModifier;
4155
import mekhq.campaign.personnel.Person;
42-
import mekhq.campaign.personnel.SkillType;
56+
import mekhq.campaign.personnel.skills.SkillType;
4357
import mekhq.campaign.rating.IUnitRating;
4458
import mekhq.campaign.unit.Unit;
4559
import mekhq.utilities.MHQXMLUtility;
@@ -48,15 +62,6 @@
4862
import org.w3c.dom.Node;
4963
import org.w3c.dom.NodeList;
5064

51-
import java.io.PrintWriter;
52-
import java.text.ParseException;
53-
import java.util.*;
54-
55-
import static mekhq.campaign.mission.AtBDynamicScenarioFactory.getPlanetOwnerAlignment;
56-
import static mekhq.campaign.mission.AtBDynamicScenarioFactory.getPlanetOwnerFaction;
57-
import static mekhq.campaign.mission.ScenarioForceTemplate.ForceAlignment.Allied;
58-
import static mekhq.campaign.mission.ScenarioForceTemplate.ForceAlignment.PlanetOwner;
59-
6065
/**
6166
* Data structure intended to hold data relevant to AtB Dynamic Scenarios (AtB 3.0)
6267
* @author NickAragua

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

+42-27
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,35 @@
2727
*/
2828
package mekhq.campaign.mission;
2929

30+
import static java.lang.Math.max;
31+
import static java.lang.Math.round;
32+
import static megamek.client.ratgenerator.MissionRole.*;
33+
import static megamek.codeUtilities.MathUtility.clamp;
34+
import static megamek.common.Compute.d6;
35+
import static megamek.common.Compute.randomInt;
36+
import static megamek.common.UnitType.*;
37+
import static megamek.common.planetaryconditions.Wind.TORNADO_F4;
38+
import static mekhq.campaign.force.CombatTeam.getStandardForceSize;
39+
import static mekhq.campaign.mission.Scenario.T_GROUND;
40+
import static mekhq.campaign.mission.ScenarioForceTemplate.SPECIAL_UNIT_TYPE_ATB_AERO_MIX;
41+
import static mekhq.campaign.mission.ScenarioForceTemplate.SPECIAL_UNIT_TYPE_ATB_CIVILIANS;
42+
import static mekhq.campaign.mission.ScenarioForceTemplate.SPECIAL_UNIT_TYPE_ATB_MIX;
43+
import static mekhq.campaign.personnel.skills.SkillType.EXP_ELITE;
44+
import static mekhq.campaign.universe.IUnitGenerator.unitTypeSupportsWeightClass;
45+
import static mekhq.utilities.EntityUtilities.getEntityFromUnitId;
46+
47+
import java.io.File;
48+
import java.time.LocalDate;
49+
import java.util.*;
50+
import java.util.stream.Collectors;
51+
import java.util.stream.IntStream;
52+
3053
import megamek.client.bot.princess.CardinalEdge;
31-
import megamek.client.generator.*;
54+
import megamek.client.generator.RandomGenderGenerator;
55+
import megamek.client.generator.RandomNameGenerator;
56+
import megamek.client.generator.RandomUnitGenerator;
57+
import megamek.client.generator.ReconfigurationParameters;
58+
import megamek.client.generator.TeamLoadOutGenerator;
3259
import megamek.client.generator.skillGenerators.AbstractSkillGenerator;
3360
import megamek.client.generator.skillGenerators.ModifiedConstantSkillGenerator;
3461
import megamek.client.ratgenerator.MissionRole;
@@ -60,42 +87,30 @@
6087
import mekhq.campaign.mission.atb.AtBScenarioModifier;
6188
import mekhq.campaign.mission.atb.AtBScenarioModifier.EventTiming;
6289
import mekhq.campaign.personnel.Bloodname;
63-
import mekhq.campaign.personnel.SkillType;
6490
import mekhq.campaign.personnel.SpecialAbility;
6591
import mekhq.campaign.personnel.enums.Phenotype;
92+
import mekhq.campaign.personnel.skills.SkillType;
6693
import mekhq.campaign.rating.IUnitRating;
67-
import mekhq.campaign.stratcon.*;
94+
import mekhq.campaign.stratcon.StratconBiomeManifest;
95+
import mekhq.campaign.stratcon.StratconCampaignState;
96+
import mekhq.campaign.stratcon.StratconContractInitializer;
97+
import mekhq.campaign.stratcon.StratconFacility;
6898
import mekhq.campaign.stratcon.StratconFacility.FacilityType;
99+
import mekhq.campaign.stratcon.StratconScenario;
100+
import mekhq.campaign.stratcon.StratconTrackState;
69101
import mekhq.campaign.unit.Unit;
70-
import mekhq.campaign.universe.*;
102+
import mekhq.campaign.universe.Faction;
71103
import mekhq.campaign.universe.Faction.Tag;
104+
import mekhq.campaign.universe.Factions;
105+
import mekhq.campaign.universe.IUnitGenerator;
106+
import mekhq.campaign.universe.Planet;
107+
import mekhq.campaign.universe.PlanetarySystem;
108+
import mekhq.campaign.universe.Systems;
109+
import mekhq.campaign.universe.UnitGeneratorParameters;
72110
import mekhq.campaign.universe.enums.EraFlag;
73111
import mekhq.campaign.universe.enums.HonorRating;
74112
import mekhq.campaign.universe.fameAndInfamy.BatchallFactions;
75113

76-
import java.io.File;
77-
import java.time.LocalDate;
78-
import java.util.*;
79-
import java.util.stream.Collectors;
80-
import java.util.stream.IntStream;
81-
82-
import static java.lang.Math.max;
83-
import static java.lang.Math.round;
84-
import static megamek.client.ratgenerator.MissionRole.*;
85-
import static megamek.codeUtilities.MathUtility.clamp;
86-
import static megamek.common.Compute.d6;
87-
import static megamek.common.Compute.randomInt;
88-
import static megamek.common.UnitType.*;
89-
import static megamek.common.planetaryconditions.Wind.TORNADO_F4;
90-
import static mekhq.campaign.force.CombatTeam.getStandardForceSize;
91-
import static mekhq.campaign.mission.Scenario.T_GROUND;
92-
import static mekhq.campaign.mission.ScenarioForceTemplate.SPECIAL_UNIT_TYPE_ATB_AERO_MIX;
93-
import static mekhq.campaign.mission.ScenarioForceTemplate.SPECIAL_UNIT_TYPE_ATB_CIVILIANS;
94-
import static mekhq.campaign.mission.ScenarioForceTemplate.SPECIAL_UNIT_TYPE_ATB_MIX;
95-
import static mekhq.campaign.personnel.SkillType.EXP_ELITE;
96-
import static mekhq.campaign.universe.IUnitGenerator.unitTypeSupportsWeightClass;
97-
import static mekhq.utilities.EntityUtilities.getEntityFromUnitId;
98-
99114
/**
100115
* This class handles the creation and substantive manipulation of
101116
* AtBDynamicScenarios

0 commit comments

Comments
 (0)