From 8cc5b676876530dc090a1f083dbbabca4e050389 Mon Sep 17 00:00:00 2001
From: Nazar Herasymchuk <nazarii.herasymchuk@student.tuke.sk>
Date: Sun, 15 Oct 2023 11:23:30 +0200
Subject: [PATCH] Fixed issue - more right click dash consistency when able to
 use materialization [bounty: 4 XTR]. Now the dark priest will always be shown
 as an active unit when you right-click on an empty grid.

---
 src/abilities/Dark-Priest.js |  2 +-
 src/ui/interface.js          |  7 ++++---
 src/utility/hexgrid.ts       | 13 ++-----------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/abilities/Dark-Priest.js b/src/abilities/Dark-Priest.js
index 07b8ef232..3ac8f8b3d 100755
--- a/src/abilities/Dark-Priest.js
+++ b/src/abilities/Dark-Priest.js
@@ -249,7 +249,7 @@ export default (G) => {
 
 				// Ask the creature to summon
 				G.UI.materializeToggled = true;
-				G.UI.toggleDash('randomize');
+				G.UI.toggleDash(true);
 			},
 
 			fnOnSelect: function (hex, args) {
diff --git a/src/ui/interface.js b/src/ui/interface.js
index 786b28b7c..e0f42da2c 100644
--- a/src/ui/interface.js
+++ b/src/ui/interface.js
@@ -1018,8 +1018,7 @@ export class UI {
 						$j('#materialize_button p').text(game.msg.ui.dash.selectUnit);
 						// Bind button for random unit selection
 						this.materializeButton.click = () => {
-							const creatureId = this.showRandomCreature();
-							this.lastViewedCreature = creatureId;
+							this.lastViewedCreature = this.showRandomCreature();
 						};
 						// Apply the changes
 						$j('#card .sideA').on('click', this.materializeButton.click);
@@ -1470,7 +1469,9 @@ export class UI {
 		if (randomize && !this.lastViewedCreature) {
 			// Optional: select a random creature from the grid
 			this.showRandomCreature();
-		} else if (this.lastViewedCreature) {
+		} else if (!randomize) {
+			this.showCreature('--', game.activeCreature.team, '');
+		}  else if (this.lastViewedCreature) {
 			this.showCreature(this.lastViewedCreature, game.activeCreature.team, '');
 		} else {
 			this.showCreature(game.activeCreature.type, game.activeCreature.team, '');
diff --git a/src/utility/hexgrid.ts b/src/utility/hexgrid.ts
index c9146015b..da81236ed 100644
--- a/src/utility/hexgrid.ts
+++ b/src/utility/hexgrid.ts
@@ -1052,17 +1052,8 @@ export class HexGrid {
 				game.UI.showCreature(hex.creature.type, hex.creature.player.id, 'grid');
 			} else {
 				if (game.activeCreature.isDarkPriest()) {
-					// If ability used, default to Dark Priest and say materialize has been used
-					if (game.activeCreature.abilities[3].used) {
-						game.UI.showCreature(
-							game.activeCreature.type,
-							game.activeCreature.player.id,
-							'emptyHex',
-						);
-					} else if (game.UI.lastViewedCreature) {
-						game.UI.showCreature(game.UI.lastViewedCreature, game.UI.selectedPlayer, 'emptyHex');
-					} else if (game.UI.selectedCreatureObj) {
-						game.UI.toggleDash(true);
+					if (game.UI.selectedCreatureObj) {
+						game.UI.toggleDash(false);
 					} else {
 						game.UI.showCreature(
 							game.activeCreature.type,