Add rolls and new fixes

2025-05-25 00:01:39 +02:00
parent 4bed84358b
commit 585b9a1ab5
20 changed files with 389 additions and 223 deletions
--- a/templates/character-equipment.hbs
+++ b/templates/character-equipment.hbs
@@ -1,5 +1,6 @@
 <section class="tab character-{{tab.id}} {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
  <div class="main-div">
+
  <fieldset>
    <legend>{{localize "HELLBORN.Label.weapons"}}{{#if isEditMode}}
      <a class="action" data-tooltip="{{localize "HELLBORN.Tooltip.addWeapon"}}" data-tooltip-direction="UP"><i
@@ -20,7 +21,6 @@
        <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>
-          {{localize "HELLBORN.Label.damageShort"}} :
          {{item.system.damage}}</a>

        <div class="controls">
@@ -84,5 +84,12 @@
      {{/each}}
    </div>
  </fieldset>
+
+  <fieldset class="limboes">
+    <legend>Limbos & Ammo</legend>
+    {{formField systemFields.limboes value=system.limboes rootId=partId disabled=isPlayMode}}
+    {{formField systemFields.ammo value=system.ammo rootId=partId disabled=isPlayMode}}
+  </fieldset>
+
 </div>
 </section>
--- a/templates/character-main.hbs
+++ b/templates/character-main.hbs
@@ -36,6 +36,28 @@
                  data-item-uuid="{{trait.uuid}}"><i class="fas fa-trash"></i></a>
              </div>
            </div>
+          <div class="flexrow">
+            <div class="form-group">
+              <label>Upright</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}}"
+                  data-item-uuid="{{upright.uuid}}"><i class="fas fa-edit"></i></a>
+                <a data-tooltip="{{localize 'HELLBORN.Delete'}}" data-action="delete" data-item-id="{{upright.id}}"
+                  data-item-uuid="{{upright.uuid}}"><i class="fas fa-trash"></i></a>
+              </div>
+            </div>
+          <div class="flexrow">
+            <div class="form-group">
+              <label>Downright</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}}"
+                  data-item-uuid="{{downright.uuid}}"><i class="fas fa-edit"></i></a>
+                <a data-tooltip="{{localize 'HELLBORN.Delete'}}" data-action="delete" data-item-id="{{downright.id}}"
+                  data-item-uuid="{{downright.uuid}}"><i class="fas fa-trash"></i></a>
+              </div>
+            </div>
          </div>
        </fieldset>

@@ -46,27 +68,27 @@
  <fieldset class="character-stats character-stats-{{ifThen isPlayMode 'play' 'edit'}}">
    <legend>{{localize "HELLBORN.Label.stats"}}</legend>
    <div class="character-stat">
-      <label class="rollable" data-roll-type="stat" data-skill-id="flesh">{{localize
+      <label class="rollable" data-roll-type="stat" data-stat-id="flesh"><i class="fa-regular fa-dice"></i>{{localize
        "HELLBORN.Label.flesh"}}</label>
      {{formInput systemFields.stats.fields.flesh.fields.value value=system.stats.flesh.value rootId=partId disabled=isPlayMode type="number" }}
    </div>
    <div class="character-stat">
-      <label class="rollable" data-roll-type="stat" data-skill-id="skin">{{localize
+      <label class="rollable" data-roll-type="stat" data-stat-id="skin"><i class="fa-regular fa-dice"></i>{{localize
        "HELLBORN.Label.skin"}}</label>
      {{formInput systemFields.stats.fields.skin.fields.value value=system.stats.skin.value rootId=partId disabled=isPlayMode type="number" }}
    </div>
    <div class="character-stat">
-      <label class="rollable" data-roll-type="stat" data-skill-id="heart">{{localize
+      <label class="rollable" data-roll-type="stat" data-stat-id="heart"><i class="fa-regular fa-dice"></i>{{localize
        "HELLBORN.Label.heart"}}</label>
      {{formInput systemFields.stats.fields.heart.fields.value value=system.stats.heart.value rootId=partId disabled=isPlayMode type="number" }}
    </div>
    <div class="character-stat">
-      <label class="rollable" data-roll-type="stat" data-skill-id="mind">{{localize
+      <label class="rollable" data-roll-type="stat" data-stat-id="mind"><i class="fa-regular fa-dice"></i>{{localize
        "HELLBORN.Label.mind"}}</label>
      {{formInput systemFields.stats.fields.mind.fields.value value=system.stats.mind.value rootId=partId disabled=isPlayMode type="number" }}
    </div>
    <div class="character-stat">
-      <label class="rollable" data-roll-type="stat" data-skill-id="soul">{{localize
+      <label class="rollable" data-roll-type="stat" data-stat-id="soul"><i class="fa-regular fa-dice"></i>{{localize
        "HELLBORN.Label.soul"}}</label>
      {{formInput systemFields.stats.fields.soul.fields.value value=system.stats.soul.value rootId=partId disabled=isPlayMode type="number" }}
    </div>
--- a/templates/character-maleficas.hbs
+++ b/templates/character-maleficas.hbs
@@ -16,7 +16,7 @@
          {{item.name}}
        </div>
        <span class="domain" data-tooltip="Domain">{{upperFirst item.system.domain}}</span>
-        <span class="level" data-tooltip="Level">{{upperFirst item.system.level}}</span>
+        <span class="level" data-tooltip="Level">{{getRomanLevel item.system.level}}</span>

        <div class="controls">
          <a data-tooltip="{{localize 'HELLBORN.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
@@ -43,6 +43,7 @@
        <div class="name" data-roll-type="weapon" data-tooltip="{{{item.system.description}}}">
          {{item.name}}
        </div>
+        <span class="ingredients" data-tooltip="Ingredients">{{upperFirst item.system.ingredients}}</span>
        <span class="difficulty" data-tooltip="Difficulty">{{upperFirst item.system.difficulty}}</span>
        <span class="threshold" data-tooltip="Threshold">{{upperFirst item.system.threshold}}</span>
        <span class="limit" data-tooltip="Limit">{{upperFirst item.system.limit}}</span>
--- a/templates/character-status.hbs
+++ b/templates/character-status.hbs
@@ -2,7 +2,7 @@
  <div class="main-div">

    <fieldset>
-      <legend>{{localize "HELLBORN.Label.Counters"}}</legend>
+      <legend>{{localize "HELLBORN.Label.characteristics"}}</legend>
      <div class="counters">
        <label>Trauma : </label>{{formInput systemFields.trauma.fields.current value=system.trauma.current}} /
        {{formInput systemFields.trauma.fields.max value=system.trauma.max}}
@@ -18,18 +18,6 @@
      </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>
-
    <fieldset>
      <legend>{{localize "HELLBORN.Label.perks"}}{{#if isEditMode}}
        <a class="action" data-tooltip="{{localize " HELLBORN.Tooltip.addPerk"}}" data-tooltip-direction="UP"><i
@@ -46,7 +34,7 @@
          </div>
          <span class="flavor" data-tooltip="Flavor text">{{upperFirst item.system.flavorText}}</span>
          <span class="role" data-tooltip="Role">{{upperFirst item.system.role}}</span>
-          <span class="level" data-tooltip="Level">{{item.system.level}}</span>
+          <span class="level" data-tooltip="Level">{{getRomanLevel item.system.level}}</span>

          <div class="controls">
            <a data-tooltip="{{localize 'HELLBORN.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
@@ -59,6 +47,22 @@
      </div>
    </fieldset>

+    <fieldset>
+      <legend>{{localize "HELLBORN.Label.ailments"}}</legend>
+      <div class="mortality">
+        <label>Mortality :</label>
+        {{formInput systemFields.mortality.fields.current value=system.mortality.current rootId=partId disabled=isPlayMode classes="mortality"}}
+      </div>
+
+      <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>
 </section>
--- a/templates/chat-message.hbs
+++ b/templates/chat-message.hbs
@@ -7,8 +7,8 @@
    <div class="intro-right">
      <ul>

-        {{#if (eq rollType "skill")}}
-        <li><strong>{{localize "HELLBORN.Label.skillRoll"}}</strong></li>
+        {{#if (eq rollType "stat")}}
+        <li><strong>{{localize "HELLBORN.Label.statRoll"}}</strong></li>
        {{/if}}


@@ -16,24 +16,42 @@
        <li><strong>Weapon : {{weapon.name}}</strong></li>
        {{/if}}

-        <li><strong>{{localize rollItem.label}} : {{fullFormula}}</strong></li>
+        <li><strong>{{localize rollItem.label}} : {{rollItem.value}}</strong></li>

-        {{#if isEncumbered}}
-        <li class="red-warning">Encumbered : -1D</li>
-        {{/if}}
+        <li>{{localize "HELLBORN.Label.difficulty"}} : {{difficulty}}</li>

-        <li>{{localize "HELLBORN.Label.modifier"}} : {{numericModifier}}D</li>
-
-        {{#if isSuccess}}
-        <li class="result-success">
-          {{localize "HELLBORN.Label.success"}}
+        {{#if (eq resultType "unknown")}}
+        <li class="result-unknown">
+          {{localize "HELLBORN.Label.unknown"}}
        </li>
-        {{/if}}
+        {{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}}
-        <li class="result-failure">
-          {{localize "HELLBORN.Label.failure"}}
-        </li>
+
+          {{#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}}
        {{/if}}
      </ul>
    </div>
--- a/templates/roll-dialog.hbs
+++ b/templates/roll-dialog.hbs
@@ -2,46 +2,35 @@

  <fieldSet>

-    {{#if (eq rollType "skill")}}
-    <legend>{{localize "HELLBORN.Label.skill"}}</legend>
+    {{#if (eq rollType "stat")}}
+    <legend>{{localize "HELLBORN.Label.stat"}}</legend>
    {{/if}}

-    <div class="dialog-skill">{{localize rollItem.label}} : 2d6+{{rollItem.value}}</div>
+    <div class="dialog-stat">{{localize rollItem.label}} : 3d6+{{rollItem.value}}</div>

    {{#if weapon}}
-    <div class="dialog-skill">Weapon : {{weapon.name}}</div>
-    {{/if}}
-
-    {{#if isEncumbered}}
-    <div class="dialog-skill red-warning">Encumbered : -1D</div>
+    <div class="dialog-stat">Weapon : {{weapon.name}}</div>
    {{/if}}

  </fieldSet>

  <fieldSet class="dialog-modifier">
-    <legend>{{localize "HELLBORN.Label.modifier"}}</legend>
+    <legend>Advantages & Disadvantages</legend>

-    <select name="modifier" class="roll-skill-modifier">
-      {{selectOptions choiceModifier selected=modifier localize=true}}
+    <select name="nbadvantages" class="roll-stat-advantages">
+      {{selectOptions choiceAdvantages selected=nbAdvantages localize=true}}
+    </select>
+    <select name="nbdisadvantages" class="roll-stat-disadvantages">
+      {{selectOptions choiceDisadvantages selected=nbDisadvantages localize=true}}
    </select>

-      {{#if weapon}}
-      <select name="range-modifier" class="roll-skill-range-modifier">
-        {{selectOptions choiceRangeModifier selected=rangeModifier}}
-      </select>
-      <ul>
-        <li>Two Attacks : <input type="checkbox" name="isAiming" data-field="two-attacks" class="select-combat-option"></li>
-        <li>Aiming : <input type="checkbox" data-field="aiming" class="select-combat-option"></li>
-        <li>Dim Lightning : <input type="checkbox" data-field="dim" class="select-combat-option"></li>
-        <li>Darkness : <input type="checkbox" data-field="darkness" class="select-combat-option"></li>
-        <li>Target Prone/Obscured : <input type="checkbox" data-field="prone" class="select-combat-option"></li>
-        <li>Target Cover : <input type="checkbox" data-field="cover" class="select-combat-option"></li>
-        <li>1/2 Auto Fire Recoil : <input type="checkbox" data-field="recoil-first" class="select-combat-option"></li>
-        <li>2+ Auto Fire Recoil : <input type="checkbox" data-field="recoil-third" class="select-combat-option"></li>
-        <li>Target Aware : <input type="checkbox" data-field="aware" class="select-combat-option"></li>
-      </ul>
-    {{/if}}
+  </fieldSet>

+  <fieldSet class="dialog-formula">
+    <legend>Difficulty</legend>
+    <select name="difficulty" class="roll-difficulty">
+      {{selectOptions difficultyChoices selected=difficulty localize=true}}
+    </select>
  </fieldSet>

  <fieldSet class="dialog-formula">
@@ -52,7 +41,7 @@
  <fieldSet>
    <legend>{{localize "HELLBORN.Label.rollView"}}</legend>
    <select name="visibility">
-      {{selectOptions rollModes selected=visibility}}
+      {{selectOptions rollModes selected=visibility localize=true}}
    </select>
  </fieldSet>

--- a/templates/tarot.hbs
+++ b/templates/tarot.hbs
@@ -9,8 +9,17 @@
  </fieldset>

  <fieldset>
-    <div class="flexrow">
+    <div class="flexrow scrollable-content">
      <div class="flexcol">
+        <legend>{{localize "HELLBORN.Label.quote"}}</legend>
+        {{formInput systemFields.quote value=system.quote toggled=true}}
+        <legend>{{localize "HELLBORN.Label.bonus"}}</legend>
+        {{formInput systemFields.bonus value=system.bonus toggled=true}}
+        <legend>{{localize "HELLBORN.Label.penalty"}}</legend>
+        {{formInput systemFields.penalty value=system.penalty toggled=true}}
+        <legend>{{localize "HELLBORN.Label.description"}}</legend>
+        {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description"
+        toggled=true}}
        <legend>{{localize "HELLBORN.Label.positiveEffect"}}</legend>
        {{formInput systemFields.positiveEffect enriched=enrichedPositiveEffect value=system.positiveEffect name="system.positiveEffect"
        toggled=true}}