dungeonslayers/tickwerk
2
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases 8 Packages 1 Activity

Compare commits

base: dungeonslayers:e5d9b25566a7acab4616394dca372ccf6d4fedb5
Branches Tags
dungeonslayers:main
dungeonslayers:renovate/swc-monorepo
dungeonslayers:renovate/prettier-3.x
dungeonslayers:renovate/eslint-plugin-prettier-5.x
dungeonslayers:renovate/eslint-9.x
dungeonslayers:renovate/sass-1.x
dungeonslayers:renovate/rollup-3.x
dungeonslayers:renovate/conventional-changelog-cli-3.x
dungeonslayers:renovate/conventional-changelog-conventionalcommits-6.x
dungeonslayers:renovate/lock-file-maintenance
dungeonslayers:1.4.4
dungeonslayers:1.4.3
dungeonslayers:1.4.2
dungeonslayers:1.4.1
dungeonslayers:1.4.0
dungeonslayers:1.3.4
dungeonslayers:1.3.3
dungeonslayers:1.3.2
dungeonslayers:1.3.2-0
dungeonslayers:1.3.1
dungeonslayers:1.3.0
dungeonslayers:1.2.1
dungeonslayers:1.2.0
dungeonslayers:1.1.0
dungeonslayers:1.0.0
...
compare: dungeonslayers:81600fd52d18915fa000219e94c2d9d31c16b9db
Branches Tags
dungeonslayers:renovate/swc-monorepo
dungeonslayers:renovate/prettier-3.x
dungeonslayers:renovate/eslint-plugin-prettier-5.x
dungeonslayers:renovate/eslint-9.x
dungeonslayers:main
dungeonslayers:renovate/sass-1.x
dungeonslayers:renovate/rollup-3.x
dungeonslayers:renovate/conventional-changelog-cli-3.x
dungeonslayers:renovate/conventional-changelog-conventionalcommits-6.x
dungeonslayers:renovate/lock-file-maintenance
dungeonslayers:1.4.4
dungeonslayers:1.4.3
dungeonslayers:1.4.2
dungeonslayers:1.4.1
dungeonslayers:1.4.0
dungeonslayers:1.3.4
dungeonslayers:1.3.3
dungeonslayers:1.3.2
dungeonslayers:1.3.2-0
dungeonslayers:1.3.1
dungeonslayers:1.3.0
dungeonslayers:1.2.1
dungeonslayers:1.2.0
dungeonslayers:1.1.0
dungeonslayers:1.0.0

7 commits
e5d9b25566 ... 81600fd52d

Author SHA1 Message Date
Renovate Bot
81600fd52d chore(deps): update dependency @swc/core to v1.3.68
All checks were successful
ci/woodpecker/pr/checks Pipeline was successful
Details
2023-07-10 01:02:30 +00:00
woodpecker[bot]
65096d11b8 chore(release): 1.4.0
All checks were successful
ci/woodpecker/push/checks Pipeline was successful
Details
ci/woodpecker/tag/checks Pipeline was successful
Details
ci/woodpecker/tag/publish Pipeline was successful
Details
2023-07-10 00:25:20 +00:00
Johannes Loher
3d00caa31f
chore: use correct styles path for hot reload
All checks were successful
ci/woodpecker/pr/checks Pipeline was successful
Details
ci/woodpecker/push/checks Pipeline was successful
Details
ci/woodpecker/manual/checks Pipeline was successful
Details
ci/woodpecker/manual/release Pipeline was successful
Details
2023-07-10 02:21:57 +02:00
Johannes Loher
5d8e34ce5f
chore: mark v11 compatibility 2023-07-10 02:20:57 +02:00
woodpecker[bot]
dbac03fbad chore(release): 1.3.4
All checks were successful
ci/woodpecker/tag/checks Pipeline was successful
Details
ci/woodpecker/push/checks Pipeline was successful
Details
ci/woodpecker/tag/publish Pipeline was successful
Details
2023-07-10 00:20:23 +00:00
Johannes Loher
95a595773d
fix: correctly calculate tick value when stopping to wait
All checks were successful
ci/woodpecker/pr/checks Pipeline was successful
Details
ci/woodpecker/push/checks Pipeline was successful
Details
ci/woodpecker/manual/checks Pipeline was successful
Details
ci/woodpecker/manual/release Pipeline was successful
Details
2023-07-10 02:17:05 +02:00
Johannes Loher
753b934534
chore: update yarn and sdks 2023-07-10 01:24:08 +02:00
12 changed files with 246 additions and 228 deletions
Show stats Expand all files Collapse all files

2
.vscode/settings.json vendored
View file

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

312
.yarn/releases/yarn-3.6.0.cjs → .yarn/releases/yarn-3.6.1.cjs vendored
View file

File diff suppressed because one or more lines are too long

2
.yarn/sdks/eslint/package.json vendored
View file

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

6
.yarn/sdks/prettier/index.js vendored
View file

@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);
if (existsSync(absPnpApiPath)) { if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) { 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(); 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`);

2
.yarn/sdks/prettier/package.json vendored
View file

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

4
.yarnrc.yml
View file

@ -2,6 +2,6 @@ nodeLinker: pnp
plugins: plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs - 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

3
jsconfig.json
View file

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

26
module.json
View file

@ -11,14 +11,28 @@
} }
], ],
"url": "https://git.f3l.de/dungeonslayers/tickwerk", "url": "https://git.f3l.de/dungeonslayers/tickwerk",
"license": "https://git.f3l.de/dungeonslayers/tickwerk/raw/tag/1.3.3/LICENSE.md", "license": "https://git.f3l.de/dungeonslayers/tickwerk/raw/tag/1.4.0/LICENSE.md",
"readme": "https://git.f3l.de/dungeonslayers/tickwerk/raw/tag/1.3.3/README.md", "readme": "https://git.f3l.de/dungeonslayers/tickwerk/raw/tag/1.4.0/README.md",
"bugs": "https://git.f3l.de/dungeonslayers/tickwerk/issues", "bugs": "https://git.f3l.de/dungeonslayers/tickwerk/issues",
"changelog": "https://git.f3l.de/dungeonslayers/tickwerk/releases/tag/1.3.3", "changelog": "https://git.f3l.de/dungeonslayers/tickwerk/releases/tag/1.4.0",
"version": "1.3.3", "version": "1.4.0",
"flags": {
"hotReload": {
"extensions": [
"css",
"hbs",
"json"
],
"paths": [
"templates",
"styles",
"lang"
]
}
},
"compatibility": { "compatibility": {
"minimum": "10.290", "minimum": "10.290",
"verified": "10" "verified": "11"
}, },
"esmodules": [ "esmodules": [
"tickwerk.js" "tickwerk.js"
@ -39,6 +53,6 @@
} }
], ],
"manifest": "https://git.f3l.de/api/packages/dungeonslayers/generic/tickwerk/latest/module.json", "manifest": "https://git.f3l.de/api/packages/dungeonslayers/generic/tickwerk/latest/module.json",
"download": "https://git.f3l.de/dungeonslayers/tickwerk/releases/download/1.3.3/tickwerk.zip", "download": "https://git.f3l.de/dungeonslayers/tickwerk/releases/download/1.4.0/tickwerk.zip",
"manifestPlusVersion": "1.2.0" "manifestPlusVersion": "1.2.0"
} }

6
package.json
View file

@ -2,7 +2,7 @@
"private": true, "private": true,
"name": "tickwerk", "name": "tickwerk",
"description": "A tick based combat system for Foundry Virtual Tabletop", "description": "A tick based combat system for Foundry Virtual Tabletop",
"version": "1.3.3", "version": "1.4.0",
"license": "https://git.f3l.de/dungeonslayers/tickwerk#licensing", "license": "https://git.f3l.de/dungeonslayers/tickwerk#licensing",
"homepage": "https://git.f3l.de/dungeonslayers/tickwerk", "homepage": "https://git.f3l.de/dungeonslayers/tickwerk",
"repository": { "repository": {
@ -37,7 +37,7 @@
"@commitlint/cli": "17.6.5", "@commitlint/cli": "17.6.5",
"@commitlint/config-conventional": "17.6.5", "@commitlint/config-conventional": "17.6.5",
"@guanghechen/rollup-plugin-copy": "5.0.1", "@guanghechen/rollup-plugin-copy": "5.0.1",
"@swc/core": "1.3.62", "@swc/core": "1.3.68",
"conventional-changelog-cli": "2.2.2", "conventional-changelog-cli": "2.2.2",
"conventional-changelog-conventionalcommits": "5.0.0", "conventional-changelog-conventionalcommits": "5.0.0",
"eslint": "8.42.0", "eslint": "8.42.0",
@ -54,5 +54,5 @@
"semver": "7.5.1", "semver": "7.5.1",
"yargs": "17.7.2" "yargs": "17.7.2"
}, },
"packageManager": "yarn@3.6.0" "packageManager": "yarn@3.6.1"
} }

17
src/data/documents/combatant.js
View file

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

4
src/systems/ds4.js
View file

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

90
yarn.lock
View file

@ -476,90 +476,90 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@swc/core-darwin-arm64@npm:1.3.62": "@swc/core-darwin-arm64@npm:1.3.68":
version: 1.3.62 version: 1.3.68
resolution: "@swc/core-darwin-arm64@npm:1.3.62" resolution: "@swc/core-darwin-arm64@npm:1.3.68"
conditions: os=darwin & cpu=arm64 conditions: os=darwin & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@swc/core-darwin-x64@npm:1.3.62": "@swc/core-darwin-x64@npm:1.3.68":
version: 1.3.62 version: 1.3.68
resolution: "@swc/core-darwin-x64@npm:1.3.62" resolution: "@swc/core-darwin-x64@npm:1.3.68"
conditions: os=darwin & cpu=x64 conditions: os=darwin & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@swc/core-linux-arm-gnueabihf@npm:1.3.62": "@swc/core-linux-arm-gnueabihf@npm:1.3.68":
version: 1.3.62 version: 1.3.68
resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.62" resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.68"
conditions: os=linux & cpu=arm conditions: os=linux & cpu=arm
languageName: node languageName: node
linkType: hard linkType: hard
"@swc/core-linux-arm64-gnu@npm:1.3.62": "@swc/core-linux-arm64-gnu@npm:1.3.68":
version: 1.3.62 version: 1.3.68
resolution: "@swc/core-linux-arm64-gnu@npm:1.3.62" resolution: "@swc/core-linux-arm64-gnu@npm:1.3.68"
conditions: os=linux & cpu=arm64 & libc=glibc conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node languageName: node
linkType: hard linkType: hard
"@swc/core-linux-arm64-musl@npm:1.3.62": "@swc/core-linux-arm64-musl@npm:1.3.68":
version: 1.3.62 version: 1.3.68
resolution: "@swc/core-linux-arm64-musl@npm:1.3.62" resolution: "@swc/core-linux-arm64-musl@npm:1.3.68"
conditions: os=linux & cpu=arm64 & libc=musl conditions: os=linux & cpu=arm64 & libc=musl
languageName: node languageName: node
linkType: hard linkType: hard
"@swc/core-linux-x64-gnu@npm:1.3.62": "@swc/core-linux-x64-gnu@npm:1.3.68":
version: 1.3.62 version: 1.3.68
resolution: "@swc/core-linux-x64-gnu@npm:1.3.62" resolution: "@swc/core-linux-x64-gnu@npm:1.3.68"
conditions: os=linux & cpu=x64 & libc=glibc conditions: os=linux & cpu=x64 & libc=glibc
languageName: node languageName: node
linkType: hard linkType: hard
"@swc/core-linux-x64-musl@npm:1.3.62": "@swc/core-linux-x64-musl@npm:1.3.68":
version: 1.3.62 version: 1.3.68
resolution: "@swc/core-linux-x64-musl@npm:1.3.62" resolution: "@swc/core-linux-x64-musl@npm:1.3.68"
conditions: os=linux & cpu=x64 & libc=musl conditions: os=linux & cpu=x64 & libc=musl
languageName: node languageName: node
linkType: hard linkType: hard
"@swc/core-win32-arm64-msvc@npm:1.3.62": "@swc/core-win32-arm64-msvc@npm:1.3.68":
version: 1.3.62 version: 1.3.68
resolution: "@swc/core-win32-arm64-msvc@npm:1.3.62" resolution: "@swc/core-win32-arm64-msvc@npm:1.3.68"
conditions: os=win32 & cpu=arm64 conditions: os=win32 & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@swc/core-win32-ia32-msvc@npm:1.3.62": "@swc/core-win32-ia32-msvc@npm:1.3.68":
version: 1.3.62 version: 1.3.68
resolution: "@swc/core-win32-ia32-msvc@npm:1.3.62" resolution: "@swc/core-win32-ia32-msvc@npm:1.3.68"
conditions: os=win32 & cpu=ia32 conditions: os=win32 & cpu=ia32
languageName: node languageName: node
linkType: hard linkType: hard
"@swc/core-win32-x64-msvc@npm:1.3.62": "@swc/core-win32-x64-msvc@npm:1.3.68":
version: 1.3.62 version: 1.3.68
resolution: "@swc/core-win32-x64-msvc@npm:1.3.62" resolution: "@swc/core-win32-x64-msvc@npm:1.3.68"
conditions: os=win32 & cpu=x64 conditions: os=win32 & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@swc/core@npm:1.3.62": "@swc/core@npm:1.3.68":
version: 1.3.62 version: 1.3.68
resolution: "@swc/core@npm:1.3.62" resolution: "@swc/core@npm:1.3.68"
dependencies: dependencies:
"@swc/core-darwin-arm64": 1.3.62 "@swc/core-darwin-arm64": 1.3.68
"@swc/core-darwin-x64": 1.3.62 "@swc/core-darwin-x64": 1.3.68
"@swc/core-linux-arm-gnueabihf": 1.3.62 "@swc/core-linux-arm-gnueabihf": 1.3.68
"@swc/core-linux-arm64-gnu": 1.3.62 "@swc/core-linux-arm64-gnu": 1.3.68
"@swc/core-linux-arm64-musl": 1.3.62 "@swc/core-linux-arm64-musl": 1.3.68
"@swc/core-linux-x64-gnu": 1.3.62 "@swc/core-linux-x64-gnu": 1.3.68
"@swc/core-linux-x64-musl": 1.3.62 "@swc/core-linux-x64-musl": 1.3.68
"@swc/core-win32-arm64-msvc": 1.3.62 "@swc/core-win32-arm64-msvc": 1.3.68
"@swc/core-win32-ia32-msvc": 1.3.62 "@swc/core-win32-ia32-msvc": 1.3.68
"@swc/core-win32-x64-msvc": 1.3.62 "@swc/core-win32-x64-msvc": 1.3.68
peerDependencies: peerDependencies:
"@swc/helpers": ^0.5.0 "@swc/helpers": ^0.5.0
dependenciesMeta: dependenciesMeta:
@ -586,7 +586,7 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@swc/helpers": "@swc/helpers":
optional: true optional: true
checksum: a7a0d9ffdb8a2b0050e0ff89fdb86fe189d9bcb7f91cb6847f1bfe3e2b520a87ea2e83692dfd80b6d541fb5addb2194769484516b8ca6d3c62ad80f1c79a9368 checksum: f56ad1d4cb91f7cc1cb5d4b9894bbb528da0b2eabc98984581f5b3f3187cf2c0d512003880f6ff7a3f6d215b7a3dcbf5a9c45e8a428ac2d711941027c0151d89
languageName: node languageName: node
linkType: hard linkType: hard
@ -5327,7 +5327,7 @@ __metadata:
"@commitlint/cli": 17.6.5 "@commitlint/cli": 17.6.5
"@commitlint/config-conventional": 17.6.5 "@commitlint/config-conventional": 17.6.5
"@guanghechen/rollup-plugin-copy": 5.0.1 "@guanghechen/rollup-plugin-copy": 5.0.1
"@swc/core": 1.3.62 "@swc/core": 1.3.68
conventional-changelog-cli: 2.2.2 conventional-changelog-cli: 2.2.2
conventional-changelog-conventionalcommits: 5.0.0 conventional-changelog-conventionalcommits: 5.0.0
eslint: 8.42.0 eslint: 8.42.0