Merge pull request #13612 from Calmacil/master

[Lames du Cardinal v2] Fix broken images and missing profile and slight improvements

Lames du Cardinal v2/lames_cardinal.html

@@ -20,59 +20,57 @@
       <label class="healthboxwrapper">
         <div class="nstate healthbox">
           <input name="attr_health_1" type="hidden" value=""/>
-          <button name="act_health_1_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">/</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">\</span>
+          <button name="act_health_1_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">&#x27CB</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">&#x27CD</span>
         </div><span>V</span>
       </label>
       <label class="healthboxwrapper">
         <div class="nstate healthbox">
           <input name="attr_health_2" type="hidden" value=""/>
-          <button name="act_health_2_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">/</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">\</span>
+          <button name="act_health_2_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">&#x27CB</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">&#x27CD</span>
         </div>
       </label>
       <label class="healthboxwrapper">
         <div class="nstate healthbox">
           <input name="attr_health_3" type="hidden" value=""/>
-          <button name="act_health_3_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">/</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">\</span>
+          <button name="act_health_3_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">&#x27CB</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">&#x27CD</span>
         </div>
       </label>
       <label class="healthboxwrapper">
         <div class="nstate healthbox">
           <input name="attr_health_4" type="hidden" value=""/>
-          <button name="act_health_4_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">/</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">\</span>
+          <button name="act_health_4_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">&#x27CB</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">&#x27CD</span>
         </div>
       </label>
       <label class="healthboxwrapper">
         <div class="nstate healthbox">
           <input name="attr_health_5" type="hidden" value=""/>
-          <button name="act_health_5_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">/</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">\</span>
+          <button name="act_health_5_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">&#x27CB</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">&#x27CD</span>
         </div>
       </label>
       <label class="healthboxwrapper">
         <div class="nstate healthbox">
           <input name="attr_health_6" type="hidden" value=""/>
-          <button name="act_health_6_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">/</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">\</span>
+          <button name="act_health_6_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">&#x27CB</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">&#x27CD</span>
         </div>
       </label>
       <label class="healthboxwrapper">
         <div class="nstate healthbox">
           <input name="attr_health_7" type="hidden" value=""/>
-          <button name="act_health_7_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">/</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">\</span>
+          <button name="act_health_7_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">&#x27CB</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">&#x27CD</span>
         </div>
       </label>
       <label class="healthboxwrapper">
         <div class="nstate healthbox">
           <input name="attr_health_8" type="hidden" value=""/>
-          <button name="act_health_8_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">/</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">\</span>
+          <button name="act_health_8_cycle" type="action" value=""></button><span class="nstateopt health_ok"> </span><span class="nstateopt health_tenacity">&#x27CB</span><span class="nstateopt health_wound">X</span><span class="nstateopt health_longTenacity">&#x27CD</span>
         </div><span>T</span>
       </label>
     </div>
     <section class="page" id="page-personnage">
-      <div id="name">
+      <div class="col col-2">
         <label class="textLabelled" for="name"><span>Nom</span>
           <input name="attr_nom" type="text" value=""/>
         </label>
-      </div>
-      <div class="col col-2">
         <label class="textLabelled"><span>Âge</span>
           <input name="attr_age" type="text" value=""/>
         </label>
@@ -81,6 +79,9 @@
         </label>
       </div>
       <div class="col col-2">
+        <label class="textLabelled" for="pex"><span>Points d’exp.</span>
+          <input name="attr_pex" type="number" value="0"/>
+        </label>
         <label class="profile"><span>Profil :</span>
           <select name="attr_profile-1">
             <option value="" selected="selected">Choisir un profil</option>
@@ -89,6 +90,7 @@
             <option value="aventurier">Aventurier</option>
             <option value="commercant">Commerçant</option>
             <option value="saltimbanque">Saltimbanque</option>
+            <option value="valet">Valet</option>
             <option class="optgroup" disabled="disabled">&nbsp;&nbsp;Lettrés</option>
             <option value="artiste">Artiste</option>
             <option value="erudit">Érudit</option>
@@ -119,6 +121,7 @@
             <option value="aventurier">Aventurier</option>
             <option value="commercant">Commerçant</option>
             <option value="saltimbanque">Saltimbanque</option>
+            <option value="valet">Valet</option>
             <option class="optgroup" disabled="disabled">&nbsp;&nbsp;Lettrés</option>
             <option value="artiste">Artiste</option>
             <option value="erudit">Érudit</option>
@@ -498,13 +501,14 @@ <h4 class="red">Finesse
             <h4 class="blue">Escrime</h4>
             <input name="attr_escrime" type="number" value="4"/>
           </label>
+          <textarea name="attr_escrime_notes"></textarea>
         </div>
         <div class="col col-2" id="occultisme">
           <label class="skill headerskill">
             <h4 class="red">Occultisme</h4>
             <input name="attr_occultisme" type="number" value="0"/>
           </label>
-          <input name="attr_occultisme_notes" type="text" value=""/>
+          <textarea name="attr_occultisme_notes"></textarea>
         </div>
       </div>
     </section>

Lames du Cardinal v2/src/abstracts/variables.sass

@@ -2,4 +2,5 @@ $emgrey:#446469
 $emblue:#395b63
 $emred:#672418
 
-$IMAGES_ROOT: 'https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/lames-cardinal-v2/assets/'
+//$IMAGES_ROOT: 'https://raw.githubusercontent.com/Calmacil/lames-cardinal-v2/main/assets/'
+$IMAGES_ROOT: 'https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Lames du Cardinal v2/assets/'

Lames du Cardinal v2/src/components/nstatebox/nstatebox.pug

@@ -26,8 +26,8 @@ mixin healthBox(name, letter=none)
     label.healthboxwrapper
         +nstateBox(name).healthbox
             +nstateOption(' ').health_ok
-            +nstateOption('/').health_tenacity
+            +nstateOption('&#x27CB').health_tenacity
             +nstateOption('X').health_wound
-            +nstateOption('\\').health_longTenacity
+            +nstateOption('&#x27CD').health_longTenacity
         if letter != none
             span!= letter

Lames du Cardinal v2/src/components/nstatebox/nstatebox.sass

@@ -27,3 +27,15 @@
                 &[value="2"] ~ span.nstateopt.health_longTenacity,
                 &[value="3"] ~ span.nstateopt.health_wound
                     display: flex
+
+            &> span.nstateopt
+                font-size: 1.8em
+
+                &.health_tenacity,
+                &.health_longTenacity
+                    margin-left: -18px
+                    margin-top: -3px
+
+                &.health_wound
+                    margin-left: -15px
+

Lames du Cardinal v2/src/components/profile/profile.pug

@@ -7,6 +7,7 @@ mixin profile(name)
             option(value='aventurier') Aventurier
             option(value='commercant') Commerçant
             option(value='saltimbanque') Saltimbanque
+            option(value='valet') Valet
             +optgroup('Lettrés')
             option(value='artiste') Artiste
             option(value='erudit') Érudit

Lames du Cardinal v2/src/components/widgets/widgets.pug

@@ -38,7 +38,7 @@ mixin numberInput(name, value='')
     - {string} id - The `id` inpu attribute (and the `for` label attribute)
     - {string} value - The default value
 mixin numberLabelled(name, label, id, value='')
-  label(for=id)&attributes(attributes)
+  label(for=id)&attributes(attributes).textLabelled
     span!= label
     +numberInput(name, value)(id=id)
 

Lames du Cardinal v2/src/components/widgets/widgets.sass

@@ -54,12 +54,17 @@
             font-weight: bold
             width: 20%
 
-        &> input[type=text]
+        &> input[type=text],
+        &> input[type=number]
             border: none
             background: none
             width: calc(80% - 10px)
             margin-left: 10px
 
+        &> input[type=number]
+            width: calc(70% - 10px)
+            text-align: right
+
     /** Expand switches */
     label
         &> input[type=checkbox][name='attr_expand']

Lames du Cardinal v2/src/modules/1-personnage/personnage.pug

@@ -1,10 +1,10 @@
 section.page#page-personnage
-    div#name
-        +textLabelled('nom', 'Nom', 'name')
     div.col.col-2
+        +textLabelled('nom', 'Nom', 'name')
         +textLabelled('age', 'Âge')
         +textLabelled('sex', 'Sexe')
     div.col.col-2
+        +numberLabelled('pex', 'Points d’exp.', 'pex', 0)
         +profile('profile-1')
         +profile('profile-2')
     div#arcanes