diff --git a/modules/malefices-actor.js b/modules/malefices-actor.js index 9844651..05cd748 100644 --- a/modules/malefices-actor.js +++ b/modules/malefices-actor.js @@ -372,7 +372,7 @@ export class MaleficesActor extends Actor { arme = duplicate(arme) let rollData = this.getCommonRollData() if (arme.system.armetype == "mainsnues" || arme.system.armetype == "epee") { - rollData.attr = { label: "(Physique+Habilité)/2", value: Math.floor( (this.getPhysiqueMalus()+this.system.attributs.physique+this.system.attributs.habilite) / 2) } + rollData.attr = { label: "(Physique+Habilité)/2", value: Math.floor( (this.getPhysiqueMalus()+this.system.attributs.physique.value+this.system.attributs.habilite.value) / 2) } } else { rollData.attr = duplicate(this.system.attributs.habilite) } diff --git a/modules/malefices-main.js b/modules/malefices-main.js index 5077e84..b0c0bde 100644 --- a/modules/malefices-main.js +++ b/modules/malefices-main.js @@ -64,6 +64,8 @@ Hooks.once("init", async function () { Items.unregisterSheet("core", ItemSheet); Items.registerSheet("fvtt-malefices", MaleficesItemSheet, { makeDefault: true }); + MaleficesUtility.init() + }); /* -------------------------------------------- */ @@ -120,12 +122,6 @@ Hooks.once("ready", function () { }); } - // CSS patch for v9 - if (game.version) { - let sidebar = document.getElementById("sidebar"); - sidebar.style.width = "min-content"; - } - registerUsageCount('fvtt-malefices') welcomeMessage(); MaleficesUtility.ready() diff --git a/modules/malefices-utility.js b/modules/malefices-utility.js index ec0ab95..e6a5e86 100644 --- a/modules/malefices-utility.js +++ b/modules/malefices-utility.js @@ -5,18 +5,18 @@ import { MaleficesCommands } from "./malefices-commands.js"; /* -------------------------------------------- */ export class MaleficesUtility { - /* -------------------------------------------- */ - static async ready() { + static async init() { Hooks.on('renderChatLog', (log, html, data) => MaleficesUtility.chatListeners(html)); - /*Hooks.on("dropCanvasData", (canvas, data) => { - MaleficesUtility.dropItemOnToken(canvas, data) - });*/ this.rollDataStore = {} this.defenderStore = {} MaleficesCommands.init(); + } + + /* -------------------------------------------- */ + static async ready() { Handlebars.registerHelper('count', function (list) { return list.length; diff --git a/styles/simple.css b/styles/simple.css index 41b44d9..045fd20 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -235,6 +235,11 @@ table {border: 1px solid #7a7971;} object-position: 50% 0; border-width: 0px; } +.profile-img-container { + margin-right: 0.2rem; + max-width: 140px; + width: 140px; +} .button-img { vertical-align: baseline; @@ -954,8 +959,6 @@ ul, li { } #sidebar #sidebar-tabs i{ - width: 25px; - height: 25px; display: inline-block; background-position:center; background-size:cover; diff --git a/system.json b/system.json index 531b4ce..b7ff007 100644 --- a/system.json +++ b/system.json @@ -72,7 +72,7 @@ ], "title": "Maléfices, le Jeu de Rôle", "url": "https://www.uberwald.me/gitea/public/fvtt-malefices", - "version": "10.1.2", - "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.1.2.zip", + "version": "10.1.3", + "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.1.3.zip", "background": "systems/fvtt-malefices/images/ui/malefice_welcome_page.webp" } \ No newline at end of file diff --git a/template.json b/template.json index 7d98d32..05d5d8b 100644 --- a/template.json +++ b/template.json @@ -132,7 +132,7 @@ "description": "" }, "arme": { - "armetype": 0, + "armetype": "", "porteecourte": "", "porteemoyenne": "", "dommagenormale": 0, diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index 6649f4b..f8065c5 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -4,7 +4,11 @@
- + +
+ +
+

diff --git a/templates/chat/chat-generic-result.hbs b/templates/chat/chat-generic-result.hbs index 0cc0234..8997207 100644 --- a/templates/chat/chat-generic-result.hbs +++ b/templates/chat/chat-generic-result.hbs @@ -33,25 +33,25 @@
  • {{#if arme}} {{#if arme.system.dommagecritiquemort}} -
  • +
  • {{else}} {{#if arme.system.dommagecritiqueko}}
  • {{/if}} -
  • +
  • {{/if}} {{/if}} {{else}} {{#if isPart}}
  • {{#if arme}} -
  • +
  • {{/if}} {{else}}
  • {{#if arme}} -
  • +
  • {{/if}} {{/if}} {{/if}}