Merge branch 'master' into development

css/deltagreen.css

@@ -1232,3 +1232,7 @@ body:not(.no-theme) #interface:not(.theme-light) .ui-control {
 body:not(.no-theme) #interface:not(.theme-light) #action-bar .slot.full:hover {
   border: 2px solid #215112;
 }
+
+.target-proficiency-mod {
+  color: #247c14;
+}

module/actor/actor.js

@@ -215,6 +215,9 @@ export default class DeltaGreenActor extends Actor {
       } else {
         skill.isCalculatedValue = false;
       }
+
+      // Add field for calculation
+      skill.targetProficiency = skill.proficiency;
     }
 
     system.wp.max = system.statistics.pow.value;

module/roll/roll.js

@@ -387,7 +387,8 @@ export class DGPercentileRoll extends DGRoll {
       localizedKey = game.i18n.localize(`DG.Attributes.${this.key}`);
     }
     if (skillKeys.includes(this.key)) {
-      target = actorData.skills[this.key].proficiency;
+      // use calculated target proficiency (effects and etc like aim + 20%)
+      target = actorData.skills[this.key].targetProficiency || actorData.skills[this.key].proficiency;
       localizedKey = game.i18n.localize(`DG.Skills.${this.key}`);
     }
     if (typedSkillKeys.includes(this.key)) {

templates/actor/actor-sheet.html

@@ -127,7 +127,7 @@
                 {{/if_eq}}
 
                 {{#if_not_eq skill.key 'ritual' }}
-                  <input class="percentile-skill-input" type="text" name="system.skills.{{skill.key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
+                  <input class="percentile-skill-input {{#if_not_eq skill.proficiency skill.targetProficiency}}target-proficiency-mod{{/if_not_eq}}" type="text" name="system.skills.{{skill.key}}.proficiency" value="{{skill.proficiency}}" data-dtype="Number" data-tooltip="{{skill.targetProficiency}}" {{#if skill.isCalculatedValue}} disabled {{/if}}/>
                   <input class="checkbox-skill-input" type="checkbox" name="system.skills.{{skill.key}}.failure" {{checked skill.failure}} data-dtype="Boolean" {{#if skill.cannotBeImprovedByFailure}} disabled {{/if}} 
                     title="{{localize 'DG.Tooltip.SkillFailCheckbox'}}"
                     />