Compare commits
2 Commits
ffba37b59e
...
3b0d4e032e
| Author | SHA1 | Date | |
|---|---|---|---|
| 3b0d4e032e | |||
| 539841c4ff |
@@ -616,8 +616,10 @@ export default class LethalFantasyRoll extends Roll {
|
||||
|
||||
let singleDice = `1D${maxValue}`
|
||||
for (let i = 0; i < rollBase.dice.length; i++) {
|
||||
for (let j = 0; j < rollBase.dice[i].results.length; j++) {
|
||||
let diceResult = rollBase.dice[i].results[j].result
|
||||
const dieResults = rollBase.dice[i].results
|
||||
const resultCount = dieResults.length
|
||||
for (let j = 0; j < resultCount; j++) {
|
||||
let diceResult = dieResults[j].result
|
||||
diceResults.push({ dice: `${singleDice.toUpperCase()}`, value: diceResult })
|
||||
diceSum += diceResult
|
||||
if (hasMaxValue) {
|
||||
@@ -626,6 +628,8 @@ export default class LethalFantasyRoll extends Roll {
|
||||
diceResult = r.dice[0].results[0].result
|
||||
diceResults.push({ dice: `${singleDice.toUpperCase()}-1`, value: diceResult - 1 })
|
||||
diceSum += (diceResult - 1)
|
||||
// Add to DieTerm results so DSN/Foundry display shows explosion dice
|
||||
dieResults.push({ result: diceResult, active: true })
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1214,6 +1218,7 @@ export default class LethalFantasyRoll extends Roll {
|
||||
diceResult = r.dice[0].results[0].result
|
||||
diceResults.push({ dice: `${dice.toUpperCase()}-1`, value: diceResult - 1 })
|
||||
diceSum += (diceResult - 1)
|
||||
rollBase.dice[0].results.push({ result: diceResult, active: true })
|
||||
}
|
||||
if (fullModifier !== 0) {
|
||||
diceResults.push({ dice: `${rollModifier.formula.toUpperCase()}`, value: rollModifier.total })
|
||||
@@ -1376,6 +1381,7 @@ export default class LethalFantasyRoll extends Roll {
|
||||
diceResult = r.dice[0].results[0].result
|
||||
diceResults.push({ dice: `${dice.toUpperCase()}-1`, value: diceResult - 1 })
|
||||
diceSum += (diceResult - 1)
|
||||
rollBase.dice[0].results.push({ result: diceResult, active: true })
|
||||
}
|
||||
|
||||
if (fullModifier !== 0) {
|
||||
@@ -1588,7 +1594,8 @@ export default class LethalFantasyRoll extends Roll {
|
||||
let diceSum = 0
|
||||
for (const term of roll.dice) {
|
||||
const singleDice = `1D${term.faces}`
|
||||
for (const r of term.results) {
|
||||
const termResults = Array.from(term.results)
|
||||
for (const r of termResults) {
|
||||
let diceResult = r.result
|
||||
diceResults.push({ dice: singleDice.toUpperCase(), value: diceResult })
|
||||
diceSum += diceResult
|
||||
@@ -1599,6 +1606,7 @@ export default class LethalFantasyRoll extends Roll {
|
||||
diceResult = xr.dice?.[0]?.results?.[0]?.result ?? (term.faces - 1)
|
||||
diceResults.push({ dice: `${singleDice.toUpperCase()}-1`, value: diceResult - 1 })
|
||||
diceSum += (diceResult - 1)
|
||||
term.results.push({ result: diceResult, active: true })
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user