diff --git a/module/rdd-utility.js b/module/rdd-utility.js index 4726943f..6de5f96c 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -181,6 +181,7 @@ export class RdDUtility { 'systems/foundryvtt-reve-de-dragon/templates/partial-roll-enctotal.html', 'systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html', 'systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html', + 'systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html', // Calendrier 'systems/foundryvtt-reve-de-dragon/templates/calendar-template.html', 'systems/foundryvtt-reve-de-dragon/templates/calendar-editor-template.html', diff --git a/system.json b/system.json index dd5a2fe7..cd64670c 100644 --- a/system.json +++ b/system.json @@ -2,11 +2,11 @@ "name": "foundryvtt-reve-de-dragon", "title": "Rêve de Dragon", "description": "Rêve de Dragon RPG for FoundryVTT", - "version": "1.5.0", + "version": "1.5.1", "manifestPlusVersion": "1.0.0", "minimumCoreVersion": "0.8.0", "compatibleCoreVersion": "0.8.99", - "templateVersion": 115, + "templateVersion": 116, "author": "LeRatierBretonnien", "authors": [ { diff --git a/template.json b/template.json index 62ac9ec7..c5bee0fa 100644 --- a/template.json +++ b/template.json @@ -582,6 +582,7 @@ "musique", "chant", "danse", "jeu", "recettecuisine", "maladie", "poison", "oeuvre", "nourritureboisson", "signedraconique" ], "objet": { "description": "", + "descriptionmj": "", "quantite": 1, "encombrement": 0, "equipe": false, @@ -591,6 +592,7 @@ }, "conteneur": { "description": "", + "descriptionmj": "", "capacite": 0, "encombrement": 0, "equipe": false, @@ -601,6 +603,7 @@ "arme": { "categorie_parade": "", "description": "", + "descriptionmj": "", "quantite": 1, "encombrement": 0, "equipe": false, @@ -623,6 +626,7 @@ }, "munition": { "description": "", + "descriptionmj": "", "quantite": 1, "encombrement": 0, "equipe": false, @@ -631,6 +635,7 @@ }, "armure": { "description": "", + "descriptionmj": "", "quantite": 1, "encombrement": 0, "equipe": false, @@ -646,6 +651,7 @@ "categorie": "", "xp": 0, "description": "Compétence : ...", + "descriptionmj": "", "defaut_carac": "", "niveau_archetype": 0, "xp_sort": 0 @@ -658,10 +664,12 @@ "iscombat": false, "isparade": false, "dommages": 0, - "description": "Compétence : ..." + "description": "Compétence : ...", + "descriptionmj": "" }, "sort": { "description": "", + "descriptionmj": "", "draconic": "", "duree": "", "JR": "", @@ -678,6 +686,7 @@ }, "herbe": { "description": "", + "descriptionmj": "", "niveau": 0, "base": 0, "quantite": 1, @@ -688,6 +697,7 @@ }, "ingredient": { "description": "", + "descriptionmj": "", "niveau": 0, "encombrement": 0, "base": 0, @@ -705,10 +715,12 @@ "difficulte": 0, "points_de_tache": 0, "points_de_tache_courant": 0, - "description": "" + "description": "", + "descriptionmj": "" }, "livre": { "description": "", + "descriptionmj": "", "competence": "", "auteur": "", "quantite": 1, @@ -722,6 +734,7 @@ }, "potion": { "description": "", + "descriptionmj": "", "quantite": 1, "encombrement": 0, "rarete": "", @@ -736,32 +749,38 @@ "cout": 0 }, "rencontresTMR": { - "description": "" + "description": "", + "descriptionmj": "" }, "queue": { "description": "", + "descriptionmj": "", "refoulement": 0, "duree": "", "restant" : 0 }, "ombre": { "description": "", + "descriptionmj": "", "refoulement": 2, "duree": "", "restant" : 0 }, "souffle": { "description": "", + "descriptionmj": "", "duree": "", "restant" : 0 }, "tete": { - "description": "" + "description": "", + "descriptionmj": "" }, "tarot": { "concept":"", "aspect":"", - "description": "" + "description": "", + "descriptionmj": "" }, "nombreastral": { "value": 0, @@ -773,7 +792,8 @@ "quantite": "", "valeur_deniers":0, "encombrement":0, - "description": "" + "description": "", + "descriptionmj": "" }, "meditation": { "competence": "", @@ -785,7 +805,8 @@ "comportement": "", "tmr": "", "malus" : 0, - "description": "" + "description": "", + "descriptionmj": "" }, "casetmr": { "coord": "", @@ -793,6 +814,7 @@ "label": "", "specific": "", "description": "", + "descriptionmj": "", "sourceid":"" }, "recettealchimique": { @@ -801,12 +823,14 @@ "enchantement": "", "sureffet": "", "manipulation": "", - "description": "" + "description": "", + "descriptionmj": "" }, "musique": { "niveau": "", "reference": "", - "description": "" + "description": "", + "descriptionmj": "" }, "danse": { "type": "", @@ -814,19 +838,22 @@ "apparence": false, "niveau": "", "reference": "", - "description": "" + "description": "", + "descriptionmj": "" }, "chant": { "niveau": "", "reference": "", - "description": "" + "description": "", + "descriptionmj": "" }, "jeu": { "type": "", "base": "", "caraccomp": "", "reference": "", - "description": "" + "description": "", + "descriptionmj": "" }, "recettecuisine": { "niveau": "", @@ -835,31 +862,36 @@ "sust": 0, "exotisme": 0, "reference": "", - "description": "" + "description": "", + "descriptionmj": "" }, "oeuvre": { "default_carac": "", "competence": "", "niveau": 0, "reference": "", - "description": "" + "description": "", + "descriptionmj": "" }, "maladie": { "malignite": 0, "periodicite": "", "remedes": "", "dommages":"", - "description": "" + "description": "", + "descriptionmj": "" }, "poison": { "malignite": 0, "periodicite": "", "remedes": "", "dommages":"", - "description": "" + "description": "", + "descriptionmj": "" }, "nourritureboisson": { "description": "", + "descriptionmj": "", "sust": 0, "boisson": false, "desaltere": 0, @@ -881,7 +913,8 @@ "sign": 5, "part": 10 }, - "description": "" + "description": "", + "descriptionmj": "" } } } diff --git a/templates/item-arme-sheet.html b/templates/item-arme-sheet.html index 494f7b87..6a80029d 100644 --- a/templates/item-arme-sheet.html +++ b/templates/item-arme-sheet.html @@ -92,12 +92,9 @@ {{/select}} -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-armure-sheet.html b/templates/item-armure-sheet.html index 0f6ac604..b7a3dca8 100644 --- a/templates/item-armure-sheet.html +++ b/templates/item-armure-sheet.html @@ -28,12 +28,8 @@ -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} diff --git a/templates/item-casetmr-sheet.html b/templates/item-casetmr-sheet.html index 6e17106d..d49735b4 100644 --- a/templates/item-casetmr-sheet.html +++ b/templates/item-casetmr-sheet.html @@ -20,12 +20,8 @@ {{/select}} -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} diff --git a/templates/item-chant-sheet.html b/templates/item-chant-sheet.html index f24685b9..b02c7cae 100644 --- a/templates/item-chant-sheet.html +++ b/templates/item-chant-sheet.html @@ -16,12 +16,9 @@ -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-competence-sheet.html b/templates/item-competence-sheet.html index 21663962..34b6985f 100644 --- a/templates/item-competence-sheet.html +++ b/templates/item-competence-sheet.html @@ -60,12 +60,9 @@ -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"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 d01b24a8..6b931c38 100644 --- a/templates/item-competencecreature-sheet.html +++ b/templates/item-competencecreature-sheet.html @@ -40,10 +40,9 @@ - -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
+ + {{>"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 b6fd46ca..ebe0bab5 100644 --- a/templates/item-conteneur-sheet.html +++ b/templates/item-conteneur-sheet.html @@ -24,12 +24,9 @@ -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-danse-sheet.html b/templates/item-danse-sheet.html index 520b6e8d..ac110fe1 100644 --- a/templates/item-danse-sheet.html +++ b/templates/item-danse-sheet.html @@ -33,12 +33,9 @@ -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"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 9d40e257..3724f9e8 100644 --- a/templates/item-herbe-sheet.html +++ b/templates/item-herbe-sheet.html @@ -46,12 +46,9 @@ {{/select}} -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-ingredient-sheet.html b/templates/item-ingredient-sheet.html index 94004736..6c624e61 100644 --- a/templates/item-ingredient-sheet.html +++ b/templates/item-ingredient-sheet.html @@ -46,12 +46,9 @@ {{/select}} -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + \ No newline at end of file diff --git a/templates/item-jeu-sheet.html b/templates/item-jeu-sheet.html index 130bd8cf..5a5bdbed 100644 --- a/templates/item-jeu-sheet.html +++ b/templates/item-jeu-sheet.html @@ -31,12 +31,9 @@ -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"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 23f6345c..19fa3b99 100644 --- a/templates/item-livre-sheet.html +++ b/templates/item-livre-sheet.html @@ -59,12 +59,9 @@ -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"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 ddd30e01..d9dfe3eb 100644 --- a/templates/item-maladie-sheet.html +++ b/templates/item-maladie-sheet.html @@ -24,12 +24,9 @@ -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-meditation-sheet.html b/templates/item-meditation-sheet.html index 89a79a9f..7be17f2d 100644 --- a/templates/item-meditation-sheet.html +++ b/templates/item-meditation-sheet.html @@ -76,10 +76,9 @@ {{/if}} - -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-monnaie-sheet.html b/templates/item-monnaie-sheet.html index 5d807445..1ec65299 100644 --- a/templates/item-monnaie-sheet.html +++ b/templates/item-monnaie-sheet.html @@ -24,10 +24,9 @@ - -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-munition-sheet.html b/templates/item-munition-sheet.html index e438ef6f..f4587019 100644 --- a/templates/item-munition-sheet.html +++ b/templates/item-munition-sheet.html @@ -24,12 +24,9 @@ -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-musique-sheet.html b/templates/item-musique-sheet.html index f24685b9..0e6ab9d7 100644 --- a/templates/item-musique-sheet.html +++ b/templates/item-musique-sheet.html @@ -16,12 +16,9 @@ -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-nourritureboisson-sheet.html b/templates/item-nourritureboisson-sheet.html index ee965f5e..eb759ac8 100644 --- a/templates/item-nourritureboisson-sheet.html +++ b/templates/item-nourritureboisson-sheet.html @@ -53,12 +53,9 @@ -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + \ No newline at end of file diff --git a/templates/item-objet-sheet.html b/templates/item-objet-sheet.html index 1ce77f5e..0fde4701 100644 --- a/templates/item-objet-sheet.html +++ b/templates/item-objet-sheet.html @@ -28,12 +28,9 @@ -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-oeuvre-sheet.html b/templates/item-oeuvre-sheet.html index 0e56bae9..c14c009f 100644 --- a/templates/item-oeuvre-sheet.html +++ b/templates/item-oeuvre-sheet.html @@ -34,12 +34,9 @@ -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-ombre-sheet.html b/templates/item-ombre-sheet.html index 281d1ff0..f87a937f 100644 --- a/templates/item-ombre-sheet.html +++ b/templates/item-ombre-sheet.html @@ -12,10 +12,9 @@ - -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-poison-sheet.html b/templates/item-poison-sheet.html index ddd30e01..d9dfe3eb 100644 --- a/templates/item-poison-sheet.html +++ b/templates/item-poison-sheet.html @@ -24,12 +24,9 @@ -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-potion-sheet.html b/templates/item-potion-sheet.html index 4cb178b2..3fadb898 100644 --- a/templates/item-potion-sheet.html +++ b/templates/item-potion-sheet.html @@ -110,12 +110,9 @@ {{/if}} -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + \ No newline at end of file diff --git a/templates/item-queue-sheet.html b/templates/item-queue-sheet.html index 70d0dd92..f87a937f 100644 --- a/templates/item-queue-sheet.html +++ b/templates/item-queue-sheet.html @@ -12,12 +12,9 @@ -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-recettealchimique-sheet.html b/templates/item-recettealchimique-sheet.html index e308176d..d894d3f8 100644 --- a/templates/item-recettealchimique-sheet.html +++ b/templates/item-recettealchimique-sheet.html @@ -36,12 +36,9 @@ {{editor content=data.sureffet target="data.sureffet" button=true owner=owner editable=editable}} -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-recettecuisine-sheet.html b/templates/item-recettecuisine-sheet.html index 2f3c7c13..21189788 100644 --- a/templates/item-recettecuisine-sheet.html +++ b/templates/item-recettecuisine-sheet.html @@ -34,12 +34,9 @@ {{editor content=data.ingredients target="data.ingredients" button=true owner=owner editable=editable}} -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-rencontresTMR-sheet.html b/templates/item-rencontresTMR-sheet.html index e22523d7..66fd689b 100644 --- a/templates/item-rencontresTMR-sheet.html +++ b/templates/item-rencontresTMR-sheet.html @@ -8,12 +8,9 @@ {{!-- Sheet Body --}}
-
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} +
diff --git a/templates/item-signedraconique-sheet.html b/templates/item-signedraconique-sheet.html index 3dce78f8..52638863 100644 --- a/templates/item-signedraconique-sheet.html +++ b/templates/item-signedraconique-sheet.html @@ -45,12 +45,9 @@ {{/each}} -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
- + + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + + \ No newline at end of file diff --git a/templates/item-sort-sheet.html b/templates/item-sort-sheet.html index 938bb0d2..3be2682e 100644 --- a/templates/item-sort-sheet.html +++ b/templates/item-sort-sheet.html @@ -74,12 +74,9 @@ {{/each}} {{/if}} -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
- + + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + + diff --git a/templates/item-souffle-sheet.html b/templates/item-souffle-sheet.html index e22523d7..086876d8 100644 --- a/templates/item-souffle-sheet.html +++ b/templates/item-souffle-sheet.html @@ -8,12 +8,9 @@ {{!-- Sheet Body --}}
-
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + + diff --git a/templates/item-tache-sheet.html b/templates/item-tache-sheet.html index 08ec7cf0..d4e1b5af 100644 --- a/templates/item-tache-sheet.html +++ b/templates/item-tache-sheet.html @@ -48,10 +48,9 @@ - -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
- + + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + + diff --git a/templates/item-tarot-sheet.html b/templates/item-tarot-sheet.html index 0b57ee12..7f652f4f 100644 --- a/templates/item-tarot-sheet.html +++ b/templates/item-tarot-sheet.html @@ -21,12 +21,9 @@ {{/select}} -
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + diff --git a/templates/item-tete-sheet.html b/templates/item-tete-sheet.html index e22523d7..086876d8 100644 --- a/templates/item-tete-sheet.html +++ b/templates/item-tete-sheet.html @@ -8,12 +8,9 @@ {{!-- Sheet Body --}}
-
- -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
-
+ + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}} + + diff --git a/templates/partial-item-description.html b/templates/partial-item-description.html new file mode 100644 index 00000000..53300178 --- /dev/null +++ b/templates/partial-item-description.html @@ -0,0 +1,14 @@ +
+ +
+ {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} +
+
+{{#if isGM}} +
+ +
+ {{editor content=data.descriptionmj target="data.descriptionmj" button=true owner=owner editable=editable}} +
+
+{{/if}} \ No newline at end of file