Fix history

2024-12-17 09:25:02 +01:00
parent 2ac69e2108
commit 2c29acd56c
32 changed files with 395 additions and 779 deletions
--- a/templates/archetype.hbs
+++ b/templates/archetype.hbs
@@ -4,7 +4,9 @@
    {{formInput fields.name value=source.name}}
  </div>  

-  {{formField systemFields.settings value=system.settings localize=true}}
+  <fieldset>
+    {{formField systemFields.settings value=system.settings localize=true}}
+  </fieldset>  

  <fieldset>
    <legend>{{localize "CTHULHUETERNAL.Label.description"}}</legend>
--- a/templates/armor.hbs
+++ b/templates/armor.hbs
@@ -2,20 +2,23 @@
  <div class="header">
    <img class="item-img" src="{{item.img}}" data-edit="img" data-action="editImage" data-tooltip="{{item.name}}" />
    {{formInput fields.name value=source.name}}
-  </div> 
+  </div>
+
+  <fieldset>
+    {{formField systemFields.settings value=system.settings localize=true}}
+    {{formField systemFields.protection value=system.protection}}
+    {{formField systemFields.resourceLevel value=system.resourceLevel}}
+  </fieldset>

-  {{formField systemFields.settings value=system.settings localize=true}}
-  {{formField systemFields.protection value=system.protection}}
-  {{formField systemFields.resourceLevel value=system.resourceLevel}}

  <fieldset>
    <legend>{{localize "CTHULHUETERNAL.Label.description"}}</legend>
    {{formInput
-      systemFields.description
-      enriched=description
-      value=system.description
-      name="system.description"
-      toggled="false"
+    systemFields.description
+    enriched=description
+    value=system.description
+    name="system.description"
+    toggled="false"
    }}
  </fieldset>
 </section>
--- a/templates/bond.hbs
+++ b/templates/bond.hbs
@@ -2,14 +2,17 @@
  <div class="header">
    <img class="item-img" src="{{item.img}}" data-edit="img" data-action="editImage" data-tooltip="{{item.name}}" />
    {{formInput fields.name value=source.name}}
-  </div>  
+  </div>

-  {{formField systemFields.bondType value=system.bondType localize=true}}
-  {{formField systemFields.value value=system.value}}
+  <fieldset>
+    {{formField systemFields.bondType value=system.bondType localize=true}}
+    {{formField systemFields.value value=system.value}}
+  </fieldset>

  <fieldset>
    <legend>{{localize "CTHULHUETERNAL.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>

 </section>
--- a/templates/chat-message.hbs
+++ b/templates/chat-message.hbs
@@ -1,43 +1,18 @@
 {{!log 'chat-message' this}}
 <div class="{{cssClass}}">
    <div class="intro-chat">
-        {{#if (ne actingCharImg "icons/svg/mystery-man.svg")}}
-            <div class="intro-img">
-                <img src="{{actingCharImg}}" data-tooltip="{{actingCharName}}" />
-            </div>
-        {{else}}
-            <div></div>
-        {{/if}}
+        <div class="intro-img">
+          <img src="{{actingCharImg}}" data-tooltip="{{actingCharName}}" />
+        </div>
        <div class="intro-right">                
            <p class="introText" {{#if isSave}}data-tooltip="{{introTextTooltip}}"{{/if}}>{{{introText}}}
-            {{#if isSave}}
-                    <br>
-                    {{#if (eq avantages "avantage")}} {{localize "TENEBRIS.Roll.avantage"}}{{/if}}
-                    {{#if (eq avantages "desavantage")}} {{localize "TENEBRIS.Roll.desavantage"}}{{/if}}
-                    {{#if (eq avantages "doubleAvantage")}} {{localize "TENEBRIS.Roll.doubleAvantage"}}{{/if}}
-                    {{#if (eq avantages "doubleDesavantage")}} {{localize "TENEBRIS.Roll.doubleDesavantage"}}{{/if}}
+            {{#if (eq rollType "skill")}}
+            <span>{{rollItem.name}} : {{targetScore}}</span>
+            <span>Modifier : {{modifier}}</span>
            {{/if}}        
            </p>                 
        </div>
    </div>
-     {{#if isSave}}
-        <div class="result">
-            {{#if (eq resultType "success")}}
-                {{#if isPrivate}}?{{else}}{{localize "TENEBRIS.Roll.success"}}{{/if}}
-            {{else}}
-                {{#if isPrivate}}?{{else}}{{localize "TENEBRIS.Roll.failure"}}{{/if}}
-            {{/if}}
-        </div>
-     {{/if}}
-     {{#if isResource}}
-        <div class="result">
-            {{#if (eq resultType "success")}}
-                {{#if isPrivate}}?{{else}}{{localize "TENEBRIS.Roll.success"}}{{/if}}
-            {{else}}
-                {{#if isPrivate}}?{{else}}{{localize "TENEBRIS.Roll.failure"}}{{#if isFailure}} ({{localize "TENEBRIS.Roll.resourceLost"}}){{/if}}{{/if}}
-            {{/if}}
-        </div>
-     {{/if}}
     {{#if isDamage}}
        <div>
            {{#if (and isGM hasTarget)}}
--- a/templates/gear.hbs
+++ b/templates/gear.hbs
@@ -2,14 +2,17 @@
  <div class="header">
    <img class="item-img" src="{{item.img}}" data-edit="img" data-action="editImage" data-tooltip="{{item.name}}" />
    {{formInput fields.name value=source.name}}
-  </div>  
-  
-  {{formField systemFields.settings value=system.settings localize=true}}
-  {{formField systemFields.resourceLevel value=system.resourceLevel}}
+  </div>
+
+  <fieldset>
+    {{formField systemFields.settings value=system.settings localize=true}}
+    {{formField systemFields.resourceLevel value=system.resourceLevel}}
+  </fieldset>

  <fieldset>
    <legend>{{localize "CTHULHUETERNAL.Label.description"}}</legend>
-    {{formInput systemFields.description enriched=description value=system.description name="system.description" toggled=true}}
+    {{formInput systemFields.description enriched=description value=system.description name="system.description"
+    toggled=true}}
  </fieldset>

 </section>
--- a/templates/protagonist-main.hbs
+++ b/templates/protagonist-main.hbs
@@ -111,7 +111,4 @@
    </div>
  </fieldset>

-  <fieldset class="protagonist-resources protagonist-resources-{{ifThen isPlayMode 'play' 'edit'}}">
-  </fieldset>
-
 </section>
--- a/templates/protagonist-skills.hbs
+++ b/templates/protagonist-skills.hbs
@@ -4,10 +4,12 @@
    <legend data-tooltip="{{localize "CTHULHUETERNAL.Tooltip.skills"}}" data-tooltip-direction="UP">{{localize "CTHULHUETERNAL.Label.skills"}}</legend>
    <div class="skills">
        {{#each skills as |item|}}
-          <div class="skill " data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
+          <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}}" />
-            <div class="name" data-tooltip="{{{item.description}}}<br><br>{{item.path}}" data-tooltip-direction="UP">{{item.name}}
-              <span data-tooltip="{{localize 'CTHULHUETERNAL.Label.progressionPossible'}}">{{item.system.skillTotal}}</span>
+            <div class="name rollable" data-roll-type="skill" data-tooltip="{{{item.description}}}" data-tooltip-direction="UP">{{item.name}}
+            </div>
+            <div class="score" >
+              {{item.system.skillTotal}}
            </div>
            <div class="controls">
              <a data-tooltip="{{localize 'CTHULHUETERNAL.Edit'}}" data-action="edit" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>
--- a/templates/roll-dialog.hbs
+++ b/templates/roll-dialog.hbs
@@ -1,59 +1,20 @@
 {{log "roll-dialog" this}}
-<div class="tenebris-roll-dialog">
-  {{#if isSave}}
+<div class="fvtt-cthulhu-eternal-roll-dialog">
+  {{#if (eq rollType "skill")}}
    <fieldSet>
-      <legend>{{localize "TENEBRIS.Label.sauvegarde"}}</legend>
-      <div class="dialog-save">{{formula}}</div>
+      <legend>{{localize "CTHULHUETERNAL.Label.skill"}}</legend>
+      <div class="dialog-skill">{{rollItem.name}} : {{targetScore}}</div>
    </fieldSet>
-    <fieldSet class="dialog-avantages">
-      <legend>{{localize "TENEBRIS.Roll.avantagesDesavantages"}}</legend>
-      <input
-        type="range"
-        name="avantages"
-        min="1"
-        max="5"
-        value="{{rangeAdvantage}}"
-        data-tooltip="Double désavantage - Désavantage - Normal - Avantage - Double avantage"
-        data-tooltip-direction="UP"
-        data-tooltip-class="tooltip-avantages"        
-      />      
-      <input id="selectAvantages" name="selectAvantages" readonly value="{{rollAdvantage}}">
-    </fieldSet>      
-    <div class="dialog-aide-gene">
-      <fieldSet>
-        <legend>{{localize "TENEBRIS.Roll.aide"}}</legend>
-        <select name="aide">
-          {{selectOptions choiceAide}}
-        </select>
-      </fieldSet>
-      <fieldSet>
-        <legend>{{localize "TENEBRIS.Roll.gene"}}</legend>
-        <select name="gene">
-          {{selectOptions choiceGene}}
-        </select>
-      </fieldSet>
-    </div>
-    <fieldSet class="dialog-modificateur">
-      <legend>{{localize "TENEBRIS.Roll.adversite"}}</legend>
-      <select name="modificateur" {{#if hasTarget}}data-tooltip="Cible : {{targetName}}" data-tooltip-direction="UP"{{/if}}>
-        {{selectOptions choiceModificateur selected=malus}}
+    <fieldSet class="dialog-modifier">
+      <legend>{{localize "CTHULHUETERNAL.Label.modifier"}}</legend>
+      <select name="modifier" class="roll-skill-modifier">
+        {{selectOptions choiceModifier selected=modifier}}
      </select>
    </fieldSet>
  {{/if}}
-  {{#if (or isDamage isAttack)}}
-    <fieldSet>
-      <legend>{{localize "TENEBRIS.Label.degats"}}</legend>
-      <div class="dialog-damage">{{damageDice}} {{#if damageDiceLowered}}limités par les dégâts max à {{damageDiceFinal}} {{/if}}</div>
-    </fieldSet>
-  {{/if}}
-  {{#if isResource}}
-    <fieldSet>
-      <legend>{{localize "TENEBRIS.Label.ressource"}}</legend>
-      <div class="dialog-resource">{{formula}}</div>
-    </fieldSet>
-  {{/if}}
+
  <fieldSet>
-    <legend>{{localize "TENEBRIS.Roll.visibilite"}}</legend>
+    <legend>{{localize "CTHULHUETERNAL.Label.rollView"}}</legend>
    <select name="visibility">
      {{selectOptions rollModes selected=visibility}}
    </select>
--- a/templates/skill.hbs
+++ b/templates/skill.hbs
@@ -1,25 +1,29 @@
 <section>
  <div class="header">
-    <img class="item-img era-icon-color" src="{{item.img}}" data-edit="img" data-action="editImage" data-tooltip="{{item.name}}" />
+    <img class="item-img era-icon-color" src="{{item.img}}" data-edit="img" data-action="editImage"
+      data-tooltip="{{item.name}}" />
    {{formInput fields.name value=source.name}}
-  </div>  
-  
-  {{formField systemFields.settings value=system.settings localize=true}}
-  {{formField systemFields.base value=system.base}}
-  {{formField systemFields.bonus value=system.bonus}}
-  {{formField systemFields.diceEvolved value=system.diceEvolved}}
-  {{#if system.diceEvolved}}
-  {{formField systemFields.rollFailed value=system.rollFailed}}
-  {{/if}}
-
-  <div class="total flexrow">
-    <legend>{{localize "CTHULHUETERNAL.Label.total"}}</legend>
-    {{system.skillTotal}}
  </div>

+  <fieldset>
+    {{formField systemFields.settings value=system.settings localize=true}}
+    {{formField systemFields.base value=system.base}}
+    {{formField systemFields.bonus value=system.bonus}}
+    <div class="total flexrow">
+      <legend>{{localize "CTHULHUETERNAL.Label.totalScore"}}</legend>
+      {{system.skillTotal}}
+    </div>
+    {{formField systemFields.diceEvolved value=system.diceEvolved}}
+    {{#if system.diceEvolved}}
+    {{formField systemFields.rollFailed value=system.rollFailed}}
+    {{/if}}
+  </fieldset>
+
+
  <fieldset>
    <legend>{{localize "CTHULHUETERNAL.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>

 </section>
--- a/templates/weapon.hbs
+++ b/templates/weapon.hbs
@@ -4,22 +4,24 @@
    {{formInput fields.name value=source.name}}
  </div>

-  {{formField systemFields.settings value=system.settings localize=true}}
-  {{formField systemFields.weaponType value=system.weaponType localize=true}}
-  {{#if (eq system.weaponType "rangedfirearm")}}
+  <fieldset>
+    {{formField systemFields.settings value=system.settings localize=true}}
+    {{formField systemFields.weaponType value=system.weaponType localize=true}}
+    {{#if (eq system.weaponType "rangedfirearm")}}
    {{formField systemFields.weaponSubtype value=system.weaponSubtype localize=true}}
-  {{/if}}
+    {{/if}}

-  {{formField systemFields.damage value=system.damage}}
-  {{formField systemFields.baseRange value=system.baseRange}}
-  {{formField systemFields.rangeUnit value=system.rangeUnit localize=true}}
-  {{formField systemFields.lethality value=system.lethality}}
-  {{formField systemFields.killRadius value=system.killRadius}}
+    {{formField systemFields.damage value=system.damage}}
+    {{formField systemFields.baseRange value=system.baseRange}}
+    {{formField systemFields.rangeUnit value=system.rangeUnit localize=true}}
+    {{formField systemFields.lethality value=system.lethality}}
+    {{formField systemFields.killRadius value=system.killRadius}}
+
+    {{formField systemFields.armorPiercing value=system.armorPiercing}}
+
+    {{formField systemFields.resourceLevel value=system.resourceLevel}}
+  </fieldset>
  
-  {{formField systemFields.armorPiercing value=system.armorPiercing}}
-
-  {{formField systemFields.resourceLevel value=system.resourceLevel}}
-
  <fieldset>
    <legend>{{localize "CTHULHUETERNAL.Label.description"}}</legend>
    {{formInput