fix: Fixes and additions

Bug Fixes:
- Augment description fix
- Stat blocks visual fix in Firefox (But Chrome is still recommended)
- Page no longer jumps to the top, not on any tab.

Additional Fixes:
- Macro text visibility improved
- Player configuration screen text visibility improved
- Journal text visibility improved

Additions:
- Character input fields now no longer require to save and can just be written in.
  These have now been changed into regular text fields and are no longer the editor.
- New Ship Sheet. When you click ‘Create Actor’ a pop-up now appears with ‘character’ and ‘ship’. Please don’t forget to give it a name or an error will occur.

src/module/entities/TwodsixActor.ts

@@ -2,36 +2,53 @@
  * Extend the base Actor entity by defining a custom roll data structure which is ideal for the Simple system.
  * @extends {Actor}
  */
-import {calcModFor} from "../utils/sheetUtils";
+import { calcModFor } from "../utils/sheetUtils";
 
 export default class TwodsixActor extends Actor {
 
   /**
    * Augment the basic actor data with additional dynamic data.
    */
-  prepareData():void {
+  prepareData(): void {
     super.prepareData();
 
     const actorData = this.data;
+    const data = actorData.data;
+    const flags = actorData.flags;
+
+    if (actorData.type === 'character') {
+      this._prepareCharacterData(actorData);
+    }
 
     // Make separate methods for each Actor type (character, npc, etc.) to keep
     // things organized.
     switch (actorData.type) {
       case 'traveller':
         this._prepareCharacterData(actorData);
+        break;
+      case 'ship':
+
         break;
       default:
         console.log(game.i18n.localize("Twodsix.Actor.UnknownActorType") + actorData.type);
     }
-
   }
 
   /**
    * Prepare Character type specific data
    */
-  _prepareCharacterData(actorData:ActorData):void {
+  _prepareCharacterData(actorData: ActorData): void {
+    // Get the Actor's data object
+    const { data } = actorData;
+
+    for (const cha of Object.values(data.characteristics as Record<any, any>)) {
+      cha.current = cha.value - cha.damage;
+      cha.mod = calcModFor(cha.current);
+    }
+  }
+  _prepareShipData(actorData: ActorData): void {
     // Get the Actor's data object
-    const {data} = actorData;
+    const { data } = actorData;
 
     for (const cha of Object.values(data.characteristics as Record<any, any>)) {
       cha.current = cha.value - cha.damage;

src/module/handlebars.ts

@@ -1,9 +1,16 @@
 import {advantageDisadvantageTerm} from "./settings";
+import * as util from "util";
 
 export default function registerHandlebarsHelpers():void {
 
   Handlebars.registerHelper('advantageDisadvantageTerm', (str) => {
     return advantageDisadvantageTerm(str);
   });
 
+  Handlebars.registerHelper('capitalize', (str) => {
+    if (!util.isString(str)) {
+      return '';
+    }
+    return str.charAt(0).toUpperCase() + str.slice(1);
+  });
 }

src/module/sheets/TwodsixActorSheet.ts

@@ -27,16 +27,16 @@ export class TwodsixActorSheet extends ActorSheet {
 
 
   private static _prepareCharacterItems(sheetData:any) {
-
     const actorData = sheetData.actor;
 
     // Initialize containers.
     const storage = [];
-    const inventory = [];
     const equipment = [];
     const weapon = [];
     const armor = [];
     const augment = [];
+    const tool = [];
+    const junk = [];
     const skills = [];
 
     // Iterate through items, allocating to containers
@@ -46,10 +46,7 @@ export class TwodsixActorSheet extends ActorSheet {
         case 'storage':
           storage.push(i);
           break;
-        case 'inventory':
-          inventory.push(i);
-          break;
-        case 'equipment':
+        case 'equipment' || 'tool' || 'junk':
           equipment.push(i);
           break;
         case 'weapon':
@@ -72,11 +69,12 @@ export class TwodsixActorSheet extends ActorSheet {
     }
     // Assign and return
     actorData.storage = storage;
-    actorData.inventory = inventory;
     actorData.equipment = equipment;
     actorData.weapon = weapon;
     actorData.armor = armor;
     actorData.augment = augment;
+    actorData.tool = tool;
+    actorData.junk = junk;
     actorData.skills = skills;
 
   }
@@ -90,7 +88,7 @@ export class TwodsixActorSheet extends ActorSheet {
       height: 648,
       resizable: false,
       tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "skills"}],
-      scrollY: [".skills", ".inventory"]
+      scrollY: [".skills", ".inventory", ".finances", ".info", ".notes"]
     });
   }
 
@@ -136,6 +134,12 @@ export class TwodsixActorSheet extends ActorSheet {
         li.addEventListener("dragstart", handler, false);
       });
     }
+
+    html.find('div[contenteditable="true"][data-edit]').on(
+      'focusout',
+      this._onSubmit.bind(this)
+    );
+
   }
 
 

src/module/sheets/TwodsixItemSheet.ts

@@ -52,6 +52,11 @@ export class TwodsixItemSheet extends ItemSheet {
       return;
     }
 
-  // Roll handlers, click handlers, etc. would go here.
+    html.find('div[contenteditable="true"][data-edit]').on(
+      'focusout',
+      this._onSubmit.bind(this)
+    );
+
+    // Roll handlers, click handlers, etc. would go here.
   }
 }