Compare commits

..

No commits in common. "4c2d31b2f4dd7b76e4c6374bd6af3cf40a1cf56a" and "fdfd8c5a8d40cc1eb99b84fbfe8cf29dd6d89ab5" have entirely different histories.

2 changed files with 21 additions and 22 deletions

View file

@ -345,7 +345,7 @@ export async function runMigrations() {
if (foundry.utils.isNewerVersion('2.0.4', lastMigrationVersion)) { if (foundry.utils.isNewerVersion('2.0.4', lastMigrationVersion)) {
const downtimeMoves = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew); const downtimeMoves = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew);
if (downtimeMoves.restMoves.longRest.moves.repairArmor) { if (restMoves.longRest.moves.repairArmor) {
await downtimeMoves.updateSource({ await downtimeMoves.updateSource({
'restMoves.longRest.moves.repairArmor': defaultRestOptions.longRest().repairArmor 'restMoves.longRest.moves.repairArmor': defaultRestOptions.longRest().repairArmor
}); });

View file

@ -33,32 +33,31 @@
<div class="roll-formula">{{total}}</div></span></label> <div class="roll-formula">{{total}}</div></span></label>
{{/if}} {{/if}}
<div class="roll-dice"> <div class="roll-dice">
{{#if dice.length}} {{#each dice}}
{{#each dice}} {{#each results}}
{{#each results}} {{#unless discarded}}
{{#unless discarded}} <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-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}"
data-die-index="0" data-type="damage" data-damage-type="{{@../../../key}}" data-part="{{@../../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}}
</div>
</div> </div>
{{/unless}} </div>
{{/each}} {{/unless}}
{{/each}} {{/each}}
{{#if modifierTotal}} {{/each}}
<div class="roll-die{{#if (gt modifierTotal 0)}} has-plus{{/if}}"> {{#if modifierTotal}}
<div class="font-20">{{modifierTotal}}</div> <div class="roll-die{{#if (gt modifierTotal 0)}} has-plus{{/if}}">
</div> <div class="font-20">{{modifierTotal}}</div>
{{/if}} </div>
{{else}} {{/if}}
{{#unless dice.length}}
<div class="roll-die"> <div class="roll-die">
<div class="font-20">{{total}}</div> <div class="font-20">{{total}}</div>
</div> </div>
{{/if}} {{/unless}}
</div> </div>
{{/each}} {{/each}}
</fieldset> </fieldset>