diff --git a/CHANGELOG.md b/CHANGELOG.md index d209ec4..3705236 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # Changelog -## 1.3.2 - Bubble Everywhere +## 1.3.2 - Ronin Bubble Everywhere - Replaced moving description in items by a big popup on hover. +- Added PoW Revised 20Q (and added tenet to core too). - Added English/French Journal Compendiums for Conditions and Terrain Qualities (thanks to TesserWract). - Added FoV Terrain Compendium. - Added PoW Name Tables compendium : Qamarist Names, Ivory Kingdoms Names, Rokugani Names and Ujik Names. diff --git a/system/lang/en-en.json b/system/lang/en-en.json index 2e5675c..481d504 100644 --- a/system/lang/en-en.json +++ b/system/lang/en-en.json @@ -71,6 +71,8 @@ "experience": "Experience", "clan": "Clan", "family": "Family", + "region": "Region", + "upbringing": "Upbringing", "school": "School", "schoolrank": "Rank", "roles": "Roles", @@ -210,6 +212,7 @@ "status": "Status", "ninjo": "Ninjo", "giri": "Giri", + "past": "Past", "titles": "Titles", "attitude": "Demeanor:", "advantages": "Distinctions and Passions", @@ -360,19 +363,27 @@ "error": "Oops it looks like there's an error:", "part0": { "intro": "You can use this sheet to fill in your answers to The Game of Twenty Questions, and to take notes for later!", - "section": "Legend of the Five Rings Core Rulebook, Chapter 2: Creating a character, p. 41-95" + "section": "Legend of the Five Rings Core Rulebook, Chapter 2: Creating a character, p. 41-95", + "section_pow": "Legend of the Five Rings Path of Waves, Chapter 2: Creating a Character p. 30–82", + "type": "Select the 20Q template you want to use", + "type_core": "Samurai (Core Rulebook)", + "type_pow": "Ronin (Path of Waves)" }, "part1": { "title": "Part I: Core Identity (Clan and Family)", + "title_pow": "Part I: Core Identity (Region and Upbringing)", "q1": "1. What clan does your character belong to? (p. 41)", + "q1_pow": "1. What region does your character come from? (p. 31)", "status": "Status", "q2": "2. What family does your character belong to? (p. 49)", + "q2_pow": "2. What was your character’s upbringing? (p. 43)", "money": "Starting wealth in Koku", "glory": "Glory" }, "part2": { "title": "Part II: Role and School", "q3": "3. What is your character’s school, and what roles does that school fall into? (p. 56)", + "q3_pow": "3. What is your character’s school, and what are its associated roles? (p. 46)", "school": "School", "role": "Roles", "honor": "Honor", @@ -380,55 +391,80 @@ "school_ability": "School ability", "starting_techniques": "Starting techniques (2-5)", "outfit": "Starting outfit", - "q4": "4. How does your character stand out within their school? (p. 88)" + "q4": "4. How does your character stand out within their school? (p. 88)", + "q4_pow": "4. What gets your character in and out of trouble? (p. 60)" }, "part3": { "title": "Part III: Honor and Glory", + "title_pow": "Part III: The Past and the Future they interact and process", "q5": "5. Who is your lord and what is your character’s duty to them? (p. 88)", - "choose_giri": "Select giri:", + "q5_pow": "5. What is your character’s past and how does it Affect them? (p. 60)", + "choose_giri": "Select giri", + "choose_past": "Select past", "q6": "6. What does your character long for, and how might this impede their duty? (p. 90)", - "choose_ninjo": "Select ninjō:", + "q6_pow": "6. What does your character long for, and how might their past impact their ninjō? (p. 62)", + "choose_ninjo": "Select ninjō", "q7": "7. What is your character’s relationship with their clan? (p. 91)", + "q7_pow": "7. What is your character known for? (p. 61)", "increase_glory": "Glory increase", "q8": "8. What does your character think of Bushidō? (p. 91)", - "increase_honor": "Honor increase" + "q8_pow": "8. What does your character think of Bushidō? (p. 62)", + "increase_honor": "Honor increase", + "tenets": "Choose one tenet of Bushidō as paramount and one tenet as less significant (see The Clans Views of Bushidō, page 301 of the core rulebook):", + "tenet_paramount": "Paramount", + "tenet_less_significant": "Less Significant", + "object": "Item (Rarity 7 or lower)" }, "part4": { "title": "Part IV: Strengths and Weaknesses", "q9": "9. What is your character’s greatest accomplishment so far? (p. 92)", + "q9_pow": "9. What is your character’s greatest accomplishment so far? (p. 64)", "distinction": "Distinction (1)", "q10": "10. What holds your character back the most in life? (p. 92)", + "q10_pow": "10. What holds your character back most in life? (p. 64)", "adversity": "Adversity (1)", "q11": "11. What activity Most makes your character feel at peace? (p. 93)", + "q11_pow": "11. What activity most makes your character feel at peace? (p. 65)", "passion": "Passion (1)", "q12": "12. What concern, fear, or foible troubles your character the most? (p. 93)", + "q12_pow": "12. What concern, fear, or foible troubles your character the most? (p. 65)", "anxiety": "Anxiety (1)", "q13": "13. Who has your character learned the most from during their life? (p. 93)", + "q13_pow": "13. Who has your character learned the most from during their life? (p. 65)", "disadvantage": "Disadvantage (1)", "advantage": "Advantage (1)" }, "part5": { "title": "Part V: Personality and Behavior", "q14": "14. What do people notice first upon encountering your character? (p. 93)", + "q14_pow": "14. What is your character’s most prized possession? (p. 66)", "accoutrement": "Personal accoutrement", "q15": "15. How does your character react to stressful situations? (p. 94)", + "q15_pow": "15. How does your character react to stressful situations? (p. 66)", "q16": "16. What are your character’s preexisting relationships with other clans, families, organizations, and traditions? (p. 94)", + "q16_pow": "16. What are your relationships to your family, the clans, peasants, and others? (p. 66)", "object": "Item (Rarity 7 or lower)" }, "part6": { "title": "Part VI: Ancestry and Family", + "title_pow": "Part VI: Ancestry and Bonds", "q17": "17. How would your character’s parents describe them? (p. 95)", + "q17_pow": "17. What shared history do you have with your group? (p. 66)", + "bond": "Determine an appropriate bond to apply to your relationship", "q18": "18. Who was your character named to honor? (p. 95)", + "q18_pow": "18. Who raised you? (p. 67)", "d10r1": "D10 Result (1/2)", "d10r1_choice": "1st D10 Effect", "d10r2": "D10 Result (2/2)", "d10r2_choice": "2nd D10 Effect", "d10r2_drop_items": "Or a technique, a advantage, a object...", - "q19": "19. What is your character’s personal name? (p. 95)" + "q19": "19. What is your character’s personal name? (p. 95)", + "q19_pow": "19. What is your character’s name? (p. 68)" }, "part7": { "title": "Part VII: Death", "q20": "20. How should your character die? (p. 95)", + "q20_pow": "20. How should your character die? (p. 68)", "summary": "Summary", "generchar": "Generate the character", "generchar_disclaimer": "Warning, this will erase character's current data!", diff --git a/system/lang/es-es.json b/system/lang/es-es.json index d5cf1d5..3efb3eb 100644 --- a/system/lang/es-es.json +++ b/system/lang/es-es.json @@ -71,6 +71,8 @@ "experience": "Experiencia", "clan": "Clan", "family": "Familia", + "region": "Region", + "upbringing": "Upbringing", "school": "Escuela", "schoolrank": "Rango", "roles": "Funciones", @@ -210,6 +212,7 @@ "status": "Estatus", "ninjo": "Ninjo", "giri": "Giri", + "past": "Past", "titles": "Títulos", "attitude": "Actitud:", "advantages": "Distinciones y pasiones", @@ -360,19 +363,27 @@ "error": "Uy, parece que hay un error:", "part0": { "intro": "Puedes usar esta hoja para rellenar tus respuestas al Juego de las 20 Preguntas, y para tomar notas para más tarde!", - "section": "Leyenda de los Cinco Anillos, capítulo 2: Creación de personajes, p. 41-95" + "section": "Leyenda de los Cinco Anillos, capítulo 2: Creación de personajes, p. 41-95", + "section_pow": "Legend of the Five Rings Path of Waves, Chapter 2: Creating a Character p. 30–82", + "type": "Select the 20Q template you want to use", + "type_core": "Samurai (Core Rulebook)", + "type_pow": "Ronin (Path of Waves)" }, "part1": { "title": "Parte I: Identidad básica (Clan y Familia)", + "title_pow": "Part I: Core Identity (Region and Upbringing)", "q1": "1. ¿A qué clan pertenece tu personaje? (p. 41)", + "q1_pow": "1. What region does your character come from? (p. 31)", "status": "Estatus", "q2": "2. ¿A qué familia pertenece tu personaje? (p. 49)", + "q2_pow": "2. What was your character’s upbringing? (p. 43)", "money": "Riqueza inicial en Koku", "glory": "Gloria" }, "part2": { "title": "Parte II: Función y escuela", "q3": "3. ¿Cuál es la escuela de tu personaje, y en qué funciones cumple esa escuela? (p. 56)", + "q3_pow": "3. What is your character’s school, and what are its associated roles? (p. 46)", "school": "Escuela", "role": "Funciones", "honor": "Honor", @@ -380,55 +391,80 @@ "school_ability": "Capacidad de escuela", "starting_techniques": "Técnicas iniciales (2-5)", "outfit": "Equipo inicial", - "q4": "4. ¿De qué manera destaca tu personaje dentro de su escuela? (p. 88)" + "q4": "4. ¿De qué manera destaca tu personaje dentro de su escuela? (p. 88)", + "q4_pow": "4. What gets your character in and out of trouble? (p. 60)" }, "part3": { "title": "Parte III: Honor y Gloria", + "title_pow": "Part III: The Past and the Future they interact and process", "q5": "5. ¿Quién es tu señor y cuál es el deber de tu personaje hacia él? (p. 88)", + "q5_pow": "5. What is your character’s past and how does it Affect them? (p. 60)", "choose_giri": "Elige un giri:", + "choose_past": "Select past", "q6": "6. ¿Qué es lo que anhela tu personaje, y cómo podría esto interferir con su deber? (p. 90)", + "q6_pow": "6. What does your character long for, and how might their past impact their ninjō? (p. 62)", "choose_ninjo": "Elige un ninjō:", "q7": "7. ¿Cuál es la relación de tu personaje con tu clan? (p. 91)", + "q7_pow": "7. What is your character known for? (p. 61)", "increase_glory": "Aumento de la gloria", "q8": "8. ¿Qué piensa tu personaje acerca del Bushidō? (p. 91)", - "increase_honor": "Aumento del honor" + "q8_pow": "8. What does your character think of Bushidō? (p. 62)", + "increase_honor": "Aumento del honor", + "tenets": "Choose one tenet of Bushidō as paramount and one tenet as less significant (see The Clans Views of Bushidō, page 301 of the core rulebook):", + "tenet_paramount": "Paramount", + "tenet_less_significant": "Less Significant", + "object": "Item (Rarity 7 or lower)" }, "part4": { "title": "Parte IV: Fortalezas y Debilidades", "q9": "9. ¿Cuál es el mayor logro de tu personaje hasta ahora? (p. 92)", + "q9_pow": "9. ¿Cuál es el mayor logro de tu personaje hasta ahora? (p. 64)", "distinction": "Distinción (1)", "q10": "10. ¿Qué es lo que más frena a tu personaje en la vida? (p. 92)", + "q10_pow": "10. ¿Qué es lo que más frena a tu personaje en la vida? (p. 64)", "adversity": "Adversidad (1)", "q11": "11. ¿Qué actividad hace que tu personaje se sienta más en paz? (p. 93)", + "q11_pow": "11. ¿Qué actividad hace que tu personaje se sienta más en paz? (p. 65)", "passion": "Pasión (1)", "q12": "12. ¿Qué preocupación, miedo o debilidad perturba más a tu personaje? (p. 93)", + "q12_pow": "12. ¿Qué preocupación, miedo o debilidad perturba más a tu personaje? (p. 65)", "anxiety": "Ansiedad (1)", "q13": "13. ¿Quién ha sido la persona de la que más ha aprendido tu personaje en el transcurso de su vida? (p. 93)", + "q13_pow": "13. ¿Quién ha sido la persona de la que más ha aprendido tu personaje en el transcurso de su vida? (p. 65)", "disadvantage": "Desventaja (1)", "advantage": "Ventaja (1)" }, "part5": { "title": "Parte V: Personalidad y Comportamiento", "q14": "14. ¿Qué es lo que advierte primero la gente al encontrarse con tu personaje? (p. 93)", + "q14_pow": "14. What is your character’s most prized possession? (p. 66)", "accoutrement": "Accesorio estético distintivo", "q15": "15. ¿Cómo reacciona tu personaje ante situaciones de tensión? (p. 94)", + "q15_pow": "15. ¿Cómo reacciona tu personaje ante situaciones de tensión? (p. 66)", "q16": "16. ¿Cuáles son las relaciones previas de tu personaje con otros clanes, familias, organizaciones y tradiciones? (p. 94)", + "q16_pow": "16. What are your relationships to your family, the clans, peasants, and others? (p. 66)", "object": "Objeto (Rareza 7 o inferior)" }, "part6": { "title": "Parte VI: Ascestros y familia", + "title_pow": "Part VI: Ancestry and Bonds", "q17": "17. ¿Cómo describirían sus padres a tu personaje? (p. 95)", + "q17_pow": "17. What shared history do you have with your group? (p. 66)", + "bond": "Determine an appropriate bond to apply to your relationship", "q18": "18. ¿En honor de quién se eligio el nombre de tu personaje? (p. 95)", + "q18_pow": "18. Who raised you? (p. 67)", "d10r1": "Resultado D10 (1/2)", "d10r1_choice": "Primer efecto de D10", "d10r2": "Resultado D10 (2/2)", "d10r2_choice": "Segundo efecto de D10", "d10r2_drop_items": "O una técnica, una ventaja, un objeto...", - "q19": "19. ¿Cuál es el nombre personal de tu personaje? (p. 95)" + "q19": "19. ¿Cuál es el nombre personal de tu personaje? (p. 95)", + "q19_pow": "19. ¿Cuál es el nombre personal de tu personaje? (p. 68)" }, "part7": { "title": "Parte VII: Muerte", "q20": "20. ¿Cómo debería morir tu personaje? (p. 95)", + "q20_pow": "20. ¿Cómo debería morir tu personaje? (p. 68)", "summary": "Resumen", "generchar": "Generar el personaje", "generchar_disclaimer": "Advertencia, esto borrará los datos actuales del personaje!", diff --git a/system/lang/fr-fr.json b/system/lang/fr-fr.json index db56575..6a9b73f 100644 --- a/system/lang/fr-fr.json +++ b/system/lang/fr-fr.json @@ -71,6 +71,8 @@ "experience": "Expérience", "clan": "Clan", "family": "Famille", + "region": "Region", + "upbringing": "Upbringing", "school": "Ecole", "schoolrank": "Rang", "roles": "Rôles", @@ -210,6 +212,7 @@ "status": "Statut", "ninjo": "Ninjo", "giri": "Giri", + "past": "Past", "titles": "Titres", "attitude": "attitude :", "advantages": "Aptitudes et Passions", @@ -360,19 +363,27 @@ "error": "Oops il semble qu'il y est erreur : ", "part0": { "intro": "Renseignez vos réponses au jeu des vingt questions sur ce formulaire et notez-y des éléments à utiliser ultérieurement !", - "section": "Livre de Règles de La Légende des Cinq Anneaux, Chapitre 2 : Création de personnage, p. 41-95" + "section": "Livre de Règles de La Légende des Cinq Anneaux, Chapitre 2 : Création de personnage, p. 41-95", + "section_pow": "La Légende des Cinq Anneaux, La Voie des Vagues, Chapitre 2: Création de personnage, p. 30–82", + "type": "Sélectionnez le type de 20Q que vous souhaitez utiliser", + "type_core": "Samurai (Livre de Règles)", + "type_pow": "Ronin (La Voie des Vagues)" }, "part1": { "title": "Partie I : Identité (clan et famille)", + "title_pow": "Partie I: Identité (Région et Education)", "q1": "1. A quel clan appartient votre personnage ? (p. 41)", + "q1_pow": "1. De quelle région vient votre personnage ? (p. 31)", "status": "Statut", "q2": "2. A quelle famille appartient votre personnage ? (p. 49)", + "q2_pow": "2. Quelle a été l'éducation de votre personnage ? (p. 43)", "money": "Fortune de départ en Koku", "glory": "Gloire" }, "part2": { "title": "Partie II : Rôle et École", "q3": "3. Quelle est l'École votre personnage, et quel rôle remplit-elle ? (p. 56)", + "q3_pow": "3. Quelle est l'École votre personnage, et quel rôle remplit-elle ? (p. 46)", "school": "École", "role": "Rôles", "honor": "Honneur", @@ -380,55 +391,80 @@ "school_ability": "Capacité d'école", "starting_techniques": "Techniques de départ (2-5)", "outfit": "Équipement de départ", - "q4": "4. De quelle manière votre personnage se démarque-t-il au sein de son école ? (p. 88)" + "q4": "4. De quelle manière votre personnage se démarque-t-il au sein de son école ? (p. 88)", + "q4_pow": "4. Qu'est-ce qui met votre personnage dans et hors du pétrin ? (p. 60)" }, "part3": { "title": "Partie III : Honneur et Gloire", + "title_pow": "Partie III: Le passé et l'Avenir : ils interagissent et se transforment", "q5": "5. Qui est le seigneur de votre personnage et quel est le devoir de votre personnage envers lui ? (p. 88)", + "q5_pow": "5. Quel est le passé de votre personnage et comment l'affecte-t-il ? (p. 60)", "choose_giri": "Choisissez un giri", + "choose_past": "Choisissez un passé", "q6": "6. Que désire votre personnage, et en quoi ce désir risque-t-il de l’empêcher d’accomplir son devoir ? (p. 90)", + "q6_pow": "6. À quoi votre personnage aspire-t-il, et comment son passé peut-il avoir un impact sur son ninjō ? (p. 62)", "choose_ninjo": "Choisissez un ninjō", "q7": "7. Quelle relation votre personnage entretient-il avec son clan ? (p. 91)", + "q7_pow": "7. Pour quoi votre personnage est-il connu ? (p. 61)", "increase_glory": "Augmentation de la gloire (+5)", "q8": "8. Que pense votre personnage du bushido ? (p. 91)", - "increase_honor": "Augmentation de l'honneur (+10)" + "q8_pow": "8. Que pense votre personnage du bushido ? (p. 62)", + "increase_honor": "Augmentation de l'honneur (+10)", + "tenets": "Choisissez un principe du Bushidō comme primordial et un principe comme moins important (voir Les Clans et leurs vision du Bushido, page 301 du livre de règles)", + "tenet_paramount": "Primordiale", + "tenet_less_significant": "Moins importante", + "object": "Objet (Rareté inférieur ou égale à 7)" }, "part4": { "title": "Partie IV : Forces et Faiblesses", "q9": "9. Quelle est à ce jour la plus belle réussite de votre personnage ? (p. 92)", + "q9_pow": "9. Quelle est à ce jour la plus belle réussite de votre personnage ? (p. 64)", "distinction": "Aptitude (1)", "q10": "10. Quel est le frein principal dans la vie de votre personnage ? (p. 92)", + "q10_pow": "10. Quel est le frein principal dans la vie de votre personnage ? (p. 64)", "adversity": "Coup du sort (1)", "q11": "11. Quelle activité apaise le plus votre personnage ? (p. 93)", + "q11_pow": "11. Quelle activité apaise le plus votre personnage ? (p. 65)", "passion": "Passion (1)", "q12": "12. Quelle inquiétude, crainte ou manie tracasse le plus votre personnage ? (p. 93)", + "q12_pow": "12. Quelle inquiétude, crainte ou manie tracasse le plus votre personnage ? (p. 65)", "anxiety": "Défaillance (1)", "q13": "13. De qui votre personnage a-t-il le plus appris au cours de sa vie ? (p. 93)", + "q13_pow": "13. De qui votre personnage a-t-il le plus appris au cours de sa vie ? (p. 65)", "disadvantage": "Désavantage (1)", "advantage": "Avantage (1)" }, "part5": { "title": "Partie V : Personnalité et Comportement", "q14": "14. Que remarque-t-on en premier chez votre personnage ? (p. 93)", + "q14_pow": "14. Quel est le bien le plus précieux de votre personnage ? (p. 66)", "accoutrement": "Vêtement ou objet distinctif", "q15": "15. Comment votre personnage réagit-il aux situations stressantes ? (p. 94)", + "q15_pow": "15. Comment votre personnage réagit-il aux situations stressantes ? (p. 66)", "q16": "16. Quelles relations votre personnage entretient-il avec des familles, des organisations, des traditions et des clans différents ? (p. 94)", + "q16_pow": "16. Quelles sont vos relations avec votre famille, les clans, les paysans et les autres ? (p. 66)", "object": "Objet (Rareté inférieur ou égale à 7)" }, "part6": { "title": "Partie VI : Lignée et Famille", + "title_pow": "Partie VI: Ancêtres et Liens", "q17": "17. Comment les parents de votre personnage le décriraient-ils ? (p. 95)", + "q17_pow": "17. Quelle histoire partagée avez-vous avec votre groupe ? (p. 66)", + "bond": "Déterminez un lien approprié qui s'applique à votre relation", "q18": "18. En l’honneur de qui votre personnage a-t-il été prénommé ? (p. 95)", + "q18_pow": "18. Qui vous a élevé ? (p. 67)", "d10r1": "Résultat du 1er D10", "d10r1_choice": "Effet du 1er D10", "d10r2": "Résultat du 2eme D10", "d10r2_choice": "Effet du 2ème D10", "d10r2_drop_items": "Ou une technique, un avantage, un objet...", - "q19": "19. Quel est le prénom de votre personnage ? (p. 95)" + "q19": "19. Quel est le prénom de votre personnage ? (p. 95)", + "q19_pow": "19. Quel est le prénom de votre personnage ? (p. 68)" }, "part7": { "title": "Partie VII : Mort", "q20": "20. Comment envisagez-vous la mort de votre personnage ? (p. 95)", + "q20_pow": "20. Comment envisagez-vous la mort de votre personnage ? (p. 68)", "summary": "Résumé", "generchar": "Générer le personnage", "generchar_disclaimer": "Attention cela écrasera les données de votre personnage actuel !", diff --git a/system/scripts/actors/twenty-questions-dialog.js b/system/scripts/actors/twenty-questions-dialog.js index d450bc1..f899638 100644 --- a/system/scripts/actors/twenty-questions-dialog.js +++ b/system/scripts/actors/twenty-questions-dialog.js @@ -122,6 +122,15 @@ export class TwentyQuestionsDialog extends FormApplication { drop: this._onDropItem.bind(this, "peculiarity"), }, }), + new DragDrop({ + dragSelector: ".bond", + dropSelector: ".bonds", + permissions: { dragstart: this._canDragStart.bind(this), drop: this._canDragDrop.bind(this) }, + callbacks: { + dragstart: this._onDragStart.bind(this), + drop: this._onDropItem.bind(this, "bond"), + }, + }), ]; } @@ -149,6 +158,11 @@ export class TwentyQuestionsDialog extends FormApplication { ...this.summary, errors: this.summary.errors.join(", "), }, + templates: [ + { id: "core", label: game.i18n.localize("l5r5e.twenty_questions.part0.type_core") }, + { id: "pow", label: game.i18n.localize("l5r5e.twenty_questions.part0.type_pow") }, + ], + suffix: this.object.data.template === "pow" ? "_pow" : "", }; } @@ -218,7 +232,7 @@ export class TwentyQuestionsDialog extends FormApplication { return; } - if (!["item", "technique", "peculiarity"].includes(type)) { + if (!["item", "technique", "peculiarity", "bond"].includes(type)) { return; } const stepKey = $(event.target).data("step"); @@ -230,7 +244,7 @@ export class TwentyQuestionsDialog extends FormApplication { // Get item const item = await game.l5r5e.HelpersL5r5e.getDragnDropTargetObject(event); if (item.documentName !== "Item" || !item) { - console.warn("forbidden item for this drop zone", type, item.data.type); + console.warn(`forbidden item for this drop zone ${type} : ${item.data.type}`); return; } @@ -243,7 +257,7 @@ export class TwentyQuestionsDialog extends FormApplication { (type !== "item" && item.data.type !== type) || (type === "item" && !["item", "weapon", "armor"].includes(item.data.type)) ) { - console.warn("forbidden item for this drop zone", type, item.data.type); + console.warn(`forbidden item for this drop zone ${type} : ${item.data.type}`); return; } @@ -255,7 +269,7 @@ export class TwentyQuestionsDialog extends FormApplication { // School Ability if (stepKey === "step3.school_ability") { if (item.data.data.technique_type !== "school_ability") { - console.warn("This technique is not a school ability", item.data.data.technique_type); + console.warn(`This technique is not a school ability : ${item.data.data.technique_type}`); return; } } else if (!this.object.data.step3.allowed_techniques?.[item.data.data.technique_type]) { @@ -327,7 +341,15 @@ export class TwentyQuestionsDialog extends FormApplication { async _updateObject(event, formData) { // Check "Or" conditions formData["step7.social_add_glory"] = formData["step7.skill"] === "none" ? 5 : 0; - formData["step8.social_add_honor"] = formData["step8.skill"] === "none" ? 10 : 0; + + if (formData["template"] === "pow" && this.object.data.step8.item.length > 0) { + formData["step8.skill"] = "none"; + formData["step8.social_add_honor"] = 0; + } else { + formData["step8.social_add_honor"] = + !formData["step8.skill"] || formData["step8.skill"] === "none" ? 10 : 0; + foundry.utils.setProperty(this.object.data, "step8.item", []); + } if (this.object.data.step13.advantage.length > 0) { formData["step13.skill"] = "none"; diff --git a/system/scripts/actors/twenty-questions.js b/system/scripts/actors/twenty-questions.js index 612ad61..5e0e886 100644 --- a/system/scripts/actors/twenty-questions.js +++ b/system/scripts/actors/twenty-questions.js @@ -34,6 +34,7 @@ export class TwentyQuestions { "step3.school_ability", "step3.equipment", "step9.distinction", + "step8.item", "step10.adversity", "step11.passion", "step12.anxiety", @@ -41,6 +42,7 @@ export class TwentyQuestions { "step13.disadvantage", "step14.special_features", "step16.item", + "step17.bond", "step18.heritage_item", ]; @@ -48,6 +50,7 @@ export class TwentyQuestions { * All this object data (Steps) */ data = { + template: "core", generated: false, step1: { clan: "", @@ -108,6 +111,9 @@ export class TwentyQuestions { bushido: "", skill: "", social_add_honor: 10, + tenet_paramount: "", + tenet_less_significant: "", + item: [], }, step9: { success: "", @@ -145,6 +151,7 @@ export class TwentyQuestions { step17: { parents_pov: "", skill: "", + bond: [], }, step18: { heritage_name: "", @@ -186,7 +193,7 @@ export class TwentyQuestions { const actorDatas = actor.data.data; // already 20q struct ? - if (!isObjectEmpty(actorDatas.twenty_questions)) { + if (!foundry.utils.isObjectEmpty(actorDatas.twenty_questions)) { this.data = { ...this.data, ...actorDatas.twenty_questions, @@ -234,6 +241,7 @@ export class TwentyQuestions { parseInt(formData.step18.heritage_add_honor); // Update the actor + actorDatas.template = formData.template; actorDatas.zeni = Math.floor(formData.step2.wealth * 50); actorDatas.identity = { ...actorDatas.identity, diff --git a/system/template.json b/system/template.json index 46c3108..f4cb3c9 100644 --- a/system/template.json +++ b/system/template.json @@ -110,6 +110,7 @@ }, "character": { "templates": ["identity", "rings", "social", "skills", "techniques", "conflict", "advancement"], + "template": "core", "zeni": 0, "twenty_questions": {} }, diff --git a/system/templates/actors/character/identity.html b/system/templates/actors/character/identity.html index cbe7f24..4c340fa 100644 --- a/system/templates/actors/character/identity.html +++ b/system/templates/actors/character/identity.html @@ -1,13 +1,21 @@