Various fixes

Last fixes from tests
2025-06-15 16:32:47 +02:00 · 2025-06-15 09:37:08 +02:00 · 2025-06-14 23:45:05 +02:00 · 2025-05-30 18:27:37 +02:00 · 2025-05-30 09:54:58 +02:00 · 2025-05-29 22:41:15 +02:00
33 changed files with 723 additions and 212 deletions
--- a/css/fvtt-hellborn.css
+++ b/css/fvtt-hellborn.css
@@ -212,6 +212,10 @@ i.fvtt-hellborn {
  flex-direction: column;
  gap: 5px;
 }
+.fvtt-hellborn .character-main .character-pc .character-right .character-definition .character-definition-pronouns input {
+  min-width: 21.2rem;
+  max-width: 21.2rem;
+}
 .fvtt-hellborn .character-main .character-pc .character-right .character-definition .form-group {
  display: flex;
  align-items: center;
@@ -417,8 +421,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 +430,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 +468,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 +551,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 +640,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;
@@ -687,6 +707,29 @@ i.fvtt-hellborn {
  height: 24px;
  margin: 4px 0 0 0;
 }
+.fvtt-hellborn .tab.character-biography .main-div .aliases {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  margin-bottom: 4px;
+  margin-left: 4px;
+}
+.fvtt-hellborn .tab.character-biography .main-div .aliases .form-group {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 4px;
+  margin-left: 4px;
+}
+.fvtt-hellborn .tab.character-biography .main-div .aliases .form-group label {
+  min-width: 6rem;
+  max-width: 6rem;
+}
+.fvtt-hellborn .tab.character-biography .main-div .aliases input {
+  text-align: left;
+  min-width: 41rem;
+  max-width: 41rem;
+}
 .fvtt-hellborn .tab.character-biography .main-div .biodata {
  display: grid;
  grid-template-columns: repeat(3, 1fr);
@@ -1286,6 +1329,28 @@ i.fvtt-hellborn {
  height: 24px;
  margin: 4px 0 0 0;
 }
+.fvtt-hellborn .tab.enemy-traits .main-div .ailments {
+  display: grid;
+  grid-template-columns: repeat(5, 1fr);
+  gap: 4px;
+}
+.fvtt-hellborn .tab.enemy-traits .main-div .ailments .ailment {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  margin-left: 4px;
+  min-width: 8rem;
+  max-width: 8rem;
+}
+.fvtt-hellborn .tab.enemy-traits .main-div .ailments .ailment label {
+  min-width: 5rem;
+  max-width: 5rem;
+}
+.fvtt-hellborn .tab.enemy-traits .main-div .ailments .ailment .item-img {
+  width: 24px;
+  height: 24px;
+  margin: 4px 0 0 0;
+}
 .fvtt-hellborn .tab.enemy-traits .main-div .maleficas {
  display: grid;
  grid-template-columns: repeat(1, 1fr);
@@ -1309,9 +1374,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 +1418,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;
@@ -1880,6 +1965,9 @@ i.fvtt-hellborn {
 .fvtt-hellborn .tarot-content fieldset {
  margin-top: 8px;
 }
+.fvtt-hellborn .tarot-content fieldset legend {
+  margin-top: 1rem;
+}
 .fvtt-hellborn .tarot-content fieldset .form-group {
  display: flex;
  align-items: center;
@@ -2166,6 +2254,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 +2430,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);
@@ -2353,6 +2449,30 @@ i.fvtt-hellborn {
  font-family: var(--font-primary);
  font-size: calc(var(--font-size-standard) * 1);
 }
+.item-to-chat ul li p {
+  margin: 0;
+}
+.flavor-text-damage {
+  font-family: var(--font-secondary);
+  font-size: calc(var(--font-size-standard) * 1.2);
+  color: var(--color-dark-2);
+  margin-top: 5px;
+}
+.flavor-text-damage .chat-damage-type {
+  font-weight: bold;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 0.5rem;
+}
+.flavor-text-damage h2 {
+  margin-top: 10px;
+  margin-left: 10px;
+  margin-bottom: 4px;
+  font-family: var(--font-title);
+  font-size: calc(var(--font-size-standard) * 1.2);
+  color: var(--title-color);
+}
 .dice-roll {
  flex-direction: column;
 }
@@ -2375,10 +2495,20 @@ i.fvtt-hellborn {
  display: flex;
  flex-direction: row;
 }
+.dice-roll .intro-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);
+}
 .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;
@@ -2396,6 +2526,12 @@ i.fvtt-hellborn {
  font-family: var(--font-primary);
  font-size: calc(var(--font-size-standard) * 1);
 }
+.dice-roll .intro-chat .intro-right ul .chat-roll-label {
+  margin-right: 2rem;
+}
+.dice-roll .intro-chat .intro-right ul .chat-results-spacing {
+  margin-bottom: 0.5rem;
+}
 .dice-roll .intro-chat .intro-right ul .nudge-roll {
  font-size: calc(var(--font-size-standard) * 1);
  margin-left: 4rem;
--- a/fvtt-hellborn.mjs
+++ b/fvtt-hellborn.mjs
@@ -30,6 +30,11 @@ Hooks.once("init", function () {
    documents,
  }

+  CONFIG.Combat.initiative = {
+    formula: '3d6 + @stats.mind.value',
+    decimals: 0
+  };
+
  CONFIG.Actor.documentClass = documents.HellbornActor
  CONFIG.Actor.dataModels = {
    character: models.HellbornCharacter,
--- a/lang/en.json
+++ b/lang/en.json
@@ -64,6 +64,9 @@
          "age": {
            "label": "Age"
          },
+          "aliases": {
+            "label": "Aliases"
+          },
          "birthplace": {
            "label": "Birthplace"
          },
@@ -76,6 +79,9 @@
          "hair": {
            "label": "Hair"
          },
+          "dod": {
+            "label": "Date of Death"
+          },
          "height": {
            "label": "Height"
          },
@@ -334,11 +340,8 @@
        "description": {
          "label": "Description"
        },
-        "enc": {
-          "label": "Enc"
-        },
-        "techAge": {
-          "label": "Tech Age"
+        "quantity": {
+          "label": "Quantity"
        }
      }
    },
@@ -389,10 +392,10 @@
      "combat": "Combat",
      "Counters": "Counters",
      "creature": "Creature",
-      "fiendishSuccess": "Fiendish Failure",
+      "fiendishFailure": "Fiendish Failure",
      "satanicSuccess": "Satanic Success",
-      "bonus": "Bonus",
-      "penalty": "Penalty",
+      "bonus": "Upright XP Trigger",
+      "penalty": "Reversed XP Trigger",
      "quote": "Quote",
      "current": "Curr.",
      "damage": "Damage",
@@ -476,9 +479,27 @@
    },
    "Malefica": {
      "FIELDS": {
+        "duration": {
+          "label": "Duration"
+        },
+        "maintain": {
+          "label": "Maintain"
+        },
+        "choiceMaintainDuration": {
+          "label": "Choice Maintain/Duration"
+        },
        "description": {
          "label": "Description"
        },
+        "hasDamage": {
+          "label": "Has Damage"
+        },
+        "damage": {
+          "label": "Damage"
+        },
+        "damageType": {
+          "label": "Damage Type"
+        },
        "domain": {
          "label": "Domain"
        },
@@ -559,7 +580,10 @@
    "Tarot": {
      "FIELDS": {
        "bonus": {
-          "label": "Bonus"
+          "label": "Upright XP Trigger"
+        },
+        "penalty": {
+          "label": "Reversed XP Trigger"
        },
        "description": {
          "label": "Description"
@@ -622,6 +646,12 @@
    },
    "Weapon": {
      "FIELDS": {
+        "stat": {
+          "label": "Stat"
+        },
+        "damageStat": {
+          "label": "Damage Stat"
+        },
        "ammo": {
          "label": "Ammo"
        },
@@ -631,6 +661,9 @@
        "damage": {
          "label": "Damage"
        },
+        "damageType": {
+          "label": "Damage Type"
+        },
        "description": {
          "label": "Description"
        },
--- a/module/applications/sheets/base-actor-sheet.mjs
+++ b/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 }),
--- a/module/applications/sheets/character-sheet.mjs
+++ b/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
--- a/module/config/system.mjs
+++ b/module/config/system.mjs
@@ -59,6 +59,7 @@ export const PERK_ROLES = {
  "sentinel": { id: "sentinel", label: "Sentinel" },
  "slayer": { id: "slayer", label: "Slayer" },
  "wretch": { id: "wretch", label: "Wretch" },
+  "other": { id: "other", label: "Other" },
 }

 export const MALEFICA_DOMAINS = {
@@ -69,6 +70,7 @@ export const MALEFICA_DOMAINS = {
  "speculo": { id: "speculo", label: "Speculo" },
  "vinculum": { id: "vinculum", label: "Vinculum" },
  "vita": { id: "vita", label: "Vita" },
+  "other": { id: "other", label: "Other" },
 }

 export const PERK_LEVELS = {
--- a/module/documents/roll.mjs
+++ b/module/documents/roll.mjs
@@ -84,29 +84,30 @@ export default class HellbornRoll extends Roll {
  static async prompt(options = {}) {
    let formula = `3D6 + 0D6KH - 0D6KH + ${options?.rollItem?.value}`

+    let actor = game.actors.get(options.actorId)
    switch (options.rollType) {
      case "stat":
        break
      case "damage":
        {
          let formula = options.rollItem.system.damage
+          if (options.rollItem?.system?.damageStat && options.rollItem.system.damageStat !== "none" && options.rollItem.system.damageStat !== "") {
+            let statKey = options.rollItem.system?.damageStat.toLowerCase()
+            let statValue = actor.system.stats[statKey].value
+            formula = `${formula} + ${statValue}`
+          }
          let damageRoll = new Roll(formula)
          await damageRoll.evaluate()
          await damageRoll.toMessage({
-            flavor: `${options.rollItem.name} - Damage Roll`
+            flavor: `<div class="flavor-text-damage"><h2>${options.rollItem.name}</h2>
+            <BR><span class="chat-damage-type"><span>${options.rollItem.system.damageType}</span></span></div>`,
          });
          return
        }
      case "weapon":
        {
-          let actor = game.actors.get(options.actorId)
          options.weapon = foundry.utils.duplicate(options.rollItem)
-          let statKey = "skin"
-          if (options.weapon.system.weaponType === "melee") {
-            if ( options.weapon.system.properties.toLowerCase().match("heavy")  || options.weapon.system.properties.toLowerCase().match("oversized")) {
-              statKey = "flesh"
-            }
-          }
+          let statKey = options.weapon.system.stat.toLowerCase()
          options.rollItem = actor.system.stats[statKey]
        }
        break
@@ -199,7 +200,17 @@ export default class HellbornRoll extends Roll {

    options.nbAdvantages = Number(options.nbAdvantages)
    options.nbDisadvantages = Number(options.nbDisadvantages)
-    let diceFormula = `3D6 + ${options.nbAdvantages}D6kh - ${options.nbDisadvantages}D6kh +  ${options.rollItem.value}`
+    let dice = 3;
+    let keep = ""
+    if ( options.nbAdvantages > 0 || options.nbDisadvantages > 0) {
+      dice = 4;
+      if ( options.nbAdvantages > options.nbDisadvantages) {
+        keep = "kh3"
+      } else {
+        keep = "kl3"
+      }
+    }
+    let diceFormula = `${dice}D6${keep} +  ${options.rollItem.value}`
    const roll = new this(diceFormula, options.data, rollData)
    await roll.evaluate()
    console.log("Roll", rollData, roll)
@@ -219,22 +230,30 @@ export default class HellbornRoll extends Roll {
    } else if (this.total >= options.difficulty) {
      resultType = "success"
    }
+
    // Compute the result quality
    this.options.satanicSuccess = false
    this.options.fiendishFailure = false
    this.options.rollData = foundry.utils.duplicate(rollData)
-    if (resultType === "success") {
-      let nb6 = roll.terms[0].results.filter(r => r.result === 6).length
-      nb6 += roll.terms[3].total === 6 ? 1 : 0
-      this.options.satanicSuccess = nb6 >= 3
+
+    // Check if all results are equal
+    let workResults = foundry.utils.duplicate(roll.terms[0].results)
+    // Get the most common result of the roll
+    let commonResult = workResults.reduce((acc, r) => {
+      acc[r.result] = (acc[r.result] || 0) + 1
+      return acc
+    }, {})
+    commonResult = Object.entries(commonResult).reduce((a, b) => (a[1] > b[1]) ? a : b)[0]
+    let nbEqual = workResults.filter(r => Number(r.result) === Number(commonResult)).length
+
+    if (commonResult >= 4 && nbEqual >= 3) {
+      this.options.satanicSuccess = true
      if (this.options.satanicSuccess) {
        resultType = "success"
      }
    }
-    if (resultType === "failure") {
-      let nb1 = roll.terms[0].results.filter(r => r.result === 1).length
-      nb1 += roll.terms[5].total === 1 ? 1 : 0
-      this.options.fiendishFailure = nb1 >= 3
+    if (commonResult <= 3 && nbEqual >= 3) {
+      this.options.fiendishFailure = true
      if (this.options.fiendishFailure) {
        resultType = "failure"
      }
@@ -242,6 +261,7 @@ export default class HellbornRoll extends Roll {
    this.options.resultType = resultType
    this.options.isSuccess = resultType === "success"
    this.options.isFailure = resultType === "failure"
+    this.options.results = roll.terms[0].results
  }

  /**
--- a/module/models/character.mjs
+++ b/module/models/character.mjs
@@ -112,16 +112,16 @@ export default class HellbornActor extends foundry.abstract.TypeDataModel {
    })

    schema.biodata = new fields.SchemaField({
-      age: new fields.NumberField({ ...requiredInteger, initial: 15, min: 6 }),
+      age: new fields.StringField({ required: true, nullable: false, initial: "" }),
      gender: new fields.StringField({ required: true, nullable: false, initial: "" }),
-      height: new fields.NumberField({ ...requiredInteger, initial: 170, min: 50 }),
+      height: new fields.StringField({ required: true, nullable: false, initial: "" }),
      eyes: new fields.StringField({ required: true, nullable: false, initial: "" }),
      birthplace: new fields.StringField({ required: true, nullable: false, initial: "" }),
      hair: new fields.StringField({ required: true, nullable: false, initial: "" }),
      home: new fields.StringField({ required: true, nullable: false, initial: "" }),
-      weight: new fields.NumberField({ ...requiredInteger, initial: 70, min: 1 }),
-      apparentAge: new fields.NumberField({ ...requiredInteger, initial: 20, min: 1 }),
-      chronologicalAge: new fields.NumberField({ ...requiredInteger, initial: 20, min: 1 }),
+      weight: new fields.StringField({ required: true, nullable: false, initial: "" }),
+      apparentAge: new fields.StringField({ required: true, nullable: false, initial: "" }),
+      chronologicalAge: new fields.StringField({ required: true, nullable: false, initial: "" }),
      dod: new fields.StringField({ required: true, nullable: false, initial: "" }),
      soul: new fields.StringField({ required: true, nullable: false, initial: "" }),
      aliases: new fields.StringField({ required: true, nullable: false, initial: "" })
--- a/module/models/enemy.mjs
+++ b/module/models/enemy.mjs
@@ -42,6 +42,21 @@ export default class HellbornEnemy extends foundry.abstract.TypeDataModel {
      value: new fields.NumberField({ ...requiredInteger, initial: 1, min: 0 }),
    })

+    // Ailments
+    const ailmentField = (label) => {
+      const schema = {
+        enabled: new fields.BooleanField({ required: true, initial: false }),
+        label: new fields.StringField({ required: true, initial: label })
+      }
+      return new fields.SchemaField(schema, { label })
+    }
+    schema.ailments = new fields.SchemaField(
+      Object.values(SYSTEM.AILMENTS).reduce((obj, ailment) => {
+        obj[ailment.id] = ailmentField(ailment.label)
+        return obj
+      }, {}),
+    )
+
    schema.defense = new fields.SchemaField({
      base: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }),
      bonus: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }),
--- a/module/models/equipment.mjs
+++ b/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
--- a/module/models/malefica.mjs
+++ b/module/models/malefica.mjs
@@ -11,6 +11,14 @@ 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 : "" })
    schema.range = new fields.StringField({ required: true, initial : "" })
    schema.target = new fields.StringField({ required: true, initial : "" })

--- a/module/models/tarot.mjs
+++ b/module/models/tarot.mjs
@@ -9,7 +9,7 @@ export default class HellbornTarot extends foundry.abstract.TypeDataModel {
    schema.bonus = new fields.StringField({ required: true, nullable: false, initial: "" });
    schema.penalty = new fields.StringField({ required: true, nullable: false, initial: "" });

-    schema.orientation = new fields.StringField({ required: true, initial: "Upright", choices: {"Upright": {label: "Upright"}, "Downright": {label: "Downright"}} });
+    schema.orientation = new fields.StringField({ required: true, initial: "Upright", choices: {"Upright": {label: "Upright"}, "Downright": {label: "Reversed"}} });
    schema.description = new fields.HTMLField({ required: true, textSearch: true })
    schema.positiveEffect = new fields.HTMLField({ required: true, textSearch: true })
    schema.negativeEffect = new fields.HTMLField({ required: true, textSearch: true })
--- a/module/models/weapon.mjs
+++ b/module/models/weapon.mjs
@@ -7,12 +7,16 @@ export default class HellbornWeapon extends foundry.abstract.TypeDataModel {
    const requiredInteger = { required: true, nullable: false, integer: true }

    schema.description = new fields.HTMLField({ required: true, textSearch: true })
+    schema.stat = new fields.StringField({ required: true, initial: "skin", choices: {"skin": "Skin", "flesh": "Flesh" }})

    schema.weaponType = new fields.StringField({ required: true, initial: "melee", choices: SYSTEM.WEAPON_TYPES })
    schema.subType = new fields.StringField({ required: false, initial: "pistols", choices: SYSTEM.RANGED_SUBTYPES })
    schema.properties = new fields.StringField({required: true, initial: ""})

    schema.damage = new fields.StringField({required: true, initial: "1d6"})
+    schema.damageStat = new fields.StringField({ required: true, initial: "none", choices: {"none": "None", "skin": "Skin", "flesh": "Flesh", "heart": "Heart", "mind": "Mind", "soul": "Soul" }})
+    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 })
@@ -23,4 +27,14 @@ export default class HellbornWeapon extends foundry.abstract.TypeDataModel {
  /** @override */
  static LOCALIZATION_PREFIXES = ["HELLBORN.Weapon"]

+  prepareDerivedData() {
+    super.prepareDerivedData();
+    let actor = this.parent?.actor;
+    if (actor) {
+      this.damageFormula = this.damage + (this.damageStat !== "none" ? `+${actor.system.stats[this.damageStat].value}` : "");
+    } else {
+      this.damageFormula = this.damage;
+    }
+  }
+
 }
--- a/styles/character.less
+++ b/styles/character.less
@@ -65,12 +65,18 @@
      gap: 5px;

      .character-definition {
+        .character-definition-pronouns {
+          input {
+            min-width: 21.2rem;
+            max-width: 21.2rem;
+          }
+        }
        .form-group {
          display: flex;
          align-items: center;
          margin-bottom: 4px;
        }
-        .splitted  {
+        .splitted {
          display: flex;
          flex-direction: row;
          gap: 4px;
@@ -183,15 +189,15 @@
    align-items: center;
    gap: 4px;
    margin-left: 4px;
-    .characteristics-label{
+    .characteristics-label {
      color: grey;
-      font-size:small;
+      font-size: small;
    }
    label {
      min-width: 4rem;
      max-width: 4rem;
    }
-    .spaced-left{
+    .spaced-left {
      margin-left: 0.8rem;
    }
    input {
@@ -286,24 +292,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 +339,8 @@
        max-width: 1.8rem;
      }
      .ingredients {
-        min-width: 26rem;
-        max-width: 26rem;
+        min-width: 24rem;
+        max-width: 24rem;
      }
      .name {
        min-width: 12rem;
@@ -417,20 +427,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 +518,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;
@@ -569,6 +591,29 @@
      }
    }
  }
+  .aliases {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-bottom: 4px;
+    margin-left: 4px;
+    .form-group {
+      label {
+        min-width: 6rem;
+        max-width: 6rem;
+      }
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      gap: 4px;
+      margin-left: 4px;
+    }
+    input {
+      text-align: left;
+      min-width: 41rem;
+      max-width: 41rem;
+    }
+  }
  .biodata {
    display: grid;
    grid-template-columns: repeat(3, 1fr);
--- a/styles/enemy.less
+++ b/styles/enemy.less
@@ -70,7 +70,7 @@
          align-items: center;
          margin-bottom: 4px;
        }
-        .splitted  {
+        .splitted {
          display: flex;
          flex-direction: row;
          gap: 4px;
@@ -165,7 +165,7 @@
    }
  }
  .enemy-column {
-    display:flex;
+    display: flex;
    flex-direction: row;
    gap: 4px;
    fieldset {
@@ -191,9 +191,9 @@
    align-items: center;
    gap: 4px;
    margin-left: 4px;
-    .characteristics-label{
+    .characteristics-label {
      color: grey;
-      font-size:small;
+      font-size: small;
      label {
        min-width: 3.5rem;
        max-width: 3.5rem;
@@ -207,7 +207,7 @@
      min-width: 4rem;
      max-width: 4rem;
    }
-    .spaced-left{
+    .spaced-left {
      margin-left: 0.8rem;
    }
    input {
@@ -247,7 +247,7 @@
      }
    }
  }
-    .equipments {
+  .equipments {
    display: grid;
    grid-template-columns: repeat(3, 1fr);
    gap: 4px;
@@ -279,6 +279,29 @@
    }
  }

+  .ailments {
+    display: grid;
+    grid-template-columns: repeat(5, 1fr);
+    gap: 4px;
+    .ailment {
+      display: flex;
+      align-items: center;
+      gap: 4px;
+      margin-left: 4px;
+      min-width: 8rem;
+      max-width: 8rem;
+      label {
+        min-width: 5rem;
+        max-width: 5rem;
+      }
+      .item-img {
+        width: 24px;
+        height: 24px;
+        margin: 4px 0 0 0;
+      }
+    }
+  }
+
  .maleficas {
    display: grid;
    grid-template-columns: repeat(1, 1fr);
@@ -300,9 +323,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 +367,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;
@@ -354,7 +397,6 @@
      }
    }
  }
-
 }

 .tab.enemy-biography .main-div {
--- a/styles/malefica.less
+++ b/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;
--- a/styles/roll.less
+++ b/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);
@@ -70,10 +73,35 @@
      margin: 0 10px;
      font-family: var(--font-primary);
      font-size: calc(var(--font-size-standard) * 1);
+      p {
+        margin: 0;
+      }
    }
  }
 }

+.flavor-text-damage {
+  font-family: var(--font-secondary);
+  font-size: calc(var(--font-size-standard) * 1.2);
+  color: var(--color-dark-2);
+  margin-top: 5px;
+  .chat-damage-type {
+    font-weight: bold;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-bottom:0.5rem;
+  }
+  h2 {
+    margin-top: 10px;
+    margin-left: 10px;
+    margin-bottom: 4px;
+    font-family: var(--font-title);
+    font-size: calc(var(--font-size-standard) * 1.2);
+    color: var(--title-color);
+  }
+}
+
 &.dice-roll {
  flex-direction: column;

@@ -95,10 +123,21 @@
    border-radius: 20px;
    display: flex;
    flex-direction: row;
+    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);
+    }
+
    .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;
@@ -114,6 +153,12 @@
          font-family: var(--font-primary);
          font-size: calc(var(--font-size-standard) * 1);
        }
+        .chat-roll-label {
+          margin-right: 2rem;
+        }
+        .chat-results-spacing {
+          margin-bottom: 0.5rem;
+        }
        .nudge-roll {
          font-size: calc(var(--font-size-standard) * 1);
          margin-left: 4rem;
@@ -153,6 +198,7 @@
      }
    }
  }
+
  .result {
    display: flex;
    flex-direction: column;
--- a/styles/tarot.less
+++ b/styles/tarot.less
@@ -4,6 +4,9 @@

  fieldset {
    margin-top: 8px;
+    legend {
+      margin-top: 1rem;
+    }
    .form-group {
      display: flex;
      align-items: center;
--- a/templates/character-biography.hbs
+++ b/templates/character-biography.hbs
@@ -17,34 +17,42 @@
      </div>
  </fieldset>

-  <fieldset class="biodata">
+  <fieldset >
      <legend>{{localize "HELLBORN.Label.biodata"}}</legend>
-      <div class="experience">
-        {{formField systemFields.biodata.fields.gender value=system.biodata.gender rootId=partId disabled=isPlayMode}}
+      <div class="aliases">
+        {{formField systemFields.biodata.fields.aliases value=system.biodata.aliases rootId=partId disabled=isPlayMode}}
      </div>
-      <div class="experience">
-        {{formField systemFields.biodata.fields.age value=system.biodata.age rootId=partId disabled=isPlayMode}}
+      <div class="biodata">
+        <div class="experience">
+          {{formField systemFields.biodata.fields.gender value=system.biodata.gender rootId=partId disabled=isPlayMode}}
+        </div>
+        <div class="experience">
+          {{formField systemFields.biodata.fields.age value=system.biodata.age rootId=partId disabled=isPlayMode}}
+        </div>
+        <div class="experience">
+          {{formField systemFields.biodata.fields.height value=system.biodata.height rootId=partId disabled=isPlayMode}}
+        </div>
+        <div class="experience">
+          {{formField systemFields.biodata.fields.weight value=system.biodata.weight rootId=partId disabled=isPlayMode}}
+        </div>
+        <div class="experience">
+          {{formField systemFields.biodata.fields.eyes value=system.biodata.eyes rootId=partId disabled=isPlayMode}}
+        </div>
+        <div class="experience">
+          {{formField systemFields.biodata.fields.hair value=system.biodata.hair rootId=partId disabled=isPlayMode}}
+        </div>
+        <div class="experience">
+          {{formField systemFields.biodata.fields.home value=system.biodata.home rootId=partId disabled=isPlayMode}}
+        </div>
+        <div class="experience">
+          {{formField systemFields.biodata.fields.birthplace value=system.biodata.birthplace rootId=partId
+          disabled=isPlayMode}}
+        </div>
+        <div class="experience">
+          {{formField systemFields.biodata.fields.dod value=system.biodata.dod rootId=partId
+          disabled=isPlayMode}}
+        </div>
      </div>
-      <div class="experience">
-        {{formField systemFields.biodata.fields.height value=system.biodata.height rootId=partId disabled=isPlayMode}}
-      </div>
-      <div class="experience">
-        {{formField systemFields.biodata.fields.weight value=system.biodata.weight rootId=partId disabled=isPlayMode}}
-      </div>
-      <div class="experience">
-        {{formField systemFields.biodata.fields.eyes value=system.biodata.eyes rootId=partId disabled=isPlayMode}}
-      </div>
-      <div class="experience">
-        {{formField systemFields.biodata.fields.hair value=system.biodata.hair rootId=partId disabled=isPlayMode}}
-      </div>
-      <div class="experience">
-        {{formField systemFields.biodata.fields.home value=system.biodata.home rootId=partId disabled=isPlayMode}}
-      </div>
-      <div class="experience">
-        {{formField systemFields.biodata.fields.birthplace value=system.biodata.birthplace rootId=partId
-        disabled=isPlayMode}}
-      </div>
-
  </fieldset>

  <fieldset>
--- a/templates/character-equipment.hbs
+++ b/templates/character-equipment.hbs
@@ -17,11 +17,13 @@
          </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}}">
+            data-roll-type="damage" data-roll-value="{{item.system.damageFormula}}">
            <i class="fa-regular fa-dice"></i>
-            {{item.system.damage}}</a>
+            {{item.system.damageFormula}}</a>

          <div class="controls">
            <a data-tooltip="{{localize 'HELLBORN.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
@@ -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>
--- a/templates/character-main.hbs
+++ b/templates/character-main.hbs
@@ -19,11 +19,11 @@
        </div>

        <fieldset class="character-definition">
+          <div class="flexcol character-definition-pronouns">
+            {{formField systemFields.pronouns value=system.pronouns rootId=partId disabled=isPlayMode}}
+          </div>
          <div class="splitted">
            <div>
-              <div class="flexcol">
-                {{formField systemFields.pronouns value=system.pronouns rootId=partId disabled=isPlayMode}}
-              </div>
              <div class="flexcol">
                {{formField systemFields.species value=system.species rootId=partId disabled=isPlayMode}}
              </div>
@@ -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="{{downright.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}}"
--- a/templates/character-maleficas.hbs
+++ b/templates/character-maleficas.hbs
@@ -12,11 +12,19 @@

        <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-action="toChat" data-item-uuid="{{item.uuid}}" data-roll-type="malefica" data-tooltip="{{{item.system.description}}}">
+        <div class="name" data-action="toChat" data-item-uuid="{{item.uuid}}" data-roll-type="malefica" data-tooltip="{{{item.system.description}}}<br>Time:{{item.system.time}}<br>Duration:{{item.system.duration}}<br>Range:{{item.system.range}}<br>Target:{{item.system.target}}">
          <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}}"
--- a/templates/character-status.hbs
+++ b/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>

--- a/templates/chat-malefica.hbs
+++ b/templates/chat-malefica.hbs
@@ -3,11 +3,16 @@
    <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>
+    {{#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>
    </ul>
  </div>
--- a/templates/chat-message.hbs
+++ b/templates/chat-message.hbs
@@ -5,55 +5,68 @@
      {{actorName}}
    </div>
    <div class="intro-right">
+
+      {{#if (eq rollType "stat")}}
+      <h2>{{localize "HELLBORN.Label.statRoll"}}</h2>
+      {{/if}}
+      {{#if weapon}}
+      <h2>{{weapon.name}}</strong></h2>
+      {{/if}}
+
      <ul>

-        {{#if (eq rollType "stat")}}
-        <li><strong>{{localize "HELLBORN.Label.statRoll"}}</strong></li>
+        <li><strong>Properties :</strong> {{weapon.system.properties}}</li>
+        <li>
+          <span>
+            <span class="chat-roll-label"><strong>{{localize rollItem.label}} : {{rollItem.value}}</strong></span>
+            <span>{{localize "HELLBORN.Label.difficulty"}} : {{difficulty}}</span>
+          </span>
+        </li>
+
+        {{#if (gt nbAdvantages 0)}}
+        <li>With Advantage !</li>
+        {{/if}}
+        {{#if (gt nbDisadvantages 0)}}
+        <li>With Disadvantages ! </li>
+        {{/if}}
+
+        <li class="chat-results-spacing">Results :
+          {{#each results as |result|}}
+          {{result.result}}
+          {{/each}}
+        </li>
+
+        {{#if isSuccess}}
+          {{#if satanicSuccess}}
+          <li class="chat-results-spacing result-satanic-success">
+            {{localize "HELLBORN.Label.satanicSuccess"}}
+          </li>
+          {{else}}
+          <li class="chat-results-spacing result-success">
+            {{localize "HELLBORN.Label.success"}}
+          </li>
+          {{/if}}
        {{/if}}


-        {{#if weapon}}
-        <li><strong>Weapon : {{weapon.name}}</strong></li>
-        <li><strong>Properties : {{weapon.system.properties}}</strong></li>
+        {{#if isFailure}}
+          {{#if fiendishFailure}}
+          <li class="chat-results-spacing result-fiendish-failure">
+            {{localize "HELLBORN.Label.fiendishFailure"}}
+          </li>
+          {{else}}
+          <li class="chat-results-spacing result-failure">
+            {{localize "HELLBORN.Label.failure"}}
+          </li>
+          {{/if}}
        {{/if}}

-        <li><strong>{{localize rollItem.label}} : {{rollItem.value}}</strong></li>
-
-        <li>{{localize "HELLBORN.Label.difficulty"}} : {{difficulty}}</li>
-
        {{#if (eq resultType "unknown")}}
-        <li class="result-unknown">
-          {{localize "HELLBORN.Label.unknown"}}
-        </li>
-        {{else}}
-          {{#if isSuccess}}
-            {{#if satanicSuccess}}
-            <li class="result-satanic-success">
-              {{localize "HELLBORN.Label.satanicSuccess"}}
-            </li>
-            {{else}}
-            <li class="result-success">
-              {{localize "HELLBORN.Label.success"}}
-            </li>
-            {{/if}}
-          {{/if}}
-
-
-          {{#if isFailure}}
-            {{#if fiendishFailure}}
-            <li class="result-fiendish-failure">
-              {{localize "HELLBORN.Label.fiendishFailure"}}
-            </li>
-            {{else}}
-            <li class="result-failure">
-              {{localize "HELLBORN.Label.failure"}}
-            </li>
-            {{/if}}
-          {{/if}}
-
-          {{#if isCritical}}
-          {{/if}}
+          <li class="chat-results-spacing result-unknown">
+            {{localize "HELLBORN.Label.unknown"}}
+          </li>
        {{/if}}
+
      </ul>
    </div>
  </div>
--- a/templates/chat-perk.hbs
+++ b/templates/chat-perk.hbs
@@ -2,9 +2,9 @@
  <div class="intro-chat">
    <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><i>{{system.flavorText}}</i></strong></li>
+    <li><strong>Role : </strong>{{upperFirst system.role}}</li>
+    <li><strong>Level : </strong>{{getRomanLevel system.level}}</li>
    <li>{{{system.description}}}</li>
    </ul>
  </div>
--- a/templates/chat-ritual.hbs
+++ b/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>
--- a/templates/chat-tarot.hbs
+++ b/templates/chat-tarot.hbs
@@ -0,0 +1,30 @@
+<div class="item-to-chat">
+  <div class="intro-chat">
+    <h2>{{name}}</h2>
+    <ul>
+    {{#if (eq system.orientation "Upright")}}
+      <li><strong>Orientation : </strong>Upright</li>
+    {{else}}
+      <li><strong>Orientation : </strong>Reversed</li>
+    {{/if}}
+
+    <li><strong>Quote : </strong>{{system.quote}}</li>
+
+    {{#if (eq system.orientation "Upright")}}
+      <li><strong>Upright XP Trigger : </strong>{{system.bonus}}</li>
+    {{else}}
+      <li><strong>Reversed XP Trigger : </strong>{{system.penalty}}</li>
+    {{/if}}
+
+    <li><strong>Description : </strong>{{{system.description}}}</li>
+
+    {{#if (eq system.orientation "Upright")}}
+      <li><strong>Positive Effect : </strong>{{{system.positiveEffect}}}</li>
+    {{else}}
+      <li><strong>Negative Effect : </strong>{{{system.negativeEffect}}}</li>
+    {{/if}}
+
+    </ul>
+  </div>
+
+</div>
--- a/templates/chat-trait.hbs
+++ b/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>
--- a/templates/enemy-trait.hbs
+++ b/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>
@@ -33,6 +33,19 @@
      </div>
    </fieldset>

+    <fieldset>
+      <legend>{{localize "HELLBORN.Label.ailments"}}</legend>
+
+      <div class="ailments">
+        {{#each system.ailments as |item id|}}
+        <div class="ailment " data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-drag="false">
+          <label>{{item.label}}</label> <input type="checkbox" class="checkbox" name="system.ailments.{{id}}.enabled"
+            {{#if item.enabled}} checked {{/if}}>
+        </div>
+        {{/each}}
+      </div>
+    </fieldset>
+
    <div class="enemy-column">

      <fieldset>
@@ -66,15 +79,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 +128,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}}">
--- a/templates/equipment.hbs
+++ b/templates/equipment.hbs
@@ -5,6 +5,7 @@
  </div>

  <fieldset>
+    {{formField systemFields.quantity value=system.quantity}}
    {{formField systemFields.cost value=system.cost}}
  </fieldset>

--- a/templates/malefica.hbs
+++ b/templates/malefica.hbs
@@ -8,8 +8,21 @@
    {{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}}
+    {{#if system.hasDamage}}
+      {{formField systemFields.damage value=system.damage}}
+      {{formField systemFields.damageType value=system.damageType}}
+    {{/if}}
  </fieldset>

  <fieldset>
--- a/templates/weapon.hbs
+++ b/templates/weapon.hbs
@@ -5,6 +5,7 @@
  </div>

  <fieldset>
+    {{formField systemFields.stat value=system.stat localize=true}}
    {{formField systemFields.weaponType value=system.weaponType localize=true}}
    {{#if (eq system.weaponType "ranged")}}
      {{formField systemFields.subType value=system.subType localize=true}}
@@ -14,6 +15,9 @@

    {{formField systemFields.properties value=system.properties classes="long-input"}}
    {{formField systemFields.damage value=system.damage}}
+    {{formField systemFields.damageStat value=system.damageStat localize=true}}
+
+    {{formField systemFields.damageType value=system.damageType}}

    {{formField systemFields.cost value=system.cost}}
  </fieldset>
Author	SHA1	Message	Date
LeRatierBretonnien	eea83aa10e	Various fixes All checks were successful Release Creation / build (release) Successful in 51s Details	2025-06-15 16:32:47 +02:00
LeRatierBretonnien	d03c5f2c1e	Various fixes All checks were successful Release Creation / build (release) Successful in 1m40s Details	2025-06-15 09:37:08 +02:00
LeRatierBretonnien	1f2d82bd0b	Last fixes from tests	2025-06-14 23:45:05 +02:00
LeRatierBretonnien	151312b994	Fix success/failure computation All checks were successful Release Creation / build (release) Successful in 1m0s Details	2025-05-30 18:27:37 +02:00
LeRatierBretonnien	10e668bc71	Fix success/failure computation All checks were successful Release Creation / build (release) Successful in 58s Details	2025-05-30 09:54:58 +02:00
LeRatierBretonnien	0ee42aef99	Various changes All checks were successful Release Creation / build (release) Successful in 58s Details	2025-05-29 22:41:15 +02:00
LeRatierBretonnien	ee3a5764f0	Add maintain/duration for maleficas All checks were successful Release Creation / build (release) Successful in 59s Details	2025-05-26 21:01:07 +02:00
LeRatierBretonnien	28ec390020	Various fixes All checks were successful Release Creation / build (release) Successful in 59s Details	2025-05-26 18:26:55 +02:00
LeRatierBretonnien	86ee9a44ec	Add Enemy sheet All checks were successful Release Creation / build (release) Successful in 54s Details	2025-05-25 22:38:24 +02:00
LeRatierBretonnien	abfc4e8443	Add Enemy sheet All checks were successful Release Creation / build (release) Successful in 58s Details	2025-05-25 22:04:42 +02:00
LeRatierBretonnien	707a318bb7	Add Enemy sheet All checks were successful Release Creation / build (release) Successful in 56s Details	2025-05-25 21:56:02 +02:00
LeRatierBretonnien	368e087e0d	Add Enemy sheet All checks were successful Release Creation / build (release) Successful in 59s Details	2025-05-25 21:52:56 +02:00
LeRatierBretonnien	f2e6415f33	Add Enemy sheet	2025-05-25 21:52:09 +02:00
LeRatierBretonnien	4aa22195a3	Add Enemy sheet All checks were successful Release Creation / build (release) Successful in 56s Details	2025-05-25 20:44:49 +02:00
LeRatierBretonnien	7e517bfb12	Add Enemy sheet	2025-05-25 20:43:10 +02:00