uberwald/fvtt-lethal-fantasy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

ATtempt to fix init rolls

Browse Source
This commit is contained in:
LeRatierBretonnier
2026-04-07 20:43:15 +02:00
parent 3ad5681539
commit 1bf88bac06
33 changed files with 134 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/models/character.mjs
View File

@@ -155,6 +155,7 @@ export default class LethalFantasyCharacter extends foundry.abstract.TypeDataMod
defenseBonus: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }),
damageModifier: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }),
armorHitPoints: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }),
combatProgressionStart: new fields.NumberField({ ...requiredInteger, initial: 1, min: 1 }),
})
const moneyField = (label) => {
@@ -273,7 +274,7 @@ export default class LethalFantasyCharacter extends foundry.abstract.TypeDataMod
* @param {"="|"+"|"++"|"-"|"--"} rollAdvantage If there is an avantage (+), a disadvantage (-), a double advantage (++), a double disadvantage (--) or a normal roll (=).
* @returns {Promise<null>} - A promise that resolves to null if the roll is cancelled.
*/
async roll(rollType, rollTarget, defenderId) {
async roll(rollType, rollTarget, defenderId, defenderTokenId) {
const hasTarget = false
let roll = await LethalFantasyRoll.prompt({
rollType,
@@ -283,7 +284,8 @@ export default class LethalFantasyCharacter extends foundry.abstract.TypeDataMod
actorImage: this.parent.img,
hasTarget,
target: false,
defenderId
defenderId,
defenderTokenId
})
if (!roll) return null

9
module/models/monster.mjs
View File

@@ -141,7 +141,7 @@ export default class LethalFantasyMonster extends foundry.abstract.TypeDataModel
* @param {"="|"+"|"++"|"-"|"--"} rollAdvantage If there is an avantage (+), a disadvantage (-), a double advantage (++), a double disadvantage (--) or a normal roll (=).
* @returns {Promise<null>} - A promise that resolves to null if the roll is cancelled.
*/
async roll(rollType, rollTarget, defenderId = undefined) {
async roll(rollType, rollTarget, defenderId = undefined, defenderTokenId = undefined) {
const hasTarget = false
let roll = await LethalFantasyRoll.prompt({
rollType,
@@ -151,14 +151,15 @@ export default class LethalFantasyMonster extends foundry.abstract.TypeDataModel
actorImage: this.parent.img,
hasTarget,
target: false,
defenderId
defenderId,
defenderTokenId
})
if (!roll) return null
await roll.toMessage({}, { rollMode: roll.options.rollMode })
}
async prepareMonsterRoll(rollType, rollKey, rollDice = undefined, tokenId = undefined, damageModifier = undefined, defenderId = undefined) {
async prepareMonsterRoll(rollType, rollKey, rollDice = undefined, tokenId = undefined, damageModifier = undefined, defenderId = undefined, defenderTokenId = undefined) {
let rollTarget
switch (rollType) {
case "monster-attack":
@@ -254,7 +255,7 @@ export default class LethalFantasyMonster extends foundry.abstract.TypeDataModel
if (rollTarget) {
rollTarget.tokenId = tokenId
console.log(rollTarget)
await this.roll(rollType, rollTarget, defenderId)
await this.roll(rollType, rollTarget, defenderId, defenderTokenId)
}
}