Ensuring default cash is correct for nobility and status

Author: softwaremagico

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);
     }

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);
     }

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);
     }

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;
+    }
 }

think-machine-random/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 {

think-machine-random/src/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);

think-machine-random/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);
     }

think-machine-random/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);
     }

think-machine-random/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;
             }

think-machine-random/src/main/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<>());
     }