Fixed issue with surnames of voroxroyal

Author: softwaremagico

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

@@ -57,8 +57,8 @@ protected Collection<Surname> getAllElements() {
 
     @Override
     protected int getWeight(Surname surname) {
-        // Nobility has faction as surname
-        if (getCharacterPlayer().getFaction() != null
+        // Human nobility has faction as surname
+        if (!getCharacterPlayer().getRace().isXeno() && getCharacterPlayer().getFaction() != null
                 && getCharacterPlayer().getFaction().getFactionGroup() == FactionGroup.NOBILITY) {
             if (getCharacterPlayer().getFaction().getName().contains(surname.getName())) {
                 return BASIC_PROBABILITY;

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

@@ -79,7 +79,7 @@ public boolean equals(Object obj) {
     }
 
     private static String getId(String name, Faction faction, String moduleName) {
-        return name.replaceAll("\\s+", "_").toLowerCase() + (faction != null ? "_" + faction : "") +
+        return name.replaceAll("\\s+", "_").toLowerCase() + (faction != null ? "_" + faction.getId() : "") +
                 (moduleName != null ? "_" + moduleName.replaceAll("\\s+", "_").toLowerCase() : "");
     }
 

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

@@ -70,7 +70,7 @@ public String getName() {
     }
 
     private static String getId(String surname, Faction faction, String moduleName) {
-        return surname.replaceAll("\\s+", "_").toLowerCase() + (faction != null ? "_" + faction : "") +
+        return surname.replaceAll("\\s+", "_").toLowerCase() + (faction != null ? "_" + faction.getId() : "") +
                 (moduleName != null ? "_" + moduleName.replaceAll("\\s+", "_").toLowerCase() : "");
     }