From fd87b7fb7561f9983aeb6a3f276f3844583f3494 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 9 Sep 2022 13:20:54 +0200
Subject: [PATCH] Added advantage popup to spell cast

---
 .../character/characterSheetTabs/StatsTab.vue | 10 +++++--
 .../spells/CastSpellWithSlotDialog.vue        | 27 +++++++++++++++----
 .../ui/properties/viewers/ActionViewer.vue    | 10 +++++--
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
index 48b67bf5..ab4aa6fc 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -542,9 +542,15 @@
 					data: {
             creatureId: this.creatureId,
           },
-          callback({spellId, slotId} = {}){
+          callback({spellId, slotId, advantage} = {}){
             if (!spellId) return;
-            doCastSpell.call({spellId, slotId}, error => {
+            doCastSpell.call({
+              spellId,
+              slotId,
+              scope: {
+                $attackAdvantage: advantage,
+              },
+            }, error => {
               if (!error) return;
               snackbar({text: error.reason || error.message || error.toString()});
               console.error(error);
diff --git a/app/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue b/app/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue
index 04db8066..c3ec9a92 100644
--- a/app/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue
+++ b/app/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue
@@ -105,13 +105,13 @@
       </template>
       <template slot="right">
         <div
-          key="spell-title"
+          key="spell-title-right"
           class="text-h6 my-3"
         >
           Spell
         </div>
         <v-list-item-group
-          key="slot-list"
+          key="slot-list-right"
           v-model="selectedSpellId"
         >
           <template v-for="spell in computedSpells">
@@ -145,10 +145,24 @@
       >
         Cancel
       </v-btn>
+      <roll-popup
+        v-if="selectedSpell && selectedSpell.attackRoll"
+        text
+        color="primary"
+        class="mx-2"
+        :disabled="!canCast"
+        :name="selectedSpell.name"
+        :advantage="selectedSpell.attackRoll && selectedSpell.attackRoll.advantage"
+        @roll="cast"
+      >
+        Cast
+      </roll-popup>
       <v-btn
+        v-else
         text
         :disabled="!canCast"
-        class="primary--text"
+        class="mx-2 px-4"
+        color="primary"
         @click="cast"
       >
         Cast
@@ -164,6 +178,7 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur
 import spellsWithSubheaders from '/imports/ui/properties/components/spells/spellsWithSubheaders.js';
 import SpellSlotListTile from '/imports/ui/properties/components/attributes/SpellSlotListTile.vue';
 import SpellListTile from '/imports/ui/properties/components/spells/SpellListTile.vue';
+import RollPopup from '/imports/ui/components/RollPopup.vue';
 import { find } from 'lodash';
 
 const slotFilter = {
@@ -178,6 +193,7 @@ const slotFilter = {
 export default {
   components: {
     DialogBase,
+    RollPopup,
     SplitListLayout,
     SpellSlotListTile,
     SpellListTile,
@@ -325,13 +341,14 @@ export default {
         )
       )
     },
-    cast(){
+    cast({advantage}){
       let selectedSlotId = this.selectedSlotId;
       if (selectedSlotId === 'no-slot') selectedSlotId = undefined;
       this.$store.dispatch('popDialogStack', {
         spellId: this.selectedSpellId,
         slotId: selectedSlotId,
-      })
+        advantage,
+      });
     }
   },
   meteor: {
diff --git a/app/imports/ui/properties/viewers/ActionViewer.vue b/app/imports/ui/properties/viewers/ActionViewer.vue
index 91c6cd33..1ed2a982 100644
--- a/app/imports/ui/properties/viewers/ActionViewer.vue
+++ b/app/imports/ui/properties/viewers/ActionViewer.vue
@@ -192,9 +192,15 @@ export default {
             creatureId: this.context.creatureId,
             spellId: this.model._id,
           },
-          callback({spellId, slotId} = {}){
+          callback({spellId, slotId, advantage} = {}){
             if (!spellId) return;
-            doCastSpell.call({spellId, slotId}, error => {
+            doCastSpell.call({
+              spellId,
+              slotId,
+              scope: {
+                $attackAdvantage: advantage,
+              },
+            }, error => {
               if (!error) return;
               snackbar({text: error.reason});
               console.error(error);