Merge pull request #7210 from SJuliez/export-factions-to-yaml-without-data

Faction data as yml

Author: rjhancock

MekHQ/data/universe/factions.xml

@@ -119,25 +119,10 @@ public static int getStandardForceSize(Faction faction) {
      * @return The standard force size, at the provided formation level, for the provided faction
      */
     public static int getStandardForceSize(Faction faction, int formationLevelDepth) {
-        int formationSize;
-        if (faction.isClan() || faction.isMarianHegemony()) {
-            formationSize = STAR_SIZE;
-        } else if (faction.isComStarOrWoB()) {
-            formationSize = LEVEL_II_SIZE;
-        } else {
-            formationSize = LANCE_SIZE;
-        }
-
-        if (formationLevelDepth == LANCE.getDepth()) {
-            return formationSize;
+        int formationSize = faction.getFormationBaseSize();
+        for (int i = 1; i <= formationLevelDepth; i++) {
+            formationSize *= faction.getFormationGrouping();
         }
-
-        if (faction.isComStarOrWoB()) {
-            formationSize *= (int) Math.pow(6, formationLevelDepth);
-        } else {
-            formationSize *= (int) Math.pow(3, formationLevelDepth);
-        }
-
         return formationSize;
     }
 

MekHQ/src/mekhq/campaign/force/CombatTeam.java

@@ -48,6 +48,7 @@
 
 import megamek.common.Compute;
 import megamek.common.enums.SkillLevel;
+import megamek.common.universe.FactionTag;
 import megamek.logging.MMLogger;
 import mekhq.MekHQ;
 import mekhq.campaign.Campaign;
@@ -63,7 +64,6 @@
 import mekhq.campaign.rating.CamOpsReputation.ReputationController;
 import mekhq.campaign.rating.IUnitRating;
 import mekhq.campaign.universe.Faction;
-import mekhq.campaign.universe.Faction.Tag;
 import mekhq.campaign.universe.Factions;
 import mekhq.campaign.universe.enums.HiringHallLevel;
 
@@ -307,7 +307,7 @@ protected void rollCommandClause(final Contract contract, final int modifier, bo
     }
 
     private Faction determineEmployer(Campaign campaign, int ratingMod, HiringHallModifiers hiringHallModifiers) {
-        Collection<Tag> employerTags;
+        Collection<FactionTag> employerTags;
         int roll = Compute.d6(2) + ratingMod + hiringHallModifiers.employersMod;
         if (roll < 6) {
             // Roll again on the independent employers column
@@ -319,19 +319,19 @@ private Faction determineEmployer(Campaign campaign, int ratingMod, HiringHallMo
         return getRandomEmployer(campaign, employerTags);
     }
 
-    private Faction getRandomEmployer(Campaign campaign, Collection<Tag> employerTags) {
+    private Faction getRandomEmployer(Campaign campaign, Collection<FactionTag> employerTags) {
         Collection<Faction> factions = Factions.getInstance().getActiveFactions(campaign.getLocalDate());
         List<Faction> filtered = new ArrayList<>();
         for (Faction faction : factions) {
             // Clans only hire units within their own clan
             if (faction.isClan() && !faction.equals(campaign.getFaction())) {
                 continue;
             }
-            for (Tag employerTag : employerTags) {
+            for (FactionTag employerTag : employerTags) {
                 if (!faction.is(employerTag)) {
                     // The SMALL tag has to be converted to independent for now, since for some reason
                     // independent is coded as a string.
-                    if (employerTag == Tag.SMALL && faction.isIndependent()) {
+                    if (employerTag == FactionTag.SMALL && faction.isIndependent()) {
                         continue;
                     }
                     break;
@@ -343,40 +343,40 @@ private Faction getRandomEmployer(Campaign campaign, Collection<Tag> employerTag
         return filtered.get(rand.nextInt(filtered.size()));
     }
 
-    private Collection<Tag> getEmployerTags(Campaign campaign, int roll, boolean independent) {
-        Collection<Tag> tags = new ArrayList<>();
+    private Collection<FactionTag> getEmployerTags(Campaign campaign, int roll, boolean independent) {
+        Collection<FactionTag> tags = new ArrayList<>();
         if (independent) {
-            tags.add(Tag.SMALL);
+            tags.add(FactionTag.SMALL);
             if (roll < 4) {
-                tags.add(Tag.NOBLE);
+                tags.add(FactionTag.NOBLE);
             } else if (roll < 6) {
-                tags.add(Tag.PLANETARY_GOVERNMENT);
+                tags.add(FactionTag.PLANETARY_GOVERNMENT);
             } else if (roll == 6) {
-                tags.add(Tag.MERC);
+                tags.add(FactionTag.MERC);
             } else if (roll < 9) {
-                tags.add(Tag.PERIPHERY);
-                tags.add(Tag.MAJOR);
+                tags.add(FactionTag.PERIPHERY);
+                tags.add(FactionTag.MAJOR);
             } else if (roll < 11) {
-                tags.add(Tag.PERIPHERY);
-                tags.add(Tag.MINOR);
+                tags.add(FactionTag.PERIPHERY);
+                tags.add(FactionTag.MINOR);
             } else {
-                tags.add(Tag.CORPORATION);
+                tags.add(FactionTag.CORPORATION);
             }
         } else {
             if (roll < 6) {
-                tags.add(Tag.SMALL);
+                tags.add(FactionTag.SMALL);
             } else if (roll < 8) {
-                tags.add(Tag.MINOR);
+                tags.add(FactionTag.MINOR);
             } else if (roll < 11) {
-                tags.add(Tag.MAJOR);
+                tags.add(FactionTag.MAJOR);
             } else {
                 if (Factions.getInstance()
                           .getActiveFactions(campaign.getLocalDate())
                           .stream()
                           .anyMatch(Faction::isSuperPower)) {
-                    tags.add(Tag.SUPER);
+                    tags.add(FactionTag.SUPER);
                 } else {
-                    tags.add(Tag.MAJOR);
+                    tags.add(FactionTag.MAJOR);
                 }
             }
         }

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

@@ -345,95 +345,16 @@ public static Camouflage pickRandomCamouflage(int currentYear, String factionCod
     }
 
     /**
-     * Retrieves the directory for the camouflage of a faction based on the current year and faction code.
+     * Returns the directory for the camouflages of a faction based on the year and faction code.
      *
-     * @param currentYear The current year in the game.
-     * @param factionCode The code representing the faction.
-     *
-     * @return The directory for the camouflage of the faction.
+     * @param year The year
+     * @param factionCode The code representing the faction, e.g. FS or HL
+     * @return The directory under data/images/camo for the camouflages of the faction
      */
-    private static String getCamouflageDirectory(int currentYear, String factionCode) {
-        return switch (factionCode) {
-            case "ARC" -> "Aurigan Coalition";
-            case "CDP" -> "Calderon Protectorate";
-            case "CC" -> "Capellan Confederation";
-            case "CIR" -> "Circinus Federation";
-            case "CS" -> "ComStar";
-            case "DC" -> "Draconis Combine";
-            case "CF" -> "Federated Commonwealth";
-            case "FS" -> "Federated Suns";
-            case "FVC" -> "Filtvelt Coalition";
-            case "FRR" -> "Free Rasalhague Republic";
-            case "FWL" -> "Free Worlds League";
-            case "FR" -> "Fronc Reaches";
-            case "HL" -> "Hanseatic League";
-            case "LL" -> "Lothian League";
-            case "LA" -> "Lyran Commonwealth";
-            case "MOC" -> "Magistracy of Canopus";
-            case "MH" -> "Marian Hegemony";
-            case "MERC" -> "Mercs";
-            case "OA" -> "Outworlds Alliance";
-            case "PIR" -> "Pirates";
-            case "ROS" -> "Republic of the Sphere";
-            case "SL" -> "Star League Defense Force";
-            case "TC" -> "Taurian Concordat";
-            case "WOB" -> "Word of Blake";
-            case "Root" -> "";
-            default -> {
-                Faction faction = Factions.getInstance().getFaction(factionCode);
-
-                if (faction.isClan()) {
-                    yield getClanCamouflageDirectory(currentYear, factionCode);
-                } else {
-                    yield "Standard Camouflage";
-                }
-            }
-        };
-    }
-
-    /**
-     * Retrieves the directory for the camouflage of a clan faction based on the current year and faction code.
-     *
-     * @param currentYear The current year in the game.
-     * @param factionCode The code representing the faction.
-     *
-     * @return The directory for the camouflage of the clan faction.
-     */
-    private static String getClanCamouflageDirectory(int currentYear, String factionCode) {
-        final String ROOT_DIRECTORY = "Clans/";
-
-        return switch (factionCode) {
-            case "CBS" -> ROOT_DIRECTORY + "Blood Spirit";
-            case "CB" -> ROOT_DIRECTORY + "Burrock";
-            case "CCC" -> ROOT_DIRECTORY + "Cloud Cobra";
-            case "CCO" -> ROOT_DIRECTORY + "Coyote";
-            case "CDS" -> {
-                if (currentYear < 3100) {
-                    yield ROOT_DIRECTORY + "Diamond Shark";
-                } else {
-                    yield ROOT_DIRECTORY + "Sea Fox (Dark Age)";
-                }
-            }
-            case "CFM" -> ROOT_DIRECTORY + "Fire Mandrill";
-            case "CGB", "RD" -> ROOT_DIRECTORY + "Ghost Bear";
-            case "CGS" -> ROOT_DIRECTORY + "Goliath Scorpion";
-            case "CHH" -> ROOT_DIRECTORY + "Hell's Horses";
-            case "CIH" -> ROOT_DIRECTORY + "Ice Hellion";
-            case "CJF" -> ROOT_DIRECTORY + "Jade Falcon";
-            case "CMG" -> ROOT_DIRECTORY + "Mongoose";
-            case "CNC" -> ROOT_DIRECTORY + "Nova Cat";
-            case "CSJ" -> ROOT_DIRECTORY + "Smoke Jaguar";
-            case "CSR" -> ROOT_DIRECTORY + "Snow Raven";
-            case "SOC" -> ROOT_DIRECTORY + "Society";
-            case "CSA" -> ROOT_DIRECTORY + "Star Adder";
-            case "CSV" -> ROOT_DIRECTORY + "Steel Viper";
-            case "CSL" -> ROOT_DIRECTORY + "Stone Lion";
-            case "CWI" -> ROOT_DIRECTORY + "Widowmaker";
-            case "CW", "CWE" -> ROOT_DIRECTORY + "Wolf";
-            case "CWIE" -> ROOT_DIRECTORY + "Wolf-in-Exile";
-            case "CWOV" -> ROOT_DIRECTORY + "Wolverine";
-            default -> "Standard Camouflage";
-        };
+    private static String getCamouflageDirectory(int year, String factionCode) {
+        return Factions.getInstance().getFaction(factionCode)
+              .getCamosFolder(year)
+              .orElse("Standard Camouflage");
     }
 
     public void calculateLength(final boolean variable) {

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

@@ -79,6 +79,7 @@
 import megamek.common.equipment.WeaponMounted;
 import megamek.common.icons.Camouflage;
 import megamek.common.planetaryconditions.Atmosphere;
+import megamek.common.universe.FactionTag;
 import megamek.common.planetaryconditions.Wind;
 import megamek.logging.MMLogger;
 import mekhq.MHQConstants;
@@ -112,15 +113,14 @@
 import mekhq.campaign.stratcon.StratconTrackState;
 import mekhq.campaign.unit.Unit;
 import mekhq.campaign.universe.Faction;
-import mekhq.campaign.universe.Faction.Tag;
 import mekhq.campaign.universe.Factions;
 import mekhq.campaign.universe.IUnitGenerator;
 import mekhq.campaign.universe.Planet;
 import mekhq.campaign.universe.PlanetarySystem;
 import mekhq.campaign.universe.Systems;
 import mekhq.campaign.universe.UnitGeneratorParameters;
 import mekhq.campaign.universe.enums.EraFlag;
-import mekhq.campaign.universe.enums.HonorRating;
+import megamek.common.universe.HonorRating;
 import mekhq.campaign.universe.factionStanding.BatchallFactions;
 
 /**
@@ -2826,9 +2826,9 @@ private static Entity getEntityByName(String name, String factionCode, SkillLeve
               faction.isClan(), extraData);
 
         CampaignOptions campaignOptions = campaign.getCampaignOptions();
-        
+
         // Optionally assign a callsign to the unit commander if enabled and skill at or above minimum level
-        if (campaignOptions.isAutoGenerateOpForCallsigns() && 
+        if (campaignOptions.isAutoGenerateOpForCallsigns() &&
                   (skill.equalsOrGreaterThan(campaignOptions.getMinimumCallsignSkillLevel()))) {
             entityCrew.setNickname(RandomCallsignGenerator.getInstance().generate(), 0);
         }
@@ -4634,7 +4634,7 @@ static String getPlanetOwnerFaction(AtBContract contract, LocalDate currentDate)
             factionCode = planetFactions.get(0);
             Faction ownerFaction = Factions.getInstance().getFaction(factionCode);
 
-            if (ownerFaction.is(Tag.ABANDONED)) {
+            if (ownerFaction.is(FactionTag.ABANDONED)) {
                 factionCode = "MERC";
             }
         }

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

@@ -71,7 +71,7 @@
 import mekhq.campaign.randomEvents.prisoners.enums.PrisonerStatus;
 import mekhq.campaign.universe.Faction;
 import mekhq.campaign.universe.Factions;
-import mekhq.campaign.universe.enums.HonorRating;
+import megamek.common.universe.HonorRating;
 import mekhq.utilities.ReportingUtilities;
 import mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogSimple;