Add maintain/duration for maleficas

css/fvtt-hellborn.css

@@ -410,15 +410,15 @@ i.fvtt-hellborn {
 }
 .fvtt-hellborn .tab.character-maleficas .main-div .maleficas {
   display: grid;
-  grid-template-columns: repeat(1, 1fr);
+  grid-template-columns: repeat(2, 1fr);
   gap: 4px;
 }
 .fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica {
   display: flex;
   align-items: center;
   gap: 4px;
-  min-width: 24rem;
-  max-width: 24rem;
+  min-width: 20rem;
+  max-width: 20rem;
 }
 .fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .controls {
   font-size: 0.7rem;
@@ -426,20 +426,20 @@ i.fvtt-hellborn {
   max-width: 1.8rem;
 }
 .fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .name {
-  min-width: 28rem;
-  max-width: 28rem;
+  min-width: 10rem;
+  max-width: 10rem;
 }
 .fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .damage {
-  min-width: 6rem;
-  max-width: 6rem;
+  min-width: 3.2rem;
+  max-width: 3.2rem;
 }
 .fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .domain {
-  min-width: 5rem;
-  max-width: 5rem;
+  min-width: 4rem;
+  max-width: 4rem;
 }
 .fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .level {
-  min-width: 3rem;
-  max-width: 3rem;
+  min-width: 2rem;
+  max-width: 2rem;
 }
 .fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .item-img {
   width: 24px;
@@ -547,16 +547,16 @@ i.fvtt-hellborn {
   max-width: 1.8rem;
 }
 .fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .properties {
-  min-width: 18rem;
-  max-width: 18rem;
+  min-width: 16.3rem;
+  max-width: 16.3rem;
 }
 .fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .range {
-  min-width: 4rem;
-  max-width: 4rem;
+  min-width: 4.5rem;
+  max-width: 4.5rem;
 }
 .fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .ammo {
-  min-width: 3rem;
-  max-width: 3rem;
+  min-width: 4.5rem;
+  max-width: 4.5rem;
 }
 .fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .type {
   min-width: 3rem;
@@ -636,8 +636,12 @@ i.fvtt-hellborn {
   max-width: 1.8rem;
 }
 .fvtt-hellborn .tab.character-equipment .main-div .equipments .equipment .name {
-  min-width: 12rem;
-  max-width: 12rem;
+  min-width: 10rem;
+  max-width: 10rem;
+}
+.fvtt-hellborn .tab.character-equipment .main-div .equipments .equipment .quantity {
+  min-width: 2rem;
+  max-width: 2rem;
 }
 .fvtt-hellborn .tab.character-equipment .main-div .equipments .equipment .item-img {
   width: 24px;
@@ -1322,16 +1326,20 @@ i.fvtt-hellborn {
   max-width: 1.8rem;
 }
 .fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .domain {
-  min-width: 5rem;
-  max-width: 5rem;
+  min-width: 4rem;
+  max-width: 4rem;
+}
+.fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .damage {
+  min-width: 3.2rem;
+  max-width: 3.2rem;
 }
 .fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .level {
-  min-width: 3rem;
-  max-width: 3rem;
+  min-width: 2rem;
+  max-width: 2rem;
 }
 .fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .name {
-  min-width: 11rem;
-  max-width: 11rem;
+  min-width: 10rem;
+  max-width: 10em;
 }
 .fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .item-img {
   width: 24px;
@@ -2412,9 +2420,11 @@ i.fvtt-hellborn {
   flex-direction: row;
 }
 .dice-roll .intro-chat .intro-img {
-  padding: 5px;
-  width: 80px;
-  align-self: center;
+  padding: 4px;
+  max-width: 80px;
+  min-width: 80px;
+  align-self: top;
+  text-align: center;
 }
 .dice-roll .intro-chat .intro-right {
   display: flex;

lang/en.json

@@ -334,11 +334,8 @@
         "description": {
           "label": "Description"
         },
-        "enc": {
-          "label": "Enc"
-        },
-        "techAge": {
-          "label": "Tech Age"
+        "quantity": {
+          "label": "Quantity"
         }
       }
     },
@@ -476,6 +473,15 @@
     },
     "Malefica": {
       "FIELDS": {
+        "duration": {
+          "label": "Duration"
+        },
+        "maintain": {
+          "label": "Maintain"
+        },
+        "choiceMaintainDuration": {
+          "label": "Choice Maintain/Duration"
+        },
         "description": {
           "label": "Description"
         },

module/applications/sheets/base-actor-sheet.mjs

@@ -214,6 +214,9 @@ export default class HellbornActorSheet extends HandlebarsApplicationMixin(found
     if (item.type === "species-trait") {
       content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-hellborn/templates/chat-trait.hbs", item.toObject())
     }
+    if (item.type === "tarot") {
+      content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-hellborn/templates/chat-tarot.hbs", item.toObject())
+    }
     const chatData = {
       user: game.user.id,
       speaker: ChatMessage.getSpeaker({ actor: this.actor }),

module/models/equipment.mjs

@@ -8,6 +8,7 @@ export default class HellbornEquipment extends foundry.abstract.TypeDataModel {
 
     schema.description = new fields.HTMLField({ required: true, textSearch: true })
 
+    schema.quantity = new fields.NumberField({ required: true, initial: 1, min: 0, integer: true })
     schema.cost = new fields.NumberField({ required: true, initial: 0, min: 0 })
 
     return schema

module/models/malefica.mjs

@@ -11,6 +11,11 @@ export default class HellbornMalefica extends foundry.abstract.TypeDataModel {
     schema.domain = new fields.StringField({ required: true, nullable: false, choices: SYSTEM.MALEFICA_DOMAINS, initial: "adfectus" })
     schema.level = new fields.StringField({ required: true, nullable: false, choices: SYSTEM.MALEFICA_LEVELS, initial: "1" })
     schema.time = new fields.StringField({ required: true, initial : "" })
+
+    schema.choiceMaintainDuration = new fields.StringField({ required: true, initial : "maintain", choices: {"maintain": "Maintain", "duration": "Duration"} })
+    schema.duration = new fields.StringField({ required: true, initial : "" })
+    schema.maintain = new fields.StringField({ required: true, initial : "" })
+
     schema.hasDamage = new fields.BooleanField({ required: true, initial: false })
     schema.damage = new fields.StringField({ required: false, initial : "" })
     schema.damageType = new fields.StringField({ required: false, initial : "" })

styles/character.less

@@ -280,34 +280,34 @@
 
   .maleficas {
     display: grid;
-    grid-template-columns: repeat(1, 1fr);
+    grid-template-columns: repeat(2, 1fr);
     gap: 4px;
     .malefica {
       display: flex;
       align-items: center;
       gap: 4px;
-      min-width: 24rem;
-      max-width: 24rem;
+      min-width: 20rem;
+      max-width: 20rem;
       .controls {
         font-size: 0.7rem;
         min-width: 1.8rem;
         max-width: 1.8rem;
       }
       .name {
-        min-width: 28rem;
-        max-width: 28rem;
+        min-width: 10rem;
+        max-width: 10rem;
       }
       .damage {
-        min-width: 6rem;
-        max-width: 6rem;
+        min-width: 3.2rem;
+        max-width: 3.2rem;
       }
       .domain {
-        min-width: 5rem;
-        max-width: 5rem;
+        min-width: 4rem;
+        max-width: 4rem;
       }
       .level {
-        min-width: 3rem;
-        max-width: 3rem;
+        min-width: 2rem;
+        max-width: 2rem;
       }
       .item-img {
         width: 24px;
@@ -421,16 +421,16 @@
         max-width: 1.8rem;
       }
       .properties {
-        min-width: 18rem;
-        max-width: 18rem;
+        min-width: 16.3rem;
+        max-width: 16.3rem;
       }
       .range {
-        min-width: 4rem;
-        max-width: 4rem;
+        min-width: 4.5rem;
+        max-width: 4.5rem;
       }
       .ammo {
-        min-width: 3rem;
-        max-width: 3rem;
+        min-width: 4.5rem;
+        max-width: 4.5rem;
       }
       .type {
         min-width: 3rem;
@@ -512,8 +512,12 @@
         max-width: 1.8rem;
       }
       .name {
-        min-width: 12rem;
-        max-width: 12rem;
+        min-width: 10rem;
+        max-width: 10rem;
+      }
+      .quantity {
+        min-width: 2rem;
+        max-width: 2rem;
       }
       .item-img {
         width: 24px;

styles/enemy.less

@@ -301,16 +301,20 @@
         max-width: 1.8rem;
       }
       .domain {
-        min-width: 5rem;
-        max-width: 5rem;
+        min-width: 4rem;
+        max-width: 4rem;
+      }
+      .damage {
+        min-width: 3.2rem;
+        max-width: 3.2rem;
       }
       .level {
-        min-width: 3rem;
-        max-width: 3rem;
+        min-width: 2rem;
+        max-width: 2rem;
       }
       .name {
-        min-width: 11rem;
-        max-width: 11rem;
+        min-width: 10rem;
+        max-width: 10em;
       }
       .item-img {
         width: 24px;

styles/roll.less

@@ -99,9 +99,11 @@
     display: flex;
     flex-direction: row;
     .intro-img {
-      padding: 5px;
-      width: 80px;
-      align-self: center;
+      padding: 4px;
+      max-width: 80px;
+      min-width : 80px;
+      align-self: top;
+      text-align: center;
     }
     .intro-right {
       display: flex;

templates/character-equipment.hbs

@@ -76,6 +76,8 @@
           <div class="name" data-tooltip="{{{item.system.description}}}">
             {{item.name}}
           </div>
+          <span class="quantity" data-tooltip="Quantity">{{item.system.quantity}}</span>
+
           <div class="controls">
             <a data-tooltip="{{localize 'HELLBORN.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
               data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>

templates/character-main.hbs

@@ -44,7 +44,7 @@
             <div>
               <div class="flexrow">
                 <div class="form-group">
-                  <label>Upright</label>
+                  <label><a data-action="toChat" data-item-uuid="{{upright.uuid}}">Upright</a></label>
                   <input class="trait" type="text" value="{{upright.name}}" disabled >
                   <div class="controls">
                     <a data-tooltip="{{localize 'HELLBORN.Edit'}}" data-action="edit" data-item-id="{{upright.id}}"
@@ -56,7 +56,7 @@
               </div>
               <div class="flexrow">
                 <div class="form-group">
-                  <label>Reversed</label>
+                  <label><a data-action="toChat" data-item-uuid="{{upright.uuid}}">Reversed</a></label>
                   <input class="trait" type="text" value="{{downright.name}}" disabled >
                   <div class="controls">
                     <a data-tooltip="{{localize 'HELLBORN.Edit'}}" data-action="edit" data-item-id="{{downright.id}}"

templates/chat-malefica.hbs

@@ -6,6 +6,11 @@
     <li><strong>Domain : </strong>{{upperFirst system.domain}}</li>
     <li><strong>Level : </strong>{{getRomanLevel system.level}}</li>
     <li><strong>Time : </strong>{{system.time}}</li>
+    {{#if (eq system.choiceMaintainDuration "duration")}}
+      <li><strong>Duration : </strong>{{system.duration}}</li>
+    {{else}}
+      <li><strong>Maintain : </strong>{{system.maintain}}</li>
+    {{/if}}
     <li><strong>Range : </strong>{{system.range}}</li>
     <li><strong>Target : </strong>{{system.target}}</li>
     <li>{{{system.description}}}</li>

templates/chat-message.hbs

@@ -14,7 +14,7 @@
 
         {{#if weapon}}
         <li><strong>Weapon : {{weapon.name}}</strong></li>
-        <li><strong>Properties : {{weapon.system.properties}}</strong></li>
+        <li><strong>Properties :</strong> {{weapon.system.properties}}</li>
         {{/if}}
 
         <li><strong>{{localize rollItem.label}} : {{rollItem.value}}</strong></li>

templates/chat-tarot.hbs

@@ -0,0 +1,15 @@
+<div class="item-to-chat">
+  <div class="intro-chat">
+    <h2>{{name}}</h2>
+    <ul>
+    <li><strong>Orientation : </strong>{{system.orientation}}</li>
+    <li><strong>Quote : </strong>{{system.quote}}</li>
+    <li><strong>Bonus : </strong>{{system.bonus}}</li>
+    <li><strong>Penalty : </strong>{{system.penalty}}</li>
+    <li><strong>Description : </strong>{{{system.description}}}</li>
+    <li><strong>Positive Effect : </strong>{{{system.positiveEffect}}}</li>
+    <li><strong>Negative Effect : </strong>{{{system.negativeEffect}}}</li>
+    </ul>
+  </div>
+
+</div>

templates/enemy-trait.hbs

@@ -77,6 +77,14 @@
             </div>
             <span class="domain" data-tooltip="Domain">{{upperFirst item.system.domain}}</span>
             <span class="level" data-tooltip="Level">{{getRomanLevel item.system.level}}</span>
+            {{#if item.system.hasDamage}}
+            <a class="damage rollable" data-tooltip="Damage" data-item-id="{{item.id}}" data-action="roll"
+                data-roll-type="damage" data-roll-value="{{item.system.damage}}">
+                <i class="fa-regular fa-dice"></i>
+                {{item.system.damage}}</a>
+            {{else}}
+            <span class="damage" data-tooltip="Damage">-</span>
+            {{/if}}
 
             <div class="controls">
               <a data-tooltip="{{localize 'HELLBORN.Edit'}}" data-action="edit" data-item-id="{{item.id}}"

templates/equipment.hbs

@@ -5,6 +5,7 @@
   </div>
 
   <fieldset>
+    {{formField systemFields.quantity value=system.quantity}}
     {{formField systemFields.cost value=system.cost}}
   </fieldset>
 

templates/malefica.hbs

@@ -8,6 +8,14 @@
     {{formField systemFields.domain value=system.domain localize=true}}
     {{formField systemFields.level value=system.level localize=true}}
     {{formField systemFields.time value=system.time localize=true }}
+
+    {{formField systemFields.choiceMaintainDuration value=system.choiceMaintainDuration localize=true }}
+    {{#if (eq system.choiceMaintainDuration "duration")}}
+      {{formField systemFields.duration value=system.duration localize=true}}
+    {{else}}
+      {{formField systemFields.maintain value=system.maintain localize=true}}
+    {{/if}}
+
     {{formField systemFields.range value=system.range localize=true}}
     {{formField systemFields.target value=system.target localize=true}}
     {{formField systemFields.hasDamage value=system.hasDamage localize=true}}