Fixed bug random faction selection is incompatible with race

Author: softwaremagico

modules/Fading Suns Revised Edition/factions.xml

@@ -1379,13 +1379,8 @@
                     Kirana, Lestari, Mawar, Melati, Ndari, Nurul, Puspita, Sarwendah, Roro
                 </female>
             </names>
-            <surnames>Darmawan, Djajadiningrat, Soerjaatmadja, Prawiranegara, Nasution, Hutagaol, Sitompul, Karokaro,
-                Rajagukguk, Sinaga, Amuata, Falakhi, Laoly, Marunduri, Ote, Wau, Bodi, Caniago, Sikumbang, Koto,
-                Piliang, Baidan, Djaim, Senen, Sastrowardoyo, Djojohadikusumo, Kolopaking, Natalegawa, Rakeyan, Raden,
-                Tumenggung, Hadiningrat, Sudrajat Belawan, Manuwu, Ngayoh, Kuntai, Unus, Apui, Usat, Laing, Djalung,
-                Merang, Gerung, Mogot, Rawung, Pangemanan, Sondakh, Wowor, Tendean, Kansil, Manganang, Mohede,
-                Tatengkeng, Batusura, Lumba, Rambulangi, Manganan, Malaiholo, Hehamahua, Sahanaya, Sahilatua, Hurek,
-                Riberu, Lamaborak, Leyn, Suebu, Solossa, Maniani, Wanggai Wonda
+            <surnames>Sari, Hidayat, Saputra, Wati, Rahayu, Kurniawan, Santoso, Susanti, Wahyuni, Ningsih, Gunawan,
+                Arifin, Siregar, Astuti, Wijaya, Handayani, Irawan
             </surnames>
             <probabilityMultiplier>100</probabilityMultiplier>
         </random>

modules/Fading Suns Revised Edition/npc_definitions.xml

@@ -625,7 +625,7 @@
         </suggestedSkills>
         <mandatoryBeneficesSpecialization>passageContracts_2</mandatoryBeneficesSpecialization>
         <mandatoryBenefices>cash</mandatoryBenefices>
-        <weapons>typicalHeavyAutofeed, typicalShotgun</weapons>
+        <weapons>typicalHvyAutofeed, typicalShotgun</weapons>
         <armours>chainMailMetal</armours>
     </muster>
     <reeves>
@@ -670,7 +670,7 @@
                 <speciality>rhetoric</speciality>
             </skill>
         </suggestedSkills>
-        <mandatoryBeneficesSpecialization>passageContracts_6, cash_6, language [latinLanguage]
+        <mandatoryBeneficesSpecialization>passageContracts_6, cash [firebirds2000], language [latinLanguage]
         </mandatoryBeneficesSpecialization>
     </reeves>
     <freeMen>
@@ -680,7 +680,6 @@
         </name>
         <group>faction</group>
         <faction>freeMen</faction>
-        <profile>guild</profile>
     </freeMen>
     <militia>
         <name>

modules/Fading Suns Revised Edition/profiles.xml

@@ -120,7 +120,6 @@
             </skill>
         </suggestedSkills>
         <suggestedBenefices>assets</suggestedBenefices>
-        <mandatoryBenefices>nobility</mandatoryBenefices>
     </general>
     <thug>
         <name>

think-machine-random/src/main/java/com/softwaremagico/tm/character/RandomizeCharacter.java

@@ -49,6 +49,7 @@
 import com.softwaremagico.tm.character.occultism.RandomPsique;
 import com.softwaremagico.tm.character.occultism.RandomPsiquePath;
 import com.softwaremagico.tm.character.races.Race;
+import com.softwaremagico.tm.character.races.RaceFactory;
 import com.softwaremagico.tm.character.races.RandomRace;
 import com.softwaremagico.tm.character.skills.AvailableSkill;
 import com.softwaremagico.tm.character.skills.RandomSkillExperience;
@@ -280,6 +281,11 @@ protected void setCharacterDefinition() throws InvalidXmlElementException, Inval
         if (characterPlayer.getFaction() == null) {
             if (requiredFaction != null) {
                 try {
+                    //Race not correct for this faction. Correct it.
+                    if (!requiredFaction.getRestrictedToRaces().isEmpty() && !requiredFaction.getRestrictedToRaces().contains(characterPlayer.getRace())) {
+                        characterPlayer.setRace(RaceFactory.getInstance().getElement("human", characterPlayer.getLanguage(),
+                                characterPlayer.getModuleName()));
+                    }
                     characterPlayer.setFaction(requiredFaction);
                 } catch (RestrictedElementException e) {
                     //Faction cannot be added.

think-machine-random/src/main/java/com/softwaremagico/tm/character/occultism/RandomPsiquePath.java

@@ -170,10 +170,14 @@ private void assignPowersOfPath(OccultismPath path, int maxLevelSelected) throws
                 break;
             }
             if (remainingPoints - power.getLevel() * CostCalculator.OCCULTISM_POWER_LEVEL_COST >= 0) {
-                getCharacterPlayer().addOccultismPower(power);
-                RandomGenerationLog.info(this.getClass().getName(), "Assinged power '{}' to path '{}'.", power, path);
-                remainingPoints -= power.getLevel() * CostCalculator.OCCULTISM_POWER_LEVEL_COST;
-                totalPowers++;
+                try {
+                    getCharacterPlayer().addOccultismPower(power);
+                    RandomGenerationLog.info(this.getClass().getName(), "Assigned power '{}' to path '{}'.", power, path);
+                    remainingPoints -= power.getLevel() * CostCalculator.OCCULTISM_POWER_LEVEL_COST;
+                    totalPowers++;
+                } catch (InvalidFactionOfPowerException e) {
+                    //Restricted to faction. Ignore.
+                }
             }
 
         }

think-machine-random/src/test/java/com/softwaremagico/tm/character/RandomCharacterTests.java

@@ -450,4 +450,15 @@ public void experience() throws
         Assert.assertTrue(characterPlayer.getExperienceEarned() - characterPlayer.getExperienceExpended() < 2);
     }
 
+    @Test
+    public void royalVorox() throws InvalidXmlElementException, RestrictedElementException, InvalidRandomElementSelectedException {
+        final CharacterPlayer characterPlayer = new CharacterPlayer(LANGUAGE, PathManager.DEFAULT_MODULE_FOLDER);
+        characterPlayer
+                .setRace(RaceFactory.getInstance().getElement("vorox", LANGUAGE, PathManager.DEFAULT_MODULE_FOLDER));
+        characterPlayer
+                .setFaction(FactionsFactory.getInstance().getElement("royalVorox", LANGUAGE, PathManager.DEFAULT_MODULE_FOLDER));
+        final RandomizeCharacter randomizeCharacter = new RandomizeCharacter(characterPlayer);
+        randomizeCharacter.createCharacter();
+    }
+
 }

think-machine-random/src/test/java/com/softwaremagico/tm/random/npc/NpcTests.java

@@ -24,6 +24,7 @@
 import com.softwaremagico.tm.file.PathManager;
 import com.softwaremagico.tm.random.exceptions.InvalidRandomElementSelectedException;
 import com.softwaremagico.tm.random.predefined.PredefinedMerger;
+import com.softwaremagico.tm.random.predefined.characters.Npc;
 import com.softwaremagico.tm.random.predefined.characters.NpcFactory;
 import com.softwaremagico.tm.random.selectors.AgePreferences;
 import com.softwaremagico.tm.random.selectors.BlessingPreferences;
@@ -162,6 +163,15 @@ public void checkParent() throws InvalidXmlElementException {
                 .getCharacteristicMinimumValues(CharacteristicName.STRENGTH).getValue(), 6);
     }
 
+    @Test
+    public void checkNoError() throws InvalidXmlElementException, InvalidRandomElementSelectedException, RestrictedElementException {
+        for (Npc npc : NpcFactory.getInstance().getElements(LANGUAGE, PathManager.DEFAULT_MODULE_FOLDER)) {
+            final CharacterPlayer characterPlayer = new CharacterPlayer(LANGUAGE, PathManager.DEFAULT_MODULE_FOLDER);
+            final RandomizeCharacter randomizeCharacter = new RandomizeCharacter(characterPlayer, npc);
+            randomizeCharacter.createCharacter();
+        }
+    }
+
     @Test
     public void serf() throws InvalidXmlElementException,
             InvalidRandomElementSelectedException, RestrictedElementException {

think-machine-rules/src/main/java/com/softwaremagico/tm/character/CharacterPlayer.java

@@ -1515,7 +1515,8 @@ private void checkBeneficesRestrictions(AvailableBenefice benefice) throws Inval
         if (benefice.getBeneficeDefinition().getRestrictedToFactionGroup() != null && (getFaction() == null ||
                 !Objects.equals(benefice.getBeneficeDefinition().getRestrictedToFactionGroup(), getFaction().getFactionGroup()))) {
             throw new RestrictedElementException("Benefice '" + benefice
-                    + "' is restricted to faction '" + benefice.getBeneficeDefinition().getRestrictedToFactionGroup() + "'");
+                    + "' is restricted to faction '" + benefice.getBeneficeDefinition().getRestrictedToFactionGroup() + "' and currently is" +
+                    "'" + getFaction() + "'.");
         }
         if (!benefice.getBeneficeDefinition().getRestrictedToRaces().isEmpty() &&
                 !benefice.getBeneficeDefinition().getRestrictedToRaces().contains(getRace())) {

think-machine-rules/src/main/java/com/softwaremagico/tm/character/Name.java

@@ -50,7 +50,7 @@ public Name(String id, String name, String customName, String language, String m
     }
 
     public Name(String name, String language, String moduleName, Gender gender, Faction faction) {
-        super(getId(name, moduleName), name, null, language, moduleName);
+        super(getId(name, faction, moduleName), name, null, language, moduleName);
         this.gender = gender;
         this.faction = faction;
         this.customName = name;
@@ -78,11 +78,9 @@ public boolean equals(Object obj) {
         return super.equals(obj);
     }
 
-    private static String getId(String name, String moduleName) {
-        if (moduleName == null) {
-            return name.toLowerCase();
-        }
-        return name.replaceAll("\\s+", "_").toLowerCase() + "_" + moduleName.replaceAll("\\s+", "_").toLowerCase();
+    private static String getId(String name, Faction faction, String moduleName) {
+        return name.replaceAll("\\s+", "_").toLowerCase() + (faction != null ? "_" + faction : "") +
+                (moduleName != null ? "_" + moduleName.replaceAll("\\s+", "_").toLowerCase() : "");
     }
 
     public String getCustomName() {

think-machine-rules/src/main/java/com/softwaremagico/tm/character/Surname.java

@@ -46,7 +46,7 @@ public Surname(String id, String surname, String customSurname, String language,
     }
 
     public Surname(String surname, String language, String moduleName, Faction faction) {
-        super(getId(surname, moduleName), surname, null, language, moduleName);
+        super(getId(surname, faction, moduleName), surname, null, language, moduleName);
         this.faction = faction;
         this.customSurname = surname;
     }
@@ -69,11 +69,9 @@ public String getName() {
         return super.getName();
     }
 
-    private static String getId(String surname, String moduleName) {
-        if (moduleName == null) {
-            return surname.toLowerCase();
-        }
-        return surname.toLowerCase() + "_" + moduleName.replaceAll("\\s+", "_").toLowerCase();
+    private static String getId(String surname, Faction faction, String moduleName) {
+        return surname.replaceAll("\\s+", "_").toLowerCase() + (faction != null ? "_" + faction : "") +
+                (moduleName != null ? "_" + moduleName.replaceAll("\\s+", "_").toLowerCase() : "");
     }
 
     public String getCustomSurname() {