Minor and cosmetic fixes (#157)

* Add fields and dependency for the bug-reporter module.
Closes #152.

* Reorder saves on upper level sheets.
Closes #151.

* Rework Halfling two weapon fighting description on the sheet.
Closes #149.

* Remove actor name from damage and healing chat cards since the token
name is at the top of the card.
Closes #146.

* Fix Skill sheet description size and other item sheet issues.
Replaced item header fields with flexrows (grid caused some layout
problems).
Spell Mercurial Magic and Description now both resize if necessary.
Closes #143.

* Update download link to be v0.0.22-preview-4.

Author: mooped

lang/en.json

@@ -268,10 +268,10 @@
   "DCC.HalflingAbilities": "Halfling Skills",
   "DCC.HalflingTwoWeaponActionDie": "Action dice d16+d16",
   "DCC.HalflingTwoWeaponCrit": "Crit on nat 16",
-  "DCC.HalflingTwoWeaponFumble": "Fumble only on 2x 1",
-  "DCC.HalflingTwoWeaponHighAg": "If Agi > 16 use normal rules",
+  "DCC.HalflingTwoWeaponFumble": "Fumble only on double 1",
+  "DCC.HalflingTwoWeaponHighAg": "If Agi > 16 use normal rules",
   "DCC.HandlePoison": "Handle Poison",
-  "DCC.HealDamage": "{target} is healed for {damage} HP.",
+  "DCC.HealDamage": "Healed for {damage} HP.",
   "DCC.Healing": "Healing",
   "DCC.Health": "Health",
   "DCC.HealthFormula": "Health Formula",
@@ -537,7 +537,7 @@
   "DCC.SkillUseDie": "Use Die",
   "DCC.SkillUseValue": "Use Modifier",
   "DCC.SkillValue": "Modifier",
-  "DCC.TakeDamage": "{target} takes {damage} HP of damage.",
+  "DCC.TakeDamage": "Takes {damage} HP of damage.",
   "DCC.Target": "Target",
   "DCC.TargetAlly": "Ally",
   "DCC.TargetCone": "Cone",

module/actor-sheet.js

@@ -73,6 +73,15 @@ class DCCActorSheet extends ActorSheet {
       this.options.template = 'systems/dcc/templates/actor-sheet-npc.html'
     } else {
       this.options.template = 'systems/dcc/templates/actor-sheet-zero-level.html'
+
+      if (!data.isZero) {
+        // Reorder saves on upper level sheet to define tabbing order
+        data.data.saves = {
+          ref: data.data.saves.ref,
+          frt: data.data.saves.frt,
+          wil: data.data.saves.wil
+        }
+      }
     }
 
     // Prepare item lists by type

styles/dcc.css

@@ -1099,14 +1099,20 @@
 .dcc.item .sheet-body.spell {
   display: grid;
   grid-template-columns: 3fr 1fr 2fr;
-  grid-template-rows: 60px 50px minmax(80px, auto) 50px 80px; }
+  grid-template-rows: 60px 50px minmax(80px, auto) 50px minmax(80px, auto); }
 
 .dcc.item .sheet-body.treasure {
   width: 100%;
   display: grid;
   grid-template-columns: 100%;
   grid-template-rows: 85px 50px minmax(80px, auto); }
 
+.dcc.item .sheet-body.skill {
+  width: 100%;
+  display: grid;
+  grid-template-columns: 100%;
+  grid-template-rows: 50px minmax(80px, auto); }
+
 .dcc.item .value-row {
   height: 150px;
   display: flex;

styles/dcc.scss

@@ -1287,7 +1287,7 @@ $border-style: 2px groove #eeede0;
   .sheet-body.spell {
     display: grid;
     grid-template-columns: 3fr 1fr 2fr;
-    grid-template-rows: 60px 50px minmax(80px, auto) 50px 80px;
+    grid-template-rows: 60px 50px minmax(80px, auto) 50px minmax(80px, auto);
   }
 
   .sheet-body.treasure {
@@ -1297,6 +1297,13 @@ $border-style: 2px groove #eeede0;
     grid-template-rows: 85px 50px minmax(80px, auto);
   }
 
+  .sheet-body.skill {
+    width: 100%;
+    display: grid;
+    grid-template-columns: 100%;
+    grid-template-rows: 50px minmax(80px, auto);
+  }
+
   .value-row {
     height: 150px;
     display: flex;

system.json

@@ -8,6 +8,11 @@
   "templateVersion": 4,
   "author": "Tim L. White",
   "contributors": { "name" : "Steve Barnett", "email" : "[email protected]" },
+  "dependencies": [
+    {
+      "name": "bug-reporter"
+    }
+  ],
   "esmodules": [
     "module/dcc.js"
   ],
@@ -38,6 +43,8 @@
   "initiative": "1d20 + @attributes.init.value",
   "url": "https://github.com/cyface/foundryvtt-dcc",
   "manifest": "https://github.com/cyface/foundryvtt-dcc/raw/preview_v0.0.22/system.json",
-  "download": "https://github.com/cyface/foundryvtt-dcc/archive/v0.0.22-preview.3.zip",
+  "download": "https://github.com/cyface/foundryvtt-dcc/archive/v0.0.22-preview.4.zip",
+  "bugs": "https://github.com/foundryvtt-dcc/foundryvtt-dcc/issues",
+  "allowBugReporter": true,
   "license": "LICENSE.txt"
 }

templates/item-partial-header.html

@@ -7,12 +7,12 @@ <h1 class="item-name charname"><input name="name" type="text" value="{{item.name
             </div>
             <label class="item-type" for="name">{{localize item.data.typeString}}</label>
         </div>
-        <div class="grid grid-2col">
-          <div class="resource">
+        <div class="flexrow">
+          <div class="resource flex1">
             <label class="resource-label">{{localize "DCC.Quantity"}}</label>
               <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
           </div>
-          <div class="resource">
+          <div class="resource flex1">
             <label class="resource-label">{{localize "DCC.Weight"}}</label>
               <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
           </div>

templates/item-sheet-skill.html

@@ -16,8 +16,8 @@ <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeh
                      data-dtype="String"/>
             </div>
             {{else}}
-            <div class="grid grid-3col">
-              <div class="resource">
+            <div class="flexrow">
+              <div class="resource flex1">
                 <label class="resource-label">{{localize "DCC.SkillAbility"}}</label>
                 <div>
                   <select name="data.ability" id="data.ability"
@@ -33,13 +33,13 @@ <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeh
                   </select>
                 </div>
               </div>
-              <div class="resource">
+              <div class="resource flex1">
                 <label class="resource-label">{{localize "DCC.SkillDie"}}</label>
                 <input type="text" name="data.die" value="{{data.die}}"
                        {{#if data.config.useDie}}{{else}}disabled{{/if}}
                        data-dtype="String"/>
               </div>
-              <div class="resource">
+              <div class="resource flex1">
                 <label class="resource-label">{{localize "DCC.SkillValue"}}</label>
                 <input type="text" name="data.value"
                        value="{{numberFormat data.value decimals=0 sign=true}}"
@@ -51,7 +51,7 @@ <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeh
         </div>
     </header>
 
-    <section class="sheet-body item">
+    <section class="sheet-body skill">
         <h1 class="description-heading">{{localize "DCC.Description"}}</h1>
         <div class="description">
             {{editor content=data.description.value target="data.description.value" button=true owner=owner editable=editable}}

templates/item-sheet-spell.html

@@ -9,14 +9,14 @@ <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeh
                 <label class="item-type" for="name">{{localize item.data.typeString}}</label>
             </div>
 
-            <div class="grid grid-2col">
-              <div class="resource">
+            <div class="flexrow">
+              <div class="resource flex1">
                 <label class="resource-label" for="data.level">{{localize "DCC.SpellLevel"}}</label>
                 <input type="text" name="data.level"
                        value="{{numberFormat data.level decimals=0 sign=false}}"
                        placeholder="1" data-dtype="Number"/>
               </div>
-              <div class="resource">
+              <div class="resource flex1">
                 <label class="resource-label" for="data.spellCheck.modifier">{{localize "DCC.SpellCheck"}}</label>
                 <div class="flexrow">
                   <input type="text" name="data.spellCheck.die" class="flex1"