add showStatus client setting

reonZ · Oct 4, 2024 · b2c9f51 · b2c9f51
1 parent e30df00
commit b2c9f51
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 12 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -80,7 +80,7 @@
             "tooltip": {
                 "title": "Token Tooltip",
                 "status": {
-                    "name": "Health Status",
+                    "name": "Health Status Entries",
                     "hint": "Comma separated strings representing the different divisions of a creature's health state from worst to best. Leave empty to disable.",
                     "default": "Dead, At Death's Door, Not Feeling Good, Seen Better Days, Barely Hurt, Perfectly Fine"
                 },
@@ -93,6 +93,15 @@
                         "observed": "Owned and observed"
                     }
                 },
+                "showStatus": {
+                    "name": "Display Health Status",
+                    "hint": "When should the creatures' health state be displayed on the tooltip if enabled in you world.",
+                    "choices": {
+                        "never": "Never",
+                        "small": "Small Version Only",
+                        "all": "Always"
+                    }
+                },
                 "delay": {
                     "name": "Tooltip Delay",
                     "hint": "Delay in milliseconds before the tooltip shows up on screen."

diff --git a/src/hud/tooltip.ts b/src/hud/tooltip.ts
@@ -64,6 +64,7 @@ const DISTANCES: Record<
 const DELAY_BUFFER = 50;
 const SETTING_POSITION = R.keys(POSITIONS);
 const SETTING_TYPE = ["never", "owned", "observed"] as const;
+const SETTING_SHOW_STATUS = ["never", "small", "all"] as const;
 const SETTING_DISTANCE = ["never", "idiot", "smart", "weird"] as const;
 const SETTING_NO_DEAD = ["none", "small", "full"] as const;
 
@@ -104,6 +105,7 @@ class PF2eHudTooltip extends PF2eHudBaseToken<TooltipSettings, ActorPF2e, Toolti
             "status",
             "enabled",
             "type",
+            "showStatus",
             "delay",
             "position",
             "fontSize",
@@ -121,6 +123,13 @@ class PF2eHudTooltip extends PF2eHudBaseToken<TooltipSettings, ActorPF2e, Toolti
                 default: undefined,
                 onChange: () => this.enable(),
             },
+            {
+                key: "showStatus",
+                type: String,
+                choices: SETTING_SHOW_STATUS,
+                default: "small",
+                scope: "client",
+            },
             {
                 key: "type",
                 type: String,
@@ -323,7 +332,16 @@ class PF2eHudTooltip extends PF2eHudBaseToken<TooltipSettings, ActorPF2e, Toolti
             return baseData;
         }
 
+        const isOwner = actor.isOwner;
+        const isObserver = userCanObserveActor(actor);
+        const extendedType = this.getSetting("type");
+        const extended =
+            (extendedType === "owned" && isOwner) || (extendedType === "observed" && isObserver);
+
         const status = (() => {
+            const statusType = this.getSetting("showStatus");
+            if (statusType === "never" || (statusType === "small" && extended)) return;
+
             const statuses = this.healthStatuses;
             if (!statuses) return;
 
@@ -345,11 +363,6 @@ class PF2eHudTooltip extends PF2eHudBaseToken<TooltipSettings, ActorPF2e, Toolti
             return statuses.at(pick - 1);
         })();
 
-        const setting = this.getSetting("type");
-        const isOwner = actor.isOwner;
-        const isObserver = userCanObserveActor(actor);
-
-        const extended = (setting === "owned" && isOwner) || (setting === "observed" && isObserver);
         if (!extended) {
             return {
                 ...baseData,
@@ -376,8 +389,8 @@ class PF2eHudTooltip extends PF2eHudBaseToken<TooltipSettings, ActorPF2e, Toolti
             statistics: getStatistics(actor),
             distance: baseData.distance,
             health: statsMain.health,
-            expended: extended,
             level: actor.level,
+            extended,
             status,
             name,
             iwr,
@@ -639,7 +652,7 @@ type StatusedTooltipContext = TooltipContextBase & {
 type TooltipContext = StatusedTooltipContext & {
     distance: DistanceContext | undefined;
     status: string | undefined;
-    expended: boolean;
+    extended: boolean;
     level: number;
     name: string | undefined;
     speeds: StatsSpeed[];
@@ -657,6 +670,7 @@ type TooltipSettings = BaseTokenSettings & {
     delay: number;
     status: string;
     drawDistance: number;
+    showStatus: (typeof SETTING_SHOW_STATUS)[number];
     type: (typeof SETTING_TYPE)[number];
     noDead: (typeof SETTING_NO_DEAD)[number];
     position: (typeof SETTING_POSITION)[number];

diff --git a/styles/_tooltip.scss b/styles/_tooltip.scss
@@ -69,6 +69,7 @@
         justify-content: center;
         gap: 0.3em var(--inner-gap);
         border: var(--outer-border);
+        margin: auto;
 
         header,
         hr {
@@ -148,5 +149,13 @@
                 }
             }
         }
+
+        + .status {
+            width: fit-content;
+            margin: auto;
+            margin-top: -2px;
+            z-index: -1;
+            position: relative;
+        }
     }
 }
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/tooltip/tooltip.hbs b/templates/tooltip/tooltip.hbs
@@ -4,7 +4,7 @@
 </div>
 {{/if}}
 
-{{#if expended}}
+{{#if extended}}
 <div class="inner">
     {{#if name}}
     <header>{{name}}</header>
@@ -78,7 +78,9 @@
     </section>
     {{/if}}
 </div>
-{{else if status}}
+{{/if}}
+
+{{#if status}}
 <div class="status" style="--hue: {{health.total.hue}};" data-section="health-status">
     {{status}}
 </div>