cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-06-08 13:48:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix conflicts again

Browse source
This commit is contained in:
Dapoolp 2025-07-01 19:02:54 +02:00
parent 1fff74d098
commit 9f88cdade8
2 changed files with 0 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

22
module/data/action/action.mjs
View file

@ -498,7 +498,6 @@ export class DHBaseAction extends foundry.abstract.DataModel {
/* SAVE */ /* SAVE */
async rollSave(target, event, message) { async rollSave(target, event, message) {
<<<<<<< HEAD
if(!target?.actor) return; if(!target?.actor) return;
return target.actor.diceRoll({ return target.actor.diceRoll({
event, event,
@ -512,27 +511,6 @@ export class DHBaseAction extends foundry.abstract.DataModel {
}).then(async (result) => { }).then(async (result) => {
if(result) this.updateChatMessage(message, target.id, {result: result.roll.total, success: result.roll.success}); if(result) this.updateChatMessage(message, target.id, {result: result.roll.total, success: result.roll.success});
}) })
=======
if (!target?.actor) return;
target.actor
.diceRoll({
event,
title: 'Roll Save',
roll: {
trait: this.save.trait,
difficulty: this.save.difficulty,
type: 'reaction'
},
data: target.actor.getRollData()
})
.then(async result => {
if (result)
this.updateChatMessage(message, target.id, {
result: result.roll.total,
success: result.roll.success
});
});
>>>>>>> main
} }
async updateChatMessage(message, targetId, changes, chain = true) { async updateChatMessage(message, targetId, changes, chain = true) {

4
module/documents/actor.mjs
View file

@ -1,12 +1,8 @@
import DamageSelectionDialog from '../applications/damageSelectionDialog.mjs'; import DamageSelectionDialog from '../applications/damageSelectionDialog.mjs';
import { GMUpdateEvent, socketEvent } from '../helpers/socket.mjs'; import { GMUpdateEvent, socketEvent } from '../helpers/socket.mjs';
import DamageReductionDialog from '../applications/damageReductionDialog.mjs'; import DamageReductionDialog from '../applications/damageReductionDialog.mjs';
<<<<<<< HEAD
import Resources from '../applications/resources.mjs';
=======
import { LevelOptionType } from '../data/levelTier.mjs'; import { LevelOptionType } from '../data/levelTier.mjs';
import DHFeature from '../data/item/feature.mjs'; import DHFeature from '../data/item/feature.mjs';
>>>>>>> main
export default class DhpActor extends Actor { export default class DhpActor extends Actor {
async _preCreate(data, options, user) { async _preCreate(data, options, user) {