Actor sheet

2025-03-05 22:15:32 +01:00
parent da9a69b916
commit 9013229c20
24 changed files with 958 additions and 682 deletions
--- a/templates/character-biography.hbs
+++ b/templates/character-biography.hbs
@@ -1,17 +1,24 @@
 <section class="tab character-{{tab.id}} {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">

-  <fieldset>
-    <legend>{{localize "FTLNOMAD.Label.resources"}}</legend>
-     <div class="resources">
-    </div>
+  <fieldset class="rank">
+    <legend>Rank</legend>
+    {{formField systemFields.rank.fields.experienced value=system.rank.experienced type="number" rootId=partId disabled=isPlayMode}}
+    {{formField systemFields.rank.fields.expert value=system.rank.expert type="number" rootId=partId disabled=isPlayMode}}
+    {{formField systemFields.rank.fields.veteran value=system.rank.veteran type="number" rootId=partId disabled=isPlayMode}}
+    {{formField systemFields.rank.fields.elite value=system.rank.elite type="number" rootId=partId disabled=isPlayMode}}
+    {{formField systemFields.rank.fields.legend value=system.rank.legend type="number" rootId=partId disabled=isPlayMode}}
  </fieldset>

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

  <fieldset>
--- a/templates/character-equipment.hbs
+++ b/templates/character-equipment.hbs
@@ -1,5 +1,15 @@
 <section class="tab character-{{tab.id}} {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">

+  <fieldset class="encumbrance">
+    {{#if isEncumbered}}
+      {{formField systemFields.enc.fields.value value=system.enc.value rootId=partId disabled=true classes="encumbered"}}
+    {{else }}
+      {{formField systemFields.enc.fields.value value=system.enc.value rootId=partId disabled=true}}  
+    {{/if}}
+    {{formField systemFields.enc.fields.max value=system.enc.max rootId=partId disabled=isPlayMode}}
+    {{formField systemFields.credits value=system.credits rootId=partId }}
+  </fieldset>
+
  <fieldset>
    <legend>{{localize "FTLNOMAD.Label.weapons"}}{{#if isEditMode}}
      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addWeapon"}}" data-tooltip-direction="UP"><i
@@ -7,16 +17,15 @@
    </legend>
    <div class="weapons">
      {{#each weapons as |item|}}
-      {{!log 'weapon' this}}
      <div class="weapon 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" />
+        <i class="fa-regular fa-dice"></i>
        <div class="name rollable" data-roll-type="weapon" data-tooltip="{{{item.system.description}}}">
          {{item.name}}
        </div>

-        <img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />
+        <i class="fa-regular fa-dice"></i>
        <a class="damage rollable" data-item-id="{{item.id}}" data-action="roll" data-roll-type="damage"
          data-roll-value="{{item.system.damage}}">
          {{localize "FTLNOMAD.Label.damageShort"}} :
@@ -39,8 +48,7 @@
    </legend>
    <div class="armors">
      {{#each armors as |item|}}
-      {{!log 'armor' this}}
-      <div class="armor" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
+      <div class="armor item" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
        <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
        <div class="name" data-tooltip="{{{item.system.description}}}">
          {{item.name}}
@@ -57,6 +65,40 @@
    </div>
  </fieldset>

+  <fieldset>
+    <legend>{{localize "FTLNOMAD.Label.implants"}}{{#if isEditMode}}
+      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addTalent"}}" data-tooltip-direction="UP"><i
+          class="fas fa-plus" data-action="createImplant"></i></a>{{/if}}
+    </legend>
+    <div class="implants">
+      {{#each implants as |item|}}
+      {{!log 'weapon' this}}
+      <div class="implant 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="weapon" data-tooltip="{{{item.system.description}}}">
+          {{item.name}}
+        </div>
+
+        <img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />
+        <a class="damage rollable" data-item-id="{{item.id}}" data-action="roll" data-roll-type="damage"
+          data-roll-value="{{item.system.damage}}">
+          {{#if item.system.isAdvantage}}
+          <i data-tooltip="Provides advantage" class="fas fa-circle-chevron-up"></i>
+          {{else}}
+          {{/if}}
+        <div class="controls">
+          <a data-tooltip="{{localize 'FTLNOMAD.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
+            data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>
+          <a data-tooltip="{{localize 'FTLNOMAD.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
+            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+        </div>
+      </div>
+      {{/each}}
+    </div>
+  </fieldset>
+
  <fieldset>
    <legend>{{localize "FTLNOMAD.Label.equipments"}}{{#if isEditMode}}
      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addGear"}}" data-tooltip-direction="UP"><i
--- a/templates/character-main.hbs
+++ b/templates/character-main.hbs
@@ -12,11 +12,9 @@
          <legend>{{localize "FTLNOMAD.Label.Stamina"}}</legend>
          <div class="flexrow">
            {{formField systemFields.health.fields.staminaValue value=health.staminaValue}}
-            <span class="hp-separator">/</span>
-            {{formField systemFields.health.fields.staminaMax value=system.health.staminaMax rootId=partId
-            disabled=true}}
+            {{formField systemFields.health.fields.staminaMax value=system.health.staminaMax rootId=partId disabled=true}}
          </div>
-          <div class="flexrow ">
+          <div class="flexrow">
            {{formField systemFields.health.fields.wounds value=system.health.wounds }}
          </div>
        </fieldset>
@@ -30,68 +28,69 @@
          </a>
        </div>

-        <fieldset class="rank">
+        <fieldset class="character-spec">
          {{formField systemFields.concept value=system.concept rootId=partId disabled=isPlayMode}}
          {{formField systemFields.species value=system.species rootId=partId disabled=isPlayMode}}
          {{formField systemFields.archetype value=system.archetype rootId=partId disabled=isPlayMode}}
+          <div class="hero-armor">          
+            {{formField systemFields.heroPoints value=system.heroPoints rootId=partId disabled=isPlayMode}}
+            {{formField systemFields.armor.fields.value value=system.armor.value rootId=partId disabled=isPlayMode}}
+          </div>
        </fieldset>

-
      </div>
    </div>
  </fieldset>

-
  <fieldset class="character-skills character-skills-{{ifThen isPlayMode 'play' 'edit'}}">
    <legend>{{localize "FTLNOMAD.Label.skills"}}</legend>
    <div class="character-skill">
-      <img src="systems/fvtt-ftl-nomad/assets/ui/2d6.svg" class="d6s" />
-      <label class="rollable" data-roll-type="skill" data-char-id="combat">{{localize
+      <img src="systems/fvtt-ftl-nomad/assets/icons/icon_combat.svg" class="icon-skill" />
+      <label class="rollable" data-roll-type="skill" data-skill-id="combat">{{localize
        "FTLNOMAD.Label.combat"}}</label>
-      {{formField systemFields.skills.fields.combat.fields.value value=system.skills.combat.value
-      rootId=partId disabled=isPlayMode }}
+      {{formInput systemFields.skills.fields.combat.fields.value value=system.skills.combat.value rootId=partId disabled=isPlayMode type="number" }}
    </div>
    <div class="character-skill">
-      <img src="systems/fvtt-ftl-nomad/assets/ui/2d6.svg" class="d6s" />
-      <label class="rollable" data-roll-type="skill" data-char-id="knowledge">{{localize
+      <img src="systems/fvtt-ftl-nomad/assets/icons/icon_knowledge.svg" class="icon-skill" />
+      <label class="rollable" data-roll-type="skill" data-skill-id="knowledge">{{localize
        "FTLNOMAD.Label.knowledge"}}</label>
-      {{formField systemFields.skills.fields.knowledge.fields.value value=system.skills.knowledge.value
-      rootId=partId disabled=isPlayMode }}
+      {{formInput systemFields.skills.fields.knowledge.fields.value value=system.skills.knowledge.value
+      rootId=partId disabled=isPlayMode  type="number"}}
    </div>
    <div class="character-skill">
-      <img src="systems/fvtt-ftl-nomad/assets/ui/2d6.svg" class="d6s" />
-      <label class="rollable" data-roll-type="skill" data-char-id="social">{{localize
+      <img src="systems/fvtt-ftl-nomad/assets/icons/icon_social.svg" class="icon-skill" />
+      <label class="rollable" data-roll-type="skill" data-skill-id="social">{{localize
        "FTLNOMAD.Label.social"}}</label>
-      {{formField systemFields.skills.fields.social.fields.value value=system.skills.social.value
-      rootId=partId disabled=isPlayMode }}
+      {{formInput systemFields.skills.fields.social.fields.value value=system.skills.social.value
+      rootId=partId disabled=isPlayMode  type="number"}}
    </div>
    <div class="character-skill">
-      <img src="systems/fvtt-ftl-nomad/assets/ui/2d6.svg" class="d6s" />
-      <label class="rollable" data-roll-type="skill" data-char-id="physical">{{localize
+      <img src="systems/fvtt-ftl-nomad/assets/icons/icon_physical.svg" class="icon-skill" />
+      <label class="rollable" data-roll-type="skill" data-skill-id="physical">{{localize
        "FTLNOMAD.Label.physical"}}</label>
-      {{formField systemFields.skills.fields.physical.fields.value value=system.skills.physical.value
-      rootId=partId disabled=isPlayMode }}
+      {{formInput systemFields.skills.fields.physical.fields.value value=system.skills.physical.value
+      rootId=partId disabled=isPlayMode  type="number"}}
    </div>
    <div class="character-skill">
-      <img src="systems/fvtt-ftl-nomad/assets/ui/2d6.svg" class="d6s" />
-      <label class="rollable" data-roll-type="skill" data-char-id="stealth">{{localize
+      <img src="systems/fvtt-ftl-nomad/assets/icons/icon_stealth.svg" class="icon-skill" />
+      <label class="rollable" data-roll-type="skill" data-skill-id="stealth">{{localize
        "FTLNOMAD.Label.stealth"}}</label>
-      {{formField systemFields.skills.fields.stealth.fields.value value=system.skills.stealth.value
-      rootId=partId disabled=isPlayMode }}
+      {{formInput systemFields.skills.fields.stealth.fields.value value=system.skills.stealth.value
+      rootId=partId disabled=isPlayMode  type="number"}}
    </div>
    <div class="character-skill">
-      <img src="systems/fvtt-ftl-nomad/assets/ui/2d6.svg" class="d6s" />
-      <label class="rollable" data-roll-type="skill" data-char-id="vehicles">{{localize
+      <img src="systems/fvtt-ftl-nomad/assets/icons/icon_vehicles.svg" class="icon-skill" />
+      <label class="rollable" data-roll-type="skill" data-skill-id="vehicles">{{localize
        "FTLNOMAD.Label.vehicles"}}</label>
-      {{formField systemFields.skills.fields.vehicles.fields.value value=system.skills.vehicles.value
-      rootId=partId disabled=isPlayMode }}
+      {{formInput systemFields.skills.fields.vehicles.fields.value value=system.skills.vehicles.value
+      rootId=partId disabled=isPlayMode  type="number"}}
    </div>
    <div class="character-skill">
-      <img src="systems/fvtt-ftl-nomad/assets/ui/2d6.svg" class="d6s" />
-      <label class="rollable" data-roll-type="skill" data-char-id="technology">{{localize
+      <img src="systems/fvtt-ftl-nomad/assets/icons/icon_technology.svg" class="icon-skill" />
+      <label class="rollable" data-roll-type="skill" data-skill-id="technology">{{localize
        "FTLNOMAD.Label.technology"}}</label>
-      {{formField systemFields.skills.fields.technology.fields.value value=system.skills.technology.value
-      rootId=partId disabled=isPlayMode }}
+      {{formInput systemFields.skills.fields.technology.fields.value value=system.skills.technology.value
+      rootId=partId disabled=isPlayMode  type="number"}}
    </div>
  </fieldset>

--- a/templates/character-talents.hbs
+++ b/templates/character-talents.hbs
@@ -0,0 +1,106 @@
+<section class="tab character-{{tab.id}} {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
+
+  <fieldset>
+    <legend>{{localize "FTLNOMAD.Label.talents"}}{{#if isEditMode}}
+      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addTalent"}}" data-tooltip-direction="UP"><i
+          class="fas fa-plus" data-action="createTalent"></i></a>{{/if}}
+    </legend>
+    <div class="talents">
+      {{#each talents as |item|}}
+      {{!log 'weapon' this}}
+      <div class="talent 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="weapon" data-tooltip="{{{item.system.description}}}">
+          {{item.name}}
+        </div>
+
+        <img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />
+        <a class="damage rollable" data-item-id="{{item.id}}" data-action="roll" data-roll-type="damage"
+          data-roll-value="{{item.system.damage}}">
+          {{#if item.system.isAdvantage}}
+          <i data-tooltip="Provides advantage" class="fas fa-circle-chevron-up"></i>
+          {{else}}
+          {{/if}}
+        <div class="controls">
+          <a data-tooltip="{{localize 'FTLNOMAD.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
+            data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>
+          <a data-tooltip="{{localize 'FTLNOMAD.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
+            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+        </div>
+      </div>
+      {{/each}}
+    </div>
+  </fieldset>
+
+  <fieldset>
+    <legend>{{localize "FTLNOMAD.Label.psionics"}}{{#if isEditMode}}
+      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addImplant"}}" data-tooltip-direction="UP"><i
+          class="fas fa-plus" data-action="createPsionic"></i></a>{{/if}}
+    </legend>
+    <div class="psionics">
+      {{#each psionics as |item|}}
+      {{!log 'weapon' this}}
+      <div class="psionic 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="weapon" data-tooltip="{{{item.system.description}}}">
+          {{item.name}}
+        </div>
+
+        <img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />
+        <a class="damage rollable" data-item-id="{{item.id}}" data-action="roll" data-roll-type="damage"
+          data-roll-value="{{item.system.damage}}">
+          {{#if item.system.isAdvantage}}
+          <i data-tooltip="Provides advantage" class="fas fa-circle-chevron-up"></i>
+          {{else}}
+          {{/if}}
+        <div class="controls">
+          <a data-tooltip="{{localize 'FTLNOMAD.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
+            data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>
+          <a data-tooltip="{{localize 'FTLNOMAD.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
+            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+        </div>
+      </div>
+      {{/each}}
+    </div>
+  </fieldset>
+
+  <fieldset>
+    <legend>{{localize "FTLNOMAD.Label.languages"}}{{#if isEditMode}}
+      <a class="action" data-tooltip="{{localize " FTLNOMAD.Tooltip.addLanguage"}}" data-tooltip-direction="UP"><i
+          class="fas fa-plus" data-action="createLanguage"></i></a>{{/if}}
+    </legend>
+    <div class="languages">
+      {{#each languages as |item|}}
+      {{!log 'weapon' this}}
+      <div class="language 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="weapon" data-tooltip="{{{item.system.description}}}">
+          {{item.name}}
+        </div>
+
+        <img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />
+        <a class="damage rollable" data-item-id="{{item.id}}" data-action="roll" data-roll-type="damage"
+          data-roll-value="{{item.system.damage}}">
+          {{#if item.system.isAdvantage}}
+          <i data-tooltip="Provides advantage" class="fas fa-circle-chevron-up"></i>
+          {{else}}
+          {{/if}}
+        <div class="controls">
+          <a data-tooltip="{{localize 'FTLNOMAD.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
+            data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>
+          <a data-tooltip="{{localize 'FTLNOMAD.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
+            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+        </div>
+      </div>
+      {{/each}}
+    </div>
+  </fieldset>
+
+
+</section>
--- a/templates/chat-message.hbs
+++ b/templates/chat-message.hbs
@@ -6,74 +6,39 @@
    </div>
    <div class="intro-right">
      <ul>
-        {{#if (eq rollType "char")}}
-        <li><strong>{{localize "FTLNOMAD.Label.charRoll"}}</strong></li>
-        {{/if}}

        {{#if (eq rollType "skill")}}
        <li><strong>{{localize "FTLNOMAD.Label.skillRoll"}}</strong></li>
        {{/if}}

-        {{#if isNudgedRoll}}
-        <li><strong>{{localize "FTLNOMAD.Label.nudgedRoll"}} : {{wpCost}} WP spent</strong></li>
-        {{/if}}

        {{#if weapon}}
        <li><strong>Weapon : {{weapon.name}}</strong></li>
        {{/if}}
        
-        {{#if (eq rollType "resource")}}
-        <li><strong>{{rollItem.name}} : {{initialScore}}</strong></li>
-        {{else}}
-        <li><strong>{{rollItem.name}} : {{initialScore}}%</strong></li>
+        <li><strong>{{localize rollItem.label}} : {{fullFormula}}</strong></li>
+
+        {{#if isEncumbered}}
+        <li class="red-warning">Encumbered : -1D</li>
        {{/if}}

-        {{#if isZeroWP}}
-        <li class="red-warning">Zero WP : Automatic failure (ie 0%)</li>
-        {{else}}
-        {{#if isLowWP}}
-        <li class="orange-warning">Low WP : -20%</li>
-        {{/if}}
-        {{/if}}
-
-        {{#if isExhausted}}
-        <li class="orange-warning">Exhausted : -20%</li>
-        {{/if}}
-
-        {{#if  (eq rollType "resource")}}
-        <li>{{localize "FTLNOMAD.Label.multiplier"}} : {{multiplier}}</li>
-        {{else}}
-        <li>{{localize "FTLNOMAD.Label.modifier"}} : {{modifier}}%</li>
-        {{/if}}
+        <li>{{localize "FTLNOMAD.Label.modifier"}} : {{numericModifier}}D</li>
  
-        <li>{{localize "FTLNOMAD.Label.targetScore"}} : {{targetScore}}%</li>
        {{#if isSuccess}}
-        {{#if isCritical}}
-        <li class="result-critical-success">{{localize "FTLNOMAD.Label.criticalSuccess"}}</li>
-        {{else}}
        <li class="result-success">
          {{localize "FTLNOMAD.Label.success"}}
-          {{#if isNudge}}
-            <a class="nudge-roll"><i class="fa-solid fa-circle-sort-down"></i></a>
-          {{/if}}
        </li>
        {{/if}}
-        {{/if}}
+
        {{#if isFailure}}
-        {{#if isCritical}}
-        <li class="result-critical-failure">{{localize "FTLNOMAD.Label.criticalFailure"}}</li>
-        {{else}}
        <li class="result-failure">
          {{localize "FTLNOMAD.Label.failure"}}
-          {{#if isNudge}}
-            <a class="nudge-roll"><i class="fa-solid fa-circle-sort-down"></i></a>
-          {{/if}}
        </li>
        {{/if}}
-        {{/if}}
      </ul>
    </div>
  </div>
+
  {{#if isDamage}}
  <div>
    {{#if (and isGM hasTarget)}}
--- a/templates/creature-biography.hbs
+++ b/templates/creature-biography.hbs
@@ -1,10 +1,12 @@
 <section class="tab creature-{{tab.id}} {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">

+
  <fieldset>
    <legend>{{localize "FTLNOMAD.Label.description"}}</legend>
-    {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description" toggled=true}}
+    {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description"
+    toggled=true}}
  </fieldset>
-  
+
  <fieldset>
    <legend>{{localize "FTLNOMAD.Label.notes"}}</legend>
    {{formInput systemFields.notes enriched=enrichedNotes value=system.notes name="system.notes" toggled=true}}
--- a/templates/roll-dialog.hbs
+++ b/templates/roll-dialog.hbs
@@ -1,57 +1,53 @@
-<div class="fvtt-cthulhu-eternal-roll-dialog">
+<div class="fvtt-ftl-nomad-roll-dialog">
+  
  <fieldSet>
+
    {{#if (eq rollType "skill")}}
    <legend>{{localize "FTLNOMAD.Label.skill"}}</legend>
    {{/if}}
-    {{#if (eq rollType "char")}}
-    <legend>{{localize "FTLNOMAD.Label.characteristic"}}</legend>
-    {{/if}}

-    {{#if (eq rollType "resource")}}
-    <legend>{{localize "FTLNOMAD.Label.resourceRating"}}</legend>
-    <div class="dialog-skill">{{rollItem.name}} : <span class="resource-score">{{initialScore}} ({{mul initialScore 5}}%)</span></div>  
-    <div class="dialog-skill">{{localize "FTLNOMAD.Label.Hand"}} : {{rollItem.hand}} <input type="checkbox" data-action="selectHand" {{checked rollItem.enableHand}}></div>  
-    <div class="dialog-skill">{{localize "FTLNOMAD.Label.Stowed"}} : {{rollItem.stowed}} <input type="checkbox" data-action="selectStowed" {{checked rollItem.enableStowed}}></div>  
-    <div class="dialog-skill">{{localize "FTLNOMAD.Label.Storage"}} : {{rollItem.storage}} <input type="checkbox" data-action="selectStorage" {{checked rollItem.enableStorage}}></div>  
-    {{else}}
-    <div class="dialog-skill">{{rollItem.name}} : {{initialScore}}%</div>
-    {{/if}}
+    <div class="dialog-skill">{{localize rollItem.label}} : 2d6+{{rollItem.value}}</div>

    {{#if weapon}}
    <div class="dialog-skill">Weapon : {{weapon.name}}</div>
    {{/if}}

-    {{#if isZeroWP}}
-    <div class="dialog-skill red-warning">Zero WP : Automatic failure (ie 0%)</div>
-    {{else}}
-    {{#if isLowWP}}
-    <div class="dialog-skill orange-warning">Low WP : -20%</div>
-    {{/if}}
-    {{/if}}
-
-    {{#if isExhausted}}
-    <div class="dialog-skill orange-warning">Exhausted : -20%</div>
+    {{#if isEncumbered}}
+    <div class="dialog-skill red-warning">Encumbered : -1D</div>
    {{/if}}

  </fieldSet>

-  {{#if hasModifier}}
  <fieldSet class="dialog-modifier">
    <legend>{{localize "FTLNOMAD.Label.modifier"}}</legend>
-    <select name="modifier" class="roll-skill-modifier">
-      {{selectOptions choiceModifier selected=modifier}}
-    </select>
-  </fieldSet>
-  {{/if}}

-  {{#if hasMultiplier}}
-  <fieldSet class="dialog-modifier">
-    <legend>{{localize "FTLNOMAD.Label.multiplier"}}</legend>
-    <select name="multiplier" class="roll-skill-modifier roll-skill-multiplier">
-      {{selectOptions choiceMultiplier selected=multiplier}}
+    <select name="modifier" class="roll-skill-modifier">
+      {{selectOptions choiceModifier selected=modifier 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>{{localize "FTLNOMAD.Label.formula"}}</legend>
+    <label name="fullFormula" id="roll-dialog-full-formula" >{{fullFormula}}</label>
  </fieldSet>
-  {{/if}}

  <fieldSet>
    <legend>{{localize "FTLNOMAD.Label.rollView"}}</legend>
@@ -59,4 +55,5 @@
      {{selectOptions rollModes selected=visibility}}
    </select>
  </fieldSet>
+
 </div>