diff --git a/lang/en.json b/lang/en.json index 68c9aa65..2290fc26 100755 --- a/lang/en.json +++ b/lang/en.json @@ -687,8 +687,7 @@ "chatMessageRollTitle": "Roll", "hints": { "completeRolls": "Set up and complete the rolls for the characters", - "selectRoll": "Select which roll value to be used for the Tagteam", - "totalDamage": "Total Damage: {damage}" + "selectRoll": "Select which roll value to be used for the Tagteam" } }, "TokenConfig": { @@ -2328,6 +2327,10 @@ "rerolled": "Rerolled", "rerollThing": "Reroll {thing}", "resource": "Resource", + "result": { + "single": "Result", + "plural": "Results" + }, "roll": "Roll", "rollAll": "Roll All", "rollDamage": "Roll Damage", diff --git a/module/applications/dialogs/tagTeamDialog.mjs b/module/applications/dialogs/tagTeamDialog.mjs index 7cd0dd47..3797b3c4 100644 --- a/module/applications/dialogs/tagTeamDialog.mjs +++ b/module/applications/dialogs/tagTeamDialog.mjs @@ -115,6 +115,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio }, []); const damage = data.rollData?.options?.damage; + partContext.hasDamage |= Boolean(damage); const critHitPointsDamage = await this.getCriticalDamage(damage); partContext.members[actorId] = { diff --git a/styles/less/dialog/tag-team-dialog/sheet.less b/styles/less/dialog/tag-team-dialog/sheet.less index f7683698..b3fbfc6d 100644 --- a/styles/less/dialog/tag-team-dialog/sheet.less +++ b/styles/less/dialog/tag-team-dialog/sheet.less @@ -159,20 +159,54 @@ } } + .results-container { + display: flex; + flex-direction: column; + align-items: center; + gap: 4px; + border: 2px solid light-dark(@dark-blue, @golden); + border-radius: 6px; + padding: 8px 10px; + + .result-container-label { + font-size: var(--font-size-24); + font-weight: bold; + } + + .results-inner-container { + display: flex; + justify-content: space-between; + gap: 8px; + width: 100%; + + .result-section-label { + font-size: var(--font-size-20); + } + + .hint { + text-align: center; + } + + .result-container { + width: 100%; + text-align: center; + + .result-info { + display: flex; + gap: 8px; + align-items: center; + justify-content: center; + } + } + } + } + .finish-container { display: flex; flex-direction: column; gap: 16px; text-align: center; - .damage-info { - font-size: var(--font-size-20); - } - - .hint { - height: 18px; - } - button { flex: 1; } diff --git a/templates/dialogs/tagTeamDialog/tagTeamRoll.hbs b/templates/dialogs/tagTeamDialog/tagTeamRoll.hbs index 233742f8..53aa802b 100644 --- a/templates/dialogs/tagTeamDialog/tagTeamRoll.hbs +++ b/templates/dialogs/tagTeamDialog/tagTeamRoll.hbs @@ -93,13 +93,38 @@ {{/each}} + +