Merge pull request #2643 from MilosDj21/fix-next-round-unit-status

fix: next round status text, closes #1049

src/ui/queue.ts

@@ -86,7 +86,7 @@ export class Queue {
 		const is1stCreature = utils.trueIfFirstElseFalse();
 
 		const newCreatureVCurr = (c: Creature) =>
-			new CreatureVignette(c, turnNum, eventHandlers, is1stCreature());
+			new CreatureVignette(c, turnNum, eventHandlers, is1stCreature(), true);
 		const undelayedVsCurr = undelayedCsCurr.map(newCreatureVCurr);
 		const delayMarkerVCurr = hasDelayedCurr
 			? [new DelayMarkerVignette(turnNum, eventHandlers)]
@@ -95,8 +95,23 @@ export class Queue {
 
 		const turnEndMarkerV = [new TurnEndMarkerVignette(turnNum, eventHandlers)];
 
-		const newCreatureVNext = (c: Creature) =>
-			new CreatureVignette(c, turnNum + 1, eventHandlers, is1stCreature());
+		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,20 +374,23 @@ class CreatureVignette extends Vignette {
 	creature: Creature;
 	isActiveCreature: boolean;
 	turnNumberIsCurrentTurn: boolean;
+	isAlreadyShown: boolean;
 
 	constructor(
 		creature: Creature,
 		turnNumber: number,
 		eventHandlers: QueueEventHandlers,
 		isActiveCreature = false,
 		turnNumberIsCurrentTurn = true,
+		isAlreadyShown = false,
 	) {
 		super();
 		this.creature = creature;
 		this.turnNumber = turnNumber;
 		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.creature.fatigueText;
+		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;