fix: Refixes damage update and handles damage from previous migration…

… by showing an error message with what could be done to fix it.

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "twodsix",
-  "version": "0.6.32",
+  "version": "0.6.33-beta.2",
   "description": "A 2d6 system",
   "scripts": {
     "build": "webpack --mode production",

src/module/config.ts

@@ -2,6 +2,16 @@
 
 export const TWODSIX:any = {};
 
+TWODSIX.CHARACTERISTICS = {
+  "strength": "STR",
+  "dexterity": "DEX",
+  "endurance": "END",
+  "intelligence": "INT",
+  "education": "EDU",
+  "socialStanding": "SOC",
+  "psionicStrength": "PSI"
+};
+
 /**
  * The sets of rules variants one can use
  * Not currently used for anything. TODO Remove?

src/module/entities/TwodsixItem.ts

@@ -27,7 +27,9 @@ export default class TwodsixItem extends Item {
       const itemCharacteristic = itemData.data.characteristic;
       if (this.actor.data.data.characteristics) { //Temporary fix until issue #102
         const actorCharacteristics = Object.values(this.actor.data.data.characteristics);
-        const activeCharacteristic:any = actorCharacteristics.filter((c:any) => c.shortLabel === itemCharacteristic);
+        const activeCharacteristic:any = actorCharacteristics.filter((c:any) => {
+          return c.shortLabel === itemCharacteristic;
+        });
 
         let mod = 0;
         if (activeCharacteristic.length) {

src/module/handlebars.ts

@@ -1,8 +1,12 @@
 import * as util from "util";
 import {advantageDisadvantageTerm} from "./i18n";
+import {calcModFor, getKeyByValue} from "./utils/sheetUtils";
+import {TWODSIX} from "./config";
 
 export default function registerHandlebarsHelpers():void {
 
+  let showedError = false;
+
   Handlebars.registerHelper('advantageDisadvantageTerm', (str) => {
     return advantageDisadvantageTerm(str);
   });
@@ -17,4 +21,19 @@ export default function registerHandlebarsHelpers():void {
   Handlebars.registerHelper('concat', function (a, b) {
     return a + b;
   });
+
+  Handlebars.registerHelper('skillCharacteristic', (actor, characteristic) => {
+    const actorData = actor.data;
+    const characteristicElement = actorData.characteristics[getKeyByValue(TWODSIX.CHARACTERISTICS, characteristic)];
+    if (characteristicElement) {
+      const mod = calcModFor(characteristicElement.current);
+      return game.i18n.localize("TWODSIX.Items.Skills." + characteristicElement.shortLabel) + "(" + (mod < 0 ? "" : "+") + mod + ")";
+    } else {
+      if (!showedError) {
+        ui.notifications.error("TWODSIX.Handlebars.CantShowCharacteristic");
+        showedError = true;
+      }
+      return "XXX";
+    }
+  });
 }