Merge pull request #57 from McGregor777/0.7

0.7

lang/en-EN.json

@@ -2,24 +2,29 @@
  "Confirm": "Confirm",
  "Finish": "Finish",
  "Ignore": "Ignore",
+ "Main": "Main",
+ "Details": "Details",
 
- "APPLICATION.BUTTON.AddBasicSkills": "Add Basic Skills",
- "APPLICATION.TITLE.ActionUsageConfirmation": "Action Usage Confirmation",
+ "APPLICATION.BUTTON.BasicSkillsAdding": "Add Basic Skills",
+ "APPLICATION.BUTTON.DeleteItem": "Delete Item",
+ "APPLICATION.BUTTON.EditItem": "Edit Item",
+ "APPLICATION.BUTTON.Expand": "More",
+ "APPLICATION.BUTTON.RollItem": "Roll Item",
+ "APPLICATION.TITLE.ActionUsage": "Action Usage Confirmation",
  "APPLICATION.TITLE.BasicSkillsAdding": "Basic Skills Adding",
- "APPLICATION.TITLE.DeleteItemConfirmation": "Delete Item Confirmation",
- "APPLICATION.TITLE.MemberRemovalConfirmation": "Member Removal Confirmation",
- "APPLICATION.DESCRIPTION.ActionUsageConfirmation": "Do you really want to use {action}?",
+ "APPLICATION.TITLE.DeleteItem": "Delete Item Confirmation",
+ "APPLICATION.TITLE.MemberRemoval": "Member Removal Confirmation",
+ "APPLICATION.DESCRIPTION.ActionUsage": "Do you really want to use {action}?",
  "APPLICATION.DESCRIPTION.BasicSkillsAdding": "<em><strong>{actor}</em></strong> has no skill. Do you wish to give <em><strong>{actor}</em></strong> all the basic skills?",
- "APPLICATION.DESCRIPTION.DeleteItemConfirmation": "Do you really want to delete <em><strong>{item}</em></strong>?",
- "APPLICATION.DESCRIPTION.MemberRemovalConfirmation": "Do you really wish to remove <em><strong>{actor}</em></strong> from the party?",
+ "APPLICATION.DESCRIPTION.DeleteItem": "Do you really want to delete <em><strong>{item}</em></strong>?",
+ "APPLICATION.DESCRIPTION.MemberRemoval": "Do you really wish to remove <em><strong>{actor}</em></strong> from the party?",
 
  "ACTOR.GenerateACharacter": "Generate a Character",
 
  "ACTION.Art": "Art",
  "ACTION.ChallengeDice": "Challenge Dice",
  "ACTION.Check": "Action Check",
  "ACTION.Effects": "Effects",
- "ACTION.Main": "Main",
  "ACTION.MisfortuneDice": "Misfortune Dice",
  "ACTION.Name": "Title",
  "ACTION.RechargeRating": "Recharge Rating",
@@ -107,7 +112,6 @@
  "CHARACTER.Corruption": "Corruption",
  "CHARACTER.Current": "Current",
  "CHARACTER.Fortune": "Fortune",
- "CHARACTER.Main": "Main",
  "CHARACTER.Maximum": "Maximum",
  "CHARACTER.Skills": "Skills",
  "CHARACTER.Stances": "Stances",
@@ -194,7 +198,6 @@
  "CREATURE.DamageRating": "Damage Rating",
  "CREATURE.DefenceValue": "Defence Value",
  "CREATURE.Details": "Details",
- "CREATURE.Main": "Main",
  "CREATURE.SoakValue": "Soak Value",
  "CREATURE.Stance": "Stance",
  "CREATURE.ThreatRating": "Threat Rating",
@@ -230,6 +233,16 @@
  "ENCOUNTER.Combat": "Combat",
  "ENCOUNTER.Social": "Social",
 
+ "GROUP.Talents": "Talents",
+ "GROUP.TalentSockets": "Talent Sockets",
+ "GROUP.SPECIALABILITY.Title": "Special Ability Title",
+ "GROUP.SPECIALABILITY.Description": "Special Ability Description",
+ "GROUP.SPECIALABILITY.Edit": "Edit Ability Track",
+ "GROUP.SPECIALABILITY.Decrease": "Decrease Ability Track",
+ "GROUP.SPECIALABILITY.Increase": "Increase Ability Track",
+ "GROUP.SPECIALABILITY.Content": "Content",
+ "GROUP.SPECIALABILITY.Trigger": "Trigger",
+
  "INSANITY.SeverityRating": "Severity Rating",
  "INSANITY.Traits": "Traits",
  "INSANITY.Description": "Description",
@@ -246,8 +259,13 @@
  "ITEM.Money": "Money",
  "ITEM.Wound": "Wound",
 
- "MONEY.Quantity": "Quantity",
  "MONEY.Value": "Value",
+ "MONEY.Brass": "Brass",
+ "MONEY.Silver": "Silver",
+ "MONEY.Gold": "Gold",
+ "MONEY.ABBREVIATION.BrassCoins": "b",
+ "MONEY.ABBREVIATION.SilverShillings": "s",
+ "MONEY.ABBREVIATION.GoldCrowns": "g",
 
  "MUTATION.SeverityRating": "Severity Rating",
  "MUTATION.Traits": "Traits",
@@ -376,7 +394,8 @@
  "SKILL.Characteristic": "Characteristic",
  "SKILL.AdvancedSkill": "Advanced Skill",
 
- "TALENT.FreeSocket": "Free Socket",
+ "TALENT.AvailableSocket": "Available {type} Socket",
+ "TALENT.TakenSocket": "{type} Socket taken by {talent}",
  "TALENT.NoSocket": "No Socket",
  "TALENT.RechargeTokens": "Recharge Tokens",
  "TALENT.TYPE.Focus": "Focus",
@@ -386,6 +405,7 @@
  "TALENT.TYPE.Order": "Order",
  "TALENT.TYPE.Tricks": "Tricks",
  "TALENT.TYPE.Insanity": "Insanity",
+ "TALENT.TYPE.Any": "Any",
 
  "TRAPPING.Cost": "Cost",
  "TRAPPING.Encumbrance": "Encumbrance",
@@ -394,12 +414,8 @@
  "TRAPPING.Name": "Name",
  "TRAPPING.Price": "Price",
  "TRAPPING.Rarity": "Rarity",
- "TRAPPING.Value": "Value",
  "TRAPPING.ABBREVIATION.Encumbrance": "Enc",
  "TRAPPING.ABBREVIATION.Quantity": "Qu",
- "TRAPPING.MONEY.Brass": "Brass",
- "TRAPPING.MONEY.Silver": "Silver",
- "TRAPPING.MONEY.Gold": "Gold",
  "TRAPPING.RARITY.Abundant": "Abundant",
  "TRAPPING.RARITY.Plentiful": "Plentiful",
  "TRAPPING.RARITY.Common": "Common",
@@ -416,6 +432,7 @@
  "WEAPON.Group": "Group",
  "WEAPON.Qualities": "Qualities",
  "WEAPON.Range": "Range",
+ "WEAPON.Rating": "Rating",
  "WEAPON.ABBREVIATION.CriticalRating": "CR",
  "WEAPON.ABBREVIATION.DamageRating": "DR",
  "WEAPON.GROUP.Blackpowder": "Blackpowder",
@@ -444,6 +461,7 @@
  "WEAPON.QUALITY.TwoHanded": "Two-Handed",
  "WEAPON.QUALITY.Unreliable": "Unreliable",
  "WEAPON.QUALITY.Vicious": "Vicious",
+ "WEAPON.QUALITY.Special": "Special",
  "WEAPON.RANGE.Close": "Close",
  "WEAPON.RANGE.Medium": "Medium",
  "WEAPON.RANGE.Long": "Long",

lang/fr-FR.json

@@ -2,24 +2,29 @@
  "Confirm": "Confirmer",
  "Finish": "Terminer",
  "Ignore": "Ignorer",
+ "Main": "Principal",
+ "Details": "Détails",
 
- "APPLICATION.BUTTON.AddBasicSkills": "Ajouter les compétences de base",
- "APPLICATION.TITLE.ActionUsageConfirmation": "Confirmation d'utilisation d'Action",
+ "APPLICATION.BUTTON.BasicSkillsAdding": "Ajouter les compétences de base",
+ "APPLICATION.BUTTON.DeleteItem": "Supprimer l'objet",
+ "APPLICATION.BUTTON.EditItem": "Éditer l'objet",
+ "APPLICATION.BUTTON.Expand": "En savoir plus",
+ "APPLICATION.BUTTON.RollItem": "Utiliser l'objet pour un test",
+ "APPLICATION.TITLE.ActionUsage": "Confirmation d'utilisation d'Action",
  "APPLICATION.TITLE.BasicSkillsAdding": "Ajout des compétences de base",
- "APPLICATION.TITLE.DeleteItemConfirmation": "Confirmation de suppression de l'élément",
- "APPLICATION.TITLE.MemberRemovalConfirmation": "Confirmation du retrait d'un membre",
- "APPLICATION.DESCRIPTION.ActionUsageConfirmation": "Êtes-vous sûr de vouloir utiliser {action} ?",
- "APPLICATION.DESCRIPTION.DeleteItemConfirmation": "Êtes-vous sûr de vouloir supprimer <em><strong>{item}</em></strong> ?",
+ "APPLICATION.TITLE.DeleteItem": "Confirmation de suppression de l'élément",
+ "APPLICATION.TITLE.MemberRemoval": "Confirmation du retrait d'un membre",
+ "APPLICATION.DESCRIPTION.ActionUsage": "Êtes-vous sûr de vouloir utiliser {action} ?",
+ "APPLICATION.DESCRIPTION.DeleteItem": "Êtes-vous sûr de vouloir supprimer <em><strong>{item}</em></strong> ?",
  "APPLICATION.DESCRIPTION.BasicSkillsAdding": "<em><strong>{actor}</em></strong> n'a aucune compétence. Souhaitez-vous ajouter les compétences de base à <em><strong>{actor}</em></strong> ?",
- "APPLICATION.DESCRIPTION.MemberRemovalConfirmation": "Êtes-vous sûr de vouloir retirer <em><strong>{actor}</em></strong> du groupe ?",
+ "APPLICATION.DESCRIPTION.MemberRemoval": "Êtes-vous sûr de vouloir retirer <em><strong>{actor}</em></strong> du groupe ?",
 
  "ACTOR.GenerateACharacter": "Générer un Personnage",
 
  "ACTION.Art": "Illustration",
  "ACTION.ChallengeDice": "Dés de Défi",
  "ACTION.Check": "Test d'Action",
  "ACTION.Effects": "Effets",
- "ACTION.Main": "Principal",
  "ACTION.MisfortuneDice": "Dés d'Infortune",
  "ACTION.Name": "Titre",
  "ACTION.RechargeRating": "Recharge Rating",
@@ -107,7 +112,6 @@
  "CHARACTER.Corruption": "Corruption",
  "CHARACTER.Current": "Actuel",
  "CHARACTER.Fortune": "Fortune",
- "CHARACTER.Main": "Principal",
  "CHARACTER.Maximum": "Maximum",
  "CHARACTER.Skills": "Compétences",
  "CHARACTER.Stances": "Attitude",
@@ -135,7 +139,7 @@
  "CHARACTERGENERATOR.Specialisations": "Specialisations",
  "CHARACTERGENERATOR.Talents": "Talents",
  "CHARACTERGENERATOR.TrainingLevel": "Training Level",
- "CHARACTERGENERATOR.TITLE": "Générateur de personnage",
+ "CHARACTERGENERATOR.Title": "Générateur de personnage",
  "CHARACTERGENERATOR.Wealth": "Wealth",
  "CHARACTERGENERATOR.CorruptionThreshold": "Corruption Threshold: ",
  "CHARACTERGENERATOR.WoundThreshold": "Wound Threshold: ",
@@ -194,7 +198,6 @@
  "CREATURE.DamageRating": "Damage Rating",
  "CREATURE.DefenceValue": "Defence Value",
  "CREATURE.Details": "Details",
- "CREATURE.Main": "Main",
  "CREATURE.SoakValue": "Soak Value",
  "CREATURE.Stance": "Stance",
  "CREATURE.ThreatRating": "Threat Rating",
@@ -230,6 +233,16 @@
  "ENCOUNTER.Combat": "Combat",
  "ENCOUNTER.Social": "Social",
 
+ "GROUP.Talents": "Talents",
+ "GROUP.TalentSockets": "Emplacements de talents",
+ "GROUP.SPECIALABILITY.Title": "Nom de la capacité spéciale",
+ "GROUP.SPECIALABILITY.Description": "Description de la capacité spéciale",
+ "GROUP.SPECIALABILITY.Edit": "Modifier la jauge de capacité",
+ "GROUP.SPECIALABILITY.Decrease": "Diminuer la jauge de capacité",
+ "GROUP.SPECIALABILITY.Increase": "Augmenter la jauge de capacité",
+ "GROUP.SPECIALABILITY.Content": "Contenu",
+ "GROUP.SPECIALABILITY.Trigger": "Déclencheur",
+
  "INSANITY.SeverityRating": "Niveau de Gravité",
  "INSANITY.Traits": "Traits",
  "INSANITY.Description": "Description",
@@ -246,8 +259,13 @@
  "ITEM.Money": "Monnaie",
  "ITEM.Wound": "Blessure",
 
- "MONEY.Quantity": "Quantité",
  "MONEY.Value": "Valeur",
+ "MONEY.Brass": "Brass",
+ "MONEY.Silver": "Silver",
+ "MONEY.Gold": "Gold",
+ "MONEY.ABBREVIATION.BrassCoins": "c",
+ "MONEY.ABBREVIATION.SilverShillings": "a",
+ "MONEY.ABBREVIATION.GoldCrowns": "o",
 
  "MUTATION.SeverityRating": "Niveau de Gravité",
  "MUTATION.Traits": "Traits",
@@ -376,7 +394,8 @@
  "SKILL.Characteristic": "Caractéristique",
  "SKILL.AdvancedSkill": "Compétence Avancée",
 
- "TALENT.FreeSocket": "Emplacement libre",
+ "TALENT.AvailableSocket": "Emplacement {type} libre",
+ "TALENT.TakenSocket": "Emplacement {type} occupé par {talent}",
  "TALENT.NoSocket": "Aucun emplacement",
  "TALENT.RechargeTokens": "Jetons de recharge",
  "TALENT.TYPE.Focus": "Affinité",
@@ -386,6 +405,7 @@
  "TALENT.TYPE.Order": "Ordre",
  "TALENT.TYPE.Tricks": "Familier",
  "TALENT.TYPE.Insanity": "Folie",
+ "TALENT.TYPE.Any": "Au choix",
 
  "TRAPPING.Cost": "Coût",
  "TRAPPING.Encumbrance": "Encombrement",
@@ -394,12 +414,8 @@
  "TRAPPING.Name": "Nom",
  "TRAPPING.Price": "Prix",
  "TRAPPING.Rarity": "Rareté",
- "TRAPPING.Value": "Valeur",
  "TRAPPING.ABBREVIATION.Encumbrance": "Enc",
  "TRAPPING.ABBREVIATION.Quantity": "Qu",
- "TRAPPING.MONEY.Brass": "Cuivre",
- "TRAPPING.MONEY.Silver": "Argent",
- "TRAPPING.MONEY.Gold": "Or",
  "TRAPPING.RARITY.Abundant": "Banal",
  "TRAPPING.RARITY.Plentiful": "Très Courant",
  "TRAPPING.RARITY.Common": "Courant",
@@ -416,6 +432,7 @@
  "WEAPON.Group": "Groupe",
  "WEAPON.Qualities": "Attributs",
  "WEAPON.Range": "Portée",
+ "WEAPON.Rating": "Rating",
  "WEAPON.ABBREVIATION.CriticalRating": "NC",
  "WEAPON.ABBREVIATION.DamageRating": "ND",
  "WEAPON.GROUP.Blackpowder": "Poudre Noire",
@@ -444,6 +461,7 @@
  "WEAPON.QUALITY.TwoHanded": "Two-Handed",
  "WEAPON.QUALITY.Unreliable": "Unreliable",
  "WEAPON.QUALITY.Vicious": "Vicious",
+ "WEAPON.QUALITY.Special": "Spécial",
  "WEAPON.RANGE.Close": "Proche",
  "WEAPON.RANGE.Medium": "Moyenne",
  "WEAPON.RANGE.Long": "Longue",

modules/CheckHelper.js

@@ -24,8 +24,8 @@ export default class CheckHelper
  characteristicDice: characteristic.value - Math.abs(stance),
  fortuneDice: characteristic.fortune,
  expertiseDice: skill.system.trainingLevel,
- conservativeDice: stance > 0 ? stance : 0,
- recklessDice: stance < 0 ? Math.abs(stance) : 0
+ conservativeDice: stance < 0 ? Math.abs(stance) : 0,
+ recklessDice: stance > 0 ? stance : 0
  }),
  game.i18n.format("ROLL.SkillCheck", {skill: skill.name}),
  {actor: actor, skill: skill, characteristic: skill.system.characteristic},
@@ -73,8 +73,8 @@ export default class CheckHelper
  characteristicDice: characteristic?.value - Math.abs(stance) ?? 0,
  fortuneDice: characteristic?.fortune ?? 0,
  expertiseDice: skill?.system.trainingLevel ?? 0,
- conservativeDice: stance > 0 ? stance : 0,
- recklessDice: stance < 0 ? Math.abs(stance) : 0,
+ conservativeDice: stance < 0 ? Math.abs(stance) : 0,
+ recklessDice: stance > 0 ? stance : 0,
  challengeDice: action.system[face].difficultyModifiers.challengeDice +
  (["melee", "ranged"].includes(action.system.type)
  ? CONFIG.WFRP3e.challengeLevels.easy.challengeDice
@@ -105,8 +105,8 @@ export default class CheckHelper
  return new DicePool({
  characteristicDice: characteristic.value - Math.abs(stance),
  fortuneDice: characteristic.fortune,
- conservativeDice: stance > 0 ? stance : 0,
- recklessDice: stance < 0 ? Math.abs(stance) : 0
+ conservativeDice: stance < 0 ? Math.abs(stance) : 0,
+ recklessDice: stance > 0 ? stance : 0
  });
  }
 

modules/applications/CharacterGenerator.js

@@ -8,7 +8,7 @@ export default class CharacterGenerator extends FormApplication
  */
  constructor(object = {})
  {
- super();
+ super(object);
 
  this.object = this.object instanceof WFRP3eActor ? object : new WFRP3eActor({
  name: "New Character",
@@ -20,7 +20,7 @@ export default class CharacterGenerator extends FormApplication
  /** @inheritDoc */
  get title()
  {
- return game.i18n.localize("CHARACTERGENERATOR.TITLE");
+ return game.i18n.localize("CHARACTERGENERATOR.Title");
  }
 
  /** @inheritDoc */