From df5823f4a53c8eff43cd4b8da4065a8cf643dffc Mon Sep 17 00:00:00 2001
From: Alexander Zeier <alex@hearthsim.net>
Date: Sat, 1 Oct 2016 17:25:56 +0200
Subject: [PATCH] Show cards discarded from hand

Closes #125.
---
 CHANGELOG.md                          | 1 +
 ts/components/game/Player.tsx         | 2 +-
 ts/state/GameStateTracker.ts          | 4 ++++
 ts/state/mutators/TagChangeMutator.ts | 9 ++++++++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d440eaf9..f8e3c926 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Show C'Thun as a minion during ritual (#137, @azeier)
 - Highlight Hero Power when it's played (#140, @azeier)
 - Show cards discarded from the deck (#141, @azeier)
+- Show cards discarded from the hand (#125, @azeier)
 
 ### Changed
 - Update dependencies
diff --git a/ts/components/game/Player.tsx b/ts/components/game/Player.tsx
index 8c176533..6e37e2de 100644
--- a/ts/components/game/Player.tsx
+++ b/ts/components/game/Player.tsx
@@ -50,7 +50,7 @@ export default class Player extends React.Component<PlayerProps, void> {
 
 		if (this.props.diffs && this.props.diffs.count() > 0) {
 			this.props.diffs.forEach(diff => {
-				if (diff.tag === GameTag.ZONE && diff.current === Zone.GRAVEYARD && diff.previous === Zone.DECK) {
+				if (diff.tag === GameTag.ZONE && diff.current === Zone.GRAVEYARD && (diff.previous === Zone.DECK || diff.previous === Zone.HAND)) {
 					let entity = this.props.entities.get(Zone.GRAVEYARD).get(diff.entity);
 					if (entity) {
 						action = <div className="played"><Card
diff --git a/ts/state/GameStateTracker.ts b/ts/state/GameStateTracker.ts
index 183451a1..1dca0cf3 100644
--- a/ts/state/GameStateTracker.ts
+++ b/ts/state/GameStateTracker.ts
@@ -178,6 +178,10 @@ export default class GameStateTracker extends Stream.Transform {
 					timeStep = 1;
 				}
 			}
+			if(mutator.tag === GameTag.ZONE && mutator.value === Zone.GRAVEYARD
+				&& (mutator.getPrevious() === Zone.DECK || mutator.getPrevious() === Zone.HAND)) {
+				timeStep = 2;
+			}
 		}
 
 		//discards
diff --git a/ts/state/mutators/TagChangeMutator.ts b/ts/state/mutators/TagChangeMutator.ts
index 5c35b46e..054d962f 100644
--- a/ts/state/mutators/TagChangeMutator.ts
+++ b/ts/state/mutators/TagChangeMutator.ts
@@ -8,6 +8,7 @@ export default class TagChangeMutator implements GameStateMutator {
 	public id: number;
 	public tag: number;
 	public value: number;
+	private previous: number;
 
 	constructor(id: number, tag: number, value: number) {
 		this.id = +id;
@@ -22,6 +23,8 @@ export default class TagChangeMutator implements GameStateMutator {
 			return state;
 		}
 
+		this.previous = oldEntity.getTag(this.tag);
+
 		let newEntity = oldEntity.setTag(this.tag, this.value);
 
 		if (newEntity === oldEntity) {
@@ -32,7 +35,7 @@ export default class TagChangeMutator implements GameStateMutator {
 		let diff: GameStateDiff = {
 			entity: this.id,
 			tag: this.tag,
-			previous: oldEntity.getTag(this.tag),
+			previous: this.previous,
 			current: this.value,
 		};
 
@@ -40,4 +43,8 @@ export default class TagChangeMutator implements GameStateMutator {
 			.apply(new ReplaceEntityMutator(newEntity))
 			.apply(new AddDiffsMutator([diff]));
 	}
+
+	public getPrevious(): number {
+		return this.previous;
+	}
 }