Merge perception to skills; rename as Checks

iBoMbY · May 13, 2023 · 1e4e499 · 1e4e499
1 parent df96931
commit 1e4e499
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -22,7 +22,7 @@
     "LMRTFY.MessagePlaceholder": "Roll to see if you find any traps...",
     "LMRTFY.SavingThrows": "Saving Throws:",
     "LMRTFY.SavingThrow": "Saving Throw: ",
-    "LMRTFY.SkillChecks": "Skill Checks:",
+    "LMRTFY.Checks": "Checks:",
     "LMRTFY.SkillCheck": "Skill Check: ",
     "LMRTFY.RequestRolls": "Request Rolls!",
     "LMRTFY.SaveRequest": "Save Request as Macro",

diff --git a/src/requestor.js b/src/requestor.js
@@ -88,6 +88,8 @@ class LMRTFYRequestor extends FormApplication {
             (Object.keys(a_skills).map(key => a_skills[key]).filter(skill => !LMRTFY.skills[skill.slug])).map(skill => skills[skill.slug] = skill.label);
         });
 
+        skills["perception"] = "LMRTFY.Perception";
+
         const extraRollOptions = game.settings.get('lmrtfy_pf2e', 'extraRollOptions')
 
         return {
@@ -134,6 +136,15 @@ class LMRTFYRequestor extends FormApplication {
         const { mode, title, message, extraRollOptions } = formData;
         const traits = formData.traits;
 
+        let perception = formData['extra-perception'];
+
+        const index = skills.indexOf("perception");
+
+        if (index > -1) {
+            perception = true;
+            delete skills[index];
+        }
+
         let dc = undefined;
         const dcValue = parseInt(formData.dc);
 
@@ -168,7 +179,7 @@ class LMRTFYRequestor extends FormApplication {
             mode,
             title,
             message,
-            perception: formData['extra-perception'],
+            perception,
             "flat-check": formData['extra-flat-check'],
             chooseOne: formData['choose-one'],
             dc,

diff --git a/templates/request-rolls.html b/templates/request-rolls.html
@@ -122,27 +122,6 @@
         <button type="button" class="add-extra-roll-note" name="submit" value="1"><i class="fas fa-plus-square"></i>{{localize "LMRTFY.AddRoleNote"}}</button>
     </fieldset>
 
-    <fieldset>
-        <div class="form-group">
-            <label>{{localize "LMRTFY.Extras"}}</label>
-
-            <div class="lmrtfy-extras">
-                {{#if specialRolls.perception}}
-                <div class="lmrtfy-extra-perception">
-                    <input type="checkbox" name="extra-perception" id="lmrtf-extra-perception" data-dtype="Boolean" {{#if (lmrtfy-isSelected "perception")}}checked{{/if}} />
-                    <label for="lmrtf-extra-perception">{{localize "LMRTFY.Perception"}}</label>
-                </div>
-                {{/if}}
-                {{#if specialRolls.flat-check}}
-                <div class="lmrtfy-extra-flat-check">
-                    <input type="checkbox" name="extra-flat-check" id="lmrtf-extra-flat-check" data-dtype="Boolean" {{#if (lmrtfy-isSelected "flat-check")}}checked{{/if}} />
-                    <label for="lmrtf-extra-flat-check">{{localize "PF2E.FlatCheck"}}</label>
-                </div>
-                {{/if}}
-            </div>
-        </div>
-    </fieldset>
-
     <fieldset>
     <div class="form-group">
         <label>{{localize "LMRTFY.SavingThrows"}}</label>
@@ -160,7 +139,7 @@
 
     <fieldset>
         <div class="form-group">
-            <label>{{localize "LMRTFY.SkillChecks"}}</label>
+            <label>{{localize "LMRTFY.Checks"}}</label>
                 <select name="skills" id="lmrtf-skills" data-placeholder="Begin typing a name to filter..." multiple class="chosen-select" data-dtype="String">
                     <option value=""></option>
                     {{#each skills as |name key|}}