From 2d1e83ffcec2dadcfe6162ad8524122cbd399238 Mon Sep 17 00:00:00 2001 From: msprijatelj <44978587+msprijatelj@users.noreply.github.com> Date: Thu, 30 Sep 2021 23:09:35 -0400 Subject: [PATCH] fix(Active Mode): enable Critical Hit text for Rams This change borrows some Critical Hit decorators from `_WeaponAttack.vue` to indicate when a Ram is a critical hit. Closes #1681 --- .../dialogs/action/_GrappleDialog.vue | 2 +- .../dialogs/action/_RamDialog.vue | 25 ++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/ui/components/panels/loadout/active_loadout/dialogs/action/_GrappleDialog.vue b/src/ui/components/panels/loadout/active_loadout/dialogs/action/_GrappleDialog.vue index c7191ab20..099cefa31 100644 --- a/src/ui/components/panels/loadout/active_loadout/dialogs/action/_GrappleDialog.vue +++ b/src/ui/components/panels/loadout/active_loadout/dialogs/action/_GrappleDialog.vue @@ -122,7 +122,7 @@ diff --git a/src/ui/components/panels/loadout/active_loadout/dialogs/action/_RamDialog.vue b/src/ui/components/panels/loadout/active_loadout/dialogs/action/_RamDialog.vue index d5b0c3ac4..86364606c 100644 --- a/src/ui/components/panels/loadout/active_loadout/dialogs/action/_RamDialog.vue +++ b/src/ui/components/panels/loadout/active_loadout/dialogs/action/_RamDialog.vue @@ -122,7 +122,7 @@ @@ -132,14 +132,17 @@ v-model="attackRoll" :key="`input_${attackRoll}`" type="number" - class="hide-input-spinners ml-n3" + :class="`hide-input-spinners ml-n3 ${crit ? 'font-weight-bold' : ''}`" style="max-width: 60px; margin-top: -0.5px" - color="accent" + :color="crit ? 'secondary' : 'accent'" dense hide-details /> +
+ CRITICAL +
@@ -175,6 +178,17 @@ + + + + mdi-progress-alert +
CRITICAL HIT
+
+
Your target is knocked PRONE and you may also choose to knock them back by one space, @@ -215,6 +229,11 @@ export default Vue.extend({ actionCost: false, actionFree: false, }), + computed: { + crit() { + return this.attackRoll && this.attackRoll >= 20 + }, + }, watch: { used: { immediate: true,