Merge branch 'working' into 'master'

herbes, ingrédients, potions

See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!4

module/rdd-utility.js

@@ -110,11 +110,15 @@ export class RdDUtility  {
       'systems/foundryvtt-reve-de-dragon/templates/item-rentontresTMR-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-queue-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-souffle-sheet.html',
+      'systems/foundryvtt-reve-de-dragon/templates/item-tarot-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-tete-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-ombre-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/competence-categorie.html',
       'systems/foundryvtt-reve-de-dragon/templates/competence-carac-defaut.html',
       'systems/foundryvtt-reve-de-dragon/templates/competence-base.html',
+      'systems/foundryvtt-reve-de-dragon/templates/enum-aspect-tarot.html',
+      'systems/foundryvtt-reve-de-dragon/templates/enum-categorie.html',
+      'systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html',
       'systems/foundryvtt-reve-de-dragon/templates/arme-competence.html',
       'systems/foundryvtt-reve-de-dragon/templates/sort-draconic.html',
       'systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html',

system.json

@@ -2,10 +2,10 @@
   "name": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
   "description": "Rêve de Dragon RPG for FoundryVTT",
-  "version": "0.9.24",
+  "version": "0.9.26",
   "minimumCoreVersion": "0.6.0",
   "compatibleCoreVersion": "0.7.5",
-  "templateVersion": 39,
+  "templateVersion": 41,
   "author": "LeRatierBretonnien",
   "esmodules": [ "module/rdd-main.js", "module/hook-renderChatLog.js" ],
   "styles": ["styles/simple.css"],
@@ -90,6 +90,15 @@
       "path": "./packs/souffles-de-dragon.db",
       "entity": "Item",
       "tag" : "item"
+    },
+  	{
+      "name": "tarot-draconique",
+      "label": "Tarot Draconique",
+      "system": "foundryvtt-reve-de-dragon",
+      "module": "foundryvtt-reve-de-dragon",
+      "path": "./packs/tarot-draconique.db",
+      "entity": "Item",
+      "tag" : "item"
     },
   	{
       "name": "tetes-de-dragon-pour-haut-revants",

template.json

@@ -451,7 +451,7 @@
   }
 },
 "Item": {
-  "types": ["objet", "arme", "armure", "conteneur", "competence", "sort", "herbe", "ingredient", "livre", "potion", "munition", "rencontresTMR", "queue", "ombre", "souffle", "tete", "competencecreature"],
+  "types": ["objet", "arme", "armure", "conteneur", "competence", "sort", "herbe", "ingredient", "livre", "potion", "munition", "rencontresTMR", "queue", "ombre", "souffle", "tete", "competencecreature", "tarot"],
   "objet": {
     "description": "",
     "quantite": 1,
@@ -545,8 +545,9 @@
     "encombrement": 0,
     "base": 0,
     "quantite": 1,
-    "rarete": "",
     "milieu": "",
+    "rarete": "",
+    "categorie": "",
     "cout": 0
     },
   "tache": {
@@ -589,6 +590,11 @@
     "description": ""
     },
   "tete": {
+    "description": ""
+    },
+  "tarot": {
+    "concept":"",
+    "aspect":"",
     "description": ""
     }
   }

templates/enum-aspect-tarot.html

@@ -0,0 +1,3 @@
+<option value="Positif">Positif</option>
+<option value="Neutre">Neutre</option>
+<option value="Négatif">Négatif</option>

templates/enum-categorie.html

@@ -0,0 +1,5 @@
+<option value=""></option>
+<option value="Alchimie">Alchimie</option>
+<option value="Cuisine">Cuisine</option>
+<option value="Repos">Repos</option>
+<option value="Soin">Soin</option>

templates/enum-rarete.html

@@ -0,0 +1,5 @@
+<option value=""></option>
+<option value="Commune">Commune</option>
+<option value="Frequente">Fréquente</option>
+<option value="Rare">Rare</option>
+<option value="Rarissime">Rarissime</option>

templates/herbe-categorie.html

@@ -0,0 +1,5 @@
+<option value=""></option>
+<option value="Alchimie">Alchimie</option>
+<option value="Cuisine">Cuisine</option>
+<option value="Repos">Repos</option>
+<option value="Soin">Soin</option>

templates/herbe-frequence.html

@@ -0,0 +1,5 @@
+<option value=""></option>
+<option value="Commune">Commune</option>
+<option value="Frequente">Fréquente</option>
+<option value="Rare">Rare</option>
+<option value="Rarissime">Rarissime</option>

templates/item-herbe-sheet.html

@@ -1,31 +1,53 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
+  <header class="sheet-header">
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
+    <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
-        <div class="header-fields">
+    <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
+      <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
-        </div>
+    </div>
-    </header>
+  </header>
-    
+
-    {{!-- Sheet Body --}}
+  {{!-- Sheet Body --}}
-    <section class="sheet-body">
+  <section class="sheet-body">
+    <div class="flexcol">
       <div class="form-group">
-        <label for="xp">Niveau (si applicable) </label>
+        <label>Niveau (si applicable)</label>
-        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number" />
       </div>
       <div class="form-group">
-        <label for="xp">Quantité (Pépins)</label>
+        <label>Quantité (Pépins)</label>
-        <input class="attribute-value" type="text" name="data.quantite" value="{{data.quantite}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.quantite" value="{{data.quantite}}" data-dtype="Number" />
       </div>
       <div class="form-group">
-        <label for="xp">Prix (sols) </label>
+        <label>Prix (sols)</label>
-        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number" />
+      </div>
+      <div class="form-group">
+        <label>Milieu</label>
+        <input class="attribute-value" type="text" name="data.milieu" value="{{data.milieu}}" data-dtype="String" />
+      </div>
+      <div class="form-group">
+        <label>Fréquence</label>
+        <select name="data.rarete" id="rarete" data-dtype="String">
+          {{#select data.rarete}}
+          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html"}}
+          {{/select}}
+        </select>
+      </div>
+      <div class="form-group">
+        <label>Catégorie</label>
+        <select name="data.categorie" id="categorie" data-dtype="String">
+          {{#select data.categorie}}
+          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie.html"}}
+          {{/select}}
+        </select>
       </div>
       <div class="flexcol">
-        <span><label>Description : </label></span>
+        <span><label>Description :</label></span>
         <div class="form-group editor">
           {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
       </div>
-    </section>
+    </div>
-    
+  </section>
-</form>
+
+</form>

templates/item-ingredient-sheet.html

@@ -1,35 +1,57 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
+  <header class="sheet-header">
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
+    <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
-        <div class="header-fields">
+    <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
+      <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
-        </div>
+    </div>
-    </header>
+  </header>
-    
+
-    {{!-- Sheet Body --}}
+  {{!-- Sheet Body --}}
-    <section class="sheet-body">
+  <section class="sheet-body">
+    <div class="flexcol">
       <div class="form-group">
-        <label for="xp">Niveau (si applicable) </label>
+        <label>Niveau (si applicable) </label>
-        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.niveau" value="{{data.niveau}}" data-dtype="Number" />
       </div>
       <div class="form-group">
-        <label for="xp">Quantité (Pépins)</label>
+        <label>Quantité (Pépins)</label>
-        <input class="attribute-value" type="text" name="data.quantite" value="{{data.quantite}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.quantite" value="{{data.quantite}}" data-dtype="Number" />
       </div>
       <div class="form-group">
-        <label for="xp">Encombrement </label>
+        <label>Encombrement</label>
-        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number" />
       </div>
       <div class="form-group">
-        <label for="xp">Prix (sols) </label>
+        <label>Prix (sols)</label>
-        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number"/>
+        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number" />
       </div>
-      <div class="flexcol">
+    </div>
-        <span><label>Description : </label></span>
+    <div class="form-group">
-        <div class="form-group editor">
+      <label>Milieu</label>
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+      <input class="attribute-value" type="text" name="data.milieu" value="{{data.milieu}}" data-dtype="String" />
-        </div>
+    </div>
+    <div class="form-group">
+      <label>Fréquence</label>
+      <select name="data.rarete" id="rarete" data-dtype="String">
+        {{#select data.rarete}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html"}}
+        {{/select}}
+      </select>
+    </div>
+    <div class="form-group">
+      <label>Catégorie</label>
+      <select name="data.categorie" id="categorie" data-dtype="String">
+        {{#select data.categorie}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie.html"}}
+        {{/select}}
+      </select>
+    </div>
+    <div class="flexcol">
+      <span><label>Description : </label></span>
+      <div class="form-group editor">
+        {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
       </div>
-    </section>
+    </div>
-    
+  </section>
-</form>
+
+</form>

templates/item-potion-sheet.html

@@ -1,27 +1,43 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
+  <header class="sheet-header">
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
+    <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
-        <div class="header-fields">
+    <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
+      <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
-        </div>
+    </div>
-    </header>
+  </header>
-    
+
-    {{!-- Sheet Body --}}
+  {{!-- Sheet Body --}}
-    <section class="sheet-body">
+  <section class="sheet-body">
-      <div class="form-group">
+    <div class="form-group">
-        <label for="xp">Encombrement</label>
+      <label>Encombrement</label>
-        <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number"/>
+      <input class="attribute-value" type="text" name="data.encombrement" value="{{data.encombrement}}" data-dtype="Number" />
+    </div>
+    <div class="form-group">
+      <label>Prix (sols)</label>
+      <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number" />
+    </div>
+    <div class="form-group">
+      <label>Fréquence</label>
+      <select name="data.rarete" id="rarete" data-dtype="String">
+        {{#select data.rarete}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html"}}
+        {{/select}}
+      </select>
+    </div>
+    <div class="form-group">
+      <label>Catégorie</label>
+      <select name="data.categorie" id="categorie" data-dtype="String">
+        {{#select data.categorie}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie.html"}}
+        {{/select}}
+      </select>
+    </div>
+    <div class="flexcol">
+      <span><label>Description :</label></span>
+      <div class="form-group editor">
+        {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
       </div>
-      <div class="form-group">
+    </div>
-        <label for="xp">Prix (sols) </label>
+  </section>
-        <input class="attribute-value" type="text" name="data.cout" value="{{data.cout}}" data-dtype="Number"/>
+
-      </div>      
+</form>
-      <div class="flexcol">
-        <span><label>Description : </label></span>
-        <div class="form-group editor">
-          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
-        </div>
-      </div>
-    </section>
-    
-</form>

templates/item-tarot-sheet.html

@@ -0,0 +1,32 @@
+<form class="{{cssClass}}" autocomplete="off">
+    <header class="sheet-header">
+        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
+        <div class="header-fields">
+            <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name"/></h1>
+        </div>
+    </header>
+    
+    {{!-- Sheet Body --}}
+    <section class="sheet-body">
+      <div class="flexcol">
+        <div class="form-group">
+          <label>Aspect</label>
+          <input class="attribute-value" type="text" name="data.concept" value="{{data.concept}}" data-dtype="String" />
+        </div>
+        <div class="form-group">
+          <label>Sens</label>
+          <select name="data.aspect" id="aspect" data-dtype="String">
+            {{#select data.aspect}}
+            {{>"systems/foundryvtt-reve-de-dragon/templates/enum-aspect-tarot.html"}}
+            {{/select}}
+          </select>
+        </div>
+        <div class="flexcol">
+        <span><label>Description :</label></span>
+        <div class="form-group editor">
+          {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+        </div>
+      </div>
+     </section>
+    
+</form>