add channel elements variant

reonZ · Jun 23, 2024 · 3c9ad96 · 3c9ad96
1 parent 070e361
commit 3c9ad96
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 9 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -217,7 +217,8 @@
                     "draw": {
                         "title": "{type} - {name}",
                         "message": "Are you sure you want to {type} <strong>{name}</strong>?"
-                    }
+                    },
+                    "noChannelElements": "Could not find the <strong>Channel Elements</strong> action on this character."
                 }
             }
         },

diff --git a/src/hud/persistent.ts b/src/hud/persistent.ts
@@ -603,7 +603,7 @@ class PF2eHudPersistent extends makeAdvancedHUD(
                 return {
                     ...shortcut,
                     isDisabled: expended || isBroken,
-                    isFadedOut: expended || isBroken,
+                    isFadedOut: expended || isBroken || notCarried,
                     rank: ROMAN_RANKS[castRank],
                     img: spell.img,
                     categoryIcon,
@@ -701,6 +701,7 @@ class PF2eHudPersistent extends makeAdvancedHUD(
                         ...shortcut,
                         isDisabled: disabled,
                         isFadedOut: disabled,
+                        isBlast: true,
                         blast,
                     } satisfies AttackShortcut as T;
                 } else {
@@ -716,7 +717,7 @@ class PF2eHudPersistent extends makeAdvancedHUD(
                     return {
                         ...shortcut,
                         isDisabled: disabled,
-                        isFadedOut: disabled,
+                        isFadedOut: disabled || !strike.ready,
                         strike,
                         img: img ?? shortcut.img,
                         name: strike
@@ -1143,6 +1144,17 @@ class PF2eHudPersistent extends makeAdvancedHUD(
                 strike?.auxiliaryActions?.at(auxiliaryActionIndex)?.execute();
                 break;
             }
+
+            case "channel-elements": {
+                const action = actor.itemTypes.action.find((x) => x.slug === "channel-elements");
+
+                if (!action) {
+                    warn("persistent.main.shortcut.noChannelElements");
+                    return;
+                }
+
+                return useAction(action);
+            }
         }
     }
 
@@ -1393,7 +1405,8 @@ type ShortcutActionEvent =
     | "strike-attack"
     | "strike-damage"
     | "strike-critical"
-    | "auxiliary-action";
+    | "auxiliary-action"
+    | "channel-elements";
 
 type ShortcutType = "action" | "attack" | "consumable" | "spell" | "toggle";
 
@@ -1516,6 +1529,7 @@ type BaseAttackShortcut = BaseShortCut<"attack"> &
     };
 
 type BlastShortcut = BaseAttackShortcut & {
+    isBlast: true;
     blast: ActionBlast | undefined;
 };
 

diff --git a/styles/_persistent.scss b/styles/_persistent.scss
@@ -415,14 +415,17 @@ $bottom-width: 542px;
                                     border-color: var(--variant-border-color);
                                     padding-block: 0.05em;
                                     padding-inline: 0.2em;
-                                    overflow: hidden;
-                                    text-overflow: ellipsis;
-                                    white-space: nowrap;
 
                                     .action-glyph {
                                         display: none;
                                     }
 
+                                    &:not(.wrap) {
+                                        overflow: hidden;
+                                        text-overflow: ellipsis;
+                                        white-space: nowrap;
+                                    }
+
                                     &.attack {
                                         background: var(--attack-background);
                                         border-color: var(--attack-border-color);

diff --git a/styles/pf2e-hud.css b/styles/pf2e-hud.css
diff --git a/styles/pf2e-hud.css.map b/styles/pf2e-hud.css.map
diff --git a/templates/persistent/main.hbs b/templates/persistent/main.hbs
@@ -162,11 +162,19 @@
 {{/inline}}
 
 {{#*inline 'attack'}}
+{{#unless attack.isDisabled}}
 <div class="background"></div>
+{{/unless}}
 {{!-- blast --}}
+{{#if attack.isBlast}}
 {{#if attack.blast}}
 {{> (@root.partial 'action_blast-row') blast=attack.blast melee=true}}
 {{> (@root.partial 'action_blast-row') blast=attack.blast melee=false}}
+{{else}}
+<div class="variants">
+    <div class="variant wrap" data-action="channel-elements">Channel Elements</div>
+</div>
+{{/if}}
 {{!-- strike --}}
 {{else}}
 {{!-- strike ready --}}