From 280870c890846f494facaa67cd0ec9282f012ee9 Mon Sep 17 00:00:00 2001
From: Milos <m.djuka@hotmail.com>
Date: Sat, 2 Nov 2024 08:50:20 +0100
Subject: [PATCH] Make status Queued only if creature not acted yet in current
 round

---
 src/ui/queue.ts | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/ui/queue.ts b/src/ui/queue.ts
index 50cfed6c2..ef84b8f4b 100644
--- a/src/ui/queue.ts
+++ b/src/ui/queue.ts
@@ -95,8 +95,23 @@ export class Queue {
 
 		const turnEndMarkerV = [new TurnEndMarkerVignette(turnNum, eventHandlers)];
 
-		const newCreatureVNext = (c: Creature) =>
-			new CreatureVignette(c, turnNum + 1, eventHandlers, is1stCreature(), false);
+		const newCreatureVNext = (c: Creature) => {
+			let isCreatureAlreadyShown = false;
+			for (const oldC of creatures) {
+				if (oldC.id === c.id) {
+					isCreatureAlreadyShown = true;
+					break;
+				}
+			}
+			return new CreatureVignette(
+				c,
+				turnNum + 1,
+				eventHandlers,
+				is1stCreature(),
+				false,
+				isCreatureAlreadyShown,
+			);
+		};
 		const undelayedVsNext = undelayedCsNext.map(newCreatureVNext);
 		const delayMarkerVNext = hasDelayedNext
 			? [new DelayMarkerVignette(turnNum + 1, eventHandlers)]
@@ -359,6 +374,7 @@ class CreatureVignette extends Vignette {
 	creature: Creature;
 	isActiveCreature: boolean;
 	turnNumberIsCurrentTurn: boolean;
+	isAlreadyShown: boolean;
 
 	constructor(
 		creature: Creature,
@@ -366,6 +382,7 @@ class CreatureVignette extends Vignette {
 		eventHandlers: QueueEventHandlers,
 		isActiveCreature = false,
 		turnNumberIsCurrentTurn = true,
+		isAlreadyShown = false,
 	) {
 		super();
 		this.creature = creature;
@@ -373,6 +390,7 @@ class CreatureVignette extends Vignette {
 		this.eventHandlers = eventHandlers;
 		this.isActiveCreature = isActiveCreature;
 		this.turnNumberIsCurrentTurn = turnNumberIsCurrentTurn;
+		this.isAlreadyShown = isAlreadyShown;
 	}
 
 	getHash() {
@@ -431,7 +449,7 @@ class CreatureVignette extends Vignette {
 
 		this.el.style.zIndex = this.creature.temp ? '1000' : this.queuePosition + 1 + '';
 
-		const stats = this.turnNumberIsCurrentTurn ? this.creature.fatigueText : 'Queued';
+		const stats = this.isAlreadyShown ? 'Queued' : this.creature.fatigueText;
 		const statsClasses = ['stats', utils.toClassName(stats)].join(' ');
 		const statsEl = this.el.querySelector('div.stats');
 		statsEl.className = statsClasses;