Merge pull request #12813 from Ulty/2024/04/17

ChroniquesOubliees: added missing option for mana dice.
Roll20 · Apr 18, 2024 · 6d36e51 · 6d36e51
2 parents dd1ed1b + 4ec888c
commit 6d36e51
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 4 deletions.
diff --git a/ChroniquesOubliees/co.css b/ChroniquesOubliees/co.css
@@ -584,6 +584,10 @@ select.carac-def{
     width: 50px;
     color: #009FE3;
 }
+select.carac-chance{
+    width: 50px;
+    color: #8105D2;
+}
 select.selectmin{
     width: 18px;
     -webkit-appearance: none;

diff --git a/ChroniquesOubliees/co.html b/ChroniquesOubliees/co.html
@@ -552,6 +552,7 @@
                     </div>
                   </div>
                 </div><!-- fin des points de chance -->
+                <input type="checkbox" class="optional-block-switch" name="attr_option_mana_totale" value="1"><span></span>
                 <input type="checkbox" class="optional-block-switch" name="attr_option_pm" value="1" checked><span></span>
                 <input type="checkbox" class="optional-block-switch" name="attr_option_epuisement" value="1" ><span></span>
                 <div class="optional-block">
@@ -560,6 +561,33 @@
                   <div class=block-show>
                     <span class="textfat-chance">&nbsp;&nbsp;&nbsp;MAGIE</span>
                     <div>
+                      <input type="checkbox" class="optional-block-switch" name="attr_option_mana_totale" value="1"><span></span>
+                      <div class="optional-block">
+                        <table class="tabsep">
+                          <tr>
+                            <td class="boxtitre-chance">
+                    <button class="boxtitre-pv" type="roll" name="roll_DM" title="Jet de Dé de Mana" value="@{jets_caches}&{template:co1} {{perso=@{displayname}}} {{name=Dé de Mana}} {{subtags=Magie}} {{DM=[[ 1d@{de_mana}[Dé] + [[@{carac_mana}]][caractéristique] ]]}}"> DM</button>
+                            </td>
+                    <td class="boxinput-chance">
+                      <select class="carac-chance" name="attr_de_mana" size="1" title="Dé de Mana">
+                        <option value="0" selected >-</option>
+                        <option value="4">d4</option>
+                        <option value="6">d6</option>
+                        <option value="8">d8</option>
+                        <option value="10">d10</option>
+                        <option value="12">d12</option>
+                      </select>
+                    </td>
+                    <td class="boxinput-chance">
+                      <select class="carac-chance" name="attr_carac_mana" size="1" title="Caractéritique associée à la mana">
+                        <option value="@{INT}" selected>INT</option>
+                        <option value="@{SAG}">SAG</option>
+                        <option value="@{CHA}">CHA</option>
+                      </select>
+                    </td>
+                          </tr>
+                        </table>
+                      </div>
                       <input type="checkbox" class="optional-block-switch" name="attr_option_pm" value="1" checked><span></span>
                       <div class="optional-block">
                         <table class="tabsep">
@@ -2409,7 +2437,7 @@
           <li>Magie :
             <ul>
               <li>Points de mana :
-                <input type="checkbox" name="attr_option_pm" value="1" title="@{option_pm}" checked />
+                <input type="checkbox" name="attr_option_pm" value="1" title="@{option_pm}" checked /> (avec dé de mana <input type="checkbox" name="attr_option_mana_totale" value="1" title="@{option_mana_totale}">)
               </li>
               <li> Épuisement magique :
                 <input type="checkbox" name="attr_option_epuisement" value="1" title="@{option_pr}" />
@@ -3212,6 +3240,12 @@
     <td>{{DV}}</td>
   </tr>
   {{/DV}}
+  {{#DM}}
+  <tr>
+    <td class="sheet-rolltemplate-tcat">PM gagnés</td>
+    <td>{{DM}}</td>
+  </tr>
+  {{/DM}}
   {{#carac}}
   <tr>
     <td class="sheet-rolltemplate-tcat">Jet </td>
@@ -3295,7 +3329,7 @@
 <!-- FIN TEMPLATES -->
 <!-- **** SCRIPTS / SHEET WORKERS -->
 <script type="text/worker">
-  let silent = {
+    let silent = {
     silent: true
   };
 
@@ -4686,7 +4720,7 @@
     typedegats: 'tranchant metal',
     modificateurs: 'metal'
   }, {
-    keys: ['lance'],
+    keys: ['lance', 'trident'],
     typeattaque: 'Arme 2 mains',
     typedegats: 'percant metal',
     modificateurs: ''
@@ -6433,7 +6467,7 @@
   });
 
   //Consommables
-  var listeConsommables = [{
+  const listeConsommables = [{
     keys: ['agrandissement', "d'agrandissement"],
     effet: "!cof-effet-temp agrandissement 8",
   }, {
@@ -6481,6 +6515,12 @@
       keys: ['feu'],
       effet: "!cof-set-attribute resistanceA_feu true",
     }],
+  }, {
+    keys:['trousse'],
+    variantes: [{
+      keys: ['soin', 'soins'],
+      effet: "!cof-soin @{selected|token_id} @{target|token_id} 1",
+    }],
   }, {
     keys: ['soin', 'soins'],
     effet: "!cof-soin 1d8",

diff --git a/ChroniquesOubliees/sheet.json b/ChroniquesOubliees/sheet.json
@@ -30,6 +30,13 @@
       "checked": "checked",
       "description": "Utilisation de l'option des points de mana (page 79 du livre de base)"
     },
+    {
+      "attribute": "option_mana_totale",
+      "displayname": "Mana totale",
+      "type": "checkbox",
+      "value": "1",
+      "description": "Si utilisation de points de mana, utilisation d'un dé de mana pour la récupération (page 180 du livre de base"
+    },
     {
       "attribute": "option_epuisement",
       "displayname": "Épuisement magique",