Enhance progression rolls, damage rolls and other fixes

2025-06-12 20:53:54 +02:00
parent 17be9df64b
commit c08a8c38e9
35 changed files with 1630 additions and 282 deletions
--- a/templates/chat-message.hbs
+++ b/templates/chat-message.hbs
@@ -19,9 +19,9 @@
        {{/if}}

        {{#if weapon}}
-        <li><strong>Weapon : {{weapon.name}}</strong></li>
+        <li><strong>{{localize "CTHULHUETERNAL.Label.Weapon"}} : {{weapon.name}}</strong></li>
        {{/if}}
-        
+
        {{#if (eq rollType "resource")}}
        <li><strong>{{rollItem.name}} : {{initialScore}}</strong></li>
        {{else}}
@@ -29,15 +29,15 @@
        {{/if}}

        {{#if isZeroWP}}
-        <li class="red-warning">Zero WP : Automatic failure (ie 0%)</li>
+        <li class="red-warning">{{localize "CTHULHUETERNAL.Label.ZeroWP"}}</li>
        {{else}}
        {{#if isLowWP}}
-        <li class="orange-warning">Low WP : -20%</li>
+        <li class="orange-warning">{{localize "CTHULHUETERNAL.Label.LowWP"}} : -20%</li>
        {{/if}}
        {{/if}}

        {{#if isExhausted}}
-        <li class="orange-warning">Exhausted : -20%</li>
+        <li class="orange-warning">{{localize "CTHULHUETERNAL.Label.Exhausted"}} : -20%</li>
        {{/if}}

        {{#if  (eq rollType "resource")}}
@@ -45,20 +45,28 @@
        {{else}}
        <li>{{localize "CTHULHUETERNAL.Label.modifier"}} : {{modifier}}%</li>
        {{/if}}
-  
+
        <li>{{localize "CTHULHUETERNAL.Label.targetScore"}} : {{targetScore}}%</li>
        {{#if isSuccess}}
-        {{#if isCritical}}
-        <li class="result-critical-success">{{localize "CTHULHUETERNAL.Label.criticalSuccess"}}</li>
-        {{else}}
-        <li class="result-success">
-          {{localize "CTHULHUETERNAL.Label.success"}}
-          {{#if isNudge}}
-            <a class="nudge-roll"><i class="fa-solid fa-circle-sort-down"></i></a>
+          {{#if isCritical}}
+            <li class="result-critical-success">{{localize "CTHULHUETERNAL.Label.criticalSuccess"}}
+              {{#if  (eq rollType "weapon")}}
+                <a class="damage-roll"><i class="fa-solid fa-sword"></i></a>
+              {{/if}}
+            </li>
+          {{else}}
+          <li class="result-success">
+            {{localize "CTHULHUETERNAL.Label.success"}}
+            {{#if isNudge}}
+              <a class="nudge-roll"><i class="fa-solid fa-circle-sort-down"></i></a>
+            {{/if}}
+            {{#if  (eq rollType "weapon")}}
+              <a class="damage-roll"><i class="fa-solid fa-sword"></i></a>
+            {{/if}}
+          </li>
          {{/if}}
-        </li>
-        {{/if}}
        {{/if}}
+
        {{#if isFailure}}
        {{#if isCritical}}
        <li class="result-critical-failure">{{localize "CTHULHUETERNAL.Label.criticalFailure"}}</li>
--- a/templates/nudge-dialog.hbs
+++ b/templates/nudge-dialog.hbs
@@ -10,7 +10,7 @@
  <fieldSet>
    <legend>{{localize "CTHULHUETERNAL.Label.wpCost"}}</legend>
    <div>
-      Willpower points cost : 
+      {{localize "CTHULHUETERNAL.Label.wpCostLabel"}} :
      <input class="text" value="0" id="nudged-wp-cost" disabled >
    </div>
  </fieldSet>
--- a/templates/protagonist-main.hbs
+++ b/templates/protagonist-main.hbs
@@ -9,7 +9,7 @@
          <img class="protagonist-img" src="{{actor.img}}" data-edit="img" data-action="editImage"
            data-tooltip="{{actor.name}}" />
        </div>
-        <fieldset class="protagonist-hp"> 
+        <fieldset class="protagonist-hp">
          <legend>{{localize "CTHULHUETERNAL.Label.HP"}}</legend>
          <div class="flexrow">
            {{formField systemFields.hp.fields.value value=system.hp.value}}
@@ -35,34 +35,36 @@
        <fieldset class="san">
          <legend>{{localize "CTHULHUETERNAL.Label.SAN"}}</legend>
          <div class="flexrow">
-            
-            <label class="label-field rollable" data-roll-type="san" ><img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" /> 
-            {{localize "CTHULHUETERNAL.Label.current"}}</label>
+
+            <label class="label-field rollable" data-roll-type="san"><img
+                src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />
+              {{localize "CTHULHUETERNAL.Label.current"}}</label>
            {{formInput systemFields.san.fields.value value=system.san.value}}
-            
-            <span class="label-field label-recovery">{{localize "CTHULHUETERNAL.Label.recovery"}}</span> 
+
+            <span class="label-field label-recovery">{{localize "CTHULHUETERNAL.Label.recovery"}}</span>
            {{formInput systemFields.san.fields.recovery value=system.san.recovery disabled=true}}

-            <span class="label-bp" data-tooltip='{{localize "CTHULHUETERNAL.Tooltip.sanBPShort"}}'>{{localize
-              "CTHULHUETERNAL.Label.sanBPShort"}}</span> 
+            <span class="label-bp" data-tooltip='{{localize "CTHULHUETERNAL.Tooltip.sanBP"}}'>{{localize
+              "CTHULHUETERNAL.Label.sanBPShort"}}</span>
            {{formInput systemFields.san.fields.breakingPoint value=system.san.breakingPoint disabled=true}}

          </div>

          <div class="flexrow">
-            
+
            <div class="flexrow">
-             <span class="label-short-field">{{localize "CTHULHUETERNAL.Label.max"}}</span> 
+              <span class="label-short-field">{{localize "CTHULHUETERNAL.Label.max"}}</span>
              {{formInput systemFields.san.fields.max value=system.san.max rootId=partId disabled=true}}
            </div>

-            <span class="label-insanity" >
+            <span class="label-insanity">
              {{localize "CTHULHUETERNAL.Label.tempInsanity"}}
            </span>
            {{formInput systemFields.san.fields.insanity value=system.san.insanity localize=true}}

            {{#if (not isPlayMode)}}
-              <button data-action="setBP" class="button" data-tooltip="{{localize "CTHULHUETERNAL.Tooltip.setBP"}}">{{localize "CTHULHUETERNAL.Label.setBP"}}</button>
+            <button data-action="setBP" class="button" data-tooltip="{{localize "
+              CTHULHUETERNAL.Tooltip.setBP"}}">{{localize "CTHULHUETERNAL.Label.setBP"}}</button>
            {{/if}}

          </div>
@@ -73,7 +75,7 @@
            <input class="san-checkbox" type="checkbox" data-action="updateCheckboxArray" data-index="{{@index}}"
              data-name="violence" {{#if violence}} checked {{/if}}>
            {{/each}}
-            
+
            <span class="label-field">{{localize "CTHULHUETERNAL.Label.helplessness"}}</span>
            {{#each system.san.helplessness as |helplessness idx|}}
            <input class="san-checkbox" type="checkbox" data-action="updateCheckboxArray" data-index="{{@index}}"
@@ -102,9 +104,10 @@

  <fieldset class="protagonist-characteristics protagonist-characteristics-{{ifThen isPlayMode 'play' 'edit'}}">
    <legend>{{localize "CTHULHUETERNAL.Label.characteristics"}}</legend>
-    <div class="protagonist-characteristic" >
+    <div class="protagonist-characteristic">
      <img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />
-      <label class="rollable" data-roll-type="char" data-char-id="str" data-tooltip="{{system.characteristics.str.feature}}">{{localize
+      <label class="rollable" data-roll-type="char" data-char-id="str"
+        data-tooltip="{{system.characteristics.str.feature}}">{{localize
        "CTHULHUETERNAL.Label.strShort"}}</label>
      {{formField systemFields.characteristics.fields.str.fields.value value=system.characteristics.str.value
      rootId=partId disabled=isPlayMode }}
@@ -112,43 +115,48 @@
    </div>
    <div class="protagonist-characteristic">
      <img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />
-      <label class="rollable" data-roll-type="char" data-char-id="dex" data-tooltip="{{system.characteristics.dex.feature}}">{{localize
+      <label class="rollable" data-roll-type="char" data-char-id="dex"
+        data-tooltip="{{system.characteristics.dex.feature}}">{{localize
        "CTHULHUETERNAL.Label.dexShort"}}</label>
      {{formField systemFields.characteristics.fields.dex.fields.value value=system.characteristics.dex.value
      rootId=partId disabled=isPlayMode }}
      <label class="char-text">{{mul system.characteristics.dex.value 5}}</label>
    </div>
-    <div class="protagonist-characteristic" >
+    <div class="protagonist-characteristic">
      <img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />
-      <label class="rollable" data-roll-type="char" data-char-id="con" data-tooltip="{{system.characteristics.con.feature}}">{{localize
+      <label class="rollable" data-roll-type="char" data-char-id="con"
+        data-tooltip="{{system.characteristics.con.feature}}">{{localize
        "CTHULHUETERNAL.Label.conShort"}}</label>
      {{formField systemFields.characteristics.fields.con.fields.value value=system.characteristics.con.value
      rootId=partId disabled=isPlayMode }}
-       <label class="char-text">{{mul system.characteristics.con.value 5}}</label>
+      <label class="char-text">{{mul system.characteristics.con.value 5}}</label>
    </div>
-    <div class="protagonist-characteristic" >
+    <div class="protagonist-characteristic">
      <img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />
-      <label class="rollable" data-roll-type="char" data-char-id="int" data-tooltip="{{system.characteristics.int.feature}}">{{localize
+      <label class="rollable" data-roll-type="char" data-char-id="int"
+        data-tooltip="{{system.characteristics.int.feature}}">{{localize
        "CTHULHUETERNAL.Label.intShort"}}</label>
      {{formField systemFields.characteristics.fields.int.fields.value value=system.characteristics.int.value
      rootId=partId disabled=isPlayMode }}
-       <label class="char-text">{{mul system.characteristics.int.value 5}}</label>
+      <label class="char-text">{{mul system.characteristics.int.value 5}}</label>
    </div>
-    <div class="protagonist-characteristic" >
+    <div class="protagonist-characteristic">
      <img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />
-      <label class="rollable" data-roll-type="char" data-char-id="pow" data-tooltip="{{system.characteristics.pow.feature}}">{{localize
+      <label class="rollable" data-roll-type="char" data-char-id="pow"
+        data-tooltip="{{system.characteristics.pow.feature}}">{{localize
        "CTHULHUETERNAL.Label.powShort"}}</label>
      {{formField systemFields.characteristics.fields.pow.fields.value value=system.characteristics.pow.value
      rootId=partId disabled=isPlayMode }}
-       <label class="char-text">{{mul system.characteristics.pow.value 5}}</label>
+      <label class="char-text">{{mul system.characteristics.pow.value 5}}</label>
    </div>
-    <div class="protagonist-characteristic" >
+    <div class="protagonist-characteristic">
      <img src="systems/fvtt-cthulhu-eternal/assets/ui/d100.svg" class="d100" />
-      <label class="rollable" data-roll-type="char" data-char-id="cha" data-tooltip="{{system.characteristics.cha.feature}}">{{localize
+      <label class="rollable" data-roll-type="char" data-char-id="cha"
+        data-tooltip="{{system.characteristics.cha.feature}}">{{localize
        "CTHULHUETERNAL.Label.chaShort"}}</label>
      {{formField systemFields.characteristics.fields.cha.fields.value value=system.characteristics.cha.value
      rootId=partId disabled=isPlayMode }}
-       <label class="char-text">{{mul system.characteristics.cha.value 5}}</label>
+      <label class="char-text">{{mul system.characteristics.cha.value 5}}</label>
    </div>
  </fieldset>

--- a/templates/protagonist-skills.hbs
+++ b/templates/protagonist-skills.hbs
@@ -5,9 +5,9 @@
    <div class="skills">
        {{#each skills as |item|}}
          <div class="skill item" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
-            <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
+            <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 rollable" data-roll-type="skill" data-tooltip="{{{item.description}}}" data-tooltip-direction="UP">{{item.name}}
+            <div class="name rollable {{#if item.system.rollFailed}}skill-failed-progress{{/if}}" data-roll-type="skill" data-tooltip="{{{item.description}}}" data-tooltip-direction="UP">{{item.name}}
            </div>
            <div class="score" >
              {{item.system.skillTotal}}
--- a/templates/protagonist-status.hbs
+++ b/templates/protagonist-status.hbs
@@ -13,7 +13,7 @@
            {{item.name}}
          </div>
          <div class="type">
-            {{upperFirst item.system.bondType}}
+            {{localize (concat  "CTHULHUETERNAL.BondType." item.system.bondType)}}
          </div>
          <div class="level">
            {{item.system.value}}
--- a/templates/roll-dialog.hbs
+++ b/templates/roll-dialog.hbs
@@ -18,7 +18,7 @@
    {{/if}}

    {{#if weapon}}
-    <div class="dialog-skill">Weapon : {{weapon.name}}</div>
+    <div class="dialog-skill">{{localize "CTHULHUETERNAL.Label.Weapon"}} : {{weapon.name}}</div>
      {{#if weapon.system.hasSelectiveFire}}
      <div class="dialog-skill">Selective Fire :
        <select name="selectiveFireChoice" class="roll-skill-modifier">
@@ -29,15 +29,15 @@
    {{/if}}

    {{#if isZeroWP}}
-    <div class="dialog-skill red-warning">Zero WP : Automatic failure (ie 0%)</div>
+    <div class="dialog-skill red-warning">{{localize "CTHULHUETERNAL.Label.ZeroWP"}}</div>
    {{else}}
    {{#if isLowWP}}
-    <div class="dialog-skill orange-warning">Low WP : -20%</div>
+    <div class="dialog-skill orange-warning">{{localize "CTHULHUETERNAL.Label.LowWP"}} : -20%</div>
    {{/if}}
    {{/if}}

    {{#if isExhausted}}
-    <div class="dialog-skill orange-warning">Exhausted : -20%</div>
+    <div class="dialog-skill orange-warning">{{localize "CTHULHUETERNAL.Label.Exhausted"}} : -20%</div>
    {{/if}}

  </fieldSet>
--- a/templates/skill.hbs
+++ b/templates/skill.hbs
@@ -13,13 +13,27 @@
      <legend>{{localize "CTHULHUETERNAL.Label.totalScore"}}</legend>
      {{system.skillTotal}}
    </div>
-    {{formField systemFields.isAdversary value=system.isAdversary}}
-    {{formField systemFields.diceEvolved value=system.diceEvolved}}
-    
-    <!-- {{#if system.diceEvolved}}
-    {{formField systemFields.rollFailed value=system.rollFailed}}
+    {{#if isGM}}
+      {{formField systemFields.isAdversary value=system.isAdversary }}
+      {{formField systemFields.diceEvolved value=system.diceEvolved}}
+
+      {{#if system.diceEvolved}}
+        {{formField systemFields.rollFailed value=system.rollFailed}}
+      {{/if}}
+    {{else}}
+      {{formField systemFields.isAdversary value=system.isAdversary disabled=true}}
+      {{formField systemFields.diceEvolved value=system.diceEvolved disabled=true}}
+
+      {{#if system.diceEvolved}}
+        {{formField systemFields.rollFailed value=system.rollFailed disabled=true}}
+      {{/if}}
+    {{/if}}
+
+    {{#if (and system.diceEvolved system.rollFailed)}}
+      <div class="roll-failed">
+        <a class="roll-progress" data-action="rollProgress"><i class="fa-solid fa-dice-d4"></i> {{localize "CTHULHUETERNAL.Label.rollProgress"}}</a>
+      </div>
    {{/if}}
-    -->

  </fieldset>