From 26e22ed3cfff8a4ab6d64e418e241e103f83abc5 Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Sun, 25 Apr 2021 18:35:29 +0200
Subject: [PATCH] Work on custom checks
---
src/module/actor/actor-prepared-data.ts | 3 +++
src/module/actor/actor.ts | 25 ++++++++++++++++++-
src/module/global.d.ts | 1 +
src/module/settings.ts | 10 ++++++++
.../sheets/actor/components/checks.hbs | 4 +++
5 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/src/module/actor/actor-prepared-data.ts b/src/module/actor/actor-prepared-data.ts
index ab23163..5dd3ec5 100644
--- a/src/module/actor/actor-prepared-data.ts
+++ b/src/module/actor/actor-prepared-data.ts
@@ -23,6 +23,7 @@ interface DS4ActorPreparedDataDataBase {
combatValues: DS4ActorPreparedDataDataCombatValues;
rolling: DS4ActorPreparedDataDataRolling;
checks: DS4ActorPreparedDataDataChecks;
+ customChecks: DS4ActorPreparedDataDataCustomChecks;
}
interface DS4ActorPreparedDataDataAttributes {
@@ -66,6 +67,8 @@ type DS4ActorPreparedDataDataChecks = {
[key in Check]: number;
};
+type DS4ActorPreparedDataDataCustomChecks = Record<string, number>;
+
// types
interface DS4CharacterPreparedDataData extends DS4ActorPreparedDataDataBase {
diff --git a/src/module/actor/actor.ts b/src/module/actor/actor.ts
index 1bb05a0..3aea531 100644
--- a/src/module/actor/actor.ts
+++ b/src/module/actor/actor.ts
@@ -110,6 +110,7 @@ export class DS4Actor extends Actor<DS4ActorData, DS4Item, DS4ActorPreparedData>
prepareDerivedData(): void {
this._prepareCombatValues();
this._prepareChecks();
+ this._prepareCustomChecks();
}
/**
@@ -122,7 +123,10 @@ export class DS4Actor extends Actor<DS4ActorData, DS4Item, DS4ActorPreparedData>
const checkProperties = Object.keys(DS4.i18n.checks)
.filter((check) => check !== "defend")
.map((check) => `data.checks.${check}`);
- return combatValueProperties.concat(checkProperties);
+ const customCheckProperties = Object.keys(game.settings.get("ds4", "customChecks")).map(
+ (check) => `data.customChecks.${check}`,
+ );
+ return combatValueProperties.concat(checkProperties).concat(customCheckProperties);
}
/**
@@ -251,6 +255,25 @@ export class DS4Actor extends Actor<DS4ActorData, DS4Item, DS4ActorPreparedData>
};
}
+ protected _prepareCustomChecks(): void {
+ const customChecksSettings = game.settings.get("ds4", "customChecks");
+ const data = this.data.data;
+ data.customChecks = {};
+ Object.entries(customChecksSettings).forEach(([identifier, check]) => {
+ const replacedFormula = this._replaceFormulaData(check.formula);
+ console.log(replacedFormula);
+ data.customChecks[identifier] = Roll.MATH_PROXY.safeEval(replacedFormula);
+ });
+ }
+
+ protected _replaceFormulaData(formula: string): string {
+ const dataRgx = new RegExp(/@([a-z.0-9_\-]+)/gi);
+ return formula.replace(dataRgx, (match, term) => {
+ const value = getProperty(this.data, term);
+ return value !== undefined ? String(value).trim() : match;
+ });
+ }
+
/**
* Handle how changes to a Token attribute bar are applied to the Actor.
* This only differs from the base implementation by also allowing negative values.
diff --git a/src/module/global.d.ts b/src/module/global.d.ts
index c560d62..4a81cb1 100644
--- a/src/module/global.d.ts
+++ b/src/module/global.d.ts
@@ -2,5 +2,6 @@ declare namespace ClientSettings {
interface Values {
"ds4.systemMigrationVersion": number;
"ds4.useSlayingDiceForAutomatedChecks": boolean;
+ "ds4.customChecks": Record<string, { label: string; formula: string }>;
}
}
diff --git a/src/module/settings.ts b/src/module/settings.ts
index 938be7c..954baa9 100644
--- a/src/module/settings.ts
+++ b/src/module/settings.ts
@@ -18,4 +18,14 @@ export function registerSystemSettings(): void {
type: Boolean,
default: false,
});
+
+ game.settings.register("ds4", "customChecks", {
+ name: "DS4.SettingsCustomChecks",
+ scope: "world",
+ config: false,
+ // eslint-disable-next-line
+ //@ts-ignore
+ type: Object,
+ default: {},
+ });
}
diff --git a/src/templates/sheets/actor/components/checks.hbs b/src/templates/sheets/actor/components/checks.hbs
index e10f671..05d58a2 100644
--- a/src/templates/sheets/actor/components/checks.hbs
+++ b/src/templates/sheets/actor/components/checks.hbs
@@ -3,4 +3,8 @@
{{> systems/ds4/templates/sheets/actor/components/check.hbs check-key=check-key check-target-number=(lookup
../data.checks check-key) check-label=check-label}}
{{/each}}
+ {{#each data.customChecks as |check-target-number check-key|}}
+ {{> systems/ds4/templates/sheets/actor/components/check.hbs check-key=check-key
+ check-target-number=check-target-number check-label=check-key}}
+ {{/each}}
</div>