Merge pull request #23 from crash1115/dev

v0.4.3

README.md

@@ -1,3 +1,5 @@
+![GitHub All Releases](https://img.shields.io/github/downloads/crash1115/5e-training/total) ![GitHub Releases](https://img.shields.io/github/downloads/crash1115/5e-training/latest/total) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/crash1115/5e-training?label=latest%20version)
+
 # Crash's 5e Downtime Tracking
 Does your group do a lot of downtime activities? Do you have a hard time keeping track of it all? Then this is the mod for you!
 

changelog.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 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.
+
 ## Version 0.4.2
 Improvements:
 - Added an option to toggle the display of the downtime tab on NPC sheets independently.

examples.md

@@ -30,3 +30,12 @@ Your PC's have arrived in town, and something is amiss. There's a super cool wor
 - Set the completion target to 100 (or any other number you see fit)
 
 Do the skill challenge as normal. Each time a player makes a check, use the quick adjustment field to increase the progression by the amount the player rolled on their skill check. A group of five PC's who all roll really well could reach the completion target in a day, but it's more likely that this will be a 2-3 day affair. Either way, now you have a super simple way to keep track of how they're doing.
+
+## Track Faction Reputation
+A really cool idea from Arkangel#5736 on Discord. Set up an actor to keep track of your party's relationships with factions in the world/region, then create a downtime activity for each faction to keep track of how much they like the party. Assuming your reputation scale goes from 1-10, you could set each one up like this:
+- Name: Name of Faction
+- Type: Simple
+- Completion Target: 10
+- Description: Enter a description of your faction here, or maybe the name of the group's contact within the organization
+
+![Example of Faction Reputation Tracking](https://media.discordapp.net/attachments/513918036919713802/737320248163827712/unknown.png)

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.2",
+	"version": "0.4.3",
 	"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.2/5e-training.zip"
+	"download": "https://github.com/crash1115/5e-training/releases/download/v0.4.3/5e-training.zip"
 }

styles/training.css

@@ -3,36 +3,36 @@
 /*****************************/
 
 /* Tweak some item controls styles to fit the additional buttons*/
-.training .item-controls {
+.crash-training .item-controls {
 	min-width: fit-content;
 	min-width: -moz-fit-content;
 }
 
-.training .item-controls a {
+.crash-training .item-controls a {
 	min-width: fit-content;
 	min-width: -moz-fit-content;
 	flex: 1 !important;
 	margin-right: 5px;
 }
 
 /* Type Column */
-.dnd5e.sheet.actor .training .inventory-list .item-detail.type {
+.dnd5e.sheet.actor .crash-training .inventory-list .item-detail.type {
 	text-transform: capitalize;
 	flex: 0 0 140px;
 }
 
 /* Override Column */
-.dnd5e.sheet.actor .training .inventory-list .item-detail.override {
+.dnd5e.sheet.actor .crash-training .inventory-list .item-detail.override {
 	flex: 0 0 90px;
 }
 
 /* Progress Columns */
-.training .item-detail.bar {
+.crash-training .item-detail.bar {
 	flex: 1 !important;
 }
 
 /* Progress Override Input */
-.training .item-detail .training-override {
+.crash-training .item-detail .crash-training-override {
 	text-align: right;
   padding-top: 1px;
   line-height: 1;
@@ -41,15 +41,15 @@
 }
 
 /* Training Bar */
-.training .progress-bar {
+.crash-training .progress-bar {
 	background-color: rgba(0,0,0,0.1);
 	border-radius: 4px;
 	height: 20px;
 	margin: 5px;
 }
 
 /* Training Bar Progress */
-.training .progress-bar .training-completion {
+.crash-training .progress-bar .crash-training-completion {
 	color: #111111;
 	background-color: rgba(255,0,0,0.4);
 	border-radius: 4px;
@@ -58,26 +58,26 @@
 }
 
 /* Training Bar Progress Percent Text */
-.training .progress-bar .training-completion span {
+.crash-training .progress-bar .crash-training-completion span {
 	margin-left: 5px;
 }
 
 /*********************************/
 /*           DIALOGS           */
 /*****************************/
 
-.training-dialog .wide-field {
+.crash-training-dialog .wide-field {
 	margin-bottom: 10px;
 	padding-top: 5px;
 }
 
-.training-dialog .field {
+.crash-training-dialog .field {
 	display: flex;
 	margin-bottom: 10px;
 	padding-top: 5px;
 }
 
-.training-dialog .field * {
+.crash-training-dialog .field * {
 	flex: 5;
 }
 
@@ -86,42 +86,42 @@
 /*         AUDIT LOGS          */
 /*****************************/
 
-.audit-log .instructions {
+.crash-audit-log .instructions {
 	margin-bottom: 10px;
 }
 
-.audit-log .action-table {
+.crash-audit-log .action-table {
 	margin-bottom: 20px;
 }
 
-.audit-log .action-table table {
+.crash-audit-log .action-table table {
 	text-align: left;
 	border: none;
 	background-color: none;
 }
 
-.audit-log .action-table table tr th,
-.audit-log .action-table table tr td {
+.crash-audit-log .action-table table tr th,
+.crash-audit-log .action-table table tr td {
 	padding-top: 5px;
 	padding-bottom: 5px;
 	text-transform: capitalize;
 }
 
 
 
-.audit-log .action-table table tr:nth-of-type(even) td {
+.crash-audit-log .action-table table tr:nth-of-type(even) td {
 	background-color: rgba(0,0,0,0.2);
 }
 
-.audit-log .action-table table tr:hover td {
+.crash-audit-log .action-table table tr:hover td {
 	background-color: rgba(255,0,0,0.2);
 }
 
-.audit-log footer{
+.crash-audit-log footer{
 	display: flex;
 }
-.audit-log #apply-audits,
-.audit-log #cancel-audits {
+.crash-audit-log #apply-audits,
+.crash-audit-log #cancel-audits {
 	flex: 1;
 }
 
@@ -130,12 +130,12 @@
 /*****************************/
 
 /* Training Bar */
-.dark-mode .training .progress-bar {
+.dark-mode .crash-training .progress-bar {
 	background-color: #303030;
 }
 
 /* Training Bar Progress */
-.dark-mode .training .progress-bar .training-completion {
+.dark-mode .crash-training .progress-bar .crash-training-completion {
 	background-color: #3F88E6;
 	color: #000000;
 }
@@ -153,52 +153,52 @@
 /*     SUPPORT FOR TIDY 5E     */
 /*****************************/
 
-.tidy5e .training .item-controls .item-create {
+.tidy5e .crash-training .item-controls .item-create {
 	padding-left: 5px;
 	padding-right: 5px;
 }
 
-.tidy5e .training .item-controls .item-create:last-child {
+.tidy5e .crash-training .item-controls .item-create:last-child {
 	margin-right: 0px;
 }
 
 /* Tweak activity entries on NPC sheet */
-.tidy5e.sheet.actor.npc .training .inventory-list .item .item-name .item-image {
+.tidy5e.sheet.actor.npc .crash-training .inventory-list .item .item-name .item-image {
 	height: 30px;
 	width: 30px;
 	flex: 0 0 30px;
 }
 
-.tidy5e.sheet.actor.npc .training .inventory-list .item .item-name h4 {
+.tidy5e.sheet.actor.npc .crash-training .inventory-list .item .item-name h4 {
 	line-height: 30px;
 }
 
-.tidy5e.sheet.actor.npc .training .inventory-list .item-detail .training-override {
+.tidy5e.sheet.actor.npc .crash-training .inventory-list .item-detail .crash-training-override {
 	max-width: 40px;
 }
 
-.tidy5e.sheet.actor.npc .training .inventory-list .inventory-header .item-controls a.item-create {
+.tidy5e.sheet.actor.npc .crash-training .inventory-list .inventory-header .item-controls a.item-create {
 	margin-top: 0px;
 	padding: 4px 5px;
 	margin-right: 5px;
 }
 
-.tidy5e.sheet.actor.npc .training .inventory-list .item {
+.tidy5e.sheet.actor.npc .crash-training .inventory-list .item {
 	line-height: 30px;
 }
 
 /* Controls dark mode support */
-.tidy5eDark .tidy5e.sheet.actor .training .inventory-list .item-controls a,
-.tidy5eDark .tidy5e.sheet.actor .training .inventory-list .item-controls a:hover {
+.tidy5eDark .tidy5e.sheet.actor .crash-training .inventory-list .item-controls a,
+.tidy5eDark .tidy5e.sheet.actor .crash-training .inventory-list .item-controls a:hover {
   color: var(--darkmode-primary-color);
 	font-weight: 300;
 }
 
 /* Training bar dark mode support */
-.tidy5eDark .training .progress-bar {
+.tidy5eDark .crash-training .progress-bar {
 	background-color: var(--darkmode-faint-color);
 }
 
-.tidy5eDark .training .progress-bar .training-completion {
+.tidy5eDark .crash-training .progress-bar .crash-training-completion {
 	background-color: var(--darkmode-secondary-accent);
 }

templates/add-training-dialog.html

@@ -1,4 +1,4 @@
-<form class="training-dialog">
+<form class="crash-training-dialog">
   <div class="field">
     <label for="name">{{ localize "C5ETRAINING.Name" }}:</label>
     <input type="text" name="nameInput" id="nameInput" value="{{training.name}}">

templates/audit-dialog.html

@@ -1,4 +1,4 @@
-<form class="audit-log">
+<form class="crash-audit-log">
   <input type="hidden" name="actorId" value="{{object._id}}"/>
 
   <h1 class="title">{{object.name}}'s Downtime Activity Log</h1>

templates/delete-training-dialog.html

@@ -1,4 +1,4 @@
-<div class="training-dialog">
+<div class="crash-training-dialog">
   <div class="field">
     {{ localize "C5ETRAINING.DeleteConfirmation" }}
   </div>

templates/training-details-dialog.html

@@ -1,4 +1,4 @@
-<form class="training-dialog">
+<form class="crash-training-dialog">
   <div class="field">
     <label for="name">{{ localize "C5ETRAINING.Name" }}:</label>
     <input type="text" name="nameInput" id="nameInput" value="{{training.name}}">

templates/training-section.html

@@ -1,12 +1,12 @@
-<div class="tab training flexrow" data-group="primary" data-tab="training">
+<div class="tab crash-training flexrow" data-group="primary" data-tab="training">
   <ol class="inventory-list">
     <li class="inventory-header flexrow">
       <h3 class="item-name flexrow">{{ localize 'C5ETRAINING.ActivityProgress' }}</h3>
       <div class="item-controls">
-        <a class="item-control item-create training-audit" title="{{ localize 'C5ETRAINING.ReviewChanges' }}">
+        <a class="item-control item-create crash-training-audit" title="{{ localize 'C5ETRAINING.ReviewChanges' }}">
           <i class="fas fa-clipboard"></i> {{ localize 'C5ETRAINING.AuditLog' }}
         </a>
-        <a class="item-control item-create training-add" title="{{ localize 'C5ETRAINING.CreateNewDowntimeActivity' }}">
+        <a class="item-control item-create crash-training-add" title="{{ localize 'C5ETRAINING.CreateNewDowntimeActivity' }}">
           <i class="fas fa-plus-circle"></i> {{ localize 'C5ETRAINING.Add' }}
         </a>
       </div>
@@ -15,26 +15,26 @@ <h3 class="item-name flexrow">{{ localize 'C5ETRAINING.ActivityProgress' }}</h3>
       {{#each actor.flags.5e-training.trainingItems as |training tid| }}
         <li class="item flexrow">
           <div class="item-name flexrow">
-            <div class="item-image rollable training-roll" id="roll-{{tid}}" title="{{ localize 'C5ETRAINING.AdvanceActivityProgress' }}" style="background-image: url(icons/svg/d20.svg);"></div>
-            <h4 class="rollable training-toggle-desc" id="toggle-desc-{{tid}}" title="{{ localize 'C5ETRAINING.ToggleInfo' }}">{{training.name}}</h4>
+            <div class="item-image rollable crash-training-roll" id="roll-{{tid}}" title="{{ localize 'C5ETRAINING.AdvanceActivityProgress' }}" style="background-image: url(icons/svg/d20.svg);"></div>
+            <h4 class="rollable crash-training-toggle-desc" id="toggle-desc-{{tid}}" title="{{ localize 'C5ETRAINING.ToggleInfo' }}">{{training.name}}</h4>
           </div>
           <div class="item-detail type">
             {{progressionStyle training}}
           </div>
           <div class="item-detail override">
-            <input type="text" class="item-control training-override" id="override-{{tid}}" title="{{ localize 'C5ETRAINING.AdjustProgressValue' }}" value="{{training.progress}}"/>
+            <input type="text" class="item-control crash-training-override" id="override-{{tid}}" title="{{ localize 'C5ETRAINING.AdjustProgressValue' }}" value="{{training.progress}}"/>
             <span> / {{training.completionAt}}</span>
           </div>
           <div class="item-detail flexrow bar">
             <div class="progress-bar">
-              <div class="training-completion" style="width:{{trainingCompletion training}}%;">
+              <div class="crash-training-completion" style="width:{{trainingCompletion training}}%;">
                 <span>{{trainingCompletion training}}%</span>
               </div>
             </div>
           </div>
           <div class="item-controls">
-            <a class="item-control training-edit" id="edit-{{tid}}" title="{{ localize 'C5ETRAINING.EditDowntimeActivity' }}"><i class="fas fa-edit"></i></a>
-            <a class="item-control training-delete" id="delete-{{tid}}" title="{{ localize 'C5ETRAINING.DeleteDowntimeActivity' }}"><i class="fas fa-trash"></i></a>
+            <a class="item-control crash-training-edit" id="edit-{{tid}}" title="{{ localize 'C5ETRAINING.EditDowntimeActivity' }}"><i class="fas fa-edit"></i></a>
+            <a class="item-control crash-training-delete" id="delete-{{tid}}" title="{{ localize 'C5ETRAINING.DeleteDowntimeActivity' }}"><i class="fas fa-trash"></i></a>
           </div>
         </li>
       {{/each}}