From 5c13cde07a0036eb4da11902a64d25d1254168eb Mon Sep 17 00:00:00 2001 From: sladecraven Date: Fri, 2 Sep 2022 16:08:56 +0200 Subject: [PATCH] rework ID --- module/actor/actor-sheet.js | 2 +- module/actor/actor.js | 31 +++++++++---------------------- system.json | 8 +++++--- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js index fd2b216..895438b 100644 --- a/module/actor/actor-sheet.js +++ b/module/actor/actor-sheet.js @@ -140,7 +140,7 @@ export class BoLActorSheet extends ActorSheet { formData.ammos = this.actor.ammos formData.misc = this.actor.misc formData.combat = this.actor.buildCombat() - formData.combatCreature = this.actor.buildCombatCreature() + //formData.combatCreature = this.actor.buildCombatCreature() formData.features = this.actor.buildFeatures() formData.isGM = game.user.isGM formData.options = this.options diff --git a/module/actor/actor.js b/module/actor/actor.js index 04ceb4c..799c858 100644 --- a/module/actor/actor.js +++ b/module/actor/actor.js @@ -479,6 +479,15 @@ export class BoLActor extends Actor { "options": false, "items": this.melee }, + "natural": { + "label": "BOL.combatCategory.natural", + "weapon": true, + "protection": false, + "blocking": false, + "ranged": false, + "options": false, + "items": this.natural + }, "ranged": { "label": "BOL.combatCategory.ranged", "weapon": true, @@ -518,28 +527,6 @@ export class BoLActor extends Actor { } } - buildCombatCreature() { - return { - "natural": { - "label": "BOL.combatCategory.natural", - "weapon": true, - "protection": false, - "blocking": false, - "ranged": false, - "options": false, - "items": this.natural - }, - "protections": { - "label": "BOL.combatCategory.protections", - "weapon": false, - "protection": true, - "blocking": false, - "ranged": false, - "options": false, - "items": this.protections - }, - } - } /*-------------------------------------------- */ buildRollList() { diff --git a/system.json b/system.json index fbb29bc..6419ed3 100644 --- a/system.json +++ b/system.json @@ -14,9 +14,11 @@ ], "url": "https://www.uberwald.me/gitea/public/bol", "license": "LICENSE.txt", - "version": "10.0.6", + "version": "10.0.7", "compatibility": { - "minimum": "10" + "minimum": "10", + "verified": "10.284", + "maximum": "10" }, "esmodules": [ "module/bol.js" @@ -192,7 +194,7 @@ ], "socket": true, "manifest": "https://www.uberwald.me/gitea/public/bol/raw/v10/system.json", - "download": "https://www.uberwald.me/gitea/public/bol/archive/bol-v10.0.6.zip", + "download": "https://www.uberwald.me/gitea/public/bol/archive/bol-v10.0.7.zip", "background": "systems/images/map_lemurie.webp", "gridDistance": 1.5, "gridUnits": "m",