Fix success/failure computation

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;
@@ -1286,6 +1302,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);
@@ -1310,16 +1348,20 @@ i.fvtt-hellborn {
   max-width: 1.8rem;
 }
 .fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .domain {
-  min-width: 5rem;
-  max-width: 5rem;
+  min-width: 4rem;
+  max-width: 4rem;
+}
+.fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .damage {
+  min-width: 3.2rem;
+  max-width: 3.2rem;
 }
 .fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .level {
-  min-width: 3rem;
-  max-width: 3rem;
+  min-width: 2rem;
+  max-width: 2rem;
 }
 .fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .name {
-  min-width: 11rem;
-  max-width: 11rem;
+  min-width: 10rem;
+  max-width: 10em;
 }
 .fvtt-hellborn .tab.enemy-traits .main-div .maleficas .malefica .item-img {
   width: 24px;
@@ -1349,20 +1391,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;
@@ -2174,6 +2224,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;
@@ -2345,7 +2400,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);
@@ -2385,9 +2442,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"
         }
       }
     },
@@ -389,10 +386,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 +473,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 +574,10 @@
     "Tarot": {
       "FIELDS": {
         "bonus": {
-          "label": "Bonus"
+          "label": "Upright XP Trigger"
+        },
+        "penalty": {
+          "label": "Reversed XP Trigger"
         },
         "description": {
           "label": "Description"
@@ -622,6 +640,12 @@
     },
     "Weapon": {
       "FIELDS": {
+        "stat": {
+          "label": "Stat"
+        },
+        "damageStat": {
+          "label": "Damage Stat"
+        },
         "ammo": {
           "label": "Ammo"
         },
@@ -631,6 +655,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/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" },
+  "other": { id: "other", label: "Other" },
   "gunslinger": { id: "gunslinger", label: "Gunslinger" },
   "malefic": { id: "malefic", label: "Malefic" },
   "mastermind": { id: "mastermind", label: "Mastermind" },
@@ -63,6 +64,7 @@ export const PERK_ROLES = {
 
 export const MALEFICA_DOMAINS = {
   "adfectus": { id: "adfectus", label: "Adfectus" },
+  "other": { id: "other", label: "Other" },
   "divinus": { id: "divinus", label: "Divinus" },
   "ignis": { id: "ignis", label: "Ignis" },
   "iunctio": { id: "iunctio", label: "Iunctio" },

module/documents/roll.mjs

@@ -84,29 +84,29 @@ 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 !== "none") {
+            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: `${options.rollItem.name} - Damage Roll - ${options.rollItem.system.damageType}`,
           });
           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 +199,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 +229,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 +260,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
   }
 
   /**

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 }),

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,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 : "" })
 

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;
+    }
+  }
+
 }

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

@@ -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);
@@ -301,16 +324,20 @@
         max-width: 1.8rem;
       }
       .domain {
-        min-width: 5rem;
-        max-width: 5rem;
+        min-width: 4rem;
+        max-width: 4rem;
+      }
+      .damage {
+        min-width: 3.2rem;
+        max-width: 3.2rem;
       }
       .level {
-        min-width: 3rem;
-        max-width: 3rem;
+        min-width: 2rem;
+        max-width: 2rem;
       }
       .name {
-        min-width: 11rem;
-        max-width: 11rem;
+        min-width: 10rem;
+        max-width: 10em;
       }
       .item-img {
         width: 24px;
@@ -340,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;
@@ -362,7 +397,6 @@
       }
     }
   }
-
 }
 
 .tab.enemy-biography .main-div {

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,7 +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);
@@ -97,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,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>

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/chat-malefica.hbs

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

templates/chat-message.hbs

@@ -14,46 +14,57 @@
 
         {{#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>
 
         <li>{{localize "HELLBORN.Label.difficulty"}} : {{difficulty}}</li>
 
-        {{#if (eq resultType "unknown")}}
-        <li class="result-unknown">
-          {{localize "HELLBORN.Label.unknown"}}
+        {{#if (gt nbAdvantages 0)}}
+        <li>With Advantage !</li>
+        {{/if}}
+        {{#if (gt nbDisadvantages 0)}}
+        <li>With Disadvantages ! </li>
+        {{/if}}
+
+        <li>Results :
+          {{#each results as |result|}}
+          {{result.result}}
+          {{/each}}
         </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 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 (eq resultType "unknown")}}
+          <li class="result-unknown">
+            {{localize "HELLBORN.Label.unknown"}}
+          </li>
+        {{/if}}
+
       </ul>
     </div>
   </div>

templates/chat-tarot.hbs

@@ -0,0 +1,25 @@
+<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>
+
+    {{#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>

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

@@ -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>
@@ -77,6 +90,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}}"
@@ -107,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}}">

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,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>

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>