Merge branch 'feature/112-items-use-action-datamodel' into feature/169-adversary-action

module/applications/sheets/character.mjs

@@ -16,8 +16,8 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
 
     static DEFAULT_OPTIONS = {
         tag: 'form',
-        classes: ['daggerheart', 'sheet', 'pc'],
-        position: { width: 810, height: 1080 },
+        classes: ['daggerheart', 'sheet', 'actor', 'dh-style', 'daggerheart', 'character'],
+        position: { width: 850, height: 800 },
         actions: {
             attributeRoll: this.rollAttribute,
             toggleMarks: this.toggleMarks,
@@ -47,10 +47,10 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
             useAdvancementCard: this.useAdvancementCard,
             useAdvancementAbility: this.useAdvancementAbility,
             toggleEquipItem: this.toggleEquipItem,
-            levelup: this.openLevelUp
+            levelup: this.openLevelUp,
+            editImage: this._onEditImage
         },
         window: {
-            minimizable: false,
             resizable: true
         },
         form: {
@@ -66,9 +66,76 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
     };
 
     static PARTS = {
-        form: {
-            id: 'character',
-            template: 'systems/daggerheart/templates/sheets/character/character.hbs'
+        sidebar: {
+            id: 'sidebar',
+            template: 'systems/daggerheart/templates/sheets/actors/character/sidebar.hbs'
+        },
+        header: {
+            id: 'header',
+            template: 'systems/daggerheart/templates/sheets/actors/character/header.hbs'
+        },
+        features: {
+            id: 'features',
+            template: 'systems/daggerheart/templates/sheets/actors/character/features.hbs'
+        },
+        loadout: {
+            id: 'loadout',
+            template: 'systems/daggerheart/templates/sheets/actors/character/loadout.hbs'
+        },
+        inventory: {
+            id: 'inventory',
+            template: 'systems/daggerheart/templates/sheets/actors/character/inventory.hbs'
+        },
+        biography: {
+            id: 'biography',
+            template: 'systems/daggerheart/templates/sheets/actors/character/biography.hbs'
+        },
+        effects: {
+            id: 'effects',
+            template: 'systems/daggerheart/templates/sheets/actors/character/effects.hbs'
+        }
+    };
+
+    static TABS = {
+        features: {
+            active: true,
+            cssClass: '',
+            group: 'primary',
+            id: 'features',
+            icon: null,
+            label: 'DAGGERHEART.Sheets.PC.Tabs.Features'
+        },
+        loadout: {
+            active: false,
+            cssClass: '',
+            group: 'primary',
+            id: 'loadout',
+            icon: null,
+            label: 'DAGGERHEART.Sheets.PC.Tabs.Loadout'
+        },
+        inventory: {
+            active: false,
+            cssClass: '',
+            group: 'primary',
+            id: 'inventory',
+            icon: null,
+            label: 'DAGGERHEART.Sheets.PC.Tabs.Inventory'
+        },
+        biography: {
+            active: false,
+            cssClass: '',
+            group: 'primary',
+            id: 'biography',
+            icon: null,
+            label: 'DAGGERHEART.Sheets.PC.Tabs.biography'
+        },
+        effects: {
+            active: false,
+            cssClass: '',
+            group: 'primary',
+            id: 'effects',
+            icon: null,
+            label: 'DAGGERHEART.Sheets.PC.Tabs.effects'
         }
     };
 
@@ -150,17 +217,29 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
     _attachPartListeners(partId, htmlElement, options) {
         super._attachPartListeners(partId, htmlElement, options);
 
-        htmlElement.querySelector('.level-value').addEventListener('change', this.onLevelChange.bind(this));
+        // htmlElement.querySelector('.level-value').addEventListener('change', this.onLevelChange.bind(this));
         // To Remove when ContextMenu Handler is made
         htmlElement
             .querySelectorAll('[data-item-id]')
             .forEach(element => element.addEventListener('contextmenu', this.editItem.bind(this)));
     }
 
+    static _onEditImage() {
+        const fp = new FilePicker({
+            current: this.document.img,
+            type: 'image',
+            redirectToRoot: ['icons/svg/mystery-man.svg'],
+            callback: async path => this._updateImage.bind(this)(path),
+            top: this.position.top + 40,
+            left: this.position.left + 10
+        });
+        return fp.browse();
+    }
+
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options);
         context.document = this.document;
-        context.tabs = this._getTabs();
+        context.tabs = super._getTabs(this.constructor.TABS);
 
         context.config = SYSTEM;
 

module/config/generalConfig.mjs

@@ -93,21 +93,21 @@ export const healingTypes = {
 export const conditions = {
     vulnerable: {
         id: 'vulnerable',
-        name: 'DAGGERHEART.Condition.Vulnerable.Name',
+        name: 'DAGGERHEART.Condition.vulnerable.name',
         icon: 'icons/magic/control/silhouette-fall-slip-prone.webp',
-        description: 'DAGGERHEART.Condition.Vulnerable.Description'
+        description: 'DAGGERHEART.Condition.vulnerable.description'
     },
     hidden: {
         id: 'hidden',
-        name: 'DAGGERHEART.Condition.Hidden.Name',
+        name: 'DAGGERHEART.Condition.hidden.name',
         icon: 'icons/magic/perception/silhouette-stealth-shadow.webp',
-        description: 'DAGGERHEART.Condition.Hidden.Description'
+        description: 'DAGGERHEART.Condition.hidden.description'
     },
     restrained: {
         id: 'restrained',
-        name: 'DAGGERHEART.Condition.Restrained.Name',
+        name: 'DAGGERHEART.Condition.restrained.name',
         icon: 'icons/magic/control/debuff-chains-shackle-movement-red.webp',
-        description: 'DAGGERHEART.Condition.Restrained.Description'
+        description: 'DAGGERHEART.Condition.restrained.description'
     }
 };
 

module/data/actor/character.mjs

@@ -62,14 +62,21 @@ export default class DhCharacter extends BaseDataActor {
                 bags: new fields.NumberField({ initial: 0, integer: true }),
                 chests: new fields.NumberField({ initial: 0, integer: true })
             }),
-            pronouns: new fields.StringField({}),
             scars: new fields.TypedObjectField(
                 new fields.SchemaField({
                     name: new fields.StringField({}),
                     description: new fields.HTMLField()
                 })
             ),
-            story: new fields.HTMLField(),
+            biography: new fields.SchemaField({
+                background: new fields.HTMLField(),
+                connections: new fields.HTMLField(),
+                characteristics: new fields.SchemaField({
+                    pronouns: new fields.StringField({}),
+                    age: new fields.StringField({}),
+                    faith: new fields.StringField({})
+                })
+            }),
             class: new fields.SchemaField({
                 value: new ForeignDocumentUUIDField({ type: 'Item', nullable: true }),
                 subclass: new ForeignDocumentUUIDField({ type: 'Item', nullable: true })

module/helpers/handlebarsHelper.mjs

@@ -13,10 +13,43 @@ export default class RegisterHandlebarsHelpers {
             signedNumber: this.signedNumber,
             length: this.length,
             switch: this.switch,
-            case: this.case
+            case: this.case,
+            eq: this.eq,
+            ne: this.ne,
+            lt: this.lt,
+            gt: this.gt,
+            lte: this.lte,
+            gte: this.gte,
+            and: this.and,
+            or: this.or
         });
     }
 
+    static eq(v1, v2) {
+        return v1 === v2;
+    }
+    static ne(v1, v2) {
+        return v1 !== v2;
+    }
+    static lt(v1, v2) {
+        return v1 < v2;
+    }
+    static gt(v1, v2) {
+        return v1 > v2;
+    }
+    static lte(v1, v2) {
+        return v1 <= v2;
+    }
+    static gte(v1, v2) {
+        return v1 >= v2;
+    }
+    static and() {
+        return Array.prototype.every.call(arguments, Boolean);
+    }
+    static or() {
+        return Array.prototype.slice.call(arguments, 0, -1).some(Boolean);
+    }
+
     static times(nr, block) {
         var accum = '';
         for (var i = 0; i < nr; ++i) accum += block.fn(i);
@@ -101,7 +134,7 @@ export default class RegisterHandlebarsHelpers {
     }
 
     static debug(a) {
-        console.log(JSON.stringify(a));
+        console.log(a);
         return a;
     }
 }