[#1852] Allow for choosing a skill's ability on the character sheet r…

…ather than during the intermediary roll dialog.
foundryvtt · Oct 8, 2022 · 8cb647d · 8cb647d
1 parent c3a7f30
commit 8cb647d
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 78 deletions.
diff --git a/dnd5e.css b/dnd5e.css
@@ -981,7 +981,7 @@
   cursor: default;
 }
 .dnd5e.sheet.actor ul.skills-list {
-  flex: 0 0 180px;
+  flex: 0 0 212px;
   list-style: none;
   margin: 0 5px 0;
   padding: 0;
@@ -991,6 +991,7 @@
 .dnd5e.sheet.actor ul.skills-list li.skill {
   height: 24px;
   padding: 3px 2px;
+  align-items: center;
 }
 .dnd5e.sheet.actor ul.skills-list li.skill:nth-child(even) {
   background: rgba(0, 0, 0, 0.05);
@@ -1019,6 +1020,7 @@
 }
 .dnd5e.sheet.actor ul.skills-list li.skill .skill-ability {
   flex: 0 0 26px;
+  border: none;
   text-transform: capitalize;
 }
 .dnd5e.sheet.actor ul.skills-list li.skill .skill-mod {
@@ -1934,16 +1936,12 @@
   margin: 0;
   top: -6px;
 }
-.dnd5e.sheet.actor.character ul.skills-list {
-  flex: 0 0 212px;
-}
 .dnd5e.sheet.actor.character ul.skills-list li.skill {
   padding: 3px;
 }
 .dnd5e.sheet.actor.character ul.skills-list li.skill h4 {
   flex: 1px;
   margin: 0;
-  font-size: 13px;
 }
 .dnd5e.sheet.actor.character .item-detail.player-class {
   flex: 0 0 180px;

diff --git a/less/actors.less b/less/actors.less
@@ -293,7 +293,7 @@
   /* ----------------------------------------- */
 
   ul.skills-list {
-    flex: 0 0 180px;
+    flex: 0 0 212px;
     list-style: none;
     margin: 0 5px 0;
     padding: 0;
@@ -303,6 +303,7 @@
     li.skill {
       height: 24px;
       padding: 3px 2px;
+      align-items: center;
 
       &:nth-child(even) {
         background: rgba(0, 0, 0, 0.05);
@@ -337,6 +338,7 @@
 
       .skill-ability {
         flex: 0 0 26px;
+        border: none;
         text-transform: capitalize;
       }
 

diff --git a/less/character.less b/less/character.less
@@ -111,14 +111,11 @@
   }
 
   ul.skills-list {
-    flex: 0 0 212px;
-
     li.skill {
       padding: 3px;
       h4 {
         flex: 1px;
         margin: 0;
-        font-size: 13px;
       }
     }
   }

diff --git a/module/applications/actor/npc-sheet.mjs b/module/applications/actor/npc-sheet.mjs
@@ -9,7 +9,7 @@ export default class ActorSheet5eNPC extends ActorSheet5e {
   static get defaultOptions() {
     return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["dnd5e", "sheet", "actor", "npc"],
-      width: 600
+      width: 632
     });
   }
 

diff --git a/module/dice/d20-roll.mjs b/module/dice/d20-roll.mjs
@@ -187,23 +187,18 @@ export default class D20Roll extends Roll {
    * @param {string} [data.title]             The title of the shown dialog window
    * @param {number} [data.defaultRollMode]   The roll mode that the roll mode select element should default to
    * @param {number} [data.defaultAction]     The button marked as default
-   * @param {boolean} [data.chooseModifier]   Choose which ability modifier should be applied to the roll?
-   * @param {string} [data.defaultAbility]    For tool rolls, the default ability modifier applied to the roll
    * @param {string} [data.template]          A custom path to an HTML template to use instead of the default
    * @param {object} options                  Additional Dialog customization options
    * @returns {Promise<D20Roll|null>}         A resulting D20Roll object constructed with the dialog, or null if the
    *                                          dialog was closed
    */
-  async configureDialog({title, defaultRollMode, defaultAction=D20Roll.ADV_MODE.NORMAL, chooseModifier=false,
-    defaultAbility, template}={}, options={}) {
+  async configureDialog({title, defaultRollMode, defaultAction=D20Roll.ADV_MODE.NORMAL, template}={}, options={}) {
 
     // Render the Dialog inner HTML
     const content = await renderTemplate(template ?? this.constructor.EVALUATION_TEMPLATE, {
       formula: `${this.formula} + @bonus`,
       defaultRollMode,
       rollModes: CONFIG.Dice.rollModes,
-      chooseModifier,
-      defaultAbility,
       abilities: CONFIG.DND5E.abilities
     });
 

diff --git a/module/dice/dice.mjs b/module/dice/dice.mjs
@@ -27,8 +27,6 @@
  *
  * ## Roll Configuration Dialog
  * @property {boolean} [fastForward]           Should the roll configuration dialog be skipped?
- * @property {boolean} [chooseModifier=false]  If the configuration dialog is shown, should the ability modifier be
- *                                             configurable within that interface?
  * @property {string} [template]               The HTML template used to display the roll configuration dialog.
  * @property {string} [title]                  Title of the roll configuration dialog.
  * @property {object} [dialogOptions]          Additional options passed to the roll configuration dialog.
@@ -52,18 +50,14 @@ export async function d20Roll({
   parts=[], data={}, event,
   advantage, disadvantage, critical=20, fumble=1, targetValue,
   elvenAccuracy, halflingLucky, reliableTalent,
-  fastForward, chooseModifier=false, template, title, dialogOptions,
+  fastForward, template, title, dialogOptions,
   chatMessage=true, messageData={}, rollMode, flavor
 }={}) {
 
   // Handle input arguments
   const formula = ["1d20"].concat(parts).join(" + ");
   const {advantageMode, isFF} = _determineAdvantageMode({advantage, disadvantage, fastForward, event});
   const defaultRollMode = rollMode || game.settings.get("core", "rollMode");
-  if ( chooseModifier && !isFF ) {
-    data.mod = "@mod";
-    if ( "abilityCheckBonus" in data ) data.abilityCheckBonus = "@abilityCheckBonus";
-  }
 
   // Construct the D20Roll instance
   const roll = new CONFIG.Dice.D20Roll(formula, data, {
@@ -83,10 +77,8 @@ export async function d20Roll({
   if ( !isFF ) {
     const configured = await roll.configureDialog({
       title,
-      chooseModifier,
       defaultRollMode,
       defaultAction: advantageMode,
-      defaultAbility: data?.item?.ability || data?.defaultAbility,
       template
     }, dialogOptions);
     if ( configured === null ) return null;

diff --git a/module/documents/actor/actor.mjs b/module/documents/actor/actor.mjs
@@ -829,7 +829,6 @@ export default class Actor5e extends Actor {
 
     // Add ability modifier
     data.mod = skl.mod;
-    data.defaultAbility = skl.ability;
 
     // Include proficiency bonus
     if ( skl.prof.hasProficiency ) {
@@ -873,7 +872,6 @@ export default class Actor5e extends Actor {
       data: data,
       title: `${flavor}: ${this.name}`,
       flavor,
-      chooseModifier: true,
       halflingLucky: this.getFlag("dnd5e", "halflingLucky"),
       reliableTalent,
       messageData: {

diff --git a/module/documents/item.mjs b/module/documents/item.mjs
@@ -1723,7 +1723,6 @@ export default class Item5e extends Item {
         top: options.event ? options.event.clientY - 80 : null,
         left: window.innerWidth - 710
       },
-      chooseModifier: true,
       halflingLucky: this.actor.getFlag("dnd5e", "halflingLucky" ),
       reliableTalent: (this.system.proficient >= 1) && this.actor.getFlag("dnd5e", "reliableTalent"),
       messageData: {

diff --git a/module/utils.mjs b/module/utils.mjs
@@ -100,6 +100,7 @@ export async function preloadHandlebarsTemplates() {
     "systems/dnd5e/templates/actors/parts/actor-features.hbs",
     "systems/dnd5e/templates/actors/parts/actor-spellbook.hbs",
     "systems/dnd5e/templates/actors/parts/actor-warnings.hbs",
+    "systems/dnd5e/templates/actors/parts/actor-skills.hbs",
 
     // Item Sheet Partials
     "systems/dnd5e/templates/items/parts/item-action.hbs",

diff --git a/templates/actors/character-sheet.hbs b/templates/actors/character-sheet.hbs
@@ -167,27 +167,7 @@
             </ul>
 
             {{!-- Skills --}}
-            <ul class="skills-list">
-            {{#each config.skills as |obj s|}}
-            {{#with (lookup ../system.skills s) as |skill|}}
-                <li class="skill flexrow {{#if skill.value}}proficient{{/if}}" data-skill="{{s}}">
-                    <input type="hidden" name="system.skills.{{s}}.value" value="{{skill.baseValue}}" data-dtype="Number"/>
-                    <a class="proficiency-toggle skill-proficiency" title="{{skill.hover}}">{{{skill.icon}}}</a>
-                    <div class="skill-name-controls">
-                      <h4 class="skill-name rollable">{{skill.label}}</h4>
-                      <a class="config-button" data-action="skill" title="{{localize 'DND5E.SkillConfigure'}}"><i class="fas fa-cog"></i></a>
-                    </div>
-                    <span class="skill-ability">{{skill.ability}}</span>
-                    <span class="skill-mod" title="{{ localize 'DND5E.SkillModifierHint' skill=skill.label }}">
-                        {{numberFormat skill.total decimals=0 sign=true}}
-                    </span>
-                    <span class="skill-passive" title="{{ localize 'DND5E.SkillPassiveHint' skill=skill.label }}">
-                        ({{skill.passive}})
-                    </span>
-                </li>
-            {{/with}}
-            {{/each}}
-            </ul>
+            {{> "dnd5e.actor-skills"}}
 
             <section class="center-pane flexcol">
 

diff --git a/templates/actors/npc-sheet.hbs b/templates/actors/npc-sheet.hbs
@@ -129,27 +129,7 @@
             </ul>
 
             {{!-- Skills --}}
-            <ul class="skills-list">
-            {{#each config.skills as |obj s|}}
-            {{#with (lookup ../system.skills s) as |skill|}}
-                <li class="skill flexrow {{#if skill.value}}proficient{{/if}}" data-skill="{{s}}">
-                    <input type="hidden" name="system.skills.{{s}}.value" value="{{skill.baseValue}}" data-dtype="Number"/>
-                    <a class="proficiency-toggle skill-proficiency" title="{{skill.hover}}">{{{skill.icon}}}</a>
-                    <div class="skill-name-controls">
-                      <h4 class="skill-name rollable">{{skill.label}}</h4>
-                      <a class="config-button" data-action="skill" title="{{localize 'DND5E.SkillConfigure'}}"><i class="fas fa-cog"></i></a>
-                    </div>
-                    <span class="skill-ability">{{skill.ability}}</span>
-                    <span class="skill-mod" title="{{ localize 'DND5E.SkillModifierHint' skill=skill.label }}">
-                        {{numberFormat skill.total decimals=0 sign=true}}
-                    </span>
-                    <span class="skill-passive" title="{{ localize 'DND5E.SkillPassiveHint' skill=skill.label }}">
-                        ({{skill.passive}})
-                    </span>
-                </li>
-            {{/with}}
-            {{/each}}
-            </ul>
+            {{> "dnd5e.actor-skills"}}
 
             <section class="center-pane flexcol">
 

diff --git a/templates/actors/parts/actor-skills.hbs b/templates/actors/parts/actor-skills.hbs
@@ -0,0 +1,25 @@
+<ul class="skills-list">
+    {{#each config.skills as |obj s|}}
+    {{#with (lookup ../system.skills s) as |skill|}}
+        <li class="skill flexrow {{#if skill.value}}proficient{{/if}}" data-skill="{{s}}">
+            <input type="hidden" name="system.skills.{{s}}.value" value="{{skill.baseValue}}" data-dtype="Number">
+            <a class="proficiency-toggle skill-proficiency" title="{{skill.hover}}">{{{skill.icon}}}</a>
+            <div class="skill-name-controls">
+                <h4 class="skill-name rollable">{{skill.label}}</h4>
+                <a class="config-button" data-action="skill" title="{{localize 'DND5E.SkillConfigure'}}">
+                    <i class="fas fa-cog"></i>
+                </a>
+            </div>
+            <select class="skill-ability" name="system.skills.{{s}}.ability">
+                {{selectOptions @root.config.abilityAbbreviations selected=skill.ability}}
+            </select>
+            <span class="skill-mod" title="{{localize 'DND5E.SkillModifierHint' skill=skill.label}}">
+                {{numberFormat skill.total decimals=0 sign=true}}
+            </span>
+            <span class="skill-passive" title="{{localize 'DND5E.SkillPassiveHint' skill=skill.label}}">
+                ({{skill.passive}})
+            </span>
+        </li>
+    {{/with}}
+    {{/each}}
+</ul>
diff --git a/templates/chat/roll-dialog.hbs b/templates/chat/roll-dialog.hbs
@@ -3,14 +3,6 @@
         <label>{{ localize "DND5E.Formula" }}</label>
         <input type="text" name="formula" value="{{formula}}" disabled/>
     </div>
-    {{#if chooseModifier}}
-    <div class="form-group">
-        <label>{{ localize "DND5E.AbilityModifier" }}</label>
-        <select name="ability">
-            {{selectOptions abilities selected=defaultAbility}}
-        </select>
-    </div>
-    {{/if}}
     <div class="form-group">
         <label>{{ localize "DND5E.RollSituationalBonus" }}</label>
         <input type="text" name="bonus" value="" placeholder="{{ localize 'DND5E.RollExample' }}"/>