Various fixes

Last fixes from tests
Fix success/failure computation
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
11 changed files with 241 additions and 109 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;
@@ -703,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);
@@ -2419,6 +2446,20 @@ i.fvtt-hellborn {
  font-family: var(--font-primary);
  font-size: calc(var(--font-size-standard) * 1);
 }
+.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 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;
 }
@@ -2441,6 +2482,14 @@ 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: 4px;
  max-width: 80px;
--- 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"
          },
@@ -386,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",
--- a/module/documents/roll.mjs
+++ b/module/documents/roll.mjs
@@ -91,15 +91,15 @@ export default class HellbornRoll extends Roll {
      case "damage":
        {
          let formula = options.rollItem.system.damage
-          if (options.rollItem.system.damageStat !== "none") {
-            let statKey = options.rollItem.system.damageStat.toLowerCase()
+          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 - ${options.rollItem.system.damageType}`,
+            flavor: `<div class="flavor-text-damage"><h2>Damage Roll : ${options.rollItem.name}</h2><BR><strong> ${options.rollItem.system.damageType}</strong></div>`,
          });
          return
        }
@@ -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 >= 4).length
-      nb6 += roll.terms[2].total <= 4 ? 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 <= 3).length
-      nb1 += roll.terms[4].total <= 3 ? 1 : 0
-      this.options.fiendishFailure = nb1 >= 3
+    if (commonResult <= 3 && nbEqual >= 3) {
+      this.options.fiendishFailure = true
      if (this.options.fiendishFailure) {
        resultType = "failure"
      }
@@ -243,8 +261,6 @@ export default class HellbornRoll extends Roll {
    this.options.isSuccess = resultType === "success"
    this.options.isFailure = resultType === "failure"
    this.options.results = roll.terms[0].results
-    this.options.advantageResult = roll.terms[2].total
-    this.options.disadvantageResult = roll.terms[4].total
  }

  /**
--- 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/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/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 {
@@ -585,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/roll.less
+++ b/styles/roll.less
@@ -57,7 +57,7 @@
 .item-to-chat {
  h2 {
    margin-top: 10px;
-    margin-left:10px;
+    margin-left: 10px;
    margin-bottom: 4px;
    font-family: var(--font-title);
    font-size: calc(var(--font-size-standard) * 1.4);
@@ -77,6 +77,21 @@
  }
 }

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

@@ -98,10 +113,19 @@
    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: 4px;
      max-width: 80px;
-      min-width : 80px;
+      min-width: 80px;
      align-self: top;
      text-align: center;
    }
@@ -158,6 +182,7 @@
      }
    }
  }
+
  .result {
    display: flex;
    flex-direction: column;
--- 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-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>
@@ -56,7 +56,7 @@
              </div>
              <div class="flexrow">
                <div class="form-group">
-                  <label><a data-action="toChat" data-item-uuid="{{upright.uuid}}">Reversed</a></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/chat-message.hbs
+++ b/templates/chat-message.hbs
@@ -5,69 +5,68 @@
      {{actorName}}
    </div>
    <div class="intro-right">
+
+      {{#if (eq rollType "stat")}}
+      <h2>{{localize "HELLBORN.Label.statRoll"}}</h2>
+      {{/if}}
+      {{#if weapon}}
+      <h2>Weapon : {{weapon.name}}</strong></h2>
+      {{/if}}
+
      <ul>

-        {{#if (eq rollType "stat")}}
-        <li><strong>{{localize "HELLBORN.Label.statRoll"}}</strong></li>
-        {{/if}}
-
-
-        {{#if weapon}}
-        <li><strong>Weapon : {{weapon.name}}</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>
-
-        <li>Results :
-          {{#each results as |result|}}
-            {{result.result}}
-          {{/each}}
+        <li>
+          <span>
+            <span><strong>{{localize rollItem.label}} : {{rollItem.value}}</strong></span>
+            <span>{{localize "HELLBORN.Label.difficulty"}} : {{difficulty}}</span>
+          </span>
        </li>

        {{#if (gt nbAdvantages 0)}}
-        <li>Advantages : {{nbAdvantages}}, result {{advantageResult}}</li>
+        <li>With Advantage !</li>
        {{/if}}
        {{#if (gt nbDisadvantages 0)}}
-        <li>Disadvantages : {{nbDisadvantages}}, result {{disadvantageResult}}</li>
+        <li>With Disadvantages ! </li>
        {{/if}}

+        <li>Results :
+          {{#each results as |result|}}
+          {{result.result}}
+          {{/each}}
+        </li>
+
+        {{#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>
-        {{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="result-unknown">
+            {{localize "HELLBORN.Label.unknown"}}
+          </li>
        {{/if}}
+
      </ul>
    </div>
  </div>
--- a/templates/chat-perk.hbs
+++ b/templates/chat-perk.hbs
@@ -2,7 +2,7 @@
  <div class="intro-chat">
    <h2>{{name}}</h2>
    <ul>
-    <li><strong>{{system.flavorText}}</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>
Author	SHA1	Message	Date
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