Predilections et warning

lang/fr.json

@@ -1,25 +1,25 @@
 {
-  "ACTOR": {
-    "TypePersonnage": "Personnage",
-    "TypeCellule": "Cellule",
-    "TypeCreature": "Créature"
+  "TYPES": {
+    "Actor": {
+      "personnage": "Personnage",
+      "cellule": "Cellule",
+      "creature": "Créature"
+    },
+    "Item": {
+      "artefact": "Artefact",
+      "arme": "Arme",
+      "talent": "Talent",
+      "historique": "Historique",
+      "profil": "Profil",
+      "competence": "Compétence",
+      "protection": "Protection",
+      "monnaie": "Monnaie",
+      "equipement": "Equipement",
+      "ressource": "Ressource",
+      "contact": "Contact"
+    
+    }
   },
-
-  "ITEM": {
-    "TypeArtefact": "Artefact",
-    "TypeArme": "Arme",
-    "TypeTalent": "Talent",
-    "TypeHistorique": "Historique",
-    "TypeProfil": "Profil",
-    "TypeCompetence": "Compétence",
-    "TypeProtection": "Protection",
-    "TypeMonnaie": "Monnaie",
-    "TypeEquipement": "Equipement",
-    "TypeRessource": "Ressource", 
-    "TypeContact": "Contact"
-
-  },
-
   "HAWKMOON": {
     "ui": {
       "editContact": "Modifier le contact",

modules/hawkmoon-main.js

@@ -127,11 +127,6 @@ Hooks.once("ready", function () {
   registerUsageCount('fvtt-hawkmoon-cyd')
   welcomeMessage()
 
-  // CSS patch for v9
-  if (game.version) {
-    let sidebar = document.getElementById("sidebar");
-    sidebar.style.width = "min-content";
-  }
 });
 
 /* -------------------------------------------- */

modules/hawkmoon-utility.js

@@ -374,7 +374,7 @@ export class HawkmoonUtility {
 
     //console.log("BEFORE COMP", rollData)
     if (rollData.competence) {
-      rollData.predilections = duplicate(rollData.competence.system.predilections.filter(pred => pred.acquise && !pred.maitrise && !pred.used) || [])
+      rollData.predilections = duplicate(rollData.competence.system.predilections || [])
       let compmod = (rollData.competence.system.niveau == 0) ? -3 : 0
       rollData.diceFormula += `+${rollData.attr.value}+${rollData.competence.system.niveau}+${rollData.modificateur}+${compmod}`
 

styles/simple.css

@@ -40,7 +40,6 @@
     --debug-box-shadow-blue: inset 0 0 2px blue;
     --debug-box-shadow-green: inset 0 0 2px green;
   }
-
 /*@import url("https://fonts.googleapis.com/css2?family=Martel:wght@400;800&family=Roboto:wght@300;400;500&display=swap");*/
 /* Global styles & Font */
 .window-app {
@@ -527,7 +526,6 @@ section.sheet-body:after {
 h1, h2, h3, h4 {
   font-weight: bold;
 }
-
 ul, ol {
     margin: 0;
     padding: 0;
@@ -828,7 +826,6 @@ ul, li {
 #sidebar {
   font-size: 1rem;
   background-position: 100%;
-  color: rgba(220,220,220,0.75);
 }
 
 /*  background: rgb(105,85,65) url("../images/ui/texture_feuille_perso_onglets.webp") no-repeat right bottom;*/
@@ -946,22 +943,11 @@ ul, li {
   height: 15%;
   font-size: 15px;
   padding: 10px;
-  padding-bottom: 20px;
+  /*padding-bottom: 20px;*/
   padding-top: .2rem;
   padding-bottom: .2rem;
 }
 
-.div-river-full {
-  height: 5rem;
-  align-items: flex-start;
-}
-
-.div-river {
-  align-content: center;
-  margin-left: 8px;
-  align-content:space-around;
-  justify-content: space-around;
-}
 
 .div-center {
   align-self: center;
@@ -999,13 +985,10 @@ ul, li {
 }
 
 #sidebar #sidebar-tabs i{
-  width: 25px;
-  height: 25px;
   display: inline-block;
   background-position:center;
   background-size:cover;
   text-shadow: 1px 1px 0 rgba(0,0,0,0.75);
-
 }
 
 /*#sidebar #sidebar-tabs i.fa-comments:before, #sidebar #sidebar-tabs i.fa-fist-raised:before, #sidebar #sidebar-tabs i.fa-users:before, #sidebar #sidebar-tabs i.fa-map:before, #sidebar #sidebar-tabs i.fa-suitcase:before, #sidebar #sidebar-tabs i.fa-book-open:before, #sidebar #sidebar-tabs i.fa-th-list:before, #sidebar #sidebar-tabs i.fa-music:before, #sidebar #sidebar-tabs i.fa-atlas:before, #sidebar #sidebar-tabs i.fa-cogs:before {content: "";}
@@ -1277,24 +1260,6 @@ ul, li {
   padding-left: 2rem;
 }
 
-.drop-equipment-effect,
-.drop-power-effect,
-.drop-perk-effect,
-.drop-ability-effect,
-.drop-effect-specaffected,
-.drop-effect-spec,
-.drop-ability-weapon,
-.drop-ability-armor,
-.drop-race-perk,
-.drop-spec-perk,
-.drop-ability-power,
-.drop-ability-spec,
-.drop-spec-power,
-.drop-abilities, 
-.drop-optionnal-abilities,
-.drop-specialperk1,
-.drop-perk2,
-.drop-spec1 ,
 .drop-spec2 {
   background: linear-gradient(to bottom, #6c95b9fc 5%, #105177ab 100%);
   background-color: #7d5d3b00;
@@ -1450,10 +1415,23 @@ ul, li {
 .argent-total-text {
   margin-left: 4px;
 }
-h4.entry-name.document-name {
-  color: black;  
+
+.compendium h4.entry-name.document-name {
+  color: black;
+}
+.page-title {
+  color: black;
+}
+textarea {
+  font-family: "Charlemagne";
+  font-size: 0.8rem;
 }
 .fxmaster {
   background: #443e37E0;
   background-color: #443e37E0;
 }
+.predilection-text {
+  padding-left: 8px;
+  font-style: italic;
+  font-size: 0.6rem;
+}

system.json

@@ -1,7 +1,7 @@
 {
   "id": "fvtt-hawkmoon-cyd",
   "description": "Hawkmoon RPG for FoundryVTT (CYD system - French)",
-  "version": "11.0.6",
+  "version": "11.0.9",
   "authors": [
     {
       "name": "Uberwald/LeRatierBretonnien",
@@ -35,7 +35,7 @@
   "gridUnits": "m",
   "license": "LICENSE.txt",
   "manifest": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/raw/branch/master/system.json",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/archive/fvtt-hawkmoon-cyd-11.0.6.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/archive/fvtt-hawkmoon-cyd-11.0.9.zip",
   "languages": [
     {
       "lang": "fr",
@@ -188,7 +188,7 @@
   "url": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd",
   "background": "systems/fvtt-hawkmoon-cyd/assets/ui/fond_hawkmoon.webp",
   "compatibility": {
-    "minimum": "10",
+    "minimum": "11",
     "verified": "11"
   }
 }

templates/actor-sheet.html

@@ -199,8 +199,20 @@
             {{#each skills as |skill key|}}
             <li class="item flexrow " data-item-id="{{skill._id}}" data-item-type="competence">
               <img class="item-name-img" src="{{skill.img}}" />
-              <span class="item-name-label competence-name"><a class="roll-competence item-field-label-short"
+              <div class="flexcol item-name-label">
+
+                <span class="item-name-label competence-name"><a class="roll-competence item-field-label-short"
                   data-attr-key="tochoose">{{skill.name}}</a></span>
+
+                    <span class="predilection-text">
+                    {{#each skill.system.predilections as |pred key|}}
+                      {{#if (and pred.acquise (not pred.used))}}
+                        {{pred.name}},
+                      {{/if}} 
+                    {{/each}}
+                  </span>
+              </div>
+
               <select class="status-small-label color-class-common edit-item-data competence-niveau" type="text"
                 data-item-field="niveau" value="{{skill.system.niveau}}" data-dtype="Number">
                 {{#select skill.system.niveau}}

templates/chat-generic-result.html

@@ -86,8 +86,11 @@
 
     {{#each predilections as |pred key|}}
     <li>
-      <button class="chat-card-button predilection-reroll" data-predilection-index="{{key}}">Predilection :
-        {{pred.name}}</button>
+        {{#if (and (and pred.acquise (not pred.maitrise)) (not pred.used))}}
+        <button class="chat-card-button predilection-reroll" data-predilection-index="{{key}}">Predilection :
+          {{pred.name}}
+        </button>
+        {{/if}}
     </li>
     {{/each}}