Ajout tarot et autres

modules/malefices-actor-sheet.js

@@ -36,6 +36,7 @@ export class MaleficesActorSheet extends ActorSheet {
       system: duplicate(this.object.system),
       limited: this.object.limited,
       armes: duplicate(this.actor.getArmes()),
+      tarots: duplicate(this.actor.getTarots()),
       equipements: duplicate(this.actor.getEquipements()),
       subActors: duplicate(this.actor.getSubActors()),
       phyMalus: this.actor.getPhysiqueMalus(),

modules/malefices-actor.js

@@ -86,6 +86,13 @@ export class MaleficesActor extends Actor {
     MaleficesUtility.sortArrayObjectsByName(comp)
     return comp;
   }
+  
+  /* -------------------------------------------- */
+  getTarots() {
+    let comp = duplicate(this.items.filter(item => item.type == 'tarot') || [])
+    MaleficesUtility.sortArrayObjectsByName(comp)
+    return comp;
+  }
   /* -------------------------------------------- */
   getArmes() {
     let comp = duplicate(this.items.filter(item => item.type == 'arme') || [])

modules/malefices-roll-dialog.js

@@ -67,6 +67,9 @@ export class MaleficesRollDialog extends Dialog {
     html.find('#bonusMalusDef').change((event) => {
       this.rollData.bonusMalusDef = Number(event.currentTarget.value)
     })
+    html.find('#bonusMalusPortee').change((event) => {
+      this.rollData.bonusMalusPortee = Number(event.currentTarget.value)
+    })
         
   }
 }

modules/malefices-utility.js

@@ -469,7 +469,7 @@ export class MaleficesUtility {
 
     // Build the dice formula
     let diceFormula = "1d20"
-    rollData.target = rollData.attr.value + rollData.bonusMalusPerso + rollData.bonusMalusSituation + rollData.bonusMalusDef
+    rollData.target = rollData.attr.value + rollData.bonusMalusPerso + rollData.bonusMalusSituation + rollData.bonusMalusDef + rollData.bonusMalusPortee
     if (rollData.attr.abbrev == "physique") {
       rollData.target += rollData.phyMalus
     }
@@ -598,6 +598,7 @@ export class MaleficesUtility {
       bonusMalusPerso: 0,
       bonusMalusSituation: 0,
       bonusMalusDef: 0,
+      bonusMalusPortee: 0,
       rollMode: game.settings.get("core", "rollMode")
     }
     MaleficesUtility.updateWithTarget(rollData)

styles/simple.css

@@ -1,4 +1,8 @@
   /* ==================== (A) Fonts ==================== */
+  @font-face {
+    font-family: "Rivanna";
+    src: url('../fonts/rivanna.ttf') format("truetype");
+  }
   
   :root {
   /* =================== 1. ACTOR SHEET FONT STYLES =========== */
@@ -276,6 +280,8 @@ table {border: 1px solid #7a7971;}
 }
 
 .fvtt-malefices .sheet-header h1.charname input {
+  font-family: Rivanna;
+  font-size: 3rem;
   width: 100%;
   height: 100%;
   margin: 0;
@@ -285,6 +291,8 @@ table {border: 1px solid #7a7971;}
   -webkit-box-flex: 0;
   -ms-flex: 0;
   flex: 0;
+  font-family: Rivanna;
+  font-size: 2.2rem;
 }
 
 .fvtt-malefices .sheet-body,
@@ -453,7 +461,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
 }
 
 .sheet nav.sheet-tabs {
-  font-size: 0.70rem;
+  font-size: 1.2rem;
   font-weight: bold;
   height: 3rem;
   flex: 0 0 3rem;
@@ -817,10 +825,19 @@ ul, li {
 .chat-message .message-header .flavor-text, .chat-message .message-header .whisper-to { 
   font-size: 0.9rem;
 }
+.chat-result-text,
 .chat-actor-name {
+  font-weight: bold;
+  font-family: Rivanna;
+  font-size: 1.2rem;
   padding: 4px;
 }
-
+.chat-result-success {
+  color:darkgreen;
+}
+.chat-result-failure {
+  color:darkred;
+}
 .chat-img {
   width: 64px;
   height: 64px;

system.json

@@ -55,7 +55,7 @@
   ],
   "title": "Maléfices, le Jeu de Rôle",
   "url": "https://www.uberwald.me/gitea/public/fvtt-malefices",
-  "version": "10.0.4",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.0.4.zip",
+  "version": "10.0.7",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.0.7.zip",
   "background": "systems/fvtt-malefices/images/ui/malefice_welcome_page.webp"
 }

templates/actors/actor-sheet.hbs

@@ -61,6 +61,13 @@
               <input type="text" class="item-field-label-short" name="system.pointdestin" value="{{system.pointdestin}}" data-dtype="Number"/>
             </li>
             
+            {{#if isGM}}
+            <li class="item flexrow list-item">
+              <span class="item-field-label-long">Fluide (MJ seulement)</span>
+              <input type="text" class="item-field-label-short" name="system.fluide" value="{{system.fluide}}" data-dtype="Number"/>
+            </li>
+            {{/if}}
+
           </ul>
         </div>
 
@@ -225,6 +232,30 @@
           </li>
         </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">Tarots</label></h3>
+          </span>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
+          </div>
+        </li>
+        {{#each tarots as |tarot key|}}
+        <li class="item flexrow list-item list-item-shadow" data-item-id="{{tarot._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{tarot.img}}" /></a>
+          <span class="item-name-label">{{tarot.name}}</span>
+          <div class="item-filler">&nbsp;</div>
+          {{#if @root.isGM}}
+            <div class="item-controls item-controls-fixed">
+              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+            </div>
+          {{/if}}
+        </li>
+        {{/each}}
+      </ul>
+
   </div>
 
   <div class="tab notes" data-group="primary" data-tab="notes">

templates/chat/chat-generic-result.hbs

@@ -2,7 +2,7 @@
   {{#if actorImg}}
   <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
   {{/if}}
-  <h4 class=chat-actor-name>{{alias}}</h4>
+  <h4 class="chat-actor-name">{{alias}}</h4>
 </div>
 
   <hr>
@@ -30,36 +30,36 @@
 
         {{#if isSuccess}}
           {{#if isCritical}}
-            <li><strong>Réussite Critique !</strong></li>
+            <li><label class="chat-result-text chat-result-success ">Réussite Critique !</label></li>
             {{#if arme}}
               {{#if arme.system.dommagecritiquemort}}
-                <li><strong>La victime est morte !</strong></li>
+                <li><label class="chat-result-text chat-result-success">La victime est morte !</label></li>
               {{else}}
                 {{#if arme.system.dommagecritiqueko}}
-                  <li><strong>La victime est KO !</strong></li>
+                  <li><label class="chat-result-text chat-result-success ">La victime est KO !</label></li>
                 {{/if}}
-                <li><strong>La victime subit {{arme.system.dommagecritique}} dommages</strong></li>
+                <li><label class="chat-result-text chat-result-success ">La victime subit {{arme.system.dommagecritique}} dommages</label></li>
               {{/if}}
             {{/if}}
           {{else}}  
             {{#if isPart}}
-              <li><strong>Réussite Particulière !</strong></li>
+              <li><label class="chat-result-text chat-result-success ">Réussite Particulière !</label></li>
               {{#if arme}}
-                <li><strong>La victime subit {{arme.system.dommagepart}} dommages</strong></li>
+                <li><label class="chat-result-text chat-result-success ">La victime subit {{arme.system.dommagepart}} dommages</label></li>
               {{/if}}        
 
             {{else}}
-              <li><strong>Succés !</strong></li>
+              <li><label class="chat-result-text chat-result-success ">Succés !</label></li>
               {{#if arme}}
-                <li><strong>La victime subit {{arme.system.dommagenormale}} dommages</strong></li>
+                <li><label class="chat-result-text chat-result-success ">La victime subit {{arme.system.dommagenormale}} dommages</label></li>
               {{/if}}        
             {{/if}}        
           {{/if}}
         {{else}}
           {{#if isFumble}}
-            <li><strong>Echec Critique !</strong></li>
+            <li><label class="chat-result-text chat-result-failure ">Echec Critique !</label></li>
           {{else}}
-            <li><strong>Echec !</strong></li>
+            <li><label class="chat-result-text chat-result-failure">Echec !</label></li>
           {{/if}}
         {{/if}}
 

templates/dialogs/roll-dialog-generic.hbs

@@ -64,6 +64,17 @@
           {{/select}}
         </select>        
       </div>
+
+      <div class="flexrow">
+        <span class="roll-dialog-label">Pörtée : </span>
+        <select id="bonusMalusPortee" name="bonusMalusPortee">
+          {{#select bonusMalusPortee}} 
+            <option value="1">+1 (Portée courte)</option>
+            <option value="0">0 (Portée moyenne)</option>
+            <option value="-1">-1 (Portée longue)</option>
+          {{/select}}
+        </select>        
+      </div>
       {{/if}}
 
   </div>