add way to draw spell consumable

reonZ · Jun 23, 2024 · 070e361 · 070e361
1 parent 7d18760
commit 070e361
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 21 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -213,6 +213,10 @@
                     "confirm": {
                         "title": "Use - {name}",
                         "message": "Are you sure you want to use <strong>{name}</strong>?"
+                    },
+                    "draw": {
+                        "title": "{type} - {name}",
+                        "message": "Are you sure you want to {type} <strong>{name}</strong>?"
                     }
                 }
             }

diff --git a/src/hud/persistent.ts b/src/hud/persistent.ts
@@ -4,11 +4,13 @@ import {
     addListener,
     addListenerAll,
     arrayIncludes,
+    changeCarryType,
     confirmDialog,
     consumeItem,
     createHTMLElement,
     createHook,
     elementDataset,
+    getActionAnnotation,
     getActionImg,
     getActiveModule,
     getFlag,
@@ -58,6 +60,7 @@ import {
     variantLabel,
 } from "./sidebar/actions";
 import { SidebarMenu, SidebarSettings, getSidebars } from "./sidebar/base";
+import { getAnnotationTooltip } from "./sidebar/spells";
 
 const ROMAN_RANKS = ["", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X"] as const;
 
@@ -577,13 +580,26 @@ class PF2eHudPersistent extends makeAdvancedHUD(
                     isCantrip || isConsumable
                         ? false
                         : isStaff
-                        ? canCastRank
+                        ? !canCastRank
                         : uses
                         ? isCharges
                             ? uses.value < castRank
                             : uses.value === 0
                         : !!active?.expended;
 
+                const notCarried = isConsumable
+                    ? spell.parentItem?.carryType !== "held"
+                    : isStaff
+                    ? (entry as dailies.StaffSpellcasting).staff.carryType !== "held"
+                    : false;
+
+                const parentItem = isStaff
+                    ? dailiesModule?.api.getStaffItem(actor as CharacterPF2e)
+                    : spell.parentItem;
+
+                const annotation =
+                    notCarried && parentItem ? getActionAnnotation(parentItem) : undefined;
+
                 return {
                     ...shortcut,
                     isDisabled: expended || isBroken,
@@ -593,13 +609,17 @@ class PF2eHudPersistent extends makeAdvancedHUD(
                     categoryIcon,
                     collection,
                     item: spell,
-                    name,
+                    name: annotation ? `${getAnnotationTooltip(annotation)} - ${name}` : name,
                     uses,
                     entryLabel,
                     isBroken,
                     castRank: castRank,
                     isPrepared: isPrepared && !isFlexible && !isCantrip,
                     cost: getCost(spell.system.time.value),
+                    notCarried,
+                    isStaff,
+                    parentItem,
+                    annotation,
                 } satisfies SpellShortcut as T;
             }
 
@@ -978,7 +998,7 @@ class PF2eHudPersistent extends makeAdvancedHUD(
 
         const actor = this.actor!;
 
-        function confimUse(name: string) {
+        function confirmUse(name: string) {
             return confirmDialog({
                 title: localize("persistent.main.shortcut.confirm.title", {
                     name,
@@ -1000,7 +1020,7 @@ class PF2eHudPersistent extends makeAdvancedHUD(
                     return item.toMessage(event);
                 }
 
-                if (setting === "confirm" && !(await confimUse(item.name))) return;
+                if (setting === "confirm" && !(await confirmUse(item.name))) return;
 
                 return consumeItem(event, item);
             }
@@ -1014,16 +1034,51 @@ class PF2eHudPersistent extends makeAdvancedHUD(
                 const item = shortcut.item;
                 if (!item) return;
 
-                if (this.getSetting("confirmShortcut") && !(await confimUse(item.name))) return;
+                if (this.getSetting("confirmShortcut") && !(await confirmUse(item.name))) return;
 
                 return useAction(item);
             }
 
             case "spell": {
-                const { castRank: rank, slotId, collection, item: spell } = shortcut;
+                const {
+                    castRank: rank,
+                    slotId,
+                    collection,
+                    item: spell,
+                    notCarried,
+                    annotation,
+                    parentItem,
+                } = shortcut;
+
                 if (!spell) return;
 
-                if (this.getSetting("confirmShortcut") && !(await confimUse(spell.name))) return;
+                const setting = this.getSetting("confirmShortcut");
+
+                if (notCarried) {
+                    if (!annotation || !parentItem) return;
+
+                    if (setting) {
+                        const type = localize("sidebars.spells.action", annotation);
+                        const name = parentItem.name;
+
+                        const confirm = await confirmDialog({
+                            title: localize("persistent.main.shortcut.draw.title", {
+                                type,
+                                name,
+                            }),
+                            content: localize("persistent.main.shortcut.draw.message", {
+                                type,
+                                name,
+                            }),
+                        });
+
+                        if (!confirm) return;
+                    }
+
+                    return changeCarryType(actor, parentItem, 1, annotation);
+                }
+
+                if (setting && !(await confirmUse(spell.name))) return;
 
                 return (
                     spell.parentItem?.consume() ?? collection.entry.cast(spell, { rank, slotId })
@@ -1418,6 +1473,10 @@ type SpellShortcut = BaseShortCut<"spell"> &
         isPrepared: boolean;
         cost: CostValue;
         castRank: OneToTen;
+        notCarried: boolean;
+        isStaff: boolean;
+        parentItem: Maybe<ConsumablePF2e<CreaturePF2e> | PhysicalItemPF2e<CreaturePF2e>>;
+        annotation: AuxiliaryActionPurpose;
     };
 
 type CostValue = number | "extra" | undefined;

diff --git a/src/hud/sidebar/spells.ts b/src/hud/sidebar/spells.ts
@@ -13,6 +13,12 @@ import {
 } from "foundry-pf2e";
 import { PF2eHudSidebar, SidebarContext, SidebarName, SidebarRenderOptions } from "./base";
 
+function getAnnotationTooltip(annotation: NonNullable<AuxiliaryActionPurpose>) {
+    const label = localize("sidebars.spells.action", annotation);
+    const icon = `<span class='action-glyph'>${annotation === "retrieve" ? 2 : 1}</span>`;
+    return `${label} ${icon}`;
+}
+
 class PF2eHudSidebarSpells extends PF2eHudSidebar {
     get key(): SidebarName {
         return "spells";
@@ -28,13 +34,7 @@ class PF2eHudSidebarSpells extends PF2eHudSidebar {
         const data: SpellsContext = {
             ...parentData,
             ...summarizedData,
-            annotationTooltip: (annotation: NonNullable<AuxiliaryActionPurpose>) => {
-                const label = localize("sidebars.spells.action", annotation);
-                const icon = `<span class='action-glyph'>${
-                    annotation === "retrieve" ? 2 : 1
-                }</span>`;
-                return `${label} ${icon}`;
-            },
+            annotationTooltip: getAnnotationTooltip,
         };
 
         return data;
@@ -149,4 +149,4 @@ type SpellsContext = SidebarContext &
         annotationTooltip: (annotation: NonNullable<AuxiliaryActionPurpose>) => string;
     };
 
-export { PF2eHudSidebarSpells };
+export { PF2eHudSidebarSpells, getAnnotationTooltip };
diff --git a/styles/_persistent.scss b/styles/_persistent.scss
@@ -251,9 +251,9 @@ $bottom-width: 542px;
                                 display: flex;
                             }
 
-                            .broken {
+                            .broken,
+                            .equip {
                                 inset: 0;
-                                font-size: 1.2em;
 
                                 i {
                                     position: absolute;
@@ -274,6 +274,14 @@ $bottom-width: 542px;
                                 }
                             }
 
+                            .broken {
+                                font-size: 1.2em;
+                            }
+
+                            .equip {
+                                font-size: 1.5em;
+                            }
+
                             .quantity {
                                 right: var(--offset);
                                 bottom: var(--offset);

diff --git a/styles/pf2e-hud.css b/styles/pf2e-hud.css