cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-19 08:20:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix conflict

Browse source
This commit is contained in:
Dapoolp 2025-08-03 14:57:18 +02:00
commit 5400b2334d
89 changed files with 9334 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/applications/sheets-configs/environment-settings.mjs
View file

@ -93,7 +93,7 @@ export default class DHEnvironmentSettings extends DHBaseActorSettings {
const adversaries = foundry.utils.getProperty(this.actor, path);
const newAdversaries = adversaries.filter(a => a.uuid !== doc.uuid);
await this.actor.update({ [path]: newAdversaries });
await this.actor.update({ [path]: newAdversaries.map(x => x.uuid) });
}
async _onDragStart(event) {

2
module/applications/ui/chatLog.mjs
View file

@ -223,7 +223,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
if (!confirmed) return;
}
const target = event.target.closest('button[data-die-index]');
const target = event.target.closest('[data-die-index]');
let originalRoll_parsed = message.rolls.map(roll => JSON.parse(roll))[0];
const rollClass =
game.system.api.dice[

4
module/config/flagsConfig.mjs
View file

@ -9,3 +9,7 @@ export const encounterCountdown = {
};
export const itemAttachmentSource = 'attachmentSource';
export const userFlags = {
welcomeMessage: 'welcome-message'
};

4
module/config/generalConfig.mjs
View file

@ -1,3 +1,7 @@
export const compendiumJournals = {
welcome: 'Compendium.daggerheart.journals.JournalEntry.g7NhKvwltwafmMyR'
};
export const range = {
self: {
id: 'self',