Various fixes

css/fvtt-hellborn.css

@@ -417,8 +417,8 @@ i.fvtt-hellborn {
   display: flex;
   align-items: center;
   gap: 4px;
-  min-width: 18rem;
-  max-width: 18rem;
+  min-width: 20rem;
+  max-width: 20rem;
 }
 .fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .controls {
   font-size: 0.7rem;
@@ -426,16 +426,20 @@ i.fvtt-hellborn {
   max-width: 1.8rem;
 }
 .fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .name {
-  min-width: 12rem;
-  max-width: 12rem;
+  min-width: 10rem;
+  max-width: 10rem;
+}
+.fvtt-hellborn .tab.character-maleficas .main-div .maleficas .malefica .damage {
+  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;
@@ -460,8 +464,8 @@ i.fvtt-hellborn {
   max-width: 1.8rem;
 }
 .fvtt-hellborn .tab.character-maleficas .main-div .rituals .ritual .ingredients {
-  min-width: 26rem;
-  max-width: 26rem;
+  min-width: 24rem;
+  max-width: 24rem;
 }
 .fvtt-hellborn .tab.character-maleficas .main-div .rituals .ritual .name {
   min-width: 12rem;
@@ -543,20 +547,28 @@ i.fvtt-hellborn {
   max-width: 1.8rem;
 }
 .fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .properties {
-  min-width: 21rem;
-  max-width: 21rem;
+  min-width: 16.3rem;
+  max-width: 16.3rem;
+}
+.fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .range {
+  min-width: 4.5rem;
+  max-width: 4.5rem;
+}
+.fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .ammo {
+  min-width: 4.5rem;
+  max-width: 4.5rem;
 }
 .fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .type {
+  min-width: 3rem;
+  max-width: 3rem;
+}
+.fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .damage {
   min-width: 4rem;
   max-width: 4rem;
 }
-.fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .damage {
-  min-width: 6rem;
-  max-width: 6rem;
-}
 .fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .name {
-  min-width: 12rem;
-  max-width: 12rem;
+  min-width: 10rem;
+  max-width: 10rem;
 }
 .fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .item-img {
   width: 24px;
@@ -624,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;
@@ -1309,9 +1325,21 @@ i.fvtt-hellborn {
   min-width: 1.8rem;
   max-width: 1.8rem;
 }
+.fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .domain {
+  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: 2rem;
+  max-width: 2rem;
+}
 .fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .name {
-  min-width: 18rem;
-  max-width: 18rem;
+  min-width: 10rem;
+  max-width: 10em;
 }
 .fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .item-img {
   width: 24px;
@@ -1341,20 +1369,28 @@ i.fvtt-hellborn {
   max-width: 1.8rem;
 }
 .fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .properties {
-  min-width: 21rem;
-  max-width: 21rem;
+  min-width: 18rem;
+  max-width: 18rem;
 }
-.fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .type {
+.fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .range {
   min-width: 4rem;
   max-width: 4rem;
 }
+.fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .ammo {
+  min-width: 3rem;
+  max-width: 3rem;
+}
+.fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .type {
+  min-width: 3rem;
+  max-width: 3rem;
+}
 .fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .damage {
-  min-width: 6rem;
-  max-width: 6rem;
+  min-width: 4rem;
+  max-width: 4rem;
 }
 .fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .name {
-  min-width: 12rem;
-  max-width: 12rem;
+  min-width: 10rem;
+  max-width: 10rem;
 }
 .fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .item-img {
   width: 24px;
@@ -2166,6 +2202,11 @@ i.fvtt-hellborn {
   display: flex;
   align-items: center;
 }
+.fvtt-hellborn .malefica-content fieldset .form-fields input[type="checkbox"] {
+  min-width: 2rem;
+  max-width: 2rem;
+  text-align: center;
+}
 .fvtt-hellborn .malefica-content fieldset .form-group input {
   min-width: 12rem;
   max-width: 12rem;
@@ -2337,6 +2378,9 @@ i.fvtt-hellborn {
   color: var(--color-dark-1);
 }
 .item-to-chat h2 {
+  margin-top: 10px;
+  margin-left: 10px;
+  margin-bottom: 4px;
   font-family: var(--font-title);
   font-size: calc(var(--font-size-standard) * 1.4);
   color: var(--title-color);
@@ -2376,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,9 +473,21 @@
     },
     "Malefica": {
       "FIELDS": {
+        "duration": {
+          "label": "Duration"
+        },
         "description": {
           "label": "Description"
         },
+        "hasDamage": {
+          "label": "Has Damage"
+        },
+        "damage": {
+          "label": "Damage"
+        },
+        "damageType": {
+          "label": "Damage Type"
+        },
         "domain": {
           "label": "Domain"
         },
@@ -631,6 +640,9 @@
         "damage": {
           "label": "Damage"
         },
+        "damageType": {
+          "label": "Damage Type"
+        },
         "description": {
           "label": "Description"
         },

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

@@ -211,6 +211,12 @@ export default class HellbornActorSheet extends HandlebarsApplicationMixin(found
     if (item.type === "ritual") {
       content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-hellborn/templates/chat-ritual.hbs", item.toObject())
     }
+    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/applications/sheets/character-sheet.mjs

@@ -90,12 +90,24 @@ export default class HellbornCharacterSheet extends HellbornActorSheet {
       case "status":
         context.tab = context.tabs.status
         context.perks = doc.itemTypes.perk
-        context.perks.sort((a, b) => a.name.localeCompare(b.name))
+        // Sort the perks by system.role and then by the system.level
+        context.perks.sort((a, b) => {
+          if (a.system.role === b.system.role) {
+            return a.system.level.localeCompare(b.system.level)
+          }
+          return a.system.role.localeCompare(b.system.role)
+        })
         break;
       case "maleficas":
         context.tab = context.tabs.maleficas
         context.maleficas = doc.itemTypes.malefica
-        context.maleficas.sort((a, b) => a.name.localeCompare(b.name))
+        // Sort the maleficas by system.domain and then by the system.level
+        context.maleficas.sort((a, b) => {
+          if (a.system.domain === b.system.domain) {
+            return a.system.level.localeCompare(b.system.level)
+          }
+          return a.system.domain.localeCompare(b.system.domain)
+        })
         context.rituals = doc.itemTypes.ritual
         context.rituals.sort((a, b) => a.name.localeCompare(b.name))
         break

module/config/system.mjs

@@ -53,6 +53,7 @@ export const CHOICE_ADVANTAGES_DISADVANTAGES ={
 export const PERK_ROLES = {
   "abbetor": { id: "abbetor", label: "Abbetor" },
   "blade": { id: "blade", label: "Blade" },
+  "brawler": { id: "brawler", label: "Brawler" },
   "gunslinger": { id: "gunslinger", label: "Gunslinger" },
   "malefic": { id: "malefic", label: "Malefic" },
   "mastermind": { id: "mastermind", label: "Mastermind" },
@@ -63,6 +64,8 @@ export const PERK_ROLES = {
 
 export const MALEFICA_DOMAINS = {
   "adfectus": { id: "adfectus", label: "Adfectus" },
+  "animalis": { id: "animalis", label: "Animalis" },
+  "carnes ": { id: "carnes", label: "Carnes" },
   "divinus": { id: "divinus", label: "Divinus" },
   "ignis": { id: "ignis", label: "Ignis" },
   "iunctio": { id: "iunctio", label: "Iunctio" },

module/documents/roll.mjs

@@ -93,7 +93,7 @@ export default class HellbornRoll extends Roll {
           let damageRoll = new Roll(formula)
           await damageRoll.evaluate()
           await damageRoll.toMessage({
-            flavor: `${options.rollItem.name} - Damage Roll`
+            flavor: `${options.rollItem.name} - Damage Roll - ${options.rollItem.system.damageType}`,
           });
           return
         }

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,10 @@ 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.duration = 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 : "" })
     schema.range = new fields.StringField({ required: true, initial : "" })
     schema.target = new fields.StringField({ required: true, initial : "" })
 

module/models/weapon.mjs

@@ -13,6 +13,8 @@ export default class HellbornWeapon extends foundry.abstract.TypeDataModel {
     schema.properties = new fields.StringField({required: true, initial: ""})
 
     schema.damage = new fields.StringField({required: true, initial: "1d6"})
+    schema.damageType = new fields.StringField({ required: false, initial : "Physical" })
+
     schema.ammo = new fields.StringField({ required: false, initial: "" })
     schema.range = new fields.StringField({ required: false, initial: "" })
     schema.cost = new fields.NumberField({ required: true, initial: 0, min: 0 })

styles/character.less

@@ -286,24 +286,28 @@
       display: flex;
       align-items: center;
       gap: 4px;
-      min-width: 18rem;
-      max-width: 18rem;
+      min-width: 20rem;
+      max-width: 20rem;
       .controls {
         font-size: 0.7rem;
         min-width: 1.8rem;
         max-width: 1.8rem;
       }
       .name {
-        min-width: 12rem;
-        max-width: 12rem;
+        min-width: 10rem;
+        max-width: 10rem;
+      }
+      .damage {
+        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;
@@ -329,8 +333,8 @@
         max-width: 1.8rem;
       }
       .ingredients {
-        min-width: 26rem;
-        max-width: 26rem;
+        min-width: 24rem;
+        max-width: 24rem;
       }
       .name {
         min-width: 12rem;
@@ -417,20 +421,28 @@
         max-width: 1.8rem;
       }
       .properties {
-        min-width: 21rem;
-        max-width: 21rem;
+        min-width: 16.3rem;
+        max-width: 16.3rem;
+      }
+      .range {
+        min-width: 4.5rem;
+        max-width: 4.5rem;
+      }
+      .ammo {
+        min-width: 4.5rem;
+        max-width: 4.5rem;
       }
       .type {
+        min-width: 3rem;
+        max-width: 3rem;
+      }
+      .damage {
         min-width: 4rem;
         max-width: 4rem;
       }
-      .damage {
-        min-width: 6rem;
-        max-width: 6rem;
-      }
       .name {
-        min-width: 12rem;
-        max-width: 12rem;
+        min-width: 10rem;
+        max-width: 10rem;
       }
       .item-img {
         width: 24px;
@@ -500,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

@@ -300,9 +300,21 @@
         min-width: 1.8rem;
         max-width: 1.8rem;
       }
+      .domain {
+        min-width: 4rem;
+        max-width: 4rem;
+      }
+      .damage {
+        min-width: 3.2rem;
+        max-width: 3.2rem;
+      }
+      .level {
+        min-width: 2rem;
+        max-width: 2rem;
+      }
       .name {
-        min-width: 18rem;
-        max-width: 18rem;
+        min-width: 10rem;
+        max-width: 10em;
       }
       .item-img {
         width: 24px;
@@ -332,20 +344,28 @@
         max-width: 1.8rem;
       }
       .properties {
-        min-width: 21rem;
-        max-width: 21rem;
+        min-width: 18rem;
+        max-width: 18rem;
       }
-      .type {
+      .range {
         min-width: 4rem;
         max-width: 4rem;
       }
+      .ammo {
+        min-width: 3rem;
+        max-width: 3rem;
+      }
+      .type {
+        min-width: 3rem;
+        max-width: 3rem;
+      }
       .damage {
-        min-width: 6rem;
-        max-width: 6rem;
+        min-width: 4rem;
+        max-width: 4rem;
       }
       .name {
-        min-width: 12rem;
-        max-width: 12rem;
+        min-width: 10rem;
+        max-width: 10rem;
       }
       .item-img {
         width: 24px;

styles/malefica.less

@@ -8,7 +8,10 @@
       display: flex;
       align-items: center;
     }
-    .form-group label {
+    .form-fields input[type="checkbox"] {
+      min-width: 2rem;
+      max-width: 2rem;
+      text-align: center;
     }
     .form-group input {
       min-width: 12rem;

styles/roll.less

@@ -56,6 +56,9 @@
 
 .item-to-chat {
   h2 {
+    margin-top: 10px;
+    margin-left:10px;
+    margin-bottom: 4px;
     font-family: var(--font-title);
     font-size: calc(var(--font-size-standard) * 1.4);
     color: var(--title-color);
@@ -96,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

@@ -17,6 +17,8 @@
           </div>
           <span class="type" data-tooltip="Type">{{upperFirst item.system.weaponType}}</span>
           <span class="properties" data-tooltip="Properties">{{upperFirst item.system.properties}}</span>
+          <span class="range" data-tooltip="Range">{{upperFirst item.system.range}}</span>
+          <span class="ammo" data-tooltip="Ammo">{{upperFirst item.system.ammo}}</span>
 
           <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}}">
@@ -74,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/character-maleficas.hbs

@@ -17,6 +17,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/character-status.hbs

@@ -6,23 +6,23 @@
       <div class="counters">
         <div class="flexcol">
           <div>
-            <label>Trauma : </label>{{formInput systemFields.trauma.fields.current value=system.trauma.current}} /
+            <label>Trauma </label>{{formInput systemFields.trauma.fields.current value=system.trauma.current}} /
             {{formInput systemFields.trauma.fields.max value=system.trauma.max}}
 
-            <label class="spaced-left"> Darkness : </label>{{formInput systemFields.darkness.fields.current value=system.darkness.current}} /
+            <label class="spaced-left"> Darkness </label>{{formInput systemFields.darkness.fields.current value=system.darkness.current}} /
             {{formInput systemFields.darkness.fields.max value=system.darkness.max}}
             {{formInput systemFields.darkness.fields.value value=system.darkness.value}}
-            <label class="spaced-left"> Defense : </label>{{formInput systemFields.defense.fields.base value=system.defense.base}}
+            <label class="spaced-left"> Defense </label>{{formInput systemFields.defense.fields.base value=system.defense.base}}
             {{formInput systemFields.defense.fields.bonus value=system.defense.bonus }}
             {{formInput systemFields.defense.fields.total value=system.defense.total}}
             {{formInput systemFields.defense.fields.resistance value=system.defense.resistance}}
-            <label class="spaced-left"> Movement : </label>{{formInput systemFields.movement.fields.base value=system.movement.base}}
+            <label class="spaced-left"> Movement </label>{{formInput systemFields.movement.fields.base value=system.movement.base}}
             {{formInput systemFields.movement.fields.reduce value=system.defense.reduce }}
           </div>
 
           <div class="flexrow characteristics-label">
             <label>&nbsp;</label><span>Curr.</span><span>Max</span>
-            <label>&nbsp;</label><span>Curr.</span><span>Max</span><span>MaxDR</span>
+            <label>&nbsp;</label><span>Curr.</span><span>Max</span><span>Mal.DR</span>
             <label>&nbsp;</label><span>Base</span><span>Armor</span><span>Total</span><span>Resi.</span>
             <label>&nbsp;</label><span>Base</span><span>Redu.</span>
 

templates/chat-malefica.hbs

@@ -3,11 +3,12 @@
     <h2>{{name}}</h2>
 
     <ul>
-    <li><strong>Domain : {{upperFirst system.domain}}</strong></li>
-    <li><strong>Level : {{getRomanLevel system.level}}</strong></li>
-    <li><strong>Time : {{system.time}}</strong></li>
-    <li><strong>Range : {{system.range}}</strong></li>
-    <li><strong>Target : {{system.target}}</strong></li>
+    <li><strong>Domain : </strong>{{upperFirst system.domain}}</li>
+    <li><strong>Level : </strong>{{getRomanLevel system.level}}</li>
+    <li><strong>Time : </strong>{{system.time}}</li>
+    <li><strong>Duration : </strong>{{system.duration}}</li>
+    <li><strong>Range : </strong>{{system.range}}</li>
+    <li><strong>Target : </strong>{{system.target}}</li>
     <li>{{{system.description}}}</li>
     </ul>
   </div>

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-perk.hbs

@@ -3,8 +3,8 @@
     <h2>{{name}}</h2>
     <ul>
     <li><strong>{{system.flavorText}}</strong></li>
-    <li><strong>Role : {{upperFirst system.role}}</strong></li>
-    <li><strong>Level : {{getRomanLevel system.level}}</strong></li>
+    <li><strong>Role : </strong>{{upperFirst system.role}}</li>
+    <li><strong>Level : </strong>{{getRomanLevel system.level}}</li>
     <li>{{{system.description}}}</li>
     </ul>
   </div>

templates/chat-ritual.hbs

@@ -2,11 +2,11 @@
   <div class="intro-chat">
     <h2>{{name}}</h2>
     <ul>
-    <li><strong>Difficulty : {{system.difficulty}}</strong></li>
-    <li><strong>Threshold : {{system.threshold}}</strong></li>
-    <li><strong>Limit : {{system.limit}}</strong></li>
-    <li><strong>Ingredients : {{system.ingredients}}</strong></li>
-    <li><strong>N. Attempts : {{system.nbAttempts}}</strong></li>
+    <li><strong>Difficulty : </strong>{{system.difficulty}}</li>
+    <li><strong>Threshold : </strong>{{system.threshold}}</li>
+    <li><strong>Limit : </strong>{{system.limit}}</li>
+    <li><strong>Ingredients : </strong>{{system.ingredients}}</li>
+    <li><strong>N. Attempts : </strong>{{system.nbAttempts}}</li>
     <li>{{{system.description}}}</li>
     </ul>
   </div>

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>{{{system.description}}}</li>
+    <li>{{{system.positiveEffect}}}</li>
+    <li>{{{system.negativeEffect}}}</li>
+    </ul>
+  </div>
+
+</div>

templates/chat-trait.hbs

@@ -0,0 +1,9 @@
+<div class="item-to-chat">
+  <div class="intro-chat">
+    <h2>{{name}}</h2>
+    <ul>
+    <li>{{{system.description}}}</li>
+    </ul>
+  </div>
+
+</div>

templates/enemy-trait.hbs

@@ -9,20 +9,20 @@
             <label>Trauma : </label>{{formInput systemFields.trauma.fields.current value=system.trauma.current}} /
             {{formInput systemFields.trauma.fields.max value=system.trauma.max}}
 
-            <label class="spaced-left"> Darkness </label>{{formInput systemFields.darkness.fields.current value=system.darkness.current}} /
+            <label class="spaced-left"> Darkness </label>
+            {{formInput systemFields.darkness.fields.current value=system.darkness.current}} /
             {{formInput systemFields.darkness.fields.max value=system.darkness.max}}
-            <label class="spaced-left"> Defense </label>{{formInput systemFields.defense.fields.base value=system.defense.base}}
-            <label class="spaced-left"> Malefic DR </label>{{formInput systemFields.defense.fields.maleficDR value=system.defense.maleficDR}}
-            <label class="spaced-left"> Res. </label>{{formInput systemFields.defense.fields.resilience value=system.defense.resilience}}
+            {{formInput systemFields.darkness.fields.value value=system.darkness.value}}
+            <label class="spaced-left"> Defense </label>
+            {{formInput systemFields.defense.fields.base value=system.defense.base}}
+            {{formInput systemFields.defense.fields.resilience value=system.defense.resilience}}
             <label class="spaced-left"> Movement </label>{{formInput systemFields.movement.fields.base value=system.movement.base}}
           </div>
 
           <div class="flexrow characteristics-label">
             <label></label><span>Curr.</span><span>Max</span>
-            <label></label><span>&nbsp;&nbsp;&nbsp;Curr.</span><span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Max</span>
-            <label></label>
-            <label></label>
-            <label></label>
+            <label></label><span>&nbsp;&nbsp;&nbsp;Curr.</span><span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Max</span><span>&nbsp;&nbsp;Mal.DR</span>
+            <label></label><span>&nbsp;&nbsp;&nbsp;Total</span><span>&nbsp;&nbsp;&nbsp;Resi.</span>
             <label></label>
             <label></label>
             <label></label>
@@ -66,15 +66,25 @@
           <a class="action" data-tooltip="{{localize "HELLBORN.Tooltip.addMalefica"}}" data-tooltip-direction="UP"><i
               class="fas fa-plus" data-action="createMalefica"></i></a>{{/if}}
         </legend>
-        <div class="traits">
+        <div class="maleficas">
           {{#each maleficas as |item|}}
-          <div class="trait item" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-drag="true">
+          <div class="malefica item" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-drag="true">
 
             <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
             <!-- <img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />-->
-            <div class="name" data-roll-type="trait" data-action="toChat" data-item-uuid="{{item.uuid}}" data-tooltip="{{{item.system.description}}}">
+            <div class="name" data-roll-type="malefica" data-action="toChat" data-item-uuid="{{item.uuid}}" data-tooltip="{{{item.system.description}}}">
               <a>{{item.name}}</a>
             </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}}"
@@ -105,6 +115,8 @@
           </div>
           <span class="type" data-tooltip="Type">{{upperFirst item.system.weaponType}}</span>
           <span class="properties" data-tooltip="Properties">{{upperFirst item.system.properties}}</span>
+          <span class="range" data-tooltip="Range">{{upperFirst item.system.range}}</span>
+          <span class="ammo" data-tooltip="Ammo">{{upperFirst item.system.ammo}}</span>
 
           <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}}">

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,8 +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.duration value=system.duration localize=true}}
     {{formField systemFields.range value=system.range localize=true}}
     {{formField systemFields.target value=system.target localize=true}}
+    {{formField systemFields.hasDamage value=system.hasDamage localize=true}}
+    {{#if system.hasDamage}}
+      {{formField systemFields.damage value=system.damage}}
+      {{formField systemFields.damageType value=system.damageType}}
+    {{/if}}
   </fieldset>
 
   <fieldset>

templates/weapon.hbs

@@ -14,6 +14,7 @@
 
     {{formField systemFields.properties value=system.properties classes="long-input"}}
     {{formField systemFields.damage value=system.damage}}
+    {{formField systemFields.damageType value=system.damageType}}
 
     {{formField systemFields.cost value=system.cost}}
   </fieldset>