From c84affb8c2cce4e9c7c3b60bc6a41b82fe8ecc9d Mon Sep 17 00:00:00 2001
From: Nyeogmi <economicsbat@gmail.com>
Date: Sat, 22 Feb 2025 11:07:30 -0800
Subject: [PATCH] Fix two minor visual flaws

---
 src/button.ts   |  5 ++++-
 src/colors.ts   |  1 +
 src/huntmode.ts |  6 +++++-
 src/pickups.ts  | 38 +++++++++++++++++++++++++++++++++++++-
 4 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/button.ts b/src/button.ts
index b03cc4b..529448b 100644
--- a/src/button.ts
+++ b/src/button.ts
@@ -1,6 +1,6 @@
 import { DrawPile } from "./drawpile.ts";
 import { AlignX, AlignY, Point, Rect, Size } from "./engine/datatypes.ts";
-import { BG_INSET, FG_BOLD, FG_TEXT } from "./colors.ts";
+import {BG_INSET, FG_BOLD, FG_TEXT, FG_TEXT_DISABLED} from "./colors.ts";
 import { D } from "./engine/public.ts";
 
 export function addButton(
@@ -23,6 +23,9 @@ export function addButton(
     0,
     (hover) => {
       let [bg, fg, fgLabel] = [BG_INSET, FG_TEXT, FG_BOLD];
+      if (!enabled) {
+        fgLabel = FG_TEXT_DISABLED;
+      }
       if (hover) {
         [bg, fg, fgLabel] = [FG_BOLD, BG_INSET, BG_INSET];
       }
diff --git a/src/colors.ts b/src/colors.ts
index 6486a65..a727f68 100644
--- a/src/colors.ts
+++ b/src/colors.ts
@@ -4,6 +4,7 @@ export const BG_OUTER = Color.parseHexCode("#143464");
 export const BG_WALL_OR_UNREVEALED = Color.parseHexCode("#143464");
 export const BG_INSET = Color.parseHexCode("#242234");
 export const FG_TEXT = Color.parseHexCode("#c0c0c0");
+export const FG_TEXT_DISABLED = Color.parseHexCode("#808080");
 export const FG_BOLD = Color.parseHexCode("#ffffff");
 export const BG_CEILING = Color.parseHexCode("#143464");
 export const FG_MOULDING = FG_TEXT;
diff --git a/src/huntmode.ts b/src/huntmode.ts
index b5ccdc5..25c5b62 100644
--- a/src/huntmode.ts
+++ b/src/huntmode.ts
@@ -174,7 +174,11 @@ export class HuntMode {
     this.drawpile.addClickable(
       OFFSET_FLOOR,
       (hover: boolean) => {
-        gridArt.drawFloor(hover ? FG_TEXT : BG_INSET);
+        let highlighted = hover;
+        if (!(pickup?.advertisesClickable() ?? true)) {
+          highlighted = false;
+        }
+        gridArt.drawFloor(highlighted ? FG_TEXT : BG_INSET);
         pickup?.drawFloor(gridArt);
       },
       gridArt.floorRect,
diff --git a/src/pickups.ts b/src/pickups.ts
index 5ed734a..0999d0a 100644
--- a/src/pickups.ts
+++ b/src/pickups.ts
@@ -37,6 +37,10 @@ export class LockPickup {
     return 0;
   }
 
+  advertisesClickable() {
+    return true;
+  }
+
   isObstructive() {
     return true;
   }
@@ -68,6 +72,10 @@ export class StatPickup {
     return 100;
   }
 
+  advertisesClickable() {
+    return true;
+  }
+
   isObstructive() {
     return true;
   }
@@ -97,6 +105,10 @@ export class ExperiencePickup {
     return 100;
   }
 
+  advertisesClickable() {
+    return true;
+  }
+
   isObstructive() {
     return true;
   }
@@ -126,6 +138,10 @@ export class LadderPickup {
     return 0;
   }
 
+  advertisesClickable() {
+    return true;
+  }
+
   isObstructive() {
     return false;
   }
@@ -156,6 +172,10 @@ export class ThrallPickup {
     return 0;
   }
 
+  advertisesClickable() {
+    return true;
+  }
+
   isObstructive() {
     return false;
   }
@@ -190,6 +210,10 @@ export class ThrallPosterPickup {
     return 0;
   }
 
+  advertisesClickable() {
+    return true;
+  }
+
   isObstructive() {
     return false;
   }
@@ -223,6 +247,10 @@ export class ThrallRecruitedPickup {
     return 0;
   }
 
+  advertisesClickable() {
+    return !this.bitten;
+  }
+
   isObstructive() {
     return false;
   }
@@ -308,6 +336,10 @@ export class ThrallCollectionPlatePickup {
     return 0;
   }
 
+  advertisesClickable() {
+    return !this.rewarded;
+  }
+
   isObstructive() {
     return false;
   }
@@ -398,7 +430,11 @@ export class ThrallItemPickup {
   }
 
   computeCostToClick() {
-    return 100;
+    return 0;
+  }
+
+  advertisesClickable() {
+    return true;
   }
 
   isObstructive() {