diff --git a/module/actor-entite-sheet.js b/module/actor-entite-sheet.js index bae8617c..4f9126f4 100644 --- a/module/actor-entite-sheet.js +++ b/module/actor-entite-sheet.js @@ -40,6 +40,9 @@ export class RdDActorEntiteSheet extends ActorSheet { options: this.options, owner: this.actor.isOwner, itemsByType: Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i))), + description: await TextEditor.enrichHTML(this.object.system.description, {async: true}), + notesmj: await TextEditor.enrichHTML(this.object.system.notesmj, {async: true}), + }; formData.options.isGM = game.user.isGM; diff --git a/module/actor-sheet.js b/module/actor-sheet.js index 8609435b..f0b50731 100644 --- a/module/actor-sheet.js +++ b/module/actor-sheet.js @@ -52,6 +52,9 @@ export class RdDActorSheet extends ActorSheet { limited: this.actor.limited, options: this.options, owner: this.actor.isOwner, + biographie: await TextEditor.enrichHTML(this.object.system.biographie, {async: true}), + notes: await TextEditor.enrichHTML(this.object.system.notes, {async: true}), + notesmj: await TextEditor.enrichHTML(this.object.system.notesmj, {async: true}), itemsByType: Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i))), } RdDUtility.filterItemsPerTypeForSheet(formData) diff --git a/module/actor-vehicule-sheet.js b/module/actor-vehicule-sheet.js index 7d0691af..41afd910 100644 --- a/module/actor-vehicule-sheet.js +++ b/module/actor-vehicule-sheet.js @@ -41,6 +41,8 @@ export class RdDActorVehiculeSheet extends ActorSheet { options: this.options, owner: this.actor.isOwner, itemsByType: Misc.classify(this.actor.items.map(i => foundry.utils.deepClone(i))), + description: await TextEditor.enrichHTML(this.object.system.biographie, {async: true}), + notesmj: await TextEditor.enrichHTML(this.object.system.notesmj, {async: true}), }; RdDUtility.filterItemsPerTypeForSheet(formData); diff --git a/module/item-sheet.js b/module/item-sheet.js index ee2abc4a..1b405df6 100644 --- a/module/item-sheet.js +++ b/module/item-sheet.js @@ -74,7 +74,10 @@ export class RdDItemSheet extends ItemSheet { owner: this.item.isOwner, editable: this.isEditable, cssClass: this.isEditable ? "editable" : "locked", - isSoins: false + isSoins: false, + description: await TextEditor.enrichHTML(this.object.system.description, {async: true}), + descriptionmj: await TextEditor.enrichHTML(this.object.system.descriptionmj, {async: true}) + } if (this.actor) { formData.isOwned = true; @@ -93,8 +96,15 @@ export class RdDItemSheet extends ItemSheet { formData.competences = await RdDUtility.loadCompendium('foundryvtt-reve-de-dragon.competences', it => RdDItemCompetence.isCompetenceArme(it)); console.log(formData.competences) } + if (this.item.type == 'recettecuisine') { + formData.ingredients = await TextEditor.enrichHTML(this.object.system.ingredients, {async: true}) + } if (this.item.type == 'recettealchimique') { RdDAlchimie.processManipulation(this.item, this.actor && this.actor.id); + formData.manipulation_update = await TextEditor.enrichHTML(this.object.system.manipulation_update, {async: true}) + formData.utilisation = await TextEditor.enrichHTML(this.object.system.utilisation, {async: true}) + formData.enchantement = await TextEditor.enrichHTML(this.object.system.enchantement, {async: true}) + formData.sureffet = await TextEditor.enrichHTML(this.object.system.sureffet, {async: true}) } if (this.item.type == 'gemme') { formData.gemmeTypeList = RdDGemme.getGemmeTypeOptionList(); diff --git a/system.json b/system.json index d3f93f7a..bf1f8f7d 100644 --- a/system.json +++ b/system.json @@ -34,7 +34,7 @@ ], "url": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/", "license": "LICENSE.txt", - "version": "10.0.20", + "version": "10.0.21", "compatibility": { "minimum": "10", "verified": "10.286" @@ -333,7 +333,7 @@ ], "socket": true, "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json", - "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.20.zip", + "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.21.zip", "gridDistance": 1, "gridUnits": "m", "primaryTokenAttribute": "sante.vie", diff --git a/templates/actor-creature-sheet.html b/templates/actor-creature-sheet.html index a5974033..94975010 100644 --- a/templates/actor-creature-sheet.html +++ b/templates/actor-creature-sheet.html @@ -139,7 +139,7 @@

Description

- {{editor system.description target="system.description" button=true owner=owner editable=true}} + {{editor description target="system.description" button=true owner=owner editable=true}}
{{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}} diff --git a/templates/actor-entite-sheet.html b/templates/actor-entite-sheet.html index 70554ec7..8026abff 100644 --- a/templates/actor-entite-sheet.html +++ b/templates/actor-entite-sheet.html @@ -131,7 +131,7 @@ {{!-- Biography Tab --}}
- {{editor system.description target="system.description" button=true owner=owner editable=true}} + {{editor description target="system.description" button=true owner=owner editable=true}}
{{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
diff --git a/templates/actor-sheet-editor-notes-mj.html b/templates/actor-sheet-editor-notes-mj.html index 11858afe..9b3a7caa 100644 --- a/templates/actor-sheet-editor-notes-mj.html +++ b/templates/actor-sheet-editor-notes-mj.html @@ -1,6 +1,6 @@ {{#if options.isGM}}

Notes du MJ :

- {{editor system.notesmj target="system.notesmj" button=true owner=owner editable=editable}} + {{editor notesmj target="system.notesmj" button=true owner=owner editable=editable}}
{{/if}} diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 0c37d61d..e9c5a389 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -713,11 +713,11 @@

Biographie :

- {{editor system.biographie target="system.biographie" button=true owner=owner editable=editable}} + {{editor biographie target="system.biographie" button=true owner=owner editable=editable}}

Notes :

- {{editor system.notes target="system.notes" button=true owner=owner editable=editable}} + {{editor notes target="system.notes" button=true owner=owner editable=editable}}

Journal d'Experience

diff --git a/templates/actor-vehicule-sheet.html b/templates/actor-vehicule-sheet.html index 51c7126b..e0a21592 100644 --- a/templates/actor-vehicule-sheet.html +++ b/templates/actor-vehicule-sheet.html @@ -75,7 +75,7 @@ {{!-- Biography Tab --}}
- {{editor content=system.description target="system.description" button=true owner=owner editable=editable}} + {{editor description target="system.description" button=true owner=owner editable=editable}}
{{>"systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html"}}
diff --git a/templates/item-recettealchimique-sheet.html b/templates/item-recettealchimique-sheet.html index b476b22b..e8a5f7b3 100644 --- a/templates/item-recettealchimique-sheet.html +++ b/templates/item-recettealchimique-sheet.html @@ -9,25 +9,25 @@
- {{editor system.manipulation_update target="system.manipulation" button=true owner=owner editable=editable}} + {{editor manipulation_update target="system.manipulation" button=true owner=owner editable=editable}}
- {{editor system.utilisation target="system.utilisation" button=true owner=owner editable=editable}} + {{editor utilisation target="system.utilisation" button=true owner=owner editable=editable}}
- {{editor system.enchantement target="system.enchantement" button=true owner=owner editable=editable}} + {{editor enchantement target="system.enchantement" button=true owner=owner editable=editable}}
- {{editor system.sureffet target="system.sureffet" button=true owner=owner editable=editable}} + {{editor sureffet target="system.sureffet" button=true owner=owner editable=editable}}
diff --git a/templates/item-recettecuisine-sheet.html b/templates/item-recettecuisine-sheet.html index 4b2a7370..e803a5e0 100644 --- a/templates/item-recettecuisine-sheet.html +++ b/templates/item-recettecuisine-sheet.html @@ -25,7 +25,7 @@
- {{editor system.ingredients target="system.ingredients" button=true owner=owner editable=editable}} + {{editor ingredients target="system.ingredients" button=true owner=owner editable=editable}}
diff --git a/templates/item-sheet.html b/templates/item-sheet.html index c49fe411..13d3a46f 100644 --- a/templates/item-sheet.html +++ b/templates/item-sheet.html @@ -25,7 +25,7 @@ {{!-- Description Tab --}}
- {{editor system.description target="system.description" button=true owner=owner editable=editable}} + {{editor description target="system.description" button=true owner=owner editable=editable}}
{{!-- Attributes Tab --}} diff --git a/templates/partial-item-description.html b/templates/partial-item-description.html index cc30d1f6..939e003b 100644 --- a/templates/partial-item-description.html +++ b/templates/partial-item-description.html @@ -1,14 +1,14 @@
- {{editor system.description target="system.description" button=true owner=owner editable=editable}} + {{editor description target="system.description" button=true owner=owner editable=editable}}
{{#if isGM}}
- {{editor system.descriptionmj target="system.descriptionmj" button=true owner=owner editable=editable}} + {{editor descriptionmj target="system.descriptionmj" button=true owner=owner editable=editable}}
{{/if}} \ No newline at end of file