From 9385917edde75447880b755a11305df3ae5fe645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Mon, 28 Dec 2020 17:34:40 +0100 Subject: [PATCH] Update to new data bindings, everythings an interface now. --- package-lock.json | 2 +- src/module/actor/actor-data.ts | 38 ++++++++++++++++----------------- src/module/actor/actor-sheet.ts | 22 +++++-------------- src/module/actor/actor.ts | 9 ++++---- src/module/ds4.ts | 4 ++-- src/module/item/item-sheet.ts | 15 +++++++------ 6 files changed, 40 insertions(+), 50 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4bf17502..f9b1dfbe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2678,7 +2678,7 @@ } }, "foundry-pc-types": { - "version": "git+https://git.f3l.de/dungeonslayers/foundry-pc-types.git#a94b1270e74d5e139c7c5d361764d9b0bc505c6f", + "version": "git+https://git.f3l.de/dungeonslayers/foundry-pc-types.git#211c36bdde13400f02421dc0f911b255767dac76", "from": "git+https://git.f3l.de/dungeonslayers/foundry-pc-types.git#f3l-fixes", "dev": true, "requires": { diff --git a/src/module/actor/actor-data.ts b/src/module/actor/actor-data.ts index 1ddcb9c9..93bb7883 100644 --- a/src/module/actor/actor-data.ts +++ b/src/module/actor/actor-data.ts @@ -1,26 +1,26 @@ -export type DS4ActorDataType = EntityData; - -// TODO: Actually add a type for data -export class DS4ActorData { - public attributes: DS4ActorDataAttributes; - public traits: DS4ActorDataTraits; +export interface DS4ActorDataType { + attributes: DS4ActorDataAttributes; + traits: DS4ActorDataTraits; } -class DS4ActorDataAttributes { - public body: ExpandableAttribute; - public mobility: ExpandableAttribute; - public mind: ExpandableAttribute; +interface DS4ActorDataAttributes { + body: BodyAttribute; + mobility: ExtensibleData; + mind: ExtensibleData; } -class ExpandableAttribute { - public initial: T; +interface ExtensibleData { + initial: T; } -class DS4ActorDataTraits { - public strength: ExpandableAttribute; - public constitution: ExpandableAttribute; - public agility: ExpandableAttribute; - public dexterity: ExpandableAttribute; - public intellect: ExpandableAttribute; - public aura: ExpandableAttribute; +// Blueprint in case we need more detailed differentiation +type BodyAttribute = ExtensibleData; + +interface DS4ActorDataTraits { + strength: ExtensibleData; + constitution: ExtensibleData; + agility: ExtensibleData; + dexterity: ExtensibleData; + intellect: ExtensibleData; + aura: ExtensibleData; } diff --git a/src/module/actor/actor-sheet.ts b/src/module/actor/actor-sheet.ts index 57128b34..925dc37b 100644 --- a/src/module/actor/actor-sheet.ts +++ b/src/module/actor/actor-sheet.ts @@ -19,18 +19,6 @@ export class DS4ActorSheet extends ActorSheet { /* -------------------------------------------- */ - /** @override */ - getData(): ActorSheetData { - const data = super.getData(); - const checkboxTypes = [typeof String, typeof Number, typeof Boolean]; - console.log(data.data["attributes"]); - for (const attr of Object.values(data.data["attributes"])) { - attr["isCheckbox"] = attr["dtype"] === "Boolean"; - } - console.log(data); - return data; - } - /** @override */ activateListeners(html: JQuery): void { super.activateListeners(html); @@ -39,17 +27,17 @@ export class DS4ActorSheet extends ActorSheet { if (!this.options.editable) return; // Add Inventory Item - html.find(".item-create").click(this._onItemCreate.bind(this)); + html.find(".item-create").on("click", this._onItemCreate.bind(this)); // Update Inventory Item - html.find(".item-edit").click((ev) => { + html.find(".item-edit").on("click", (ev) => { const li = $(ev.currentTarget).parents(".item"); const item = this.actor.getOwnedItem(li.data("itemId")); item.sheet.render(true); }); // Delete Inventory Item - html.find(".item-delete").click((ev) => { + html.find(".item-delete").on("clock", (ev) => { const li = $(ev.currentTarget).parents(".item"); this.actor.deleteOwnedItem(li.data("itemId")); li.slideUp(200, () => this.render(false)); @@ -66,7 +54,7 @@ export class DS4ActorSheet extends ActorSheet { * @param {Event} event The originating click event * @private */ - _onItemCreate(event: JQuery.ClickEvent): Promise { + private _onItemCreate(event: JQuery.ClickEvent): Promise { event.preventDefault(); const header = event.currentTarget; // Get the type of item to create. @@ -93,7 +81,7 @@ export class DS4ActorSheet extends ActorSheet { * @param {Event} event The originating click event * @private */ - _onRoll(event: JQuery.ClickEvent): void { + private _onRoll(event: JQuery.ClickEvent): void { event.preventDefault(); const element = event.currentTarget; const dataset = element.dataset; diff --git a/src/module/actor/actor.ts b/src/module/actor/actor.ts index e1f806b0..5f67e96e 100644 --- a/src/module/actor/actor.ts +++ b/src/module/actor/actor.ts @@ -1,4 +1,4 @@ -import { DS4ActorData, DS4ActorDataType } from "./actor-data"; +import { DS4ActorDataType } from "./actor-data"; /** * Extend the base Actor entity by defining a custom roll data structure which is ideal for the Simple system. @@ -11,10 +11,9 @@ export class DS4Actor extends Actor { this._prepareCombatValues(data); } - _prepareCombatValues(data: ActorData): void { + private _prepareCombatValues(data: ActorData): void { const hitPointsModifier = getProperty(data, "data.combatValues.hitPoints.modifier") || 0; - // data.data seems to get initialized with the enitity's data - const actorData = (data.data as unknown) as DS4ActorData; + const actorData = data.data; setProperty( data, "data.combatValues.hitPoints.max", @@ -32,7 +31,7 @@ export class DS4Actor extends Actor { ); } - _getArmorValue(): number { + private _getArmorValue(): number { return this.data["items"] .filter((item) => ["armor", "shield"].includes(item.type)) .filter((item) => item.data.equipped) diff --git a/src/module/ds4.ts b/src/module/ds4.ts index bd76905c..002e9314 100644 --- a/src/module/ds4.ts +++ b/src/module/ds4.ts @@ -18,8 +18,8 @@ Hooks.once("init", async function () { CONFIG.DS4 = DS4; // Define custom Entity classes - CONFIG.Actor.entityClass = DS4Actor as typeof Actor; // TODO: Can we remove the casts? - CONFIG.Item.entityClass = DS4Item as typeof Item; // TODO: Can we remove the casts? + CONFIG.Actor.entityClass = DS4Actor as typeof Actor; + CONFIG.Item.entityClass = DS4Item as typeof Item; // Register sheet application classes Actors.unregisterSheet("core", ActorSheet); diff --git a/src/module/item/item-sheet.ts b/src/module/item/item-sheet.ts index eff93c0d..f9cb4022 100644 --- a/src/module/item/item-sheet.ts +++ b/src/module/item/item-sheet.ts @@ -1,4 +1,3 @@ -import { DS4ActorDataType } from "../actor/actor-data"; import { DS4Item } from "./item"; import { DS4ItemDataType } from "./item-data"; @@ -26,7 +25,7 @@ export class DS4ItemSheet extends ItemSheet { /* -------------------------------------------- */ /** @override */ - getData(): ItemSheetData { + getData(): ItemSheetData { const data = { ...super.getData(), config: CONFIG.DS4 }; console.log(data); return data; @@ -35,11 +34,15 @@ export class DS4ItemSheet extends ItemSheet { /* -------------------------------------------- */ /** @override */ - setPosition(options = {}): unknown { + setPosition(options: ApplicationPosition = {}): ApplicationPosition { const position = super.setPosition(options); - const sheetBody = (this.element as JQuery).find(".sheet-body"); // TODO: Why is the cast necessary? - const bodyHeight = position.height - 192; - sheetBody.css("height", bodyHeight); + if ("find" in this.element) { + const sheetBody = this.element.find(".sheet"); + const bodyHeight = position.height - 192; + sheetBody.css("height", bodyHeight); + } else { + console.log("Failure setting position."); + } return position; }