Generalized some random controls

think-machine-core/src/main/java/com/softwaremagico/tm/XmlFactory.java

@@ -30,14 +30,30 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.StringTokenizer;
 
+import com.softwaremagico.tm.character.factions.FactionGroup;
+import com.softwaremagico.tm.character.factions.FactionsFactory;
+import com.softwaremagico.tm.character.race.RaceFactory;
 import com.softwaremagico.tm.language.ITranslator;
 import com.softwaremagico.tm.language.Language;
 import com.softwaremagico.tm.log.MachineLog;
+import com.softwaremagico.tm.random.definition.RandomProbabilityDefinition;
 
 public abstract class XmlFactory<T extends Element<T>> {
 	protected Map<String, List<T>> elements = new HashMap<>();
 
+	private final static String RANDOM = "random";
+	private final static String ELEMENT_PROBABILITY_MULTIPLIER = "probabilityMultiplier";
+	private final static String RESTRICTED_FACTIONS = "restrictedFactions";
+	private final static String MIN_TECH_LEVEL = "minTechLevel";
+	private final static String MAX_TECH_LEVEL = "maxTechLevel";
+	private final static String RECOMMENDED_FACTIONS = "recommendedFactions";
+	private final static String RECOMMENDED_FACTION_GROUPS = "recommendedFactionGroups";
+	private final static String RECOMMENDED_RACES = "recommendedRaces";
+	private final static String GENERAL_PROBABILITY = "generalProbability";
+	private final static String STATIC_PROBABILITY = "staticProbability";
+
 	protected XmlFactory() {
 		initialize();
 	}
@@ -62,11 +78,94 @@ public void clearCache() {
 		initialize();
 	}
 
+	protected void setRandomConfiguration(Element<?> element, ITranslator translator, String language) throws InvalidXmlElementException {
+		// Is an element restricted to a faction?
+		String restrictedFactionsId = translator.getNodeValue(element.getId(), RANDOM, RESTRICTED_FACTIONS);
+		if (restrictedFactionsId != null) {
+			StringTokenizer factionTokenizer = new StringTokenizer(restrictedFactionsId, ",");
+			while (factionTokenizer.hasMoreTokens()) {
+				element.getRandomDefinition().getRestrictedFactions()
+						.add(FactionsFactory.getInstance().getElement(factionTokenizer.nextToken().trim(), language));
+			}
+		}
+
+		try {
+			String elementProbability = getTranslator().getNodeValue(element.getId(), RANDOM, ELEMENT_PROBABILITY_MULTIPLIER);
+			if (elementProbability != null) {
+				element.getRandomDefinition().setProbabilityMultiplier(Double.parseDouble(elementProbability));
+			} else {
+				element.getRandomDefinition().setProbabilityMultiplier(1d);
+			}
+		} catch (NumberFormatException nfe) {
+			throw new InvalidXmlElementException("Invalid number value for element probability in '" + element.getId() + "'.");
+		}
+
+		try {
+			String minTechLevel = translator.getNodeValue(element.getId(), RANDOM, MIN_TECH_LEVEL);
+			if (minTechLevel != null) {
+				element.getRandomDefinition().setMinimumTechLevel(Integer.parseInt(minTechLevel));
+			}
+		} catch (NumberFormatException nfe) {
+			throw new InvalidXmlElementException("Invalid number value for techlevel in element '" + element.getId() + "'.");
+		}
+
+		try {
+			String maxTechLevel = translator.getNodeValue(element.getId(), RANDOM, MAX_TECH_LEVEL);
+			if (maxTechLevel != null) {
+				element.getRandomDefinition().setMaximumTechLevel(Integer.parseInt(maxTechLevel));
+			}
+		} catch (NumberFormatException nfe) {
+			throw new InvalidXmlElementException("Invalid number value for max techlevel in element '" + element.getId() + "'.");
+		}
+
+		String recommendedFactionGroups = translator.getNodeValue(element.getId(), RANDOM, RECOMMENDED_FACTION_GROUPS);
+		if (recommendedFactionGroups != null) {
+			StringTokenizer recommendedFactionGroupsOfSkill = new StringTokenizer(recommendedFactionGroups, ",");
+			while (recommendedFactionGroupsOfSkill.hasMoreTokens()) {
+				element.getRandomDefinition().addRecommendedFactionGroup(FactionGroup.get(recommendedFactionGroupsOfSkill.nextToken().trim()));
+			}
+		}
+
+		String recommendedFactions = translator.getNodeValue(element.getId(), RANDOM, RECOMMENDED_FACTIONS);
+		if (recommendedFactions != null) {
+			StringTokenizer recommendedFactionsOfSkill = new StringTokenizer(recommendedFactions, ",");
+			while (recommendedFactionsOfSkill.hasMoreTokens()) {
+				element.getRandomDefinition().addRecommendedFaction(
+						FactionsFactory.getInstance().getElement(recommendedFactionsOfSkill.nextToken().trim(), language));
+			}
+		}
+
+		String recommendedRaces = translator.getNodeValue(element.getId(), RANDOM, RECOMMENDED_RACES);
+		if (recommendedRaces != null) {
+			StringTokenizer recommendedRacesOfSkill = new StringTokenizer(recommendedRaces, ",");
+			while (recommendedRacesOfSkill.hasMoreTokens()) {
+				element.getRandomDefinition().addRecommendedRace(RaceFactory.getInstance().getElement(recommendedRacesOfSkill.nextToken().trim(), language));
+			}
+		}
+
+		String generalProbability = translator.getNodeValue(element.getId(), RANDOM, GENERAL_PROBABILITY);
+		if (generalProbability != null) {
+			element.getRandomDefinition().setProbability(RandomProbabilityDefinition.get(generalProbability));
+		}
+
+		try {
+			String staticProbability = translator.getNodeValue(element.getId(), RANDOM, STATIC_PROBABILITY);
+			if (staticProbability != null) {
+				element.getRandomDefinition().setStaticProbability(Integer.parseInt(staticProbability));
+			} else {
+				element.getRandomDefinition().setStaticProbability(1);
+			}
+		} catch (NumberFormatException nfe) {
+			throw new InvalidXmlElementException("Invalid number value for element probability in '" + element.getId() + "'.");
+		}
+	}
+
 	public List<T> getElements(String language) throws InvalidXmlElementException {
 		if (elements.get(language) == null) {
 			elements.put(language, new ArrayList<T>());
 			for (String elementId : getTranslator().getAllTranslatedElements()) {
 				T element = createElement(getTranslator(), elementId, language);
+				setRandomConfiguration(element, getTranslator(), language);
 				if (elements.get(language).contains(element)) {
 					throw new ElementAlreadyExistsException("Element '" + element + "' already is inserted. Probably the ID is duplicated.");
 				}

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

@@ -89,6 +89,7 @@
 import com.softwaremagico.tm.character.values.SpecialValuesFactory;
 import com.softwaremagico.tm.log.CostCalculatorLog;
 import com.softwaremagico.tm.log.MachineLog;
+import com.softwaremagico.tm.txt.CharacterSheet;
 
 public class CharacterPlayer {
 	private String language;
@@ -696,6 +697,11 @@ public String toString() {
 		return super.toString();
 	}
 
+	public String getRepresentation() {
+		CharacterSheet characterSheet = new CharacterSheet(this);
+		return characterSheet.toString();
+	}
+
 	public int getStrengthDamangeModification() {
 		try {
 			int strength = characteristics.get(CharacteristicName.STRENGTH.getId()).getValue();

think-machine-core/src/main/java/com/softwaremagico/tm/character/characteristics/Characteristic.java

@@ -26,6 +26,7 @@
 
 public class Characteristic extends CharacteristicDefinition {
 	public final static int DEFAULT_INITIAL_VALUE = 3;
+	public final static int MAX_VALUE = 12;
 	private int value;
 
 	public Characteristic(CharacteristicDefinition characteristicDefinition) {

think-machine-core/src/main/java/com/softwaremagico/tm/character/equipment/weapons/Weapon.java

@@ -30,7 +30,6 @@
 import com.softwaremagico.tm.character.characteristics.CharacteristicDefinition;
 import com.softwaremagico.tm.character.equipment.DamageType;
 import com.softwaremagico.tm.character.equipment.Size;
-import com.softwaremagico.tm.character.factions.Faction;
 import com.softwaremagico.tm.character.skills.SkillDefinition;
 
 public class Weapon extends Element<Weapon> {
@@ -54,11 +53,9 @@ public class Weapon extends Element<Weapon> {
 	private final Set<Ammunition> ammunitions;
 	private final Set<Accessory> accesories;
 
-	private final Faction faction;
-
 	public Weapon(String id, String name, WeaponType type, String goal, CharacteristicDefinition characteristic, SkillDefinition skill, String damage,
 			int strength, String range, Integer shots, String rate, int tech, boolean techLevelSpecial, Size size, String special, Set<DamageType> damageTypes,
-			float cost, Set<Ammunition> ammunitions, Set<Accessory> accesories, Faction faction) {
+			float cost, Set<Ammunition> ammunitions, Set<Accessory> accesories) {
 		super(id, name);
 		this.characteristic = characteristic;
 		this.skill = skill;
@@ -76,7 +73,6 @@ public Weapon(String id, String name, WeaponType type, String goal, Characterist
 		this.damageTypes = damageTypes;
 		this.cost = cost;
 		this.ammunitions = ammunitions;
-		this.faction = faction;
 		this.accesories = accesories;
 	}
 
@@ -162,10 +158,6 @@ public Set<Ammunition> getAmmunitions() {
 		return ammunitions;
 	}
 
-	public Faction getFaction() {
-		return faction;
-	}
-
 	public Set<Accessory> getAccesories() {
 		return accesories;
 	}

think-machine-core/src/main/java/com/softwaremagico/tm/character/equipment/weapons/WeaponFactory.java

@@ -35,8 +35,6 @@
 import com.softwaremagico.tm.character.equipment.DamageType;
 import com.softwaremagico.tm.character.equipment.DamageTypeFactory;
 import com.softwaremagico.tm.character.equipment.Size;
-import com.softwaremagico.tm.character.factions.Faction;
-import com.softwaremagico.tm.character.factions.FactionsFactory;
 import com.softwaremagico.tm.character.skills.SkillDefinition;
 import com.softwaremagico.tm.character.skills.SkillsDefinitionsFactory;
 import com.softwaremagico.tm.language.ITranslator;
@@ -58,10 +56,6 @@ public class WeaponFactory extends XmlFactory<Weapon> {
 	private final static String RATE = "rate";
 	private final static String SIZE = "size";
 	private final static String COST = "cost";
-	private final static String FACTION = "faction";
-
-	private final static String RANDOM = "random";
-	private final static String WEAPON_PROBABILITY = "probabilityMultiplier";
 
 	private final static String TYPE = "type";
 	private final static String SPECIAL = "special";
@@ -254,27 +248,8 @@ protected Weapon createElement(ITranslator translator, String weaponId, String l
 			}
 		}
 
-		// Is a weapon of a faction?
-		Faction faction = null;
-		String factionId = translator.getNodeValue(weaponId, FACTION);
-		if (factionId != null) {
-			Faction restrictedFaction = FactionsFactory.getInstance().getElement(factionId, language);
-			faction = restrictedFaction;
-		}
-
 		weapon = new Weapon(weaponId, name, WeaponType.get(typeName), goal, characteristicDefintion, skill, damage, strength, range, shots, rate, techLevel,
-				techLevelSpecial, size, special, damageOfWeapon, cost, ammunitions, accessories, faction);
-
-		try {
-			String weaponProbability = translator.getNodeValue(weaponId, RANDOM, WEAPON_PROBABILITY);
-			if (weaponProbability != null) {
-				weapon.getRandomDefinition().setProbabilityMultiplier(Double.parseDouble(weaponProbability));
-			} else {
-				weapon.getRandomDefinition().setProbabilityMultiplier(1d);
-			}
-		} catch (NumberFormatException nfe) {
-			throw new InvalidWeaponException("Invalid number value for weapon probability in '" + weaponId + "'.");
-		}
+				techLevelSpecial, size, special, damageOfWeapon, cost, ammunitions, accessories);
 
 		return weapon;
 	}

think-machine-core/src/main/java/com/softwaremagico/tm/character/race/RaceFactory.java

@@ -32,8 +32,6 @@
 
 public class RaceFactory extends XmlFactory<Race> {
 	private final static ITranslator translatorRace = LanguagePool.getTranslator("races.xml");
-	private final static String RANDOM = "random";
-	private final static String RACE_PROBABILITY = "probability";
 
 	private final static String NAME = "name";
 	private final static String MAX_VALUE = "maximumValue";
@@ -70,8 +68,7 @@ protected ITranslator getTranslator() {
 	}
 
 	@Override
-	protected Race createElement(ITranslator translator, String raceId, String language)
-			throws InvalidXmlElementException {
+	protected Race createElement(ITranslator translator, String raceId, String language) throws InvalidXmlElementException {
 		Race race = null;
 		try {
 			String name = translator.getNodeValue(raceId, NAME, language);
@@ -96,8 +93,7 @@ protected Race createElement(ITranslator translator, String raceId, String langu
 					race.setValue(characteristic, Integer.parseInt(value));
 				}
 			} catch (NumberFormatException nfe) {
-				throw new InvalidRaceException("Invalid value for characteristic '" + characteristic.getId()
-						+ "' in race '" + raceId + "'.");
+				throw new InvalidRaceException("Invalid value for characteristic '" + characteristic.getId() + "' in race '" + raceId + "'.");
 			}
 		}
 		try {
@@ -124,16 +120,7 @@ protected Race createElement(ITranslator translator, String raceId, String langu
 		} catch (Exception e) {
 			throw new InvalidRaceException("Invalid hubris value in race '" + raceId + "'.");
 		}
-		try {
-			String raceProbability = translator.getNodeValue(raceId, RANDOM, RACE_PROBABILITY);
-			if (raceProbability != null) {
-				race.getRandomDefinition().setStaticProbability(Integer.parseInt(raceProbability));
-			} else {
-				race.getRandomDefinition().setStaticProbability(1);
-			}
-		} catch (NumberFormatException nfe) {
-			throw new InvalidRaceException("Invalid number value for race probability in '" + raceId + "'.");
-		}
+
 		return race;
 
 	}