Merge pull request #24 from crash1115/dev

v0.4.4

README.md

@@ -17,11 +17,11 @@ There are three core ways to track activities in this module:
 
 [![Image from Gyazo](https://i.gyazo.com/5f7d0c52b2e1632dceebe94f5de842d4.gif)](https://gyazo.com/5f7d0c52b2e1632dceebe94f5de842d4)
 
-**Ability Check Progression** is the fun stuff. When you set up an activity that uses this mode, you also select an associated ability or skill to go along with it. Every attempt to progress the activity prompts the player for an ability/skill check. Currently, this uses the core 5e roll system and prompts for advantage/disadvantage, and modifiers. The check is rolled, and the total gets added to the progress score. Use this one for training skill or tool proficiencies.
+**Ability(/Skill/Tool) Check Progression** is the fun stuff. When you set up an activity that uses this mode, you also select an associated ability, skill, or tool to go along with it. Every attempt to progress the activity prompts the player for an ability/skill/tool check. Currently, this uses the core 5e roll system and prompts for advantage/disadvantage, and modifiers. The check is rolled, and the total gets added to the progress score.
 
 [![Image from Gyazo](https://i.gyazo.com/83287fa524afe4fc618d0c9014b66bff.gif)](https://gyazo.com/83287fa524afe4fc618d0c9014b66bff)
 
-**DC Progression (v0.4.0+)** is a hybrid of the first two modes. This progression mode prompts the player to make a skill or ability check against a set DC. If the roll is successful, the progression score increases by one. If the roll fails, no progress is gained. Currently, this uses the core 5e roll system and prompts for advantage/disadvantage, and modifiers.
+**Check With DC Progression (v0.4.0+)** is a hybrid of the first two modes. This progression mode prompts the player to make a skill, ability, or tool check against a set DC. If the roll is successful, the progression score increases by one. If the roll fails, no progress is gained. Currently, this uses the core 5e roll system and prompts for advantage/disadvantage, and modifiers.
 
 [![Image from Gyazo](https://i.gyazo.com/75ff889b77d7a3e1aced719503cf3eeb.gif)](https://gyazo.com/75ff889b77d7a3e1aced719503cf3eeb)
 
@@ -59,6 +59,7 @@ If you'd like to contribute, please get in touch with me or create a pull reques
 - Sky's Alt D&D 5e Character Sheet
 - Tidy5e Sheet (including dark mode with your custom colors!)
 - D&D5E Dark Mode (works with both the default sheet and Sky's Alt 5e sheet)
+- Ethck's Downtime Tracking
 
 ### Unsupported Modules
 - Obsidian (no plans to support at this time)

changelog.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## Version 0.4.4
+Improvements:
+- Added the ability to select tools in addition to skills and ability checks. Tools are limited to those the actor has in their inventory. This means they're not available on NPC sheets.
+
+Changes:
+
+- "Ability" progression mode is now called "Ability/Skill/Tool Check" mode.
+- "DC" progression mode is now called "Check with DC".
+- Together, these modes are referred to as "Check-Based" progression modes, since they both utilize checks. You'll see them referred to this way in the module settings.
+
 ## Version 0.4.3
 Fixes:
 - Enhanced compatibility with Ethck's very cool downtime module. Clicking things will no longer open dialogs from two modules, and styles no longer wreak havoc with one another.

lang/en.json

@@ -6,6 +6,7 @@
   "C5ETRAINING.AbilityCon": "Constitution",
   "C5ETRAINING.AbilityDex": "Dexterity",
   "C5ETRAINING.AbilityInt": "Intelligence",
+  "C5ETRAINING.AbilitySkillToolCheck": "Ability/Skill/Tool Check",
   "C5ETRAINING.AbilityStr": "Strength",
   "C5ETRAINING.AbilityWis": "Wisdom",
   "C5ETRAINING.Action": "Action",
@@ -27,6 +28,7 @@
 
 	"C5ETRAINING.Cancel": "Cancel",
   "C5ETRAINING.CheckDC": "Check DC",
+  "C5ETRAINING.CheckWithDC": "Check with DC",
 	"C5ETRAINING.Completed": "completed",
 	"C5ETRAINING.CompletedADowntimeActivity": "completed a downtime activity.",
   "C5ETRAINING.CompletionTarget": "Completion Target",
@@ -37,14 +39,14 @@
   "C5ETRAINING.CustomRoll": "Custom Roll",
 
   "C5ETRAINING.DC": "DC",
-	"C5ETRAINING.DefaultAbility": "Default Attribute for Ability Check Progression",
-	"C5ETRAINING.DefaultAbilityHint": "Sets the default attribute assigned to a downtime activity upon creation. This can be edited after activity creation.",
-	"C5ETRAINING.DefaultAbilityCompletion": "Default Activity Completion Target (Ability Checks)",
-  "C5ETRAINING.DefaultAbilityCompletionHint": "Sets the default target number required to reach 100% activity completion for downtime activities using ability check progression. A good rule of thumb is that the average individual will be able to contribute about 10 points to their total per check to progress the activity. The default is 300 (or 30 days for the average individual training once a day).",
-  "C5ETRAINING.DefaultDcDifficulty": "Default Check Difficulty (DC)",
-  "C5ETRAINING.DefaultDcDifficultyHint": "Sets the default DC for ability checks used by downtime activities using the DC progression system. Defaults to 10.",
-  "C5ETRAINING.DefaultDcSuccesses": "Default Activity Completion Target (DC)",
-  "C5ETRAINING.DefaultDcSuccessesHint": "Sets the default target number of check successes required to reach 100% activity completion for downtime activities using the DC progression system. The default is 5 successes.",
+	"C5ETRAINING.DefaultAbility": "Default Attribute/Skill for Check-Based Progression",
+	"C5ETRAINING.DefaultAbilityHint": "Sets the default attribute/skill assigned to check-based downtime activites upon creation. This can be edited after activity creation.",
+	"C5ETRAINING.DefaultAbilityCompletion": "Default Activity Completion Target (Ability/Skill/Tool Checks)",
+  "C5ETRAINING.DefaultAbilityCompletionHint": "Sets the default target number required to reach 100% activity completion for downtime activities using check-based progression. A good rule of thumb is that the average individual will be able to contribute about 10 points to their total per check to progress the activity. The default is 300 (or 30 days for the average individual training once a day).",
+  "C5ETRAINING.DefaultDcDifficulty": "Default Check Difficulty (Checks with DCs)",
+  "C5ETRAINING.DefaultDcDifficultyHint": "Sets the default DC for ability checks used by downtime activities using the Check With DC progression system. The default is 10.",
+  "C5ETRAINING.DefaultDcSuccesses": "Default Activity Completion Target (Checks with DCs)",
+  "C5ETRAINING.DefaultDcSuccessesHint": "Sets the default target number of check successes required to reach 100% activity completion for downtime activities using the Check With DC progression system. The default is 5 successes.",
   "C5ETRAINING.DefaultSimpleCompletion": "Default Activity Completion Target (Simple)",
 	"C5ETRAINING.DefaultSimpleCompletionHint": "Sets the default target number of attempts required to reach 100% activity completion for downtime activities using simple progression. The default is 10 attempts.",
   "C5ETRAINING.DefaultTimeCompletion": "Default Activity Completion Target (Time)",
@@ -66,6 +68,7 @@
 	"C5ETRAINING.EnableDowntimeRemindersHint": "Enabling this will display a prompt to the GM at the start of each day to help them remember to ask the players if they have any downtime activities they'd like to make progress on. (Requires About Time)",
 
 	"C5ETRAINING.InvalidNumberWarning": "Invalid input. Please enter a number.",
+  "C5ETRAINING.InvalidTool": "Tool Not Found",
 
 	"C5ETRAINING.Name": "Name",
 	"C5ETRAINING.NewDowntimeActivity": "New Downtime Activity",
@@ -110,6 +113,8 @@
 
 	"C5ETRAINING.Time": "Time (UTC)",
   "C5ETRAINING.ToggleInfo": "Toggle Info",
+  "C5ETRAINING.Tool": "Tool",
+  "C5ETRAINING.ToolNotFoundWarning": "Selected tool not found. Please edit the activity and select a new one.",
 
   "C5ETRAINING.User": "User"
 }

lang/ko.json

@@ -31,10 +31,6 @@
 	"C5ETRAINING.CreateNewDowntimeActivity": "새 여가 활동 생성",
 	"C5ETRAINING.CurrentProgress": "현재 진행률",
 
-	"C5ETRAINING.DefaultAbility": "능력 판정 진행에 대한 기본 속성",
-	"C5ETRAINING.DefaultAbilityHint": "생성시 여가 활동에 할당된 기본 속성을 설정한다. 생성 후 편집할 수 있다.",
-	"C5ETRAINING.DefaultAbilityCompletion": "기본 활동 달성 목표 (능력 판정)",
-	"C5ETRAINING.DefaultAbilityCompletionHint": "능력 판정 진행을 통한 여가 활동의 100% 완료에 필요한 기본 목표 수를 설정한다. 경험에 비추어 볼 때 평균적 개인은 활동 진행을 위해 판정 당 전체 점수에 10점 정도를 기여할 수 있다. 기본값은 300(또는 일별 평균 개인 훈련의 경우 30일)이다.",
 	"C5ETRAINING.DefaultSimpleCompletion": "기본 활동 완료 목표 (심플)",
 	"C5ETRAINING.DefaultSimpleCompletionHint": "심플 진행을 통한 여가 활동에 대해 100% 완료에 필요한 기본 목표 시도 횟수를 설정한다. 기본값은 10이다.",
 	"C5ETRAINING.DefaultTimeCompletion": "기본 활동 완료 목표 (시간)",

lang/missing/ko.json

@@ -1,19 +1,27 @@
 
 {
   "C5ETRAINING.Ability": "Ability",
+  "C5ETRAINING.AbilitySkillToolCheck": "Ability/Skill/Tool Check",
   "C5ETRAINING.Attempt": "Attempt",
 
   "C5ETRAINING.CheckDC": "Check DC",
+  "C5ETRAINING.CheckWithDC": "Check with DC",
   "C5ETRAINING.Custom": "Custom",
   "C5ETRAINING.CustomRoll": "Custom Roll",
 
   "C5ETRAINING.DC": "DC",
-  "C5ETRAINING.DefaultDcDifficulty": "Default Check Difficulty (DC)",
-  "C5ETRAINING.DefaultDcDifficultyHint": "Sets the default DC for ability checks used by downtime activities using the DC progression system. Defaults to 10.",
-  "C5ETRAINING.DefaultDcSuccesses": "Default Activity Completion Target (DC)",
-  "C5ETRAINING.DefaultDcSuccessesHint": "Sets the default target number of check successes required to reach 100% activity completion for downtime activities using the DC progression system. The default is 5 successes.",
+  "C5ETRAINING.DefaultAbility": "Default Attribute/Skill for Check-Based Progression",
+  "C5ETRAINING.DefaultAbilityHint": "Sets the default attribute/skill assigned to check-based downtime activites upon creation. This can be edited after activity creation.",
+	"C5ETRAINING.DefaultAbilityCompletion": "Default Activity Completion Target (Ability/Skill/Tool Checks)",
+  "C5ETRAINING.DefaultAbilityCompletionHint": "Sets the default target number required to reach 100% activity completion for downtime activities using check-based progression. A good rule of thumb is that the average individual will be able to contribute about 10 points to their total per check to progress the activity. The default is 300 (or 30 days for the average individual training once a day).",
+  "C5ETRAINING.DefaultDcDifficulty": "Default Check Difficulty (Checks with DCs)",
+  "C5ETRAINING.DefaultDcDifficultyHint": "Sets the default DC for ability checks used by downtime activities using the Check With DC progression system. The default is 10.",
+  "C5ETRAINING.DefaultDcSuccesses": "Default Activity Completion Target (Checks with DCs)",
+  "C5ETRAINING.DefaultDcSuccessesHint": "Sets the default target number of check successes required to reach 100% activity completion for downtime activities using the Check With DC progression system. The default is 5 successes.",
   "C5ETRAINING.Description": "Description",
 
+  "C5ETRAINING.InvalidTool": "Tool Not Found", 
+
   "C5ETRAINING.Roll": "Roll",
 
   "C5ETRAINING.ShowDowntimeTabPc": "Show Downtime Tab (PCs)",
@@ -41,5 +49,7 @@
   "C5ETRAINING.SkillSur": "Survival",
   "C5ETRAINING.SuccessesRequired": "Successes Required",
 
-  "C5ETRAINING.ToggleInfo": "Toggle Info"
+  "C5ETRAINING.ToggleInfo": "Toggle Info",
+  "C5ETRAINING.Tool": "Tool",
+  "C5ETRAINING.ToolNotFoundWarning": "Selected tool not found. Please edit the activity and select a new one."
 }

module.json

@@ -2,7 +2,7 @@
 	"name": "5e-training",
 	"title": "Crash's 5e Downtime Tracking",
 	"description": "Adds a section to the character sheet to keep track of downtime activity progression. Track proficiency training, spell scribing, and anything else you can think of.",
-	"version": "0.4.3",
+	"version": "0.4.4",
 	"author": "CRASH1115#2944",
 	"minimumCoreVersion": "0.6.0",
 	"compatibleCoreVersion": "0.7.0",
@@ -23,5 +23,5 @@
 	],
 	"url": "https://github.com/crash1115/5e-training",
   "manifest": "https://raw.githubusercontent.com/crash1115/5e-training/master/module.json",
-	"download": "https://github.com/crash1115/5e-training/releases/download/v0.4.3/5e-training.zip"
+	"download": "https://github.com/crash1115/5e-training/releases/download/v0.4.4/5e-training.zip"
 }

templates/add-training-dialog.html

@@ -6,10 +6,10 @@
 
   <div class="field">
     <label for="progressionStyle">{{ localize "C5ETRAINING.ProgressionType" }}:</label>
-      <select name="progressionStyleInput" id="progressionStyleInput">
-      <option value="ability" {{#if (eq training.progressionStyle "ability")}} selected {{/if}}>{{ localize "C5ETRAINING.AbilityCheck" }}</option>
+    <select name="progressionStyleInput" id="progressionStyleInput">
       <option value="simple" {{#if (eq training.progressionStyle "simple")}} selected {{/if}}>{{ localize "C5ETRAINING.Simple" }}</option>
-      <option value="dc" {{#if (eq training.progressionStyle "dc")}} selected {{/if}}>{{ localize "C5ETRAINING.DC" }}</option>
+      <option value="ability" {{#if (eq training.progressionStyle "ability")}} selected {{/if}}>{{ localize "C5ETRAINING.AbilitySkillToolCheck" }}</option>
+      <option value="dc" {{#if (eq training.progressionStyle "dc")}} selected {{/if}}>{{ localize "C5ETRAINING.CheckWithDC" }}</option>
     </select>
   </div>
 

templates/partials/ability.html

@@ -1,30 +1,9 @@
 <div class="field">
   <label for="ability">{{ localize 'C5ETRAINING.SelectAnAbility' }}:</label>
   <select name="abilityInput" id="abilityInput"" {{#if (eq training.progressionStyle "simple")}}style="visibility:hidden;"{{/if}}>
-    <option value="str" {{#if (eq training.ability "str")}} selected {{/if}}>{{ localize 'C5ETRAINING.Ability' }}: {{ localize 'C5ETRAINING.AbilityStr' }}</option>
-    <option value="dex" {{#if (eq training.ability "dex")}} selected {{/if}}>{{ localize 'C5ETRAINING.Ability' }}: {{ localize 'C5ETRAINING.AbilityDex' }}</option>
-    <option value="con" {{#if (eq training.ability "con")}} selected {{/if}}>{{ localize 'C5ETRAINING.Ability' }}: {{ localize 'C5ETRAINING.AbilityCon' }}</option>
-    <option value="int" {{#if (eq training.ability "int")}} selected {{/if}}>{{ localize 'C5ETRAINING.Ability' }}: {{ localize 'C5ETRAINING.AbilityInt' }}</option>
-    <option value="wis" {{#if (eq training.ability "wis")}} selected {{/if}}>{{ localize 'C5ETRAINING.Ability' }}: {{ localize 'C5ETRAINING.AbilityWis' }}</option>
-    <option value="cha" {{#if (eq training.ability "cha")}} selected {{/if}}>{{ localize 'C5ETRAINING.Ability' }}: {{ localize 'C5ETRAINING.AbilityCha' }}</option>
-    <option value="acr" {{#if (eq training.ability "acr")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillAcr' }}</option>
-    <option value="ani" {{#if (eq training.ability "ani")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillAni' }}</option>
-    <option value="arc" {{#if (eq training.ability "arc")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillArc' }}</option>
-    <option value="ath" {{#if (eq training.ability "ath")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillAth' }}</option>
-    <option value="dec" {{#if (eq training.ability "dec")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillDec' }}</option>
-    <option value="his" {{#if (eq training.ability "his")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillHis' }}</option>
-    <option value="ins" {{#if (eq training.ability "ins")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillIns' }}</option>
-    <option value="inv" {{#if (eq training.ability "inv")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillInv' }}</option>
-    <option value="itm" {{#if (eq training.ability "itm")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillItm' }}</option>
-    <option value="med" {{#if (eq training.ability "med")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillMed' }}</option>
-    <option value="nat" {{#if (eq training.ability "nat")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillNat' }}</option>
-    <option value="per" {{#if (eq training.ability "per")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillPer' }}</option>
-    <option value="prc" {{#if (eq training.ability "prc")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillPrc' }}</option>
-    <option value="prf" {{#if (eq training.ability "prf")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillPrf' }}</option>
-    <option value="rel" {{#if (eq training.ability "rel")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillRel' }}</option>
-    <option value="slt" {{#if (eq training.ability "slt")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillSlt' }}</option>
-    <option value="ste" {{#if (eq training.ability "ste")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillSte' }}</option>
-    <option value="sur" {{#if (eq training.ability "sur")}} selected {{/if}}>{{ localize 'C5ETRAINING.Skill' }}: {{ localize 'C5ETRAINING.SkillSur' }}</option>
+    {{#each options as |option oid| }}
+      <option value="{{option.value}}" {{#if (eq ../training.ability option.value)}} selected {{/if}}>{{option.label}}</option>
+    {{/each}}
   </select>
 </div>