cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-07-21 18:09:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Semi-corrected reroll of one of multiple results on a die

Browse source
This commit is contained in:
WBHarry 2026-07-15 02:35:27 +02:00
parent fea3671069
commit 20febb82d5
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -254,8 +254,8 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
const target = event.target.closest('[data-die-index]'); const target = event.target.closest('[data-die-index]');
if (target.dataset.type === 'damage') { if (target.dataset.type === 'damage') {
const { damageType, dice } = target.dataset; const { damageType, dice, result } = target.dataset;
await message.system.damage.rerollDamageDice(damageType, dice); await message.system.damage.rerollDamageDice(damageType, dice, result);
await message.update({ await message.update({
'system.damage.types': { 'system.damage.types': {
[damageType]: { [damageType]: {

15
module/data/chat-message/actorRoll.mjs
View file

@ -59,20 +59,21 @@ class ChatMessageRollDamage extends foundry.abstract.DataModel {
} }
} }
async rerollDamageDice(damageType, dice) { async rerollDamageDice(damageType, dice, resultIndex) {
const reroll = this.types[damageType].roll; const reroll = this.types[damageType].roll;
const rerollDice = reroll.dice[dice]; const rerollDice = reroll.dice[dice];
await rerollDice.reroll(`/r1=${rerollDice.total}`); const diceResult = rerollDice.results[resultIndex];
await rerollDice.reroll(`/r1=${diceResult.result}`);
await reroll._evaluate(); await reroll._evaluate();
const result = rerollDice.results.find(x => x.active); const rerolledResult = rerollDice.results[rerollDice.results.length - 1];
if (result) { if (rerolledResult) {
const fakeRoll = { const fakeRoll = {
_evaluated: true, _evaluated: true,
dice: [new foundry.dice.terms.Die({ dice: [new foundry.dice.terms.Die({
...rerollDice, ...rerollDice,
results: [result], results: [rerolledResult],
total: result.value, total: rerolledResult.value,
faces: rerollDice.faces faces: rerollDice.faces
})], })],
options: { appearance: {} } options: { appearance: {} }

2
templates/ui/chat/parts/damage-part.hbs
View file

@ -40,7 +40,7 @@
<div class="roll-die{{#unless @../first}} has-plus{{/unless}}"> <div class="roll-die{{#unless @../first}} has-plus{{/unless}}">
<div <div
class="dice reroll-button {{../dice}}" class="dice reroll-button {{../dice}}"
data-die-index="0" data-type="damage" data-damage-type="{{@../../key}}" data-dice="{{@../key}}" data-die-index="0" data-type="damage" data-damage-type="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}"
> >
{{#if hasRerolls}}<i class="fa-solid fa-dice dice-rerolled" data-tooltip="{{localize "DAGGERHEART.GENERAL.rerolled"}}"></i>{{/if}} {{#if hasRerolls}}<i class="fa-solid fa-dice dice-rerolled" data-tooltip="{{localize "DAGGERHEART.GENERAL.rerolled"}}"></i>{{/if}}
{{result}} {{result}}