diff --git a/modules/yggdrasill-actor-sheet.js b/modules/yggdrasill-actor-sheet.js index 3380355..4a29ad2 100644 --- a/modules/yggdrasill-actor-sheet.js +++ b/modules/yggdrasill-actor-sheet.js @@ -97,7 +97,7 @@ export class YggdrasillActorSheet extends ActorSheet { // Update Inventory Item html.find('.item-edit').click(ev => { const li = $(ev.currentTarget).parents(".item"); - const item = this.actor.getOwnedItem(li.data("item-id")); + const item = this.actor.items.get(li.data("item-id")); item.sheet.render(true); }); // Delete Inventory Item @@ -112,12 +112,12 @@ export class YggdrasillActorSheet extends ActorSheet { html.find('.munition-moins').click(event => { const li = $(event.currentTarget).parents(".item"); - const item = this.actor.getOwnedItem(li.data("item-id")); + const item = this.actor.items.get(li.data("item-id")); this.actor.decrementeMunition( item ); } ); html.find('.munition-plus').click(event => { const li = $(event.currentTarget).parents(".item"); - const item = this.actor.getOwnedItem(li.data("item-id")); + const item = this.actor.items.get(li.data("item-id")); this.actor.incrementeMunition( item ); } ); html.find('.equipement-moins').click(event => { @@ -176,7 +176,7 @@ export class YggdrasillActorSheet extends ActorSheet { }); html.find('.weapon-damage').click((event) => { const li = $(event.currentTarget).parents(".item"); - const weapon = this.actor.getOwnedItem(li.data("item-id")); + const weapon = this.actor.items.get(li.data("item-id")); this.actor.rollDamage(weapon, 'damage'); }); html.find('.competence-base').change((event) => { @@ -190,7 +190,7 @@ export class YggdrasillActorSheet extends ActorSheet { }); html.find('.item-link a').click((event) => { const itemId = $(event.currentTarget).data("item-id"); - const item = this.actor.getOwnedItem(itemId); + const item = this.actor.items.get(itemId); item.sheet.render(true); }); html.find('.item-equip').click(ev => { diff --git a/modules/yggdrasill-utility.js b/modules/yggdrasill-utility.js index 0f50b9a..3705509 100644 --- a/modules/yggdrasill-utility.js +++ b/modules/yggdrasill-utility.js @@ -226,9 +226,9 @@ export class YggdrasillUtility { } if ( rollData.srFinal > 0 ) { - isCritical = myRoll.finalTotal >= rollData.srFinal*2; - isSuccess = myRoll.finalTotal >= rollData.srFinal; - marge = myRoll.finalTotal - rollData.srFinal; + isCritical = rollData.finalTotal >= rollData.srFinal*2; + isSuccess = rollData.finalTotal >= rollData.srFinal; + marge = rollData.finalTotal - rollData.srFinal; } if (nbDice == 1 && rolls[0].dice[0].results[0].result == 1) { diff --git a/system.json b/system.json index 9f25122..683d318 100644 --- a/system.json +++ b/system.json @@ -2,7 +2,7 @@ "name": "fvtt-yggdrasill", "title": "Yggdrasill", "description": "Système non-officiel Yggdrasill (7ièm Cercle) pour FoundryVTT", - "version": "1.1.2", + "version": "1.1.4", "manifestPlusVersion": "1.0.0", "minimumCoreVersion": "0.8.0", "compatibleCoreVersion": "9",