diff --git a/module/sheets/character-sheet.mjs b/module/sheets/character-sheet.mjs index b32901d..0b504b9 100644 --- a/module/sheets/character-sheet.mjs +++ b/module/sheets/character-sheet.mjs @@ -1,4 +1,4 @@ -import {onManageActiveEffect, prepareActiveEffectCategories} from "../system/effects.mjs"; +import { onManageActiveEffect, prepareActiveEffectCategories } from "../system/effects.mjs"; import { VermineActorSheet } from "./actor-sheet.mjs"; import { getRollBox } from "../system/dialogs.mjs"; import { TotemPicker } from "../system/applications.mjs"; @@ -42,7 +42,7 @@ export class VermineCharacterSheet extends VermineActorSheet { context.system = actorData.system; context.flags = actorData.flags; context.config = CONFIG.VERMINE; - + // Prepare character data and items. if (actorData.type == 'character') { this._prepareItems(context); @@ -102,8 +102,9 @@ export class VermineCharacterSheet extends VermineActorSheet { /** @override */ activateListeners(html) { super.activateListeners(html); - // Choose Totem + // Choose Totem html.find('.chooseTotem').click(this._onTotemButton.bind(this)); + html.find('.ability .rollable').click(this._onRoll.bind(this)); } @@ -130,27 +131,27 @@ export class VermineCharacterSheet extends VermineActorSheet { // Handle rolls that supply the formula directly. if (dataset.label) { dataset.rollType = dataset.type; - /*const label = game.i18n.localize(dataset.label) ? `[ability] ${game.i18n.localize(dataset.label)}` : ''; - console.log($(element).attr('for')); - const NoD = this.actor.system.skills[$(element).attr('for').split('.')[2]]?.value || 0 - return game.vermine2047.VermineRoll.roll(this.actor.id, label, NoD, 0, {});*/ - let data = { - actorId: this.actor.id, - abilities: this.actor.system.abilities, - skills: this.actor.system.skills, - rollType: dataset.rollType, - labelKey: dataset.label, - abilityScore: 0, - skillScore: 0, - label: game.i18n.localize(dataset.label) - }; - if (dataset.type == 'ability'){ - data.abilityScore = this.actor.system.abilities[dataset.label].value; - } else if (dataset.type == 'skill'){ - data.skillScore = this.actor.system.skills[dataset.label].value; - } - getRollBox(data); - return true; + /*const label = game.i18n.localize(dataset.label) ? `[ability] ${game.i18n.localize(dataset.label)}` : ''; + console.log($(element).attr('for')); + const NoD = this.actor.system.skills[$(element).attr('for').split('.')[2]]?.value || 0 + return game.vermine2047.VermineRoll.roll(this.actor.id, label, NoD, 0, {});*/ + let data = { + actorId: this.actor.id, + abilities: this.actor.system.abilities, + skills: this.actor.system.skills, + rollType: dataset.rollType, + labelKey: dataset.label, + abilityScore: 0, + skillScore: 0, + label: game.i18n.localize(dataset.label) + }; + if (dataset.type == 'ability') { + data.abilityScore = this.actor.system.abilities[dataset.label].value; + } else if (dataset.type == 'skill') { + data.skillScore = this.actor.system.skills[dataset.label].value; + } + getRollBox(data); + return true; } } @@ -163,7 +164,7 @@ export class VermineCharacterSheet extends VermineActorSheet { event.preventDefault(); const el = event.currentTarget; // const dataset = el.dataset; - + const totemPicker = new TotemPicker(el, this.actor); totemPicker.render(true); } diff --git a/module/system/dialogs.mjs b/module/system/dialogs.mjs index 48b6542..002ba44 100644 --- a/module/system/dialogs.mjs +++ b/module/system/dialogs.mjs @@ -1,129 +1,129 @@ - export class CombatResultDialog extends Dialog { +export class CombatResultDialog extends Dialog { - constructor(dialogData, options) { - /*let options = { classes: ["combat", "result"], ...options }; - let conf = { - title: "Résultat de la confrontation", - content: dialogData.content - }; - super(conf, options); - this.dialogData = dialogData;*/ - } - - /* -------------------------------------------- */ - activateListeners(html) { - /*super.activateListeners(html); - this.html = html; - this.setEphemere(this.dialogData.signe.system.ephemere); - html.find(".signe-aleatoire").click(event => this.setSigneAleatoire()); - html.find("[name='signe.system.ephemere']").change((event) => this.setEphemere(event.currentTarget.checked)); - html.find(".signe-xp-sort").change((event) => this.onValeurXpSort(event)); - html.find("input.select-actor").change((event) => this.onSelectActor(event)); - html.find("input.select-tmr").change((event) => this.onSelectTmr(event));*/ - } - - - async onSelectActor(event) { - /*const actorId = this.html.find(event.currentTarget)?.data("actor-id"); - const actor = this.dialogData.actors.find(it => it.id == actorId); - if (actor) { - actor.selected = event.currentTarget.checked; - }*/ - } - - + constructor(dialogData, options) { + /*let options = { classes: ["combat", "result"], ...options }; + let conf = { + title: "Résultat de la confrontation", + content: dialogData.content + }; + super(conf, options); + this.dialogData = dialogData;*/ } - export const getRollBox = async function(data) { - let html = await renderTemplate('systems/vermine2047/templates/roll.hbs', data); - let ui = new Dialog({ - title: game.i18n.localize("ROLLS.tool"), - content: html, - buttons: { - roll: { - label: game.i18n.localize('ROLLS.roll_dice'), - callback: (html) => { - let form = html.find('#dice-pool-form'); - if (!form[0].checkValidity()) { - throw "Invalid Data"; - } - let formData = {}; - form.serializeArray().map(item => { - formData[item.name] = item.value; - }); - // console.log("roll form data", formData); - let NoD = parseInt(formData.abilityScore,10); - let Reroll = 0; - // difficulty - data.difficulty = (formData.difficulty != undefined) ? formData.difficulty : 7; - // maîtrise bonus - if (formData.rollType == 'skill'){ - NoD += CONFIG.VERMINE.SkillLevels[formData.skillScore].dicePool || 0; - Reroll += CONFIG.VERMINE.SkillLevels[formData.skillScore].reroll || 0; - } - console.log('reroll', Reroll); + /* -------------------------------------------- */ + activateListeners(html) { + /*super.activateListeners(html); + this.html = html; + this.setEphemere(this.dialogData.signe.system.ephemere); + html.find(".signe-aleatoire").click(event => this.setSigneAleatoire()); + html.find("[name='signe.system.ephemere']").change((event) => this.setEphemere(event.currentTarget.checked)); + html.find(".signe-xp-sort").change((event) => this.onValeurXpSort(event)); + html.find("input.select-actor").change((event) => this.onSelectActor(event)); + html.find("input.select-tmr").change((event) => this.onSelectTmr(event));*/ + } - // réserves - if (formData.self_control > 0){ - NoD += parseInt(formData.self_control,10); - } - if (formData.group > 0){ - NoD += parseInt(formData.group,10); - } - // checks - if (formData.usingSpecialization !== undefined && formData.usingSpecialization == 1){ - NoD += 1; - } - if (formData.usingTools !== undefined && formData.usingTools == 1){ - NoD += 1; - } - if (formData.helped !== undefined && formData.helped == 1){ - NoD += 1; - } - if (formData.abilityScore == 0){ - ui.notifications.notify(`veuillez saisir une caractéristique`); - } else return game.vermine2047.VermineRoll.roll(data.actorId, data.label, NoD, Reroll, data); + + async onSelectActor(event) { + /*const actorId = this.html.find(event.currentTarget)?.data("actor-id"); + const actor = this.dialogData.actors.find(it => it.id == actorId); + if (actor) { + actor.selected = event.currentTarget.checked; + }*/ + } + + +} + +export const getRollBox = async function (data) { + let html = await renderTemplate('systems/vermine2047/templates/roll.hbs', data); + let dial = new Dialog({ + title: game.i18n.localize("ROLLS.tool"), + content: html, + buttons: { + roll: { + label: game.i18n.localize('ROLLS.roll_dice'), + callback: (html) => { + let form = html.find('#dice-pool-form'); + if (!form[0].checkValidity()) { + throw "Invalid Data"; } - }, - close: { - label: game.i18n.localize('Close'), - callback: () => { } + let formData = {}; + form.serializeArray().map(item => { + formData[item.name] = item.value; + }); + // console.log("roll form data", formData); + let NoD = parseInt(formData.abilityScore, 10); + let Reroll = 0; + // difficulty + data.difficulty = (formData.difficulty != undefined) ? formData.difficulty : 7; + // maîtrise bonus + if (formData.rollType == 'skill') { + NoD += CONFIG.VERMINE.SkillLevels[formData.skillScore].dicePool || 0; + Reroll += CONFIG.VERMINE.SkillLevels[formData.skillScore].reroll || 0; + } + console.log('reroll', Reroll); + + // réserves + if (formData.self_control > 0) { + NoD += parseInt(formData.self_control, 10); + } + if (formData.group > 0) { + NoD += parseInt(formData.group, 10); + } + // checks + if (formData.usingSpecialization !== undefined && formData.usingSpecialization == 1) { + NoD += 1; + } + if (formData.usingTools !== undefined && formData.usingTools == 1) { + NoD += 1; + } + if (formData.helped !== undefined && formData.helped == 1) { + NoD += 1; + } + if (formData.abilityScore == 0 || !formData.abilityScore) { + ui.notifications.notify(`veuillez saisir une caractéristique`); + } else return game.vermine2047.VermineRoll.roll(data.actorId, data.label, NoD, Reroll, data); } - }, - render: function (h) { - if( h.find('input[name="abilityScore"]').val()== 0 && data.rollType == 'ability'){ - h.find('input[name="abilityScore"]').val(data.abilities[data.label].value); - } - - h.find('select[name="ability"]').change((event) => { - if (event.target.value != undefined){ - const abilityScore = data.abilities[event.target.value].value; - console.log('ability', abilityScore); - // on enregistre la valeur de la caractéristique - h.find('input[name="abilityScore"]').val(abilityScore); - } - }); - - h.find('select[name="skill"]').change((event) => { - if (data.rollType == 'skill' && event.target.value != undefined){ - const skillScore = data.skills[event.target.value].value; - // on enregistre la valeur de la compétence - h.find('input[name="skillScore"]').val(skillScore); - // on met à jour les infos de niveaux de compétence - const skillLevel = CONFIG.VERMINE.SkillLevels[skillScore]; - if (skillLevel != undefined){ - h.find('#skillLevel').text(game.i18n.localize(skillLevel.label)); - h.find('#skillDicePool').text(skillLevel.dicePool); - h.find('#skillReroll').text(skillLevel.reroll); - } else { - h.find('#skillLevel').text('Inconnu'); - h.find('#skillDicePool').text(0); - h.find('#skillReroll').text(0); - } - } - }); + }, + close: { + label: game.i18n.localize('Close'), + callback: () => { } } - }); - ui.render(true); - } \ No newline at end of file + }, + render: function (h) { + if (h.find('input[name="abilityScore"]').val() == 0 && data.rollType == 'ability') { + h.find('input[name="abilityScore"]').val(data.abilities[data.label].value); + } + + h.find('select[name="ability"]').change((event) => { + if (event.target.value != undefined) { + const abilityScore = data.abilities[event.target.value].value; + console.log('ability', abilityScore); + // on enregistre la valeur de la caractéristique + h.find('input[name="abilityScore"]').val(abilityScore); + } + }); + + h.find('select[name="skill"]').change((event) => { + if (data.rollType == 'skill' && event.target.value != undefined) { + const skillScore = data.skills[event.target.value].value; + // on enregistre la valeur de la compétence + h.find('input[name="skillScore"]').val(skillScore); + // on met à jour les infos de niveaux de compétence + const skillLevel = CONFIG.VERMINE.SkillLevels[skillScore]; + if (skillLevel != undefined) { + h.find('#skillLevel').text(game.i18n.localize(skillLevel.label)); + h.find('#skillDicePool').text(skillLevel.dicePool); + h.find('#skillReroll').text(skillLevel.reroll); + } else { + h.find('#skillLevel').text('Inconnu'); + h.find('#skillDicePool').text(0); + h.find('#skillReroll').text(0); + } + } + }); + } + }); + dial.render(true); +} \ No newline at end of file diff --git a/templates/applications/choose-totem.hbs b/templates/applications/choose-totem.hbs index 90659e0..18c4f29 100644 --- a/templates/applications/choose-totem.hbs +++ b/templates/applications/choose-totem.hbs @@ -1,21 +1,32 @@
{{#each config.totems as | totem tk|}} {{#if (ne tk "human")}} - {{#if (ne tk "adapted")}} -
-

- - {{ localize totem }} - -

-

- Instincts : {{ smarttlk "TOTEMS" tk "instincts"}}
- Interdits : {{ smarttlk "TOTEMS" tk "bans"}}
- Comportements : {{ smarttlk "TOTEMS" tk "behaviour"}}
- Totem opposé : {{ smartcfg "totem_opposites" tk }}
-

-
- {{/if}} + {{#if (ne tk "adapted")}} + +
+

+ + {{ localize totem }} +

{{ smarttlk "TOTEMS" + tk "name"}}

+ +

+

+ Instincts : {{ smarttlk "TOTEMS" tk + "instincts"}}
+ Interdits : {{ smarttlk "TOTEMS" tk + "bans"}}
+ Comportements : {{ smarttlk "TOTEMS" tk + "behaviour"}}
+ Totem opposé : {{ smartcfg "totem_opposites" tk + }}
+

+
+ {{/if}} {{/if}} {{/each}}
\ No newline at end of file