From dcd2aee76e132b364e3b80c0b2ce8ca4d70b2237 Mon Sep 17 00:00:00 2001 From: U~man Date: Tue, 14 Jul 2020 12:53:43 +0200 Subject: [PATCH] ENH: Languages spoken --- src/lang/en.json | 6 ++++++ src/lang/fr.json | 6 ++++++ src/module/actor/entity.js | 12 ++++++------ src/module/dialog/character-modifiers.js | 2 +- src/template.json | 4 +--- src/templates/actors/dialogs/modifiers-dialog.html | 2 +- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/lang/en.json b/src/lang/en.json index aa32162..48cf4a9 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -128,6 +128,12 @@ "OSE.Literate": "Literate", "OSE.LiteracyBasic": "Basic", "OSE.Illiterate": "Illiterate", + "OSE.NativeBroken": "Native (Broken)", + "OSE.Native": "Native", + "OSE.NativePlus1": "Native + 1", + "OSE.NativePlus2": "Native + 2", + "OSE.NativePlus3": "Native + 3", + "OSE.NPCReaction": "NPC Reaction", "OSE.RetainersMax": "#Retainers", diff --git a/src/lang/fr.json b/src/lang/fr.json index 3a84012..324b119 100644 --- a/src/lang/fr.json +++ b/src/lang/fr.json @@ -128,6 +128,12 @@ "OSE.Literate": "Oui", "OSE.LiteracyBasic": "Basique", "OSE.Illiterate": "Non", + "OSE.NativeBroken": "Natale (Primitif)", + "OSE.Native": "Natale", + "OSE.NativePlus1": "Natale + 1", + "OSE.NativePlus2": "Natale + 2", + "OSE.NativePlus3": "Natale + 3", + "OSE.NPCReaction": "Réaction", "OSE.RetainersMax": "#Suivants", diff --git a/src/module/actor/entity.js b/src/module/actor/entity.js index 5020a53..96d2cff 100644 --- a/src/module/actor/entity.js +++ b/src/module/actor/entity.js @@ -535,13 +535,13 @@ export class OseActor extends Actor { ); const spoken = { - 0: 0, - 3: 0, - 13: 2, - 16: 3, - 18: 4, + 0: "OSE.NativeBroken", + 3: "OSE.Native", + 13: "OSE.NativePlus1", + 16: "OSE.NativePlus2", + 18: "OSE.NativePlus3", }; - data.languages.count = OseActor._valueFromTable( + data.languages.spoken = OseActor._valueFromTable( spoken, data.scores.int.value ); diff --git a/src/module/dialog/character-modifiers.js b/src/module/dialog/character-modifiers.js index d946e99..54e5bf5 100644 --- a/src/module/dialog/character-modifiers.js +++ b/src/module/dialog/character-modifiers.js @@ -8,7 +8,7 @@ export class OseCharacterModifiers extends FormApplication { options.id = 'sheet-modifiers'; options.template = 'systems/ose/templates/actors/dialogs/modifiers-dialog.html'; - options.width = 220; + options.width = 240; return options; } diff --git a/src/template.json b/src/template.json index e430478..0fb45a5 100644 --- a/src/template.json +++ b/src/template.json @@ -131,9 +131,7 @@ "max": 1600 }, "languages": { - "value": [], - "literacy": "literate", - "count": 1 + "value": [] } }, "monster": { diff --git a/src/templates/actors/dialogs/modifiers-dialog.html b/src/templates/actors/dialogs/modifiers-dialog.html index 03148c0..ed147dd 100644 --- a/src/templates/actors/dialogs/modifiers-dialog.html +++ b/src/templates/actors/dialogs/modifiers-dialog.html @@ -14,7 +14,7 @@
  1. - {{localize 'OSE.SpokenLanguages'}} ({{mod data.languages.count}}) + {{localize 'OSE.SpokenLanguages'}} ({{localize data.languages.spoken}})
  2. {{localize 'OSE.Literacy'}} ({{localize data.languages.literacy}})