Fix previously hidden entities with 0/0 stats

Introduced with 6e77e6a.
HearthSim · Oct 11, 2016 · b4924e2 · b4924e2
1 parent 17e71f7
commit b4924e2
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Add several character states (#7, @azeier)
 
+### Fixed
+- Fix previously hidden entities with 0/0 stats (e.g. Prince Malchezaar)
+
 ## [0.8.0] - 2016-10-10
 ### Added
 - Show Prince Malchezaar at game start (#142, @azeier)

diff --git a/ts/Entity.ts b/ts/Entity.ts
@@ -16,8 +16,12 @@ export default class Entity {
 		return this._cardId;
 	}
 
+	get hidden():boolean {
+		return !this.cardId;
+	}
+
 	get revealed():boolean {
-		return !!this.cardId;
+		return !this.hidden;
 	}
 
 	public getResourcesUsed():number {

diff --git a/ts/components/game/Card.tsx b/ts/components/game/Card.tsx
@@ -12,6 +12,9 @@ interface CardProps extends EntityProps, OptionProps, React.ClassAttributes<Card
 	isHidden?: boolean;
 	defaultStats?: boolean;
 	mulligan?: boolean;
+	customHealth?: number;
+	customAtk?: number;
+	customCost?: number;
 }
 
 export default class Card extends React.Component<CardProps, void> {
@@ -218,8 +221,25 @@ export default class Card extends React.Component<CardProps, void> {
 	}
 
 	private getStatValue(tag: GameTag, defaultValue: number): number {
+		switch(tag) {
+			case GameTag.HEALTH:
+				if (typeof this.props.customHealth !== "undefined") {
+					return this.props.customHealth;
+				}
+				break;
+			case GameTag.ATK:
+				if (typeof this.props.customAtk !== "undefined") {
+					return this.props.customAtk;
+				}
+				break;
+			case GameTag.COST:
+				if (typeof this.props.customCost !== "undefined") {
+					return this.props.customCost;
+				}
+				break;
+		}
 		let value = this.props.entity.getTag(tag);
-		if (this.props.defaultStats || this.props.isHidden && !value) {
+		if (this.props.defaultStats || this.props.isHidden) {
 			return defaultValue;
 		}
 		return value;

diff --git a/ts/components/game/Hand.tsx b/ts/components/game/Hand.tsx
@@ -1,11 +1,9 @@
 import * as React from "react";
-
 import EntityList from "./EntityList";
 import Entity from "../../Entity";
 import Option from "../../Option";
 import Card from "./Card";
 import {GameTag} from "../../enums";
-import {CardType} from "../../enums";
 import {EntityListProps} from "../../interfaces";
 
 interface HandProps extends EntityListProps {
@@ -45,6 +43,10 @@ export default class Hand extends EntityList<HandProps> {
 
 		let wasHidden = false;
 
+		let customHealth = undefined;
+		let customAtk = undefined;
+		let customCost = undefined;
+
 		if (this.props.hideCards) {
 			entity = new Entity(entity.id, entity.getTags());
 		}
@@ -55,13 +57,15 @@ export default class Hand extends EntityList<HandProps> {
 				let proxyId = this.props.cardOracle.findKey(x => x === "OG_279");
 				let proxy = proxyId && this.props.setAside.get(proxyId);
 				if (proxy) {
-					entity = entity.setTag(GameTag.ATK, proxy.getAtk()).setTag(GameTag.HEALTH, proxy.getHealth());
+					customHealth = proxy.getHealth();
+					customAtk = proxy.getAtk();
 				}
 			}
 			wasHidden = true;
 		}
 
-		return (<Card entity={entity}
+		return <Card
+			entity={entity}
 			option={option}
 			style={style}
 			optionCallback={this.props.optionCallback}
@@ -70,6 +74,9 @@ export default class Hand extends EntityList<HandProps> {
 			isHidden={wasHidden}
 			controller={this.props.controller}
 			cardArtDirectory={this.props.cardArtDirectory}
-			/>);
+			customHealth={customHealth}
+			customAtk={customAtk}
+			customCost={customCost}
+		/>;
 	}
 }
diff --git a/ts/state/mutators/HideEntityMutator.ts b/ts/state/mutators/HideEntityMutator.ts
@@ -22,9 +22,6 @@ export default class HideEntityMutator implements GameStateMutator {
 		// reset various tags
 		let tags = oldEntity.getTags();
 		tags = tags.set("" + GameTag.ZONE, this.zone);
-		tags = tags.remove("" + GameTag.ATK);
-		tags = tags.remove("" + GameTag.HEALTH);
-		tags = tags.remove("" + GameTag.DAMAGE);
 		let newEntity = oldEntity.replaceTags(tags).setCardId(null);
 
 		return state.apply(new ReplaceEntityMutator(newEntity));