Affichage des specialisations

.gitignore

@@ -1 +1,14 @@
-.history/
+.vscode/settings.json
+.idea
+.history
+todo.md
+/.vscode
+/ignored/
+/node_modules/
+/jsconfig.json
+/package.json
+/package-lock.json
+/packs/*/
+/packs/*/CURRENT
+/packs/*/LOG
+/packs/*/LOCK

modules/hawkmoon-actor.js

@@ -226,7 +226,7 @@ export class HawkmoonActor extends Actor {
 
     if (this.type == 'personnage') {
       let talentBonus = this.getVigueurBonus()
-      let vigueur = Math.floor((this.system.attributs.pui.value + this.system.attributs.tre.value) / 2) + talentBonus
+      let vigueur = Math.floor((this.system.attributs.pui.value + this.system.attributs.tre.value) / 2) + talentBonus + this.system.sante.vigueurmodifier
       if (vigueur != this.system.sante.vigueur) {
         this.update({ 'system.sante.vigueur': vigueur })
       }

modules/hawkmoon-item-sheet.js

@@ -185,7 +185,7 @@ export class HawkmoonItemSheet extends ItemSheet {
 
     html.find('#add-automation').click(ev => {
       let autom = duplicate(this.object.system.automations)
-      autom.push( { eventtype: "on-drop", name: "Automatisation 1", competence: "", minLevel: 0, id: randomID(16) }) 
+      autom.push( { eventtype: "on-drop", name: "Automatisation 1", bonusname: "vigueur", bonus: 0, competence: "", minLevel: 0, baCost: 0, id: randomID(16) }) 
       this.object.update( { 'system.automations': autom })
     })
     html.find('.delete-automation').click(ev => {

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";
-  }
 });
 
 /* -------------------------------------------- */

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;
@@ -1449,4 +1414,24 @@ ul, li {
 }
 .argent-total-text {
   margin-left: 4px;
-}
+}
+
+.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.1",
+  "version": "11.0.8",
   "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.1.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/archive/fvtt-hawkmoon-cyd-11.0.8.zip",
   "languages": [
     {
       "lang": "fr",
@@ -49,100 +49,133 @@
       "type": "Item",
       "label": "Compétences",
       "name": "skills",
-      "path": "packs/competences.db",
+      "path": "packs/competences",
       "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Compétences de Créatures",
       "name": "skills-creatures",
-      "path": "packs/competences-creatures.db",
+      "path": "packs/competences-creatures",
       "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Historiques",
       "name": "historiques",
-      "path": "packs/historiques.db",
+      "path": "packs/historiques",
       "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Armes",
       "name": "armes",
-      "path": "packs/armes.db",
+      "path": "packs/armes",
       "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Protections",
       "name": "protections",
-      "path": "packs/protections.db",
+      "path": "packs/protections",
       "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Equipement",
       "name": "equipement",
-      "path": "packs/equipement.db",
+      "path": "packs/equipement",
       "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Profils",
       "name": "profils",
-      "path": "packs/profils.db",
+      "path": "packs/profils",
       "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Talents de Personnage",
       "name": "talents",
-      "path": "packs/talents.db",
+      "path": "packs/talents",
       "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "Item",
       "label": "Talents de Cellule",
       "name": "talents-cellule",
-      "path": "packs/talents-cellule.db",
+      "path": "packs/talents-cellule",
       "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "RollTable",
       "label": "Tables",
       "name": "tables",
-      "path": "packs/tables.db",
+      "path": "packs/tables",
       "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     },
     {
       "type": "JournalEntry",
       "label": "Aides de Jeu",
       "name": "aides-de-jeu",
-      "path": "packs/aides-de-jeu.db",
+      "path": "packs/aides-de-jeu",
       "system": "fvtt-hawkmoon-cyd",
-      "private": false,
-      "flags": {}
+      "flags": {},
+      "ownership": {
+        "PLAYER": "OBSERVER",
+        "ASSISTANT": "OWNER"
+      }
     }
   ],
   "primaryTokenAttribute": "sante.vigueur",
@@ -156,7 +189,6 @@
   "background": "systems/fvtt-hawkmoon-cyd/assets/ui/fond_hawkmoon.webp",
   "compatibility": {
     "minimum": "10",
-    "maximum": "11",
     "verified": "11"
   }
 }

template.json

@@ -69,7 +69,8 @@
         },
         "sante": {
           "vigueur": 0,
-          "etat": 0
+          "etat": 0,
+          "vigueurmodifier": 0
         },
         "adversite":  {
           "bleue": 0,

templates/actor-sheet.html

@@ -112,6 +112,13 @@
               </li>
               {{/each}}
             </ul>
+            {{#if isGM}}
+            <div class="flexrow">
+              <span class="item-name-label competence-name item-field-label-medium">Modificateur de Vigueur</span>
+              <input type="text" class="item-field-label-short" name="system.sante.vigueurmodifier"
+                  value="{{system.sante.vigueurmodifier}}" data-dtype="Number" />
+            </div>
+            {{/if}}
           </div>
         </div>
 
@@ -192,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 pred.acquise}}
+                        {{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/roll-dialog-generic.html

@@ -159,7 +159,7 @@
       </select>
     </div>
 
-    {{#if armeDefense}}
+    {{#if (or armeDefense arme.system.isDistance)}}
     
       {{#if arme.system.isDistance}}
       <div class="flexrow">
@@ -168,7 +168,7 @@
           {{#select distanceTir}}
             <option value="porteecourte">Courte ({{protectionDefenseur}}+5)</option>
             <option value="porteemoyenne">Moyenne ({{protectionDefenseur}}+9)</option>
-            <option value="porteelongue">Moyenne ({{protectionDefenseur}}+14)</option>
+            <option value="porteelongue">Longue ({{protectionDefenseur}}+14)</option>
           {{/select}}
         </select>
       </div>