Ensuring default cash is correct for nobility and status

softwaremagico · May 24, 2021 · 6b24b2a · 6b24b2a
1 parent 9c0ba3c
commit 6b24b2a
Show file tree

Hide file tree

Showing 75 changed files with 300 additions and 239 deletions.
diff --git a/think-machine-random/src/main/java/com/softwaremagico/tm/character/RandomName.java b/think-machine-random/src/main/java/com/softwaremagico/tm/character/RandomName.java
@@ -40,7 +40,7 @@
 
 public class RandomName extends RandomSelector<Name> {
 
-    public RandomName(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences)
+    public RandomName(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences)
             throws InvalidXmlElementException, RestrictedElementException {
         super(characterPlayer, preferences);
     }

diff --git a/think-machine-random/src/main/java/com/softwaremagico/tm/character/RandomPlanet.java b/think-machine-random/src/main/java/com/softwaremagico/tm/character/RandomPlanet.java
@@ -41,7 +41,7 @@ public class RandomPlanet extends RandomSelector<Planet> {
     private static final int NEUTRAL_PLANET = 8;
     private static final int ENEMY_PLANET = 1;
 
-    public RandomPlanet(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences)
+    public RandomPlanet(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences)
             throws InvalidXmlElementException, RestrictedElementException {
         super(characterPlayer, preferences);
     }

diff --git a/think-machine-random/src/main/java/com/softwaremagico/tm/character/RandomSurname.java b/think-machine-random/src/main/java/com/softwaremagico/tm/character/RandomSurname.java
@@ -40,7 +40,7 @@
 
 public class RandomSurname extends RandomSelector<Surname> {
 
-    public RandomSurname(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences)
+    public RandomSurname(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences)
             throws InvalidXmlElementException, RestrictedElementException {
         super(characterPlayer, preferences);
     }

diff --git a/think-machine-random/src/main/java/com/softwaremagico/tm/character/RandomizeCharacter.java b/think-machine-random/src/main/java/com/softwaremagico/tm/character/RandomizeCharacter.java
@@ -66,7 +66,7 @@
 
 public class RandomizeCharacter {
     private final CharacterPlayer characterPlayer;
-    private final Set<IRandomPreference> preferences;
+    private final Set<IRandomPreference<?>> preferences;
     private final Set<AvailableSkill> requiredSkills;
     private final Set<AvailableSkill> suggestedSkills;
     private final Set<Blessing> mandatoryBlessings;
@@ -82,7 +82,7 @@ public class RandomizeCharacter {
     private final Faction requiredFaction;
     private final Race requiredRace;
 
-    public RandomizeCharacter(CharacterPlayer characterPlayer, int experiencePoints, IRandomPreference... preferences) {
+    public RandomizeCharacter(CharacterPlayer characterPlayer, int experiencePoints, IRandomPreference<?>... preferences) {
         this(characterPlayer, experiencePoints, null, new HashSet<>(Arrays.asList(preferences)), new HashSet<>(), new HashSet<>(),
                 new HashSet<>(), new HashSet<>(), new HashSet<>(), new HashSet<>(), new HashSet<>(), new HashSet<>(), new HashSet<>(),
                 new HashSet<>(), new HashSet<>(), new HashSet<>());
@@ -94,13 +94,13 @@ public RandomizeCharacter(CharacterPlayer characterPlayer, IRandomPredefined...
                 new HashSet<>(), new HashSet<>(), new HashSet<>());
     }
 
-    public RandomizeCharacter(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences, IRandomPredefined... profiles) {
+    public RandomizeCharacter(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences, IRandomPredefined... profiles) {
         this(characterPlayer, null, new HashSet<>(Arrays.asList(profiles)), preferences, new HashSet<>(), new HashSet<>(),
                 new HashSet<>(), new HashSet<>(), new HashSet<>(), new HashSet<>(), new HashSet<>(), new HashSet<>(), new HashSet<>(),
                 new HashSet<>(), new HashSet<>(), new HashSet<>());
     }
 
-    public RandomizeCharacter(CharacterPlayer characterPlayer, Integer experiencePoints, Set<IRandomPredefined> profiles, Set<IRandomPreference> preferences,
+    public RandomizeCharacter(CharacterPlayer characterPlayer, Integer experiencePoints, Set<IRandomPredefined> profiles, Set<IRandomPreference<?>> preferences,
                               Set<AvailableSkill> requiredSkills, Set<AvailableSkill> suggestedSkills,
                               Set<Blessing> mandatoryBlessings, Set<Blessing> suggestedBlessings,
                               Set<BeneficeDefinition> mandatoryBenefices, Set<BeneficeDefinition> suggestedBenefices,
@@ -193,7 +193,7 @@ public void createCharacter() throws InvalidXmlElementException, InvalidRandomEl
         setExperiencePoints();
     }
 
-    private void setDefaultPreferences() {
+    public void setDefaultPreferences() {
         final AgePreferences agePreferences = AgePreferences.getSelected(preferences);
         if (agePreferences == null) {
             preferences.add(AgePreferences.getDefaultOption());
@@ -241,11 +241,22 @@ private void setDefaultPreferences() {
 
         final CashPreferences cashPreferences = CashPreferences.getSelected(preferences);
         if (cashPreferences == null) {
+            //Faction and status also change the cash amount.
+            final CashPreferences factionCashPreference = CashPreferences.get(FactionPreferences.getSelected(preferences));
+            final CashPreferences statusCashPreference = CashPreferences.get(StatusPreferences.getSelected(preferences));
+
+            //Equipment minimum cash.
             final AtomicReference<Float> equipmentCost = new AtomicReference<>((float) 0);
             mandatoryWeapons.forEach(weapon -> equipmentCost.updateAndGet(v -> (v + weapon.getCost())));
             mandatoryArmours.forEach(armour -> equipmentCost.updateAndGet(v -> (v + armour.getCost())));
             mandatoryShields.forEach(shield -> equipmentCost.updateAndGet(v -> (v + shield.getCost())));
-            preferences.add(CashPreferences.get(equipmentCost.get()));
+            final CashPreferences equipmentCostPreference = CashPreferences.get(equipmentCost.get());
+
+            //Select higher value.
+            final List<IRandomPreference> list = Arrays.asList(factionCashPreference,
+                    statusCashPreference, equipmentCostPreference);
+            final Optional<IRandomPreference> cashSelected = list.stream().filter(Objects::nonNull).max(Comparator.naturalOrder());
+            cashSelected.ifPresent(preferences::add);
         }
         preferences.removeIf(Objects::isNull);
     }
@@ -450,4 +461,8 @@ private void setExperiencePoints() throws InvalidXmlElementException, Restricted
     public String toString() {
         return characterPlayer.getCompleteNameRepresentation() + " (" + characterPlayer.getRace() + ") [" + characterPlayer.getFaction() + "]";
     }
+
+    public Set<IRandomPreference<?>> getPreferences() {
+        return preferences;
+    }
 }
diff --git a/...dom/src/main/java/com/softwaremagico/tm/character/benefices/RandomBeneficeDefinition.java b/...dom/src/main/java/com/softwaremagico/tm/character/benefices/RandomBeneficeDefinition.java
@@ -52,12 +52,12 @@ public class RandomBeneficeDefinition extends RandomSelector<BeneficeDefinition>
     private Integer totalCombatActions;
     private final Set<AvailableBenefice> suggestedAvailableBenefices;
 
-    public RandomBeneficeDefinition(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences)
+    public RandomBeneficeDefinition(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences)
             throws InvalidXmlElementException, RestrictedElementException {
         this(characterPlayer, preferences, new HashSet<>(), new HashSet<>(), new HashSet<>());
     }
 
-    public RandomBeneficeDefinition(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences,
+    public RandomBeneficeDefinition(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences,
                                     Set<BeneficeDefinition> mandatoryBenefices, Set<BeneficeDefinition> suggestedBenefices,
                                     Set<AvailableBenefice> suggestedAvailableBenefices)
             throws InvalidXmlElementException, RestrictedElementException {

diff --git a/...rc/main/java/com/softwaremagico/tm/character/benefices/RandomExtraBeneficeDefinition.java b/...rc/main/java/com/softwaremagico/tm/character/benefices/RandomExtraBeneficeDefinition.java
@@ -39,7 +39,7 @@
 public class RandomExtraBeneficeDefinition extends RandomBeneficeDefinition {
     private static final int MAX_COMBAT_STYLES = 2;
 
-    public RandomExtraBeneficeDefinition(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences,
+    public RandomExtraBeneficeDefinition(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences,
                                          Set<BeneficeDefinition> suggestedBenefices, Set<AvailableBenefice> suggestedAvailableBenefices) throws
             InvalidXmlElementException, RestrictedElementException {
         super(characterPlayer, preferences, new HashSet<>(), suggestedBenefices, suggestedAvailableBenefices);

diff --git a/...dom/src/main/java/com/softwaremagico/tm/character/blessings/RandomBlessingDefinition.java b/...dom/src/main/java/com/softwaremagico/tm/character/blessings/RandomBlessingDefinition.java
@@ -39,7 +39,7 @@
 
 public class RandomBlessingDefinition extends RandomSelector<Blessing> {
 
-    public RandomBlessingDefinition(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences, Set<Blessing> mandatoryBlessings,
+    public RandomBlessingDefinition(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences, Set<Blessing> mandatoryBlessings,
                                     Set<Blessing> suggestedBlessings) throws InvalidXmlElementException, RestrictedElementException {
         super(characterPlayer, null, preferences, mandatoryBlessings, suggestedBlessings);
     }

diff --git a/...andom/src/main/java/com/softwaremagico/tm/character/blessings/RandomCursesDefinition.java b/...andom/src/main/java/com/softwaremagico/tm/character/blessings/RandomCursesDefinition.java
@@ -39,7 +39,7 @@
 
 public class RandomCursesDefinition extends RandomSelector<Blessing> {
 
-    public RandomCursesDefinition(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences)
+    public RandomCursesDefinition(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences)
             throws InvalidXmlElementException, RestrictedElementException {
         super(characterPlayer, preferences);
     }

diff --git a/.../src/main/java/com/softwaremagico/tm/character/characteristics/RandomCharacteristics.java b/.../src/main/java/com/softwaremagico/tm/character/characteristics/RandomCharacteristics.java
@@ -43,7 +43,7 @@ public class RandomCharacteristics extends RandomSelector<Characteristic> {
     private static final int MIN_FAITH_FOR_THEURGY = 6;
     private static final int MIN_WILL_FOR_PSIQUE = 5;
 
-    public RandomCharacteristics(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences,
+    public RandomCharacteristics(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences,
                                  Set<Characteristic> characteristicsMinimumValues) throws InvalidXmlElementException,
             RestrictedElementException {
         super(characterPlayer, null, preferences, characteristicsMinimumValues, new HashSet<>());
@@ -54,8 +54,8 @@ public void assign() throws InvalidRandomElementSelectedException {
         final SpecializationPreferences selectedSpecialization = SpecializationPreferences
                 .getSelected(getPreferences());
 
-        IRandomPreference techPreference = null;
-        for (final IRandomPreference preference : getPreferences()) {
+        IRandomPreference<?> techPreference = null;
+        for (final IRandomPreference<?> preference : getPreferences()) {
             if (preference instanceof TechnologicalPreferences) {
                 techPreference = preference;
             }

diff --git a/...java/com/softwaremagico/tm/character/characteristics/RandomCharacteristicsExperience.java b/...java/com/softwaremagico/tm/character/characteristics/RandomCharacteristicsExperience.java
@@ -41,7 +41,7 @@
 
 public class RandomCharacteristicsExperience extends RandomCharacteristics {
 
-    public RandomCharacteristicsExperience(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences) throws InvalidXmlElementException,
+    public RandomCharacteristicsExperience(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences) throws InvalidXmlElementException,
             RestrictedElementException {
         super(characterPlayer, preferences, new HashSet<>());
     }

diff --git a/...ava/com/softwaremagico/tm/character/characteristics/RandomCharacteristicsExtraPoints.java b/...ava/com/softwaremagico/tm/character/characteristics/RandomCharacteristicsExtraPoints.java
@@ -42,16 +42,16 @@
 
 public class RandomCharacteristicsExtraPoints extends RandomCharacteristics {
 
-	public RandomCharacteristicsExtraPoints(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences) throws InvalidXmlElementException,
+	public RandomCharacteristicsExtraPoints(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences) throws InvalidXmlElementException,
 			RestrictedElementException {
-		super(characterPlayer, preferences, new HashSet<Characteristic>());
+		super(characterPlayer, preferences, new HashSet<>());
 	}
 
 	public int spendCharacteristicsPoints(int remainingPoints) throws InvalidRandomElementSelectedException {
 		final IGaussianDistribution specialization = SpecializationPreferences.getSelected(getPreferences());
 
-		IRandomPreference techPreference = null;
-		for (final IRandomPreference preference : getPreferences()) {
+		IRandomPreference<?> techPreference = null;
+		for (final IRandomPreference<?> preference : getPreferences()) {
 			if (preference instanceof TechnologicalPreferences) {
 				techPreference = preference;
 			}

diff --git a/...e-random/src/main/java/com/softwaremagico/tm/character/cybernetics/RandomCybernetics.java b/...e-random/src/main/java/com/softwaremagico/tm/character/cybernetics/RandomCybernetics.java
@@ -48,7 +48,7 @@ public class RandomCybernetics extends RandomSelector<CyberneticDevice> {
     private int totalDevices;
     private int desiredCyberneticsPoints;
 
-    public RandomCybernetics(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences)
+    public RandomCybernetics(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences)
             throws InvalidXmlElementException, RestrictedElementException {
         super(characterPlayer, preferences);
         totalDevices = CyberneticTotalDevicesPreferences.getSelected(getPreferences()).randomGaussian();

diff --git a/...ine-random/src/main/java/com/softwaremagico/tm/character/equipment/EquipmentSelector.java b/...ine-random/src/main/java/com/softwaremagico/tm/character/equipment/EquipmentSelector.java
@@ -37,7 +37,7 @@
 public abstract class EquipmentSelector<E extends Equipment<?>> extends RandomSelector<E> {
 	private Integer currentMoney = null;
 
-	protected EquipmentSelector(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences,
+	protected EquipmentSelector(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences,
 			Set<E> mandatoryElements) throws InvalidXmlElementException, RestrictedElementException {
 		super(characterPlayer, null, preferences, mandatoryElements, null);
 	}

diff --git a/...-random/src/main/java/com/softwaremagico/tm/character/equipment/armours/RandomArmour.java b/...-random/src/main/java/com/softwaremagico/tm/character/equipment/armours/RandomArmour.java
@@ -43,7 +43,7 @@
 
 public class RandomArmour extends EquipmentSelector<Armour> {
 
-    public RandomArmour(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences,
+    public RandomArmour(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences,
                         Set<Armour> mandatoryArmours) throws InvalidXmlElementException, RestrictedElementException {
         super(characterPlayer, preferences, mandatoryArmours);
     }

diff --git a/...-random/src/main/java/com/softwaremagico/tm/character/equipment/shields/RandomShield.java b/...-random/src/main/java/com/softwaremagico/tm/character/equipment/shields/RandomShield.java
@@ -39,7 +39,7 @@
 
 public class RandomShield extends EquipmentSelector<Shield> {
 
-    public RandomShield(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences,
+    public RandomShield(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences,
                         Set<Shield> mandatoryShields) throws InvalidXmlElementException, RestrictedElementException {
         super(characterPlayer, preferences, mandatoryShields);
     }
@@ -138,13 +138,7 @@ protected void assignMandatoryValues(Set<Shield> mandatoryValues) throws Invalid
         // We only assign the most expensive one.
         if (!mandatoryValues.isEmpty()) {
             final List<Shield> sortedShields = new ArrayList<>(mandatoryValues);
-            Collections.sort(sortedShields, new Comparator<Shield>() {
-
-                @Override
-                public int compare(Shield shield0, Shield shield1) {
-                    return Float.compare(shield0.getCost(), shield1.getCost());
-                }
-            });
+            sortedShields.sort((shield0, shield1) -> Float.compare(shield0.getCost(), shield1.getCost()));
             getCharacterPlayer().setShield(sortedShields.get(0));
         }
     }

diff --git a/...om/src/main/java/com/softwaremagico/tm/character/equipment/weapons/RandomMeleeWeapon.java b/...om/src/main/java/com/softwaremagico/tm/character/equipment/weapons/RandomMeleeWeapon.java
@@ -38,7 +38,7 @@
 
 public class RandomMeleeWeapon extends RandomWeapon {
 
-    public RandomMeleeWeapon(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences,
+    public RandomMeleeWeapon(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences,
                              Set<Weapon> mandatoryWeapons) throws InvalidXmlElementException, RestrictedElementException {
         super(characterPlayer, preferences, mandatoryWeapons);
     }
@@ -69,7 +69,7 @@ protected Set<WeaponType> weaponTypesFilter() {
 
     @Override
     protected int getWeightCostModificator(Weapon weapon) {
-        if (weapon.getCost() > getCurrentMoney() / (double) 1.1) {
+        if (weapon.getCost() > getCurrentMoney() / 1.1) {
             return 10;
         } else if (weapon.getCost() > getCurrentMoney() / (double) 2) {
             return 7;

diff --git a/...om/src/main/java/com/softwaremagico/tm/character/equipment/weapons/RandomRangeWeapon.java b/...om/src/main/java/com/softwaremagico/tm/character/equipment/weapons/RandomRangeWeapon.java
@@ -38,7 +38,7 @@
 
 public class RandomRangeWeapon extends RandomWeapon {
 
-    public RandomRangeWeapon(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences,
+    public RandomRangeWeapon(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences,
                              Set<Weapon> mandatoryWeapons) throws InvalidXmlElementException, RestrictedElementException {
         super(characterPlayer, preferences, mandatoryWeapons);
     }
@@ -69,7 +69,7 @@ protected Set<WeaponType> weaponTypesFilter() {
 
     @Override
     protected int getWeightCostModificator(Weapon weapon) {
-        if (weapon.getCost() > getCurrentMoney() / (double) 1.1) {
+        if (weapon.getCost() > getCurrentMoney() / 1.1) {
             return 100;
         } else if (weapon.getCost() > getCurrentMoney() / (double) 2) {
             return 7;

diff --git a/...-random/src/main/java/com/softwaremagico/tm/character/equipment/weapons/RandomWeapon.java b/...-random/src/main/java/com/softwaremagico/tm/character/equipment/weapons/RandomWeapon.java
@@ -38,7 +38,7 @@
 
 public abstract class RandomWeapon extends EquipmentSelector<Weapon> {
 
-    protected RandomWeapon(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences,
+    protected RandomWeapon(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences,
                            Set<Weapon> mandatoryWeapons) throws InvalidXmlElementException, RestrictedElementException {
         super(characterPlayer, preferences, mandatoryWeapons);
     }

diff --git a/...-machine-random/src/main/java/com/softwaremagico/tm/character/factions/RandomFaction.java b/...-machine-random/src/main/java/com/softwaremagico/tm/character/factions/RandomFaction.java
@@ -37,7 +37,7 @@
 
 public class RandomFaction extends RandomSelector<Faction> {
 
-    public RandomFaction(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences) throws InvalidXmlElementException,
+    public RandomFaction(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences) throws InvalidXmlElementException,
             RestrictedElementException {
         super(characterPlayer, preferences);
     }
@@ -67,17 +67,16 @@ protected int getWeight(Faction faction) throws InvalidRandomElementSelectedExce
         // Specialization desired.
         final FactionPreferences selectedFactionGroup = FactionPreferences.getSelected(getPreferences());
         if (selectedFactionGroup != null) {
-            if (faction.getFactionGroup() != null && faction.getFactionGroup().name().equalsIgnoreCase(selectedFactionGroup.name())) {
-                return 1;
+            if (faction.getFactionGroup() != null && !faction.getFactionGroup().name().equalsIgnoreCase(selectedFactionGroup.name())) {
+                // Different faction than selected.
+                throw new InvalidRandomElementSelectedException("Faction '" + faction + "' not in preferences selection '" + selectedFactionGroup + "'.");
+            }
+        } else
+            // No faction preference selected. Xeno factions has preferences by its own factions.
+            if (getCharacterPlayer().getRace().isXeno() && faction.getRestrictedToRaces().size() == 1 &&
+                    faction.getRestrictedToRaces().contains(getCharacterPlayer().getRace())) {
+                return 100;
             }
-            // Different faction than selected.
-            throw new InvalidRandomElementSelectedException("Faction '" + faction + "' not in preferences selection '" + selectedFactionGroup + "'.");
-        }
-        // No faction preference selected. Xeno factions has preferences by its own factions.
-        if (getCharacterPlayer().getRace().isXeno() && faction.getRestrictedToRaces().size() == 1 &&
-                faction.getRestrictedToRaces().contains(getCharacterPlayer().getRace())) {
-            return 100;
-        }
         return 1;
     }
 

diff --git a/...-machine-random/src/main/java/com/softwaremagico/tm/character/occultism/RandomPsique.java b/...-machine-random/src/main/java/com/softwaremagico/tm/character/occultism/RandomPsique.java
@@ -45,7 +45,7 @@
 
 public class RandomPsique extends RandomSelector<OccultismType> {
 
-    public RandomPsique(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences)
+    public RandomPsique(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences)
             throws InvalidXmlElementException, RestrictedElementException {
         super(characterPlayer, preferences);
     }

diff --git a/...hine-random/src/main/java/com/softwaremagico/tm/character/occultism/RandomPsiquePath.java b/...hine-random/src/main/java/com/softwaremagico/tm/character/occultism/RandomPsiquePath.java
@@ -42,7 +42,7 @@ public class RandomPsiquePath extends RandomSelector<OccultismPath> {
 
     private int totalPowers;
 
-    public RandomPsiquePath(CharacterPlayer characterPlayer, Set<IRandomPreference> preferences, Set<OccultismPath> mandatoryOccultismPaths)
+    public RandomPsiquePath(CharacterPlayer characterPlayer, Set<IRandomPreference<?>> preferences, Set<OccultismPath> mandatoryOccultismPaths)
             throws InvalidXmlElementException, RestrictedElementException {
         super(characterPlayer, null, preferences, mandatoryOccultismPaths, new HashSet<>());
     }