diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js index 4b68257..579cfe9 100644 --- a/module/actor/actor-sheet.js +++ b/module/actor/actor-sheet.js @@ -148,7 +148,7 @@ export class BoLActorSheet extends ActorSheet { formData.options = this.options formData.owner = this.document.isOwner formData.editScore = this.options.editScore - formData.useBougette = BoLUtility.getUseBougette() + formData.useBougette = (this.actor.type == "character" && BoLUtility.getUseBougette()) || false formData.bougette = this.actor.getBougette() formData.charType = this.actor.getCharType() formData.villainy = this.actor.getVillainy() diff --git a/module/actor/actor.js b/module/actor/actor.js index 464dcf4..577e9ca 100644 --- a/module/actor/actor.js +++ b/module/actor/actor.js @@ -40,26 +40,35 @@ export class BoLActor extends Actor { /* -------------------------------------------- */ getBougette() { - let b = duplicate(this.system.bougette) - b.label = game.i18n.localize( game.bol.config.bougetteState[String(this.system.bougette.value)] ) - b.diceImg = "icons/dice/" + game.bol.config.bougetteDice[String(this.system.bougette.value)] + "black.svg" - return b + if ( this.type == "character") { + let b = duplicate(this.system.bougette) + b.label = game.i18n.localize( game.bol.config.bougetteState[String(this.system.bougette.value)] ) + b.diceImg = "icons/dice/" + game.bol.config.bougetteDice[String(this.system.bougette.value)] + "black.svg" + return b + } + return undefined } + /* -------------------------------------------- */ async rollBougette() { - //ui.notifications.info("Roll bougette done !") - let attribute = duplicate(this.system.attributes.vigor) - let rollData = BoLRoll.getCommonRollData(this, "bougette", attribute, undefined ) - rollData.formula = game.bol.config.bougetteDice[String(this.system.bougette.value)] - let r = new BoLDefaultRoll(rollData) - r.roll() + if ( this.type == "character") { + let attribute = duplicate(this.system.attributes.vigor) + let rollData = BoLRoll.getCommonRollData(this, "bougette", attribute, undefined ) + rollData.formula = game.bol.config.bougetteDice[String(this.system.bougette.value)] + let r = new BoLDefaultRoll(rollData) + r.roll() + } } + /* -------------------------------------------- */ decBougette() { - let bougette = duplicate(this.system.bougette) - bougette.value = Math.max( Number(bougette.value) - 1, 0) - this.update( { 'system.bougette': bougette } ) + if ( this.type == "character") { + let bougette = duplicate(this.system.bougette) + bougette.value = Math.max( Number(bougette.value) - 1, 0) + this.update( { 'system.bougette': bougette } ) + } } + /* -------------------------------------------- */ updateResourcesData() { if (this.type == 'character') { diff --git a/system.json b/system.json index f00acee..d366a3e 100644 --- a/system.json +++ b/system.json @@ -14,7 +14,7 @@ ], "url": "https://www.uberwald.me/gitea/public/bol", "license": "LICENSE.txt", - "version": "10.4.10", + "version": "10.4.11", "compatibility": { "minimum": "10", "verified": "10", @@ -203,7 +203,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.4.10.zip", + "download": "https://www.uberwald.me/gitea/public/bol/archive/bol-v10.4.11.zip", "background": "systems/images/map_lemurie.webp", "gridDistance": 1.5, "gridUnits": "m", diff --git a/templates/actor/parts/tabs/actor-equipment.hbs b/templates/actor/parts/tabs/actor-equipment.hbs index 0605e56..4c56ef3 100644 --- a/templates/actor/parts/tabs/actor-equipment.hbs +++ b/templates/actor/parts/tabs/actor-equipment.hbs @@ -1,34 +1,34 @@ -{{#if useBougette}} -
    -
  1. -
    {{localize "BOL.ui.moneyTitle"}}
    -
     
    -
  2. -
  3. -

    -
    - {{localize "BOL.ui.money"}} -

    -
    - -
    - {{#if isGM}} - - {{else}} - - {{/if}} -
  4. -
-{{/if}} + {{#if useBougette}} +
    +
  1. +
    {{localize "BOL.ui.moneyTitle"}}
    +
     
    +
  2. +
  3. +

    +
    + {{localize "BOL.ui.money"}} +

    +
    + +
    + {{#if isGM}} + + {{else}} + + {{/if}} +
  4. +
+ {{/if}}