Merge pull request #2459 from andretchen0/bugfix-hex-bounce

fix: stop creature health bounce when dash opened, closes #2451
FreezingMoon · Aug 2, 2023 · 4d1abf9 · 4d1abf9 · vercel · Aug 2, 2023
2 parents ca62a93 + 16279ab
commit 4d1abf9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/ui/interface.js b/src/ui/interface.js
@@ -1468,6 +1468,7 @@ export class UI {
 			return;
 		}
 
+		game.signals.ui.dispatch('onOpenDash');
 		if (randomize && !this.lastViewedCreature) {
 			// Optional: select a random creature from the grid
 			this.showRandomCreature();

diff --git a/src/utility/hexgrid.ts b/src/utility/hexgrid.ts
@@ -185,6 +185,7 @@ export class HexGrid {
 
 		// Events
 		this.game.signals.metaPowers.add(this.handleMetaPowerEvent, this);
+		this.game.signals.ui.add(this.handleUIEvent, this);
 	}
 
 	get traps() {
@@ -204,6 +205,21 @@ export class HexGrid {
 		}
 	}
 
+	handleUIEvent(message, payload) {
+		if (message === 'onOpenDash') {
+			// NOTE: This is a rather hacky bugfix.
+			// If a "query" is going on, and the dash is opened,
+			// creatures can remain in a "hovered" state.
+			// This hack undoes the "hovered" state.
+			this.forEachHex((hex) => {
+				const creature = hex.creature;
+				if (creature instanceof Creature) {
+					creature.resetBounce();
+				}
+			});
+		}
+	}
+
 	querySelf(o) {
 		const game = this.game;
 		const defaultOpt = {