highlight Reno Jackson in list when his effect is active

thedudend · Dec 9, 2015 · f4dd1ae · f4dd1ae
1 parent 24a99eb
commit f4dd1ae
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 15 deletions.
diff --git a/Hearthstone Deck Tracker/Hearthstone Deck Tracker.csproj b/Hearthstone Deck Tracker/Hearthstone Deck Tracker.csproj
@@ -1231,6 +1231,9 @@
     <Content Include="Images\board_damage.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Images\frame_golden.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Images\gold_progress_frame_center.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

diff --git a/Hearthstone Deck Tracker/Hearthstone/Card.cs b/Hearthstone Deck Tracker/Hearthstone/Card.cs
@@ -393,6 +393,8 @@ public SolidColorBrush ColorPlayer
 			}
 		}
 
+		public bool HighlightFrame { get; set; }
+
 		public SolidColorBrush ColorOpponent
 		{
 			get { return new SolidColorBrush(Colors.White); }
@@ -456,21 +458,26 @@ public ImageBrush Background
 					var frame = "Images/frame.png";
 					if(Config.Instance.RarityCardFrames)
 					{
-						switch(Rarity)
+						if(HighlightFrame)
+							frame = "Images/frame_golden.png";
+						else
 						{
-							case Rarity.Free:
-							case Rarity.Common:
-								frame = "Images/frame_rarity_common.png";
-								break;
-							case Rarity.Rare:
-								frame = "Images/frame_rarity_rare.png";
-								break;
-							case Rarity.Epic:
-								frame = "Images/frame_rarity_epic.png";
-								break;
-							case Rarity.Legendary:
-								frame = "Images/frame_rarity_legendary.png";
-								break;
+							switch(Rarity)
+							{
+								case Rarity.Free:
+								case Rarity.Common:
+									frame = "Images/frame_rarity_common.png";
+									break;
+								case Rarity.Rare:
+									frame = "Images/frame_rarity_rare.png";
+									break;
+								case Rarity.Epic:
+									frame = "Images/frame_rarity_epic.png";
+									break;
+								case Rarity.Legendary:
+									frame = "Images/frame_rarity_legendary.png";
+									break;
+							}
 						}
 					}
 					drawingGroup.Children.Add(new ImageDrawing(new BitmapImage(new Uri(frame, UriKind.Relative)), new Rect(0, 0, 218, 35)));
@@ -495,6 +502,7 @@ public ImageBrush Background
 
 					if(Math.Abs(Count) > 1 || Rarity == Rarity.Legendary)
 					{
+
 						drawingGroup.Children.Add(new ImageDrawing(new BitmapImage(new Uri("Images/frame_countbox.png", UriKind.Relative)),
 						                                           new Rect(189, 6, 25, 24)));
 

diff --git a/Hearthstone Deck Tracker/Hearthstone/Player.cs b/Hearthstone Deck Tracker/Hearthstone/Player.cs
@@ -122,6 +122,9 @@ public List<Card> DisplayCards
 								        var card = (Card)c.Clone();
 								        card.Count = 0;
 								        card.HighlightInHand = true;
+								        if(IsLocalPlayer && card.Id == HearthDb.CardIds.Collectible.Neutral.RenoJackson
+									        && Deck.Where(x => !string.IsNullOrEmpty(x.CardId)).Select(x => x.CardId).GroupBy(x => x).All(x => x.Count() <= 1))
+									        card.HighlightFrame = true;
 								        return card;
 							        });
 						;
@@ -134,7 +137,13 @@ public List<Card> DisplayCards
 					var card = (Card)c.Clone();
 					card.Count = 0;
 					card.HighlightDraw = _hightlightedCards.Contains(c.Id);
-					card.HighlightInHand = Hand.Any(ce => ce.CardId == c.Id);
+					if(Hand.Any(ce => ce.CardId == c.Id))
+					{
+						card.HighlightInHand = true;
+						if(IsLocalPlayer && card.Id == HearthDb.CardIds.Collectible.Neutral.RenoJackson
+							&& Deck.Where(x => !string.IsNullOrEmpty(x.CardId)).Select(x => x.CardId).GroupBy(x => x).All(x => x.Count() <= 1))
+							card.HighlightFrame = true;
+					}
 					return card;
 				});
 				return stillInDeck.Concat(notInDeck).Concat(createdInHand).ToSortedCardList();

diff --git a/Hearthstone Deck Tracker/Images/frame_golden.png b/Hearthstone Deck Tracker/Images/frame_golden.png