Ajout elements bio et fix mineurs

lang/fr.json

@@ -1,22 +1,12 @@
 {
   "ACTOR": {
-    "TypeCharacter": "Character",
+    "TypePersonnage": "Personnage"
-    "TypeNpc": "NPC"
   },
   "ITEM": {
-    "TypeWeapon": "Weapon",
+    "TypeArme": "Arme",
-    "TypeShield": "Shield",
+    "TypeEquipement": "Equipement",
-    "TypeArmor": "Armor",
+    "TypeTarot": "Tarot",
-    "TypeSpell": "Spell",
+    "TypeElementbio": "Element Biographique",
-    "TypeModule": "Module",
+    "TypeArchetype": "Archetype"
-    "TypeMoney": "Money",
-    "TypeEquipment": "Equipment",
-    "TypeAction": "Action",
-    "TypeFreeaction": "Free Action",
-    "TypeReaction": "Reaction",
-    "TypeStance": "Stance",
-    "TypeTrait": "Trait",
-    "TypeCondition": "Condition",
-    "TypeCraftingskill": "Crafting Skill"
   }
 }

modules/malefices-actor-sheet.js

@@ -41,6 +41,7 @@ export class MaleficesActorSheet extends ActorSheet {
       equipements: duplicate(this.actor.getEquipements()),
       subActors: duplicate(this.actor.getSubActors()),
       phyMalus: this.actor.getPhysiqueMalus(),
+      elementsbio: this.actor.getElementsBio(),
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,

modules/malefices-actor.js

@@ -88,13 +88,19 @@ export class MaleficesActor extends Actor {
   }
   getArchetype() {
     let comp = duplicate(this.items.find(item => item.type == 'archetype') || {name: "Pas d'archetype"})
-    if (comp) {
+    if (comp && comp.system) {
       comp.tarot = MaleficesUtility.getTarot(comp.system.lametutelaire)
     }
 
     return comp;
   }
   /* -------------------------------------------- */
+  getElementsBio() {
+    let comp = duplicate(this.items.filter(item => item.type == 'elementbio') || [])
+    MaleficesUtility.sortArrayObjectsByName(comp)
+    return comp;
+  }
+  /* -------------------------------------------- */
   getTarots() {
     let comp = duplicate(this.items.filter(item => item.type == 'tarot') || [])
     MaleficesUtility.sortArrayObjectsByName(comp)
@@ -297,6 +303,7 @@ export class MaleficesActor extends Actor {
     rollData.actorId = this.id
     rollData.img = this.img
     rollData.phyMalus = this.getPhysiqueMalus()
+    rollData.elementsbio = this.getElementsBio()
     rollData.destin = this.system.pointdestin
     rollData.isReroll = false
 

modules/malefices-item-sheet.js

@@ -14,7 +14,7 @@ export class MaleficesItemSheet extends ItemSheet {
       template: "systems/fvtt-malefices/templates/item-sheet.hbs",
       dragDrop: [{ dragSelector: null, dropSelector: null }],
       width: 620,
-      height: 'fit-content',
+      height: 580,
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }]
     });
   }

modules/malefices-item.js

@@ -1,8 +1,11 @@
 import { MaleficesUtility } from "./malefices-utility.js";
 
 export const defaultItemImg = {
-  //skill: "systems/fvtt-malefices/images/icons/skill1.webp",
+  arme: "systems/fvtt-malefices/images/icons/arme.webp",
-  arme: "systems/fvtt-malefices/images/icones/arme.webp"
+  equipement: "systems/fvtt-malefices/images/icons/equipement.webp",
+  elementbio: "systems/fvtt-malefices/images/icons/wisdom.webp",
+  archetype: "systems/fvtt-malefices/images/icons/archetype.webp",
+  tarot: "systems/fvtt-malefices/images/icons/tarot.webp",
 }
 
 /**

styles/simple.css

@@ -304,7 +304,7 @@ table {border: 1px solid #7a7971;}
 
 .editor {
   border: 2;
-  height: 300px;
+  height: 100%;
   padding: 0 3px;
 }
 
@@ -398,7 +398,7 @@ li.folder > .folder-header h3 {
 /* Sheet  */
 .window-app.sheet .window-content .sheet-header{
   color: rgba(19, 18, 18, 0.95);
-  background: url("../images/ui/background_01.webp");
+  background: url("../images/ui/background_01_clear.webp");
   /*background: #494e6b;*/
 }
 
@@ -420,7 +420,7 @@ select {
 
 .window-app.sheet .window-content .sheet-header input[type="password"], .window-app.sheet .window-content .sheet-header input[type="date"], .window-app.sheet .window-content .sheet-header input[type="time"] {
   color: rgba(19, 18, 18, 0.95);
-  background: url("../images/ui/background_01.webp");
+  background: url("../images/ui/background_01_clear.webp");
   border: 1 none;
   margin-bottom: 0.25rem;
   margin-left: 2px;
@@ -428,7 +428,7 @@ select {
 
 .window-app.sheet .window-content .sheet-body input[type="password"], .window-app.sheet .window-content .sheet-body input[type="date"], .window-app.sheet .window-content .sheet-body input[type="time"] {
   color: rgba(19, 18, 18, 0.95);
-  background: url("../images/ui/background_01.webp");
+  background: url("../images/ui/background_01_clear.webp");
   border: 1 none;
   margin-bottom: 0.25rem;
   margin-left: 2px;
@@ -445,7 +445,7 @@ select {
 .window-app .window-content, .window-app.sheet .window-content .sheet-body{
   font-size: 0.8rem;
   /*background: url("../images/ui/pc_sheet_bg.webp") repeat left top;*/
-  background: url("../images/ui/background_01.webp");
+  background: url("../images/ui/background_01_clear.webp");
   color: rgba(19, 18, 18, 0.95);
 }
 
@@ -790,7 +790,7 @@ ul, li {
   background-color:#f5f5f5;
   background-position: 0px 35px;
   background-repeat: no-repeat;
-  background-image: url("../images/ui/background_01.webp");
+  background-image: url("../images/ui/background_01_clear.webp");
   color: rgba(19, 18, 18, 0.95);
 }
 

system.json

@@ -37,6 +37,15 @@
       "system": "fvtt-malefices",
       "private": false,
       "flags": {}
+    },
+    {
+      "type": "Item",
+      "label": "Archetypes",
+      "name": "malefices-archetypes",
+      "path": "packs/malefices-archetypes.db",
+      "system": "fvtt-malefices",
+      "private": false,
+      "flags": {}
     }
   ],
   "license": "LICENSE.txt",
@@ -55,7 +64,7 @@
   ],
   "title": "Maléfices, le Jeu de Rôle",
   "url": "https://www.uberwald.me/gitea/public/fvtt-malefices",
-  "version": "10.0.8",
+  "version": "10.0.14",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.0.8.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.0.14.zip",
   "background": "systems/fvtt-malefices/images/ui/malefice_welcome_page.webp"
 }

template.json

@@ -1,8 +1,7 @@
 {
   "Actor": {
     "types": [
-      "personnage",
+      "personnage"
-      "pnj"
     ],
     "templates": {
       "biodata": {
@@ -99,9 +98,13 @@
       "arme",
       "equipement",
       "archetype",
-      "tarot"
+      "tarot",
+      "elementbio"
     ],
     "templates": {},
+    "elementbio": {
+      "description": ""
+    },
     "equipement": {
       "description": ""
     },

templates/actors/actor-sheet.hbs

@@ -31,7 +31,7 @@
   {{!-- Sheet Tab Navigation --}}
   <nav class="sheet-tabs tabs" data-group="primary">
     <a class="item" data-tab="main">Principal</a>
-    <a class="item" data-tab="equipements">Equipements</a>
+    <a class="item" data-tab="equipements">Equipement</a>
     <a class="item" data-tab="biodata">Biographie</a>
     <a class="item" data-tab="notes">Notes</a>
   </nav>
@@ -95,6 +95,32 @@
             </li>
             {{/each}}
           </ul>
+
+          <ul class="item-list alternate-list">
+            <li class="item flexrow list-item items-title-bg">
+              <span class="item-name-label-header">
+                <h3><label class="items-title-text">Elements biographiques</label></h3>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="elementbio" title="Create Item"><i class="fas fa-plus"></i></a>
+              </div>
+            </li>
+
+            {{#each elementsbio as |elem key|}}
+            <li class="item list-item flexrow list-item-shadow" data-item-id="{{elem._id}}">
+              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                  src="{{elem.img}}" /></a>
+              <span class="item-name-label">{{elem.name}}</span>
+
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+
         </div>
 
       </div>
@@ -173,24 +199,19 @@
 
     {{!-- Biography Tab --}}
     <div class="tab biodata" data-group="primary" data-tab="biodata">
-      <div>
-        <ul>
-          <li class="item flexrow" data-item-id="{{archetype._id}}">
-            <label class="item-name-label-medium">Archetype : </label>
-            <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{archetype.img}}" /></a>
-            <span class="item-name-label-medium">{{archetype.name}}</span>
-            <label class="item-name-label-long">Lame tutélaire : </label>
-            <span class="item-name-label-medium">{{archetype.tarot.name}}</span>
-            <div class="item-controls item-controls-fixed">
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-          </li>
-        </ul>
-      </div>
 
       <div class="grid grid-2col">
         <div>
           <ul class="item-list alternate-list">
+            <li class="item flexrow" data-item-id="{{archetype._id}}">
+              <label class="item-name-label-medium">Archetype</label>
+              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                  src="{{archetype.img}}" /></a>
+              <span class="item-name-label-medium">{{archetype.name}}</span>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
             <li class="item flexrow">
               <label class="item-name-label-medium">Lieu de naissance</label>
               <input type="text" class="" name="system.biodata.lieunaissance" value="{{system.biodata.lieunaissance}}"
@@ -216,6 +237,10 @@
         </div>
        <div>
           <ul>
+            <li class="item flexrow">
+              <label class="item-name-label-medium">Lame tutélaire</label>
+              <span class="item-name-label-medium">{{archetype.tarot.name}}</span>
+            </li>
             <li class="item flexrow">
               <label class="item-name-label-medium">Résidence</label>
               <input type="text" class="" name="system.biodata.residence" value="{{system.biodata.residence}}" data-dtype="String" />
@@ -238,7 +263,7 @@
             </li>
           </ul>
         </div>
-  </div>
+      </div>
   
         <ul>
           <li class="item flexrow">

templates/dialogs/roll-dialog-generic.hbs

@@ -21,6 +21,17 @@
         </span>
       </div>
       {{/if}}
+      
+      <div class="flexcol">
+        <span class="roll-dialog-label">Rappel des élements biographiques : </span>
+        <ul class="ul-level1 item-list alternate-list">
+          {{#each elementsbio as |elem key|}}
+            <li class="item flexrow">
+              <span class="roll-dialog-label">{{elem.name}}</span>
+            </li>
+          {{/each}}
+        </ul>
+      </div>
 
       <div class="flexrow">
         <span class="roll-dialog-label">Bonus/Malus biographique : </span>
@@ -55,8 +66,8 @@
       {{#if arme}}
       <div class="flexrow">
         <span class="roll-dialog-label">Défense : </span>
-        <select id="bonusMalusSituation" name="bonusMalusSituation">
+        <select id="bonusMalusDef" name="bonusMalusDef">
-          {{#select bonusMalusSituation}} 
+          {{#select bonusMalusDef}} 
             <option value="-3">-6 (réussite critique)</option>
             <option value="-3">-3 (réussite)</option>
             <option value="0">0 (echec ou pas d'esquive)</option>

templates/items/item-elementbio-sheet.hbs

@@ -0,0 +1,27 @@
+<form class="{{cssClass}}" autocomplete="off">
+  <header class="sheet-header">
+      <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+      <div class="header-fields">
+          <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
+      </div>
+  </header>
+  
+  {{> systems/fvtt-malefices/templates/items/partial-item-nav.hbs}}
+
+
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+
+    {{> systems/fvtt-malefices/templates/items/partial-item-description.hbs}}
+    
+    <div class="tab details" data-group="primary" data-tab="details">
+
+      <div class="tab" data-group="primary">
+        <ul>
+
+        </ul>
+    </div>
+  </div>
+
+  </section>
+</form>

templates/items/partial-item-description.hbs

@@ -1,8 +1,3 @@
 <div class="tab description" data-group="primary" data-tab="description">
-  <div>
-    <label class="generic-label">Description</label>
-    <div class="medium-editor item-text-long-line">
     {{editor description target="system.description" button=true owner=owner editable=editable}}
-    </div>
-  </div>
 </div>

templates/items/partial-item-nav.hbs

@@ -2,7 +2,4 @@
 <nav class="sheet-tabs tabs" data-group="primary">
   <a class="item" data-tab="description">Description</a>
   <a class="item" data-tab="details">Details</a>
-  {{#if builder}}
-    <a class="item" data-tab="builder">Builder (GM only)</a>
-  {{/if}}
 </nav>