fix: correctly calculate tick value when stopping to wait

.vscode/settings.json

@@ -4,5 +4,5 @@
     "**/.pnp.*": true
   },
   "eslint.nodePath": ".yarn/sdks",
-  "prettier.prettierPath": ".yarn/sdks/prettier/index.js",
+  "prettier.prettierPath": ".yarn/sdks/prettier/index.js"
 }

.yarn/sdks/eslint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "8.28.0-sdk",
+  "version": "8.42.0-sdk",
   "main": "./lib/api.js",
   "type": "commonjs"
 }

.yarn/sdks/prettier/index.js

@@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier/index.js
+    // Setup the environment to be able to require prettier
     require(absPnpApiPath).setup();
   }
 }
 
-// Defer to the real prettier/index.js your application uses
+// Defer to the real prettier your application uses
-module.exports = absRequire(`prettier/index.js`);
+module.exports = absRequire(`prettier`);

.yarn/sdks/prettier/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "2.8.0-sdk",
+  "version": "2.8.8-sdk",
   "main": "./index.js",
   "type": "commonjs"
 }

.yarnrc.yml

@@ -2,6 +2,6 @@ nodeLinker: pnp
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: '@yarnpkg/plugin-interactive-tools'
+    spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-3.6.0.cjs
+yarnPath: .yarn/releases/yarn-3.6.1.cjs

jsconfig.json

@@ -1,7 +1,8 @@
 {
   "compilerOptions": {
     "module": "es2022",
-    "target": "ES2022"
+    "target": "ES2022",
+    "strict": true
   },
   "exclude": ["node_modules", "dist"],
   "include": ["src", "client", "common"]

module.json

@@ -16,16 +16,18 @@
   "bugs": "https://git.f3l.de/dungeonslayers/tickwerk/issues",
   "changelog": "https://git.f3l.de/dungeonslayers/tickwerk/releases/tag/1.3.3",
   "version": "1.3.3",
+  "flags": {
+    "hotReload": {
+      "extensions": ["css", "hbs", "json"],
+      "paths": ["templates", "css", "lang"]
+    }
+  },
   "compatibility": {
     "minimum": "10.290",
     "verified": "10"
   },
-  "esmodules": [
+  "esmodules": ["tickwerk.js"],
-    "tickwerk.js"
+  "styles": ["styles/tickwerk.css"],
-  ],
-  "styles": [
-    "styles/tickwerk.css"
-  ],
   "languages": [
     {
       "lang": "en",

package.json

@@ -54,5 +54,5 @@
     "semver": "7.5.1",
     "yargs": "17.7.2"
   },
-  "packageManager": "yarn@3.6.0"
+  "packageManager": "yarn@3.6.1"
 }

src/data/documents/combatant.js

@@ -112,14 +112,16 @@ const CombatantMixin = (BaseCombatant) => {
      * @param {object} data The data of the creation / update
      */
     async #updateTiebreakerData(data) {
-      if ('initiative' in data) {
+      const waiting = data.flags?.[packageId]?.waiting;
+      if ('initiative' in data || waiting !== undefined) {
+        const newInitiative = data.initiative ?? this.initiative;
         const combatantsWithSameTickValue =
           this.parent?.combatants.filter((combatant) => {
             const otherInitiative =
               combatant._newInitiative !== undefined ? combatant._newInitiative : combatant.initiative;
-            return otherInitiative === data.initiative;
+            return otherInitiative === newInitiative && combatant !== this;
           }) ?? [];
-        const tiebreaker = await this.#getTiebreaker(combatantsWithSameTickValue);
+        const tiebreaker = await this.#getTiebreaker(combatantsWithSameTickValue, waiting);
         foundry.utils.setProperty(data, `flags.${packageId}.tiebreaker`, tiebreaker);
         this._newInitiative = data.initiative;
         this._newTiebreaker = tiebreaker;
@@ -129,11 +131,12 @@ const CombatantMixin = (BaseCombatant) => {
     /**
      * Get a tiebreaker between this combatant and the given other combatants.
      * @param {TickwerkCombatant[]} combatants  The other combatants among which to find a tiebreaker
+     * @param {boolean | undefined} waiting     The change of the waiting state of the combatanmt
      * @returns {Promise<number>} A promise that resolves to the tiebreaker
      */
-    async #getTiebreaker(combatants) {
+    async #getTiebreaker(combatants, waiting) {
       const getTiebreaker = CONFIG.tickwerk?.getTiebreaker ?? defaultGetTiebreaker;
-      return getTiebreaker(this, combatants);
+      return getTiebreaker(this, combatants, waiting);
     }
 
     /** @override */
@@ -179,14 +182,14 @@ const CombatantMixin = (BaseCombatant) => {
 
 /**
  * A function to get a tiebreaker for a combatant
- * @typedef {(combatant: TickwerkCombatant, combatants: TickwerkCombatant[]) => Promise<number>} GetTiebreaker
+ * @typedef {(combatant: TickwerkCombatant, combatants: TickwerkCombatant[], waiting: boolean | undefined) => Promise<number>} GetTiebreaker
  */
 
 /**
  * Default implementation to get a tiebreaker for a combatant.
  * @type {GetTiebreaker}
  */
-const defaultGetTiebreaker = async (combatant, combatants) => {
+export const defaultGetTiebreaker = async (combatant, combatants) => {
   if (combatants.length === 0) return 0;
   const tiebreakers = combatants.map((combatant) => {
     return (

src/systems/ds4.js

@@ -14,7 +14,7 @@ export const registerDS4SpecificFunctionality = () => {
 };
 
 /** @type {import("../data/documents/combatant").GetTiebreaker} */
-const getTiebreaker = async (combatant, combatants) => {
+const getTiebreaker = async (combatant, combatants, waiting) => {
   if (combatants.length === 0) return 0;
 
   /** @type {number[]} */
@@ -26,7 +26,7 @@ const getTiebreaker = async (combatant, combatants) => {
 
   for (const other of combatants) {
     const tiebreaker = other._newTiebreaker ?? other.getFlag(packageId, 'tiebreaker') ?? 0;
-    if (getInitiative(other) > getInitiative(combatant)) {
+    if (getInitiative(other) > getInitiative(combatant) || waiting === false) {
       lowerBounds.push(tiebreaker);
     } else if (getInitiative(other) < getInitiative(combatant)) {
       upperBounds.push(tiebreaker);