diff --git a/module/actor-sheet.js b/module/actor-sheet.js index 1d995885..1dec14dd 100644 --- a/module/actor-sheet.js +++ b/module/actor-sheet.js @@ -76,12 +76,14 @@ export class RdDActorSheet extends ActorSheet { surEncombrementMessage: this.actor.getMessageSurEncombrement() }; + /* TODO - TO FIX for v10 formData.competences.forEach(item => { + console.log("ITEM1", item) item.visible = this.options.recherche ? RdDItemCompetence.nomContientTexte(item, this.options.recherche.text) : (!this.options.showCompNiveauBase || !RdDItemCompetence.isNiveauBase(item)); RdDItemCompetence.levelUp(item, formData.data.compteurs.experience.value); - }); + });*/ Object.values(formData.data.carac).forEach(c => { RdDCarac.levelUp(c); @@ -130,9 +132,9 @@ export class RdDActorSheet extends ActorSheet { /* -------------------------------------------- */ async _onDropActor(event, dragData) { - console.log("_onDropActor", this.actor.id, dragData); - this.actor.addSubActeur(dragData.id || dragData.data._id); - super._onDropActor(event, dragData); + console.log("_onDropActor", this.actor.id, dragData) + this.actor.addSubActeur(dragData.id || dragData.data._id) + super._onDropActor(event, dragData) } /* -------------------------------------------- */ diff --git a/module/rdd-combat.js b/module/rdd-combat.js index f62a9a8e..9d1cbc38 100644 --- a/module/rdd-combat.js +++ b/module/rdd-combat.js @@ -155,14 +155,14 @@ export class RdDCombatManager extends Combat { // Gestion des armes 1/2 mains let actionsArme = []; for (const arme of armes) { - let action = duplicate(Misc.data(arme)); + let action = duplicate(arme) if (action.system.equipe) { let compData = competences.find(c => c.name == action.system.competence) actionsArme.push(action); action.action = 'attaque'; action.system.dommagesReels = Number(action.system.dommages); - action.system.niveau = compData.data.niveau; + action.system.niveau = compData.system.niveau; action.system.initiative = RdDCombatManager.calculInitiative(compData.system.niveau, carac[compData.system.defaut_carac].value); // Dupliquer les armes pouvant être à 1 main et 2 mains en patchant la compétence if (action.system.unemain && !action.system.deuxmains) { diff --git a/module/rdd-hotbar-drop.js b/module/rdd-hotbar-drop.js index cb09b2af..ea215554 100644 --- a/module/rdd-hotbar-drop.js +++ b/module/rdd-hotbar-drop.js @@ -11,11 +11,18 @@ export class RdDHotbar { static initDropbar( ) { Hooks.on("hotbarDrop", async (bar, documentData, slot) => { + + // Create item macro if rollable item - weapon, spell, prayer, trait, or skill if (documentData.type == "Item") { - if (documentData.data.type != "arme" && documentData.data.type != "competence" ) + let item = fromUuidSync(documentData.uuid) + if (item == undefined) { + item = this.actor.items.get( documentData.uuid ) + } + console.log( "DROP", documentData, item) + if (!item || (item.type != "arme" && item.type != "competence" ) ) { return - let item = documentData.data + } let command = `game.system.rdd.RdDHotbar.rollMacro("${item.name}", "${item.type}");`; let macro = game.macros.contents.find(m => (m.name === item.name) && (m.command === command)); if (!macro) { @@ -28,6 +35,7 @@ export class RdDHotbar { } game.user.assignHotbarMacro(macro, slot); } + // Create a macro to open the actor sheet of the actor dropped on the hotbar else if (documentData.type == "Actor") { let actor = game.actors.get(documentData.id); @@ -35,7 +43,7 @@ export class RdDHotbar { let macro = game.macros.contents.find(m => (m.name === actor.name) && (m.command === command)); if (!macro) { macro = await Macro.create({ - name: actor.data.name, + name: actor.name, type: "script", img: actor.data.img, command: command @@ -45,12 +53,12 @@ export class RdDHotbar { } // Create a macro to open the journal sheet of the journal dropped on the hotbar else if (documentData.type == "JournalEntry") { - let journal = game.journal.get(documentData.id); + let journal = fromUuidSync(documentData.uuid) let command = `game.journal.get("${documentData.id}").sheet.render(true)` let macro = game.macros.contents.find(m => (m.name === journal.name) && (m.command === command)); if (!macro) { macro = await Macro.create({ - name: journal.data.name, + name: journal.name, type: "script", img: "systems/foundryvtt-reve-de-dragon/icons/templates/icone_parchement_vierge.webp", command: command diff --git a/module/rdd-utility.js b/module/rdd-utility.js index 01812e66..cdd1edab 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -248,7 +248,7 @@ export class RdDUtility { if (b.name.includes("Extérieur")) return 1; return a.name.localeCompare(b.name); } - if (a.data.categorie.startsWith("melee") && b.data.categorie.startsWith("melee")) { + if (a.system.categorie.startsWith("melee") && b.system.categorie.startsWith("melee")) { if (a.name.includes("Corps")) return -1; if (b.name.includes("Corps")) return 1; if (a.name.includes("Dague")) return -1; @@ -475,7 +475,7 @@ export class RdDUtility { objet.niveau = profondeur; const isConteneur = objet.type == 'conteneur'; const isOuvert = isConteneur && this.getAfficheContenu(objet._id); - const isVide = isConteneur && Misc.templateData(objet).contenu.length == 0; + const isVide = isConteneur && objet.system.contenu.length == 0; const conteneur = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html']({ item: objet, vide: isVide, diff --git a/system.json b/system.json index 70e8cc02..68bb681d 100644 --- a/system.json +++ b/system.json @@ -34,11 +34,9 @@ ], "url": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/", "license": "LICENSE.txt", - "version": "10.0.8", + "version": "10.0.9", "compatibility": { - "minimum": "10", - "verified": "10.283", - "maximum": "10" + "minimum": "10" }, "esmodules": [ "module/rdd-main.js" diff --git a/templates/actor-creature-sheet.html b/templates/actor-creature-sheet.html index b8844288..5e26a5d6 100644 --- a/templates/actor-creature-sheet.html +++ b/templates/actor-creature-sheet.html @@ -68,7 +68,7 @@ {{/each}}
  • - Vie + Vie / diff --git a/templates/actor-entite-sheet.html b/templates/actor-entite-sheet.html index a912bd8a..d4297203 100644 --- a/templates/actor-entite-sheet.html +++ b/templates/actor-entite-sheet.html @@ -35,12 +35,12 @@ {{#each data.carac as |carac key|}}
  • {{#if (eq key 'taille')}} - {{carac.label}} + {{carac.label}} {{else}} - {{carac.label}} {{/if}} -
    • {{/each}} @@ -52,7 +52,7 @@
    1. Catégorie : - {{#select data.definition.categorieentite}} @@ -61,7 +61,7 @@
    2. Type d'entité : - {{#select data.definition.typeentite}} @@ -71,16 +71,16 @@
      3. {{#each data.attributs as |attr key|}}
    3. - {{attr.label}} : - {{attr.label}} : +
      4. {{/each}}
    4. - Endurance : - Endurance : + / -
    @@ -98,11 +98,11 @@ {{comp.name}} + value="{{comp.system.carac_value}}" data-dtype="number" /> + value="{{numberFormat comp.system.niveau decimals=0 sign=true}}" data-dtype="number" /> + value="{{numberFormat comp.system.dommages decimals=0 sign=true}}" data-dtype="number" />
    diff --git a/templates/actor-sheet-inventaire-item.html b/templates/actor-sheet-inventaire-item.html index fe9a9d89..74d14643 100644 --- a/templates/actor-sheet-inventaire-item.html +++ b/templates/actor-sheet-inventaire-item.html @@ -21,27 +21,27 @@ {{item.name}} {{/if}} - {{item.data.quantite}} - {{#if (gt item.data.quantite 1)}} + {{item.system.quantite}} + {{#if (gt item.system.quantite 1)}} {{/if}} - {{numberFormat item.data.encTotal decimals=2}} + {{numberFormat item.system.encTotal decimals=2}} {{#unless item.estContenu}} {{#if (ne item.type 'conteneur')}} - {{#if item.data.equipe}}{{else}}{{/if}} + {{#if item.system.equipe}}{{else}}{{/if}} {{/if}} {{/unless}}   - {{#if (or (eq item.type 'arme') (eq item.type 'conteneur') item.data.quantite)}} + {{#if (or (eq item.type 'arme') (eq item.type 'conteneur') item.system.quantite)}} {{/if}} - {{#if item.data.actionPrincipale}} - {{item.data.actionPrincipale}} + {{#if item.system.actionPrincipale}} + {{item.system.actionPrincipale}} {{/if}} diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index e721b852..252a87b2 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -13,7 +13,7 @@ @@ -22,7 +22,7 @@ @@ -32,7 +32,7 @@ {{{calc.fatigue.html}}} Fatigue - + / {{data.sante.fatigue.max}} @@ -41,7 +41,7 @@ @@ -107,27 +107,27 @@
  • {{/if}} {{#if (eq key 'taille')}} - {{carac.label}} - + {{carac.label}} +
    • diff --git a/templates/chat-demande-defense.html b/templates/chat-demande-defense.html index 9864da84..2cab97b3 100644 --- a/templates/chat-demande-defense.html +++ b/templates/chat-demande-defense.html @@ -26,7 +26,7 @@
    {{/if}} {{#if (eq defender.type 'personnage')}} - {{#if (gt defender.data.compteurs.destinee.value 0)}} + {{#if (gt defender.system.compteurs.destinee.value 0)}} Utiliser la destinée @@ -38,14 +38,14 @@ {{#each armes as |arme key|}} - Parer avec {{arme.name}} à {{../diffLibre }}{{#if arme.data.nbUsage}} (Utilisations : {{arme.data.nbUsage}}){{/if}} + Parer avec {{arme.name}} à {{../diffLibre }}{{#if arme.system.nbUsage}} (Utilisations : {{arme.system.nbUsage}}){{/if}}
    {{/each}} {{#if mainsNues}} - Parer à mains nues à {{diffLibre}}{{#if arme.data.nbUsage}} (Utilisations : {{arme.data.nbUsage}}){{/if}} + data-armeid='{{arme._id}}' data-competence='{{arme.system.competence}}'> + Parer à mains nues à {{diffLibre}}{{#if arme.system.nbUsage}} (Utilisations : {{arme.system.nbUsage}}){{/if}}
    {{/if}} diff --git a/templates/chat-resultat-oeuvre.html b/templates/chat-resultat-oeuvre.html index a3d78d21..c119d087 100644 --- a/templates/chat-resultat-oeuvre.html +++ b/templates/chat-resultat-oeuvre.html @@ -2,7 +2,7 @@ {{alias}} tente d'interpréter {{oeuvre.name}} (niveau {{oeuvre.system.niveau}}) -
    {{upperFirst oeuvre.data.default_carac}} / {{oeuvre.data.competence}} +
    {{upperFirst oeuvre.system.default_carac}} / {{oeuvre.system.competence}} {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
    diff --git a/templates/dialog-create-signedraconique.html b/templates/dialog-create-signedraconique.html index 44a7e941..23ba5a97 100644 --- a/templates/dialog-create-signedraconique.html +++ b/templates/dialog-create-signedraconique.html @@ -8,27 +8,27 @@
    - - + +
    - +
    - + Sign. - + Part. - +
    - - + + - +
    diff --git a/templates/dialog-item-achat.html b/templates/dialog-item-achat.html index b182a975..3363a358 100644 --- a/templates/dialog-item-achat.html +++ b/templates/dialog-item-achat.html @@ -47,30 +47,30 @@ {{#if (eq item.type 'nourritureboisson')}}

    - Si vous souhaitez {{#if item.data.boisson}}boire{{else}}manger{{/if}}: + Si vous souhaitez {{#if item.system.boisson}}boire{{else}}manger{{/if}}:

    - {{#if item.data.sust}} -

    Cette {{#if item.data.boisson}}boisson{{else}}nourriture{{/if}} vous apportera Cette {{#if item.system.boisson}}boisson{{else}}nourriture{{/if}} vous apportera {{totalSust}} de sustantation.

    {{/if}} - {{#if item.data.boisson}} -

    {{#if item.data.alcoolise}} - C'est une boisson alcoolisée de force {{item.data.force}}, vous effectuerez un jet d'éthylisme. + {{#if item.system.boisson}} +

    {{#if item.system.alcoolise}} + C'est une boisson alcoolisée de force {{item.system.force}}, vous effectuerez un jet d'éthylisme. {{/if}} Cette boisson vous apportera {{totalDesaltere}} unités d'eau.

    {{/if}} - {{#if (gt item.data.qualite 0)}} - {{#if (gt item.data.qualite cuisine.data.niveau)}} -

    La qualité du plat est telle qu'un jet de Goût/Cuisine à {{numberFormat item.data.qualite decimals=0 sign=true}} + {{#if (gt item.system.qualite 0)}} + {{#if (gt item.system.qualite cuisine.system.niveau)}} +

    La qualité du plat est telle qu'un jet de Goût/Cuisine à {{numberFormat item.system.qualite decimals=0 sign=true}} vous permettra un jet de moral heureux.

    {{/if}} {{/if}} - {{#if (or (lt item.data.qualite 0) (lt item.data.exotisme 0))}} + {{#if (or (lt item.system.qualite 0) (lt item.system.exotisme 0))}}

    - Pour surmonter {{#if (lt item.data.qualite 0)}}le mauvais goût{{else}}l'exotisme{{/if}}, vous devez effectuer un jet de Volonté/Cuisine à {{numberFormat (min item.data.exotisme item.data.qualite) decimals=0 sign=true}}. + Pour surmonter {{#if (lt item.system.qualite 0)}}le mauvais goût{{else}}l'exotisme{{/if}}, vous devez effectuer un jet de Volonté/Cuisine à {{numberFormat (min item.system.exotisme item.system.qualite) decimals=0 sign=true}}.
    diff --git a/templates/dialog-item-consommer.html b/templates/dialog-item-consommer.html index 81ed53fe..2f1fa490 100644 --- a/templates/dialog-item-consommer.html +++ b/templates/dialog-item-consommer.html @@ -2,31 +2,31 @@ {{item.name}}

    {{item.name}}

    - +
    - {{#if item.data.sust}} -

    Cette {{#if item.data.boisson}}boisson{{else}}nourriture{{/if}} vous apportera Cette {{#if item.system.boisson}}boisson{{else}}nourriture{{/if}} vous apportera {{totalSust}} de sustantation.

    {{/if}} - {{#if item.data.boisson}} -

    {{#if item.data.alcoolise}} - C'est une boisson alcoolisée de force {{item.data.force}}, vous effectuerez un jet d'éthylisme. + {{#if item.system.boisson}} +

    {{#if item.system.alcoolise}} + C'est une boisson alcoolisée de force {{item.system.force}}, vous effectuerez un jet d'éthylisme. {{/if}} Cette boisson vous apportera {{totalDesaltere}} unités d'eau.

    {{/if}} - {{#if (gt item.data.qualite 0)}} - {{#if (gt item.data.qualite cuisine.data.niveau)}} -

    La qualité du plat est telle qu'un jet de Goût/Cuisine à {{numberFormat item.data.qualite decimals=0 sign=true}} + {{#if (gt item.system.qualite 0)}} + {{#if (gt item.system.qualite cuisine.system.niveau)}} +

    La qualité du plat est telle qu'un jet de Goût/Cuisine à {{numberFormat item.system.qualite decimals=0 sign=true}} vous permettra un jet de moral heureux.

    {{/if}} {{/if}} - {{#if (or (lt item.data.qualite 0) (lt item.data.exotisme 0))}} + {{#if (or (lt item.system.qualite 0) (lt item.system.exotisme 0))}}

    - Pour surmonter {{#if (lt item.data.qualite 0)}}le mauvais goût{{else}}l'exotisme{{/if}}, vous devez effectuer un jet de Volonté/Cuisine à {{numberFormat (min item.data.exotisme item.data.qualite) decimals=0 sign=true}}. + Pour surmonter {{#if (lt item.system.qualite 0)}}le mauvais goût{{else}}l'exotisme{{/if}}, vous devez effectuer un jet de Volonté/Cuisine à {{numberFormat (min item.system.exotisme item.system.qualite) decimals=0 sign=true}}.
    diff --git a/templates/dialog-item-split.html b/templates/dialog-item-split.html index acfb7552..f09da7e8 100644 --- a/templates/dialog-item-split.html +++ b/templates/dialog-item-split.html @@ -1,7 +1,7 @@

    {{item.name}}

    {{item.name}}

    - +
    - +
    diff --git a/templates/dialog-roll-chant.html b/templates/dialog-roll-chant.html index 8f72f568..908b0036 100644 --- a/templates/dialog-roll-chant.html +++ b/templates/dialog-roll-chant.html @@ -6,9 +6,9 @@ {{competence.name}}
    - +
    - {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}} + {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.system}}
    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}} diff --git a/templates/dialog-roll-competence.html b/templates/dialog-roll-competence.html index 86d26d22..0e33f2a9 100644 --- a/templates/dialog-roll-competence.html +++ b/templates/dialog-roll-competence.html @@ -43,9 +43,9 @@ {{#if arme}} {{#unless attackerRoll}}
    - {{#if (eq arme.data.mortalite 'non-mortel')}} + {{#if (eq arme.system.mortalite 'non-mortel')}} - {{else if (eq arme.data.mortalite 'empoignade')}} + {{else if (eq arme.system.mortalite 'empoignade')}} {{else}} diff --git a/templates/dialog-roll-danse.html b/templates/dialog-roll-danse.html index 65d3376e..efb792b8 100644 --- a/templates/dialog-roll-danse.html +++ b/templates/dialog-roll-danse.html @@ -6,9 +6,9 @@ {{competence.name}}
    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}} - +
    - {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}} + {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.system}}
    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}} diff --git a/templates/dialog-roll-maitrise-tmr.html b/templates/dialog-roll-maitrise-tmr.html index 952e2219..794633ec 100644 --- a/templates/dialog-roll-maitrise-tmr.html +++ b/templates/dialog-roll-maitrise-tmr.html @@ -10,7 +10,7 @@ {{competence.name}}
    - +
    diff --git a/templates/dialog-roll-recettecuisine.html b/templates/dialog-roll-recettecuisine.html index 394ff935..5a03c1ab 100644 --- a/templates/dialog-roll-recettecuisine.html +++ b/templates/dialog-roll-recettecuisine.html @@ -9,10 +9,10 @@
    - +
    - +
    diff --git a/templates/dialog-roll-reve-de-dragon.html b/templates/dialog-roll-reve-de-dragon.html index 5e93afda..308c6fdf 100644 --- a/templates/dialog-roll-reve-de-dragon.html +++ b/templates/dialog-roll-reve-de-dragon.html @@ -5,7 +5,7 @@ {{competence.name}}
    - +
    diff --git a/templates/dialog-roll-signedraconique.html b/templates/dialog-roll-signedraconique.html index 051341ec..a0bc0423 100644 --- a/templates/dialog-roll-signedraconique.html +++ b/templates/dialog-roll-signedraconique.html @@ -24,7 +24,7 @@ {{#select sort}} {{#each sortList as |sort key|}} - {{/each}} {{/select}} @@ -28,7 +28,7 @@ {{/each}} {{/select}} -
    @@ -41,7 +41,7 @@ - +
    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}} diff --git a/templates/item-competence-sheet.html b/templates/item-competence-sheet.html index 0b953cb1..d215aa56 100644 --- a/templates/item-competence-sheet.html +++ b/templates/item-competence-sheet.html @@ -16,7 +16,7 @@
    - {{#select data.categorie}} {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-competence.html"}} {{/select}} @@ -24,16 +24,16 @@
    - +
    - +
    {{#if isGM}} - {{#select data.base}} {{>"systems/foundryvtt-reve-de-dragon/templates/competence-base.html"}} {{/select}} @@ -44,7 +44,7 @@
    - {{#select data.defaut_carac}} {{>"systems/foundryvtt-reve-de-dragon/templates/competence-carac-defaut.html"}} {{/select}} @@ -52,17 +52,17 @@
    - +
    {{#if (eq data.categorie 'draconic')}}
    - +
    {{/if}}
    - +
    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} diff --git a/templates/item-competencecreature-sheet.html b/templates/item-competencecreature-sheet.html index cf4c43a9..805a72cd 100644 --- a/templates/item-competencecreature-sheet.html +++ b/templates/item-competencecreature-sheet.html @@ -10,31 +10,31 @@
    - +
    - +
    - +
    - +
    - +
    - +
    - {{#select data.categorie_parade}} {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-parade.html"}} {{/select}} @@ -42,7 +42,7 @@
    - +
    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} diff --git a/templates/item-conteneur-sheet.html b/templates/item-conteneur-sheet.html index 3cf93108..ff3b15f7 100644 --- a/templates/item-conteneur-sheet.html +++ b/templates/item-conteneur-sheet.html @@ -10,19 +10,19 @@
    - +
    - +
    - +
    - +
    {{#if isOwned}}
    diff --git a/templates/item-danse-sheet.html b/templates/item-danse-sheet.html index ac110fe1..638a9fc2 100644 --- a/templates/item-danse-sheet.html +++ b/templates/item-danse-sheet.html @@ -10,7 +10,7 @@
    - {{#select data.type}} @@ -19,19 +19,19 @@
    - +
    - +
    - +
    - +
    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} diff --git a/templates/item-gemme-sheet.html b/templates/item-gemme-sheet.html index fadbcd51..d82222ed 100644 --- a/templates/item-gemme-sheet.html +++ b/templates/item-gemme-sheet.html @@ -10,7 +10,7 @@
    - {{#select data.type}} {{{gemmeTypeList}}} {{/select}} @@ -18,35 +18,35 @@
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} diff --git a/templates/item-herbe-sheet.html b/templates/item-herbe-sheet.html index 3724f9e8..b9bf1756 100644 --- a/templates/item-herbe-sheet.html +++ b/templates/item-herbe-sheet.html @@ -16,23 +16,23 @@
    - +
    - +
    - +
    - +
    - {{#select data.rarete}} {{>"systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html"}} {{/select}} @@ -40,7 +40,7 @@
    - {{#select data.categorie}} {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-ingredient.html"}} {{/select}} diff --git a/templates/item-ingredient-sheet.html b/templates/item-ingredient-sheet.html index 6c624e61..4260724d 100644 --- a/templates/item-ingredient-sheet.html +++ b/templates/item-ingredient-sheet.html @@ -11,28 +11,28 @@
    - +
    - +
    - +
    - +
    - +
    - {{#select data.rarete}} {{>"systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html"}} {{/select}} @@ -40,7 +40,7 @@
    - {{#select data.categorie}} {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-ingredient.html"}} {{/select}} diff --git a/templates/item-jeu-sheet.html b/templates/item-jeu-sheet.html index 5a5bdbed..653d4f4b 100644 --- a/templates/item-jeu-sheet.html +++ b/templates/item-jeu-sheet.html @@ -10,7 +10,7 @@
    - {{#select data.type}} @@ -21,15 +21,15 @@
    - +
    - +
    - +
    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} diff --git a/templates/item-livre-sheet.html b/templates/item-livre-sheet.html index 19fa3b99..64994774 100644 --- a/templates/item-livre-sheet.html +++ b/templates/item-livre-sheet.html @@ -15,11 +15,11 @@
    - +
    - {{#select data.competence}} {{#each competences as |competence key|}} @@ -29,35 +29,35 @@
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} diff --git a/templates/item-maladie-sheet.html b/templates/item-maladie-sheet.html index 1c032af9..1eb70e3d 100644 --- a/templates/item-maladie-sheet.html +++ b/templates/item-maladie-sheet.html @@ -15,28 +15,28 @@ {{#if (or isGM data.identifie)}}
    - +
    - +
    - +
    - +
    - +
    {{#if (or isGM data.remedesconnus)}}
    - +
    {{/if}} {{/if}} diff --git a/templates/item-meditation-sheet.html b/templates/item-meditation-sheet.html index 7be17f2d..f308665e 100644 --- a/templates/item-meditation-sheet.html +++ b/templates/item-meditation-sheet.html @@ -10,7 +10,7 @@
    - {{#select data.competence}} {{#each competences as |competence key|}} @@ -20,15 +20,15 @@
    - +
    - +
    - {{#select data.heure}} {{>"systems/foundryvtt-reve-de-dragon/templates/heures-select-option.html"}} {{/select}} @@ -36,19 +36,19 @@
    - +
    - +
    - +
    - {{#select data.tmr}} {{>"systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html"}} {{/select}} @@ -57,7 +57,7 @@
    {{#if isGM}} - {{#select data.malus}} diff --git a/templates/item-poison-sheet.html b/templates/item-poison-sheet.html index 7411aa60..312802c6 100644 --- a/templates/item-poison-sheet.html +++ b/templates/item-poison-sheet.html @@ -14,7 +14,7 @@
    - +
    {{#if (or isGM data.identifie)}}
    diff --git a/templates/item-sort-sheet.html b/templates/item-sort-sheet.html index 878ddf93..b9dd8774 100644 --- a/templates/item-sort-sheet.html +++ b/templates/item-sort-sheet.html @@ -18,7 +18,7 @@
    - {{#select data.caseTMR}} {{>"systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html"}} diff --git a/templates/partial-description-sort.html b/templates/partial-description-sort.html index 1174e0c7..841eeb6b 100644 --- a/templates/partial-description-sort.html +++ b/templates/partial-description-sort.html @@ -1,10 +1,10 @@
    - {{#if sort.data.cible}}{{/if}} - {{#if sort.data.JR}}{{/if}} - {{#if sort.data.portee}}{{/if}} - {{#if sort.data.duree}}{{/if}} - {{#if sort.data.coutseuil}}{{/if}} + {{#if sort.system.cible}}{{/if}} + {{#if sort.system.JR}}{{/if}} + {{#if sort.system.portee}}{{/if}} + {{#if sort.system.duree}}{{/if}} + {{#if sort.system.coutseuil}}{{/if}}
    - {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" sort.data}} + {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" sort.system}}
    \ No newline at end of file