Athemis/ds4
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update to new data bindings, everythings an interface now.

Browse source
This commit is contained in:
Oliver Rümpelein 2020-12-28 17:34:40 +01:00
parent 78be1c2370
commit 9385917edd
6 changed files with 40 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/module/actor/actor-data.ts
View file

@ -1,26 +1,26 @@
export type DS4ActorDataType = EntityData<DS4ActorData>;
// 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<number>;
public mobility: ExpandableAttribute<number>;
public mind: ExpandableAttribute<number>;
interface DS4ActorDataAttributes {
body: BodyAttribute;
mobility: ExtensibleData<number>;
mind: ExtensibleData<number>;
}
class ExpandableAttribute<T extends any> {
public initial: T;
interface ExtensibleData<T extends any> {
initial: T;
}
class DS4ActorDataTraits {
public strength: ExpandableAttribute<number>;
public constitution: ExpandableAttribute<number>;
public agility: ExpandableAttribute<number>;
public dexterity: ExpandableAttribute<number>;
public intellect: ExpandableAttribute<number>;
public aura: ExpandableAttribute<number>;
// Blueprint in case we need more detailed differentiation
type BodyAttribute = ExtensibleData<number>;
interface DS4ActorDataTraits {
strength: ExtensibleData<number>;
constitution: ExtensibleData<number>;
agility: ExtensibleData<number>;
dexterity: ExtensibleData<number>;
intellect: ExtensibleData<number>;
aura: ExtensibleData<number>;
}

22
src/module/actor/actor-sheet.ts
View file

@ -19,18 +19,6 @@ export class DS4ActorSheet extends ActorSheet<DS4ActorDataType, DS4Actor> {
/* -------------------------------------------- */
/** @override */
getData(): ActorSheetData<DS4ActorDataType> {
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<DS4ActorDataType, DS4Actor> {
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<DS4ActorDataType, DS4Actor> {
* @param {Event} event The originating click event
* @private
*/
_onItemCreate(event: JQuery.ClickEvent): Promise<Item> {
private _onItemCreate(event: JQuery.ClickEvent): Promise<Item> {
event.preventDefault();
const header = event.currentTarget;
// Get the type of item to create.
@ -93,7 +81,7 @@ export class DS4ActorSheet extends ActorSheet<DS4ActorDataType, DS4Actor> {
* @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;

9
src/module/actor/actor.ts
View file

@ -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<DS4ActorDataType> {
this._prepareCombatValues(data);
}
_prepareCombatValues(data: ActorData<DS4ActorDataType>): void {
private _prepareCombatValues(data: ActorData<DS4ActorDataType>): 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<DS4ActorDataType> {
);
}
_getArmorValue(): number {
private _getArmorValue(): number {
return this.data["items"]
.filter((item) => ["armor", "shield"].includes(item.type))
.filter((item) => item.data.equipped)