dungeonslayers/ds4
dungeonslayers/ds4
3
0
Fork 0
Code Issues 9 Pull requests 7 Projects Releases 10 Packages 1 Activity

allow-using-includes-in-effect-filters #243

Merged
saluu merged 2 commits from allow-using-includes-in-effect-filters into main 2023-09-16 10:58:18 +02:00
Conversation 0 Commits 2 Files changed 3 +15 -6
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.vscode/launch.json vendored
View file

@ -5,12 +5,14 @@
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"type": "pwa-chrome", "type": "chrome",
"request": "launch", "request": "launch",
"runtimeExecutable": "/usr/bin/chromium", "runtimeExecutable": "/usr/bin/chromium",
"name": "Launch Chrome against localhost", "name": "Launch Chrome against localhost",
"url": "http://localhost:30000/game", "url": "http://localhost:30000/game",
"webRoot": "${workspaceFolder}/dist" "pathMapping": {
"/systems/ds4": "${workspaceFolder}/dist"
}
} }
] ]
} }

13
src/documents/actor/actor.js
View file

@ -5,7 +5,8 @@
import { DS4 } from "../../config"; import { DS4 } from "../../config";
import { createCheckRoll } from "../../dice/check-factory"; import { createCheckRoll } from "../../dice/check-factory";
import { mathEvaluator } from "../../expression-evaluation/evaluator"; import { Evaluator } from "../../expression-evaluation/evaluator";
import { Validator } from "../../expression-evaluation/validator";
import { logger } from "../../utils/logger"; import { logger } from "../../utils/logger";
import { getGame } from "../../utils/utils"; import { getGame } from "../../utils/utils";
import { DS4ActiveEffect } from "../active-effect"; import { DS4ActiveEffect } from "../active-effect";
@ -59,7 +60,7 @@ export class DS4Actor extends Actor {
} }
/** /**
* The effects that should be applioed to this actor. * The effects that should be applied to this actor.
* @type {import("../active-effect").DS4ActiveEffect[]} * @type {import("../active-effect").DS4ActiveEffect[]}
* @protected * @protected
*/ */
@ -90,7 +91,7 @@ export class DS4Actor extends Actor {
if (condition !== undefined && condition !== "") { if (condition !== undefined && condition !== "") {
try { try {
const replacedCondition = DS4Actor.replaceFormulaData(condition, { item, actor: this, effect }); const replacedCondition = DS4Actor.replaceFormulaData(condition, { item, actor: this, effect });
return replacedCondition !== undefined ? Boolean(mathEvaluator.evaluate(replacedCondition)) : false; return replacedCondition !== undefined ? Boolean(DS4Actor.evaluator.evaluate(replacedCondition)) : false;
} catch (error) { } catch (error) {
logger.warn(error); logger.warn(error);
return false; return false;
@ -520,6 +521,12 @@ export class DS4Actor extends Actor {
rejectClose: false, rejectClose: false,
}); });
} }
static evaluator = new Evaluator({
context: Math,
predicate: (identifier) =>
Validator.defaultPredicate(identifier) || ["includes", "toLowerCase", "toUpperCase"].includes(identifier),
});
} }
/** /**

2
src/expression-evaluation/evaluator.ts
View file

@ -19,7 +19,7 @@ export class Evaluator<Context extends object> {
get: (t, k) => (k === Symbol.unscopables ? undefined : t[k as keyof typeof t]), get: (t, k) => (k === Symbol.unscopables ? undefined : t[k as keyof typeof t]),
}); });
actualPredicate = (identifier: string) => actualPredicate = (identifier: string) =>
predicate(identifier) || Object.getOwnPropertyNames(Math).includes(identifier); predicate(identifier) || Object.getOwnPropertyNames(context).includes(identifier);
} }
this.validator = new Validator(actualPredicate); this.validator = new Validator(actualPredicate);
} }