Don't remove judgement of justice if a hero is attacking (HearthSim#4344

) * Don't remove judgement of justice if a hero is attacking * Fix secrets
bitzhjr · Sep 14, 2021 · 3a5a68e · 3a5a68e
1 parent 243445d
commit 3a5a68e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/HDTTests/Hearthstone/Secrets/SecretEventHandlerTest.cs b/HDTTests/Hearthstone/Secrets/SecretEventHandlerTest.cs
@@ -170,7 +170,7 @@ public void SingleSecret_HeroToHero_PlayerAttackTest()
 			_game.SecretsManager.HandleAttack(_heroPlayer, _heroOpponent);
 			VerifySecrets(0, HunterSecrets.All, HunterSecrets.BearTrap, HunterSecrets.ExplosiveTrap, HunterSecrets.WanderingMonster);
 			VerifySecrets(1, MageSecrets.All, MageSecrets.IceBarrier);
-			VerifySecrets(2, PaladinSecrets.All, PaladinSecrets.NobleSacrifice, PaladinSecrets.JudgmentOfJustice);
+			VerifySecrets(2, PaladinSecrets.All, PaladinSecrets.NobleSacrifice);
 			VerifySecrets(3, RogueSecrets.All);
 
 			_playerMinion1.SetTag(GameTag.ZONE, (int)Zone.PLAY);
@@ -179,7 +179,7 @@ public void SingleSecret_HeroToHero_PlayerAttackTest()
 			VerifySecrets(0, HunterSecrets.All, HunterSecrets.BearTrap, HunterSecrets.ExplosiveTrap,
 				HunterSecrets.Misdirection, HunterSecrets.WanderingMonster);
 			VerifySecrets(1, MageSecrets.All, MageSecrets.IceBarrier);
-			VerifySecrets(2, PaladinSecrets.All, PaladinSecrets.NobleSacrifice, PaladinSecrets.JudgmentOfJustice);
+			VerifySecrets(2, PaladinSecrets.All, PaladinSecrets.NobleSacrifice);
 			VerifySecrets(3, RogueSecrets.All);
 		}
 
@@ -211,7 +211,7 @@ public void SingleSecret_HeroToMinion_PlayerAttackTest()
 			_game.SecretsManager.HandleAttack(_heroPlayer, _opponentMinion1);
 			VerifySecrets(0, HunterSecrets.All, HunterSecrets.SnakeTrap, HunterSecrets.VenomstrikeTrap, HunterSecrets.PackTactics);
 			VerifySecrets(1, MageSecrets.All, MageSecrets.SplittingImage, MageSecrets.OasisAlly);
-			VerifySecrets(2, PaladinSecrets.All, PaladinSecrets.NobleSacrifice, PaladinSecrets.AutodefenseMatrix, PaladinSecrets.JudgmentOfJustice);
+			VerifySecrets(2, PaladinSecrets.All, PaladinSecrets.NobleSacrifice, PaladinSecrets.AutodefenseMatrix);
 			VerifySecrets(3, RogueSecrets.All, RogueSecrets.Bamboozle);
 		}
 

diff --git a/Hearthstone Deck Tracker/Hearthstone/Secrets/SecretsEventHandler.cs b/Hearthstone Deck Tracker/Hearthstone/Secrets/SecretsEventHandler.cs
@@ -58,12 +58,19 @@ public void HandleAttack(Entity attacker, Entity defender, bool fastOnly = false
 
 			var exclude = new List<MultiIdCard>();
 
-			exclude.Add(Paladin.JudgmentOfJustice);
-
 			var freeSpaceOnBoard = FreeSpaceOnBoard;
 			if(freeSpaceOnBoard)
 				exclude.Add(Paladin.NobleSacrifice);
 
+			if(attacker.IsHero)
+			{
+
+			}
+			else
+			{
+				exclude.Add(Paladin.JudgmentOfJustice);
+			}
+
 			if(defender.IsHero)
 			{
 				if(!fastOnly && attacker.Health >= 1)