.vscode/launch.json

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

package.json

@@ -2,7 +2,7 @@
   "private": true,
   "name": "dungeonslayers4",
   "description": "An implementation of the Dungeonslayers 4 game system for Foundry Virtual Tabletop.",
-  "version": "1.21.1",
+  "version": "1.20.0-1",
   "license": "https://git.f3l.de/dungeonslayers/ds4#licensing",
   "homepage": "https://git.f3l.de/dungeonslayers/ds4",
   "repository": {
@@ -52,46 +52,48 @@
     "eslint": "eslint --ext .ts,.js,.cjs,.mjs .",
     "format": "pnpm prettier --write",
     "format:check": "pnpm prettier --check",
-    "prettier": "prettier './**/*.(ts|js|cjs|mjs|json|scss|yml|yaml)'",
+    "prettier": "prettier \"./**/*.(ts|js|cjs|mjs|json|scss|yml|yaml)\"",
     "test": "run-p test:vitest test:typecheck",
     "test:vitest": "vitest run",
     "test:typecheck": "tsc --noEmit --project spec/tsconfig.json",
     "test:watch": "vitest",
+    "test:ci": "run-p test:ci:vitest test:typecheck",
+    "test:ci:vitest": "vitest run --reporter=default --reporter=junit --outputFile=junit.xml",
     "typecheck": "tsc --noEmit",
     "typecheck:watch": "tsc --noEmit --watch",
     "bump-version": "node ./tools/bump-version.js",
     "changelog": "conventional-changelog -p conventionalcommits -o CHANGELOG.md -r 2"
   },
   "devDependencies": {
-    "@commitlint/cli": "19.5.0",
-    "@commitlint/config-conventional": "19.5.0",
+    "@commitlint/cli": "17.6.7",
+    "@commitlint/config-conventional": "17.6.7",
     "@foundryvtt/foundryvtt-cli": "0.0.9",
-    "@guanghechen/rollup-plugin-copy": "6.0.2",
+    "@guanghechen/rollup-plugin-copy": "5.0.2",
     "@ironkinoko/rollup-plugin-styles": "4.0.3",
-    "@swc/core": "1.7.39",
-    "@types/fs-extra": "11.0.4",
-    "@types/jquery": "3.5.31",
-    "@types/node": "18.19.3",
-    "@typescript-eslint/eslint-plugin": "7.18.0",
-    "@typescript-eslint/parser": "7.18.0",
-    "conventional-changelog-cli": "5.0.0",
-    "conventional-changelog-conventionalcommits": "8.0.0",
-    "eslint": "8.57.1",
-    "eslint-config-prettier": "9.1.0",
-    "fs-extra": "11.2.0",
-    "handlebars": "4.7.8",
+    "@swc/core": "1.3.70",
+    "@types/fs-extra": "11.0.1",
+    "@types/jquery": "3.5.16",
+    "@types/node": "18.16.19",
+    "@typescript-eslint/eslint-plugin": "6.1.0",
+    "@typescript-eslint/parser": "6.1.0",
+    "conventional-changelog-cli": "3.0.0",
+    "conventional-changelog-conventionalcommits": "6.1.0",
+    "eslint": "8.45.0",
+    "eslint-config-prettier": "8.8.0",
+    "fs-extra": "11.1.1",
+    "handlebars": "4.7.7",
     "npm-run-all": "4.1.5",
-    "prettier": "3.3.3",
-    "rimraf": "6.0.1",
-    "rollup": "4.24.0",
-    "rollup-plugin-swc3": "0.12.1",
-    "sass": "1.80.3",
-    "semver": "7.6.3",
-    "tslib": "2.8.0",
-    "typescript": "5.5.4",
-    "vite": "4.5.5",
-    "vitest": "0.34.6",
+    "prettier": "3.0.0",
+    "rimraf": "5.0.1",
+    "rollup": "3.26.3",
+    "rollup-plugin-swc3": "0.9.1",
+    "sass": "1.64.0",
+    "semver": "7.5.4",
+    "tslib": "2.6.0",
+    "typescript": "5.1.6",
+    "vite": "4.4.6",
+    "vitest": "0.33.0",
     "yargs": "17.7.2"
   },
-  "packageManager": "pnpm@9.12.2"
+  "packageManager": "pnpm@8.6.9"
 }

src/apps/actor/base-sheet.js

@@ -457,6 +457,27 @@ export class DS4ActorSheet extends ActorSheet {
 
     this.actor.updateEmbeddedDocuments("Item", updates);
   }
+
+  /**
+   * @param {DragEvent} event
+   * @param {object} data
+   * @override
+   */
+  async _onDropItem(event, data) {
+    const item = await Item.implementation.fromDropData(data);
+    if (item && !this.actor.canOwnItemType(item.type)) {
+      notifications.warn(
+        getGame().i18n.format("DS4.WarningActorCannotOwnItem", {
+          actorName: this.actor.name,
+          actorType: this.actor.type,
+          itemName: item.name,
+          itemType: item.type,
+        }),
+      );
+      return false;
+    }
+    return super._onDropItem(event, data);
+  }
 }
 
 /**

src/documents/actor/actor.js

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

src/expression-evaluation/evaluator.ts

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

src/hooks/hooks.ts

@@ -4,14 +4,12 @@
 
 import { registerForHotbarDropHook } from "./hotbar-drop";
 import { registerForInitHook } from "./init";
-import { registerForPreCreateItemHook } from "./pre-create-item";
 import { registerForReadyHook } from "./ready";
 import { registerForRenderHooks } from "./render";
 import { registerForSetupHook } from "./setup";
 
 export function registerForHooks(): void {
   registerForHotbarDropHook();
-  registerForPreCreateItemHook();
   registerForInitHook();
   registerForReadyHook();
   registerForRenderHooks();

src/hooks/pre-create-item.js

@@ -1,28 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Johannes Loher
-//
-// SPDX-License-Identifier: MIT
-
-import { notifications } from "../ui/notifications.js";
-import { getGame } from "../utils/utils.js";
-
-export function registerForPreCreateItemHook() {
-  Hooks.on("preCreateItem", preCreateItem);
-}
-
-/**
- * @param {import('../documents/item/item.js').DS4Item} item
- * @returns {void | false}
- */
-function preCreateItem(item) {
-  if (item.parent instanceof Actor && !item.parent.canOwnItemType(item.type)) {
-    notifications.warn(
-      getGame().i18n.format("DS4.WarningActorCannotOwnItem", {
-        actorName: item.actor.name,
-        actorType: item.actor.type,
-        itemName: item.name,
-        itemType: item.type,
-      }),
-    );
-    return false;
-  }
-}

system.json

@@ -28,11 +28,12 @@
       "name": "Sascha Martens"
     }
   ],
-  "license": "https://git.f3l.de/dungeonslayers/ds4/raw/tag/1.21.1/LICENSE.md",
-  "readme": "https://git.f3l.de/dungeonslayers/ds4/raw/tag/1.21.1/README.md",
+  "url": "https://git.f3l.de/dungeonslayers/ds4",
+  "license": "https://git.f3l.de/dungeonslayers/ds4/raw/tag/1.20.0-1/LICENSE.md",
+  "readme": "https://git.f3l.de/dungeonslayers/ds4/raw/tag/1.20.0-1/README.md",
   "bugs": "https://git.f3l.de/dungeonslayers/ds4/issues",
-  "changelog": "https://git.f3l.de/dungeonslayers/ds4/releases/tag/1.21.1",
-  "version": "1.21.1",
+  "changelog": "https://git.f3l.de/dungeonslayers/ds4/releases/tag/1.20.0-1",
+  "version": "1.20.0-1",
   "flags": {
     "hotReload": {
       "extensions": ["css", "hbs", "json"],
@@ -115,12 +116,11 @@
       "type": "Item"
     }
   ],
-  "manifest": "https://git.f3l.de/api/packages/dungeonslayers/generic/ds4/latest/system.json",
-  "download": "https://git.f3l.de/dungeonslayers/ds4/releases/download/1.21.1/ds4.zip",
+  "manifest": "https://git.f3l.de/api/packages/dungeonslayers/generic/ds4/beta/system.json",
+  "download": "https://git.f3l.de/dungeonslayers/ds4/releases/download/1.20.0-1/ds4.zip",
   "initiative": "@combatValues.initiative.total",
   "gridDistance": 1,
   "gridUnits": "m",
   "primaryTokenAttribute": "combatValues.hitPoints",
-  "manifestPlusVersion": "1.2.0",
-  "url": "https://git.f3l.de/dungeonslayers/ds4"
+  "manifestPlusVersion": "1.2.0"
 }

templates/sheets/actor/components/effect-list-entry.hbs

@@ -9,7 +9,7 @@ SPDX-License-Identifier: MIT
 !-- Render an effect list entry row.
 !-- @param effectData: The data of the item.
 --}}
-<li class="ds4-embedded-document-list__row effect" data-effect-uuid="{{effectData.uuid}}" data-effect-id="{{effectData.id}}">
+<li class="ds4-embedded-document-list__row effect" data-effect-uuid="{{effectData.uuid}}">
     {{!-- enabled --}}
     <input class="ds4-embedded-document-list__editable ds4-embedded-document-list__editable--checkbox change-effect"
         type="checkbox" {{checked (ne effectData.disabled true)}} data-dtype="Boolean" data-property="disabled"

templates/sheets/actor/components/item-list-entry.hbs

@@ -15,7 +15,7 @@ SPDX-License-Identifier: MIT
 !-- @param hideDescription: A flag to disable the description column.
 !-- @param @partial-block: Custom column headers can be passed using the partial block.
 --}}
-<li class="ds4-embedded-document-list__row item" data-item-uuid="{{item.uuid}}" data-item-id="{{item.id}}">
+<li class="ds4-embedded-document-list__row item" data-item-uuid="{{item.uuid}}">
     {{!-- equipped --}}
     {{#if isEquipable}}
     <input class="ds4-embedded-document-list__editable ds4-embedded-document-list__editable--checkbox change-item"

tools/bump-version.js

@@ -10,7 +10,7 @@ import { hideBin } from "yargs/helpers";
 const packageType = "system";
 const repositoryOwner = process.env.CI_REPO_OWNER;
 const repositoryName = process.env.CI_REPO_NAME;
-const repositoryURL = process.env.CI_REPO_URL;
+const repositoryURL = process.env.CI_REPO_LINK;
 const forgeURL = process.env.CI_FORGE_URL;
 
 const getManifestUrl = (channel) =>