feat: Squashed, rebased, merged in changes from Kevin, tested that no…

…thing seems to have broken.

Also made sure we comply with the various licenses.

Changes from Kevin below:
Fixes: New Skill page, New Font, Many CSS/HTML adjustments
Fixes: Tabs need fixing, added inventory, storage and finances.
Fixes: Sub-tabs, initial tab still blank and broken
Fixes: Finished all the pages, ready for first release
Fixes: Macro text visibility
fix: Removed read only, attempts to fix drop-down
fix: Skill modifiers and option default jumps fixed *so happy!*
fix: Added total (skill+mod) near dice, added CSS styling to finish skill list
Updated Skill list modifiers and resetting modifier option window. All good, very happy! (#43)

CHANGELOG.md

@@ -181,7 +181,7 @@
 
 * Switched to Kevin's/Rob's way of doing things. ([047859b](https://github.com/UltraKev/twodsix-foundryvtt/commit/047859b8a0d1beba7045e55fd08525d4acafda96))
 
-## [0.3.2](https://github.com/xdy/twodsix-foundryvtt/compare/v0.3.1...v0.3.2) (2020-08-16)
+# [0.3.2](https://github.com/xdy/twodsix-foundryvtt/compare/v0.3.1...v0.3.2) (2020-08-16)
 
 
 ### Bug Fixes

README.md

@@ -1,5 +1,5 @@
 # 2d6 system
-A system for running games using various 2d6-based role-playing games.
+A system for running games using various 2d6-based role-playing games, specifically with the Cepheus Engine Core Rules.
 
 Note that this system is *very* early in its development.
 
@@ -29,5 +29,8 @@ Content Usage and Licensing:
 Virtual Table Top Platform Licenses:
 *  Foundry VTT support is covered by the following license: [Limited License Agreement for module development 09/02/2020](https://foundryvtt.com/article/license/).
 
+Font licenses:
+* Perfect DOS VGA 437 (quote from https://www.dafont.com/font-comment.php?file=perfect_dos_vga_437 "zeh  author of Perfect DOS VGA 437   Sep 16, 2014 The license is this: this font is free to use in whatever you want.")
+
 ### Contributing
 See CONTRIBUTING.md

src/module/TwodsixSystem.ts

@@ -2,4 +2,5 @@ export class TwodsixSystem {
   //Nothing to do yet
 
   //TODO
+
 }

src/module/entities/TwodsixActor.ts

@@ -37,10 +37,9 @@ export default class TwodsixActor extends Actor {
       cha.current = cha.value - cha.damage;
       cha.mod = calcModFor(cha.current);
     }
-
-    for (const skill of Object.values(data.skills as Record<any, any>)) {
-      const characteristic = skill.defaultCharacteristic;
-      skill.mod = calcModFor(data.characteristics[characteristic].value);
+    //for (const skill of Object.values(data.skills as Record<any, any>)) {
+    //  const characteristic = skill.characteristic;
+    //  skill.mod = calcModFor(data.characteristics[characteristic].value);
+    //}
     }
-  }
 }

src/module/entities/TwodsixItem.ts

@@ -9,9 +9,35 @@ export default class TwodsixItem extends Item {
   prepareData():void {
     super.prepareData();
 
+    const itemData: ItemData = this.data;
+
+    switch (itemData.type) {
+      case 'skills':
+        this._prepareSkillData(itemData);
+        break;
+      default:
+
+    }
     // Get the Item's data
     // const itemData = this.data;
     // const actorData = this.actor ? this.actor.data : {};
     // const {data} = itemData;
   }
+
+  private _prepareSkillData(itemData: ItemData) {
+    if(this.isOwned) {
+      const itemCharacteristic = itemData.data.characteristic;
+      const actorCharacteristics = Object.values(this.actor.data.data.characteristics);
+      const activeCharacteristic: any = actorCharacteristics.filter((c: any) => c.shortLabel === itemCharacteristic);
+
+      let mod = 0;
+      if(activeCharacteristic.length) {
+        mod = activeCharacteristic[0].mod;
+      }
+
+      itemData.data.total = itemData.data.value + mod;
+      itemData.data.mod = mod;
+
+    }
+  }
 }

src/module/handlebars.ts

@@ -1,3 +1,5 @@
+import { SIGKILL } from "constants";
+
 export default function registerHandlebarsHelpers():void {
 
   // If you need to add Handlebars helpers, here are a few useful examples:
@@ -22,8 +24,8 @@ export default function registerHandlebarsHelpers():void {
     return true;
   });
 
-  Handlebars.registerHelper('checkTrainedSkill', function (skill) {
-    return skill.value >= 0
+  Handlebars.registerHelper('checkTrainedSkill', function (skills) {
+    return skills.value >= 0
   });
 
   Handlebars.registerHelper('shouldShowSkill', function (skill, hideUntrainedSkills) {
@@ -41,6 +43,10 @@ export default function registerHandlebarsHelpers():void {
     return getSkillValueWithJoat(skill, joat) + mod
   });
 
+  Handlebars.registerHelper('getTotalSkillValue', function(skill, joat, mod){
+  return skill.value + joat.value + skill.mod
+});
+
 
   Handlebars.registerHelper({
     add: (v1, v2) => v1 + v2,