diff --git a/MekHQ/resources/mekhq/resources/RandomBackgrounds.properties b/MekHQ/resources/mekhq/resources/RandomBackgrounds.properties deleted file mode 100644 index c34af42e3e..0000000000 --- a/MekHQ/resources/mekhq/resources/RandomBackgrounds.properties +++ /dev/null @@ -1,2 +0,0 @@ -toughnessStrongJaw.biography=%s demonstrates remarkable resilience and toughness, enduring physical blows without being easily knocked down or deterred. -toughnessWeakJaw.biography=%s is easily overwhelmed or hurt by physical blows, quickly showing signs of distress or defeat. \ No newline at end of file diff --git a/MekHQ/src/mekhq/campaign/personnel/backgrounds/BackgroundsController.java b/MekHQ/src/mekhq/campaign/personnel/backgrounds/BackgroundsController.java index b5c88bcb05..2e09ed8eea 100644 --- a/MekHQ/src/mekhq/campaign/personnel/backgrounds/BackgroundsController.java +++ b/MekHQ/src/mekhq/campaign/personnel/backgrounds/BackgroundsController.java @@ -1,18 +1,12 @@ package mekhq.campaign.personnel.backgrounds; -import mekhq.MekHQ; import mekhq.campaign.Campaign; import mekhq.campaign.personnel.Person; -import java.util.ResourceBundle; - public class BackgroundsController { public static void generateBackground(Campaign campaign, Person person) { - ResourceBundle resources = ResourceBundle.getBundle("mekhq.resources.RandomBackgrounds", - MekHQ.getMHQOptions().getLocale()); - if (campaign.getCampaignOptions().isUseToughness()) { - Toughness.generateToughness(person, resources); + Toughness.generateToughness(person); } } } diff --git a/MekHQ/src/mekhq/campaign/personnel/backgrounds/Toughness.java b/MekHQ/src/mekhq/campaign/personnel/backgrounds/Toughness.java index f245fe1086..6ef8596b8c 100644 --- a/MekHQ/src/mekhq/campaign/personnel/backgrounds/Toughness.java +++ b/MekHQ/src/mekhq/campaign/personnel/backgrounds/Toughness.java @@ -3,26 +3,19 @@ import megamek.common.Compute; import mekhq.campaign.personnel.Person; -import java.util.ResourceBundle; - public class Toughness { /** * Generates the toughness attribute for a character. * * @param person The person for whom the toughness attribute is being generated. - * @param resources The resource bundle for retrieving localized strings. */ - public static void generateToughness(Person person, ResourceBundle resources) { + public static void generateToughness(Person person) { int roll = Compute.d6(2); if (roll == 2) { person.setToughness(-1); - - person.setBiography(String.format(resources.getString("toughnessWeakJaw.biography"), person.getFirstName())); } else if (roll == 12) { person.setToughness(1); - - person.setBiography(String.format(resources.getString("toughnessStrongJaw.biography"), person.getFirstName())); } } } diff --git a/MekHQ/src/mekhq/campaign/personnel/enums/randomEvents/personalities/Aggression.java b/MekHQ/src/mekhq/campaign/personnel/enums/randomEvents/personalities/Aggression.java index f2fa428a96..f86295b7d3 100644 --- a/MekHQ/src/mekhq/campaign/personnel/enums/randomEvents/personalities/Aggression.java +++ b/MekHQ/src/mekhq/campaign/personnel/enums/randomEvents/personalities/Aggression.java @@ -26,7 +26,7 @@ public enum Aggression { //region Enum Declarations NONE("Personality.NONE.text", "Personality.NONE.description", false, false), AGGRESSIVE("Aggression.AGGRESSIVE.text", "Aggression.AGGRESSIVE.description", false, false), - ASSERTIVE("Aggression.ASSERTIVE.text", "Aggression.ASSERTIVE.description", false, false), + ASSERTIVE("Aggression.ASSERTIVE.text", "Aggression.ASSERTIVE.description", true, false), BELLIGERENT("Aggression.BELLIGERENT.text", "Aggression.BELLIGERENT.description", false, false), BLOODTHIRSTY("Aggression.BLOODTHIRSTY.text", "Aggression.BLOODTHIRSTY.description", false, true), BOLD("Aggression.BOLD.text", "Aggression.BOLD.description", true, false),