diff --git a/module/actor-sheet.js b/module/actor-sheet.js index b0b99090..732b1922 100644 --- a/module/actor-sheet.js +++ b/module/actor-sheet.js @@ -216,7 +216,7 @@ export class RdDActorSheet extends ActorSheet { 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); }); // Update Inventory Item diff --git a/module/item-sheet.js b/module/item-sheet.js index aec1cc75..cd298a3f 100644 --- a/module/item-sheet.js +++ b/module/item-sheet.js @@ -48,24 +48,34 @@ export class RdDItemSheet extends ItemSheet { /* -------------------------------------------- */ async getData() { - let formData = super.getData(); + const objectData = Misc.data(this.object); + console.log("3", objectData); + + let formData ={ + title: this.title, + id: objectData.id, + type: objectData.type, + img: objectData.img, + name: objectData.name, + data: objectData.data, + isGM: game.user.isGM + } formData.categorieCompetences = RdDItemCompetence.getCategorieCompetences(); - if ( formData.item.type == 'tache' || formData.item.type == 'livre' || formData.item.type == 'meditation' || formData.item.type == 'oeuvre') { + if ( formData.type == 'tache' || formData.type == 'livre' || formData.type == 'meditation' || formData.type == 'oeuvre') { formData.caracList = duplicate(game.system.model.Actor.personnage.carac); formData.competences = await RdDUtility.loadCompendium( 'foundryvtt-reve-de-dragon.competences' ); } - if (formData.item.type == 'arme') { + if (formData.type == 'arme') { formData.competences = await RdDUtility.loadCompendium( 'foundryvtt-reve-de-dragon.competences', it => RdDItemCompetence.isCompetenceArme(it)); } - if ( formData.item.type == 'recettealchimique' ) { - RdDAlchimie.processManipulation(formData.item, this.actor && this.actor._id ); + if ( formData.type == 'recettealchimique' ) { + RdDAlchimie.processManipulation(formData.item, this.actor && this.actor.id ); } if ( this.actor ) { formData.isOwned = true; - formData.actorId = this.actor._id; + formData.actorId = this.actor.id; } formData.bonusCaseList = RdDItemSort.getBonusCaseList(formData, true); - formData.isGM = game.user.isGM; // Pour verrouiller certaines éditions return formData; } @@ -120,14 +130,16 @@ export class RdDItemSheet extends ItemSheet { /* -------------------------------------------- */ get template() { - let type = this.item.type; + //console.log(this); + let type = this.object.data.type; return `systems/foundryvtt-reve-de-dragon/templates/item-${type}-sheet.html`; } /* -------------------------------------------- */ /** @override */ - _updateObject(event, formData) { + _updateObject(event, formData) { // Deprecated en v0.8 à clarifier + console.log("UPDATE !", formData); // Données de bonus de cases ? formData = RdDItemSort.buildBonusCaseStringFromFormData( formData ); diff --git a/module/item-sort.js b/module/item-sort.js index d529f879..f9942b18 100644 --- a/module/item-sort.js +++ b/module/item-sort.js @@ -51,10 +51,10 @@ export class RdDItemSort extends Item { * Retourne une liste de bonus/case pour un item-sheet * @param {} item */ - static getBonusCaseList( data, newCase = false ) { + static getBonusCaseList( item, newCase = false ) { // Gestion spéciale case bonus - if ( data.item.type == 'sort') { - return this.buildBonusCaseList(data.data.bonuscase, newCase ); + if ( item.type == 'sort') { + return this.buildBonusCaseList(item.data.bonuscase, newCase ); } return undefined; } diff --git a/templates/item-arme-sheet.html b/templates/item-arme-sheet.html index 8441eccd..e7ee4b32 100644 --- a/templates/item-arme-sheet.html +++ b/templates/item-arme-sheet.html @@ -1,8 +1,8 @@