From 6e6fc8273f2e7e0ab337cf8fd721370b9d776f41 Mon Sep 17 00:00:00 2001
From: epix37 <epikz37@gmail.com>
Date: Fri, 30 May 2014 13:36:31 +0200
Subject: [PATCH] v0.1.1

+option to search class+neutral cards
+option to highlight cards currently in hand
+removed included playerdecks.xml to avoid overwriting peoples decks

*end of game detection fixed (=> hiding overlay in menu option reenabled)
---
 Hearthstone Deck Tracker/Card.cs              |   5 +-
 Hearthstone Deck Tracker/Config.cs            |   1 +
 .../Hearthstone Deck Tracker.csproj           |   3 -
 Hearthstone Deck Tracker/Hearthstone.cs       |  52 +++-
 Hearthstone Deck Tracker/HsLogReader.cs       | 241 +++++++++---------
 Hearthstone Deck Tracker/MainWindow.xaml      |  12 +-
 Hearthstone Deck Tracker/MainWindow.xaml.cs   |  97 ++++++-
 Hearthstone Deck Tracker/PlayerDecks.xml      |   5 -
 Hearthstone Deck Tracker/Version.xml          |   2 +-
 Hearthstone Deck Tracker/log.config           |   5 +
 10 files changed, 274 insertions(+), 149 deletions(-)
 delete mode 100644 Hearthstone Deck Tracker/PlayerDecks.xml

diff --git a/Hearthstone Deck Tracker/Card.cs b/Hearthstone Deck Tracker/Card.cs
index e3bad401ab..e6dab5c137 100644
--- a/Hearthstone Deck Tracker/Card.cs	
+++ b/Hearthstone Deck Tracker/Card.cs	
@@ -15,6 +15,8 @@ public struct Card
         private int? _count;
         public string Name { get; set; }
         public int Cost { get; set; }
+        public int InHandCount;
+
 
         public string GetPlayerClass
         {
@@ -32,11 +34,12 @@ public SolidColorBrush ColorPlayer
             get
             {
                 return Hearthstone.IsUsingPremade
-                           ? new SolidColorBrush((_count != 0) ? Colors.White : Colors.Gray)
+                    ?new SolidColorBrush((InHandCount > 0 && Hearthstone.HighlightCardsInHand) ? Colors.GreenYellow :  (_count != 0) ? Colors.White : Colors.Gray)
                            : ColorEnemy;
             }
         }
 
+       
         public SolidColorBrush ColorEnemy
         {
             get { return new SolidColorBrush(Colors.White); }
diff --git a/Hearthstone Deck Tracker/Config.cs b/Hearthstone Deck Tracker/Config.cs
index a25ef5aabb..aefcfa34b8 100644
--- a/Hearthstone Deck Tracker/Config.cs	
+++ b/Hearthstone Deck Tracker/Config.cs	
@@ -12,5 +12,6 @@ public class Config
         public int WindowHeight;
         public string HearthstoneDirectory;
         public bool ShowInTaskbar;
+        public bool HighlightCardsInHand;
     }
 }
\ No newline at end of file
diff --git a/Hearthstone Deck Tracker/Hearthstone Deck Tracker.csproj b/Hearthstone Deck Tracker/Hearthstone Deck Tracker.csproj
index a51e8f82a8..8968225d7c 100644
--- a/Hearthstone Deck Tracker/Hearthstone Deck Tracker.csproj	
+++ b/Hearthstone Deck Tracker/Hearthstone Deck Tracker.csproj	
@@ -1281,9 +1281,6 @@
     <Content Include="images\ysera.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="PlayerDecks.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Version.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/Hearthstone Deck Tracker/Hearthstone.cs b/Hearthstone Deck Tracker/Hearthstone.cs
index e1ae8ff081..df8eab36e3 100644
--- a/Hearthstone Deck Tracker/Hearthstone.cs	
+++ b/Hearthstone Deck Tracker/Hearthstone.cs	
@@ -13,6 +13,11 @@ public class Hearthstone
         //public bool UsingPremadeDeck;
         //public ObservableCollection<Card> PremadePlayerDeck; 
         public static bool IsUsingPremade;
+
+        //dont like this solution, cant think of better atm
+        public static bool HighlightCardsInHand;
+
+
         private readonly Dictionary<string, Card> _cardDb;
         public ObservableCollection<Card> EnemyCards;
         public int EnemyHandCount;
@@ -105,7 +110,6 @@ public void PlayerDraw(string cardId)
                 return;
             }
             var card = GetCardFromDb(cardId);
-            //sorta need to chance this to get the full deck and remove then
 
             if (!IsUsingPremade)
             {
@@ -122,22 +126,41 @@ public void PlayerDraw(string cardId)
                 
                 PlayerDeck.Remove(deckCard);
                 deckCard.Count--;
+                deckCard.InHandCount++;
                 PlayerDeck.Add(deckCard);
-                //if (deckCard.Count == 2)
-                // {
-                //     deckCard.Count = 1;
-                // }
             }
             PlayerHandCount++;
         }
-        public void PlayerGet()
+
+        //cards from board(?), thoughtsteal etc
+        public void PlayerGet(string cardId)
         {
-            PlayerHandCount++;
+            PlayerHandCount++; 
+            if (IsUsingPremade)
+            {
+                if (PlayerDeck.Any(c => c.Id == cardId))
+                {
+                    var card = PlayerDeck.First(c => c.Id == cardId);
+                    PlayerDeck.Remove(card);
+                    card.InHandCount++;
+                    PlayerDeck.Add(card);
+                }
+            }
         }
-        
+
         public void PlayerPlayed(string cardId)
         {
             PlayerHandCount--;
+            if (IsUsingPremade)
+            {
+                if (PlayerDeck.Any(c => c.Id == cardId))
+                {
+                    var card = PlayerDeck.First(c => c.Id == cardId);
+                    PlayerDeck.Remove(card);
+                    card.InHandCount--;
+                    PlayerDeck.Add(card);
+                }
+            }
         }
 
         public void EnemyDraw()
@@ -180,6 +203,7 @@ public void Mulligan(string cardId)
                 Card deckCard = PlayerDeck.FirstOrDefault(c => c.Name != null && c.Name == card.Name);
                 PlayerDeck.Remove(deckCard);
                 deckCard.Count++;
+                deckCard.InHandCount--;
                 PlayerDeck.Add(deckCard);
             }
 
@@ -193,7 +217,17 @@ public void EnemyMulligan()
 
         internal void PlayerHandDiscard(string cardId)
         {
-            PlayerHandCount--;
+            PlayerHandCount--; 
+            if (IsUsingPremade)
+            {
+                if (PlayerDeck.Any(c => c.Id == cardId))
+                {
+                    var card = PlayerDeck.First(c => c.Id == cardId);
+                    PlayerDeck.Remove(card);
+                    card.InHandCount--;
+                    PlayerDeck.Add(card);
+                }
+            }
         }
 
         internal void PlayerDeckDiscard(string cardId)
diff --git a/Hearthstone Deck Tracker/HsLogReader.cs b/Hearthstone Deck Tracker/HsLogReader.cs
index 9f2b1b096b..f938944214 100644
--- a/Hearthstone Deck Tracker/HsLogReader.cs	
+++ b/Hearthstone Deck Tracker/HsLogReader.cs	
@@ -116,142 +116,151 @@ private void ReadFile()
         private void Analyze(string log)
         {
             var logLines = log.Split('\n');
-            foreach (var logLine in logLines.Where(logLine => logLine.StartsWith("[Zone]")))
+            foreach (var logLine in logLines)
             {
-                if (!_cardMovementRegex.IsMatch(logLine)) continue;
-
-                var id = _cardMovementRegex.Match(logLine).Groups["Id"].Value.Trim();
-                var player = int.Parse(_cardMovementRegex.Match(logLine).Groups["player"].Value);
-                var from = _cardMovementRegex.Match(logLine).Groups["from"].Value.Trim();
-                var to = _cardMovementRegex.Match(logLine).Groups["to"].Value.Trim();
-                    
-                //coin
-                if (id == "GAME_005")
-                {
-                    if (from == "FRIENDLY HAND")
-                    {
-                        CardMovement(this, new CardMovementArgs(CardMovementType.PlayerHandDiscard, id));
-                    }
-                    else if (to == "FRIENDLY HAND")
-                    {
-                        CardMovement(this, new CardMovementArgs(CardMovementType.PlayerDraw, id));
-                    }
-                    else if (from.Contains("OPPOSING"))
-                    {
-                        CardMovement(this, new CardMovementArgs(CardMovementType.OpponentPlay, id));
-                    }
-                    continue;
-                }
-
-                //game start/end
-                if (id.Contains("HERO"))
+                if (logLine.StartsWith("[Bob] legend rank"))
                 {
                     //game ended
-                    if (from == "OPPOSING PLAY" || from == "FRIENDLY PLAY")
-                    {
-                        GameStateChange(this, new GameStateArgs(GameState.GameEnd));
-                    }
-                        //game started, no idea if i have to split it up, need to check
-                    else if (player == 1)
-                    {
-                        GameStateChange(this, new GameStateArgs(GameState.GameBegin));
-                    }
-                    continue;
+                    GameStateChange(this, new GameStateArgs(GameState.GameEnd));
                 }
-
-                switch (from)
+                else if (logLine.StartsWith("[Zone]"))
                 {
-                    case "FRIENDLY DECK":
-                        if (to == "FRIENDLY HAND")
-                        {
-                            //player draw
-                            CardMovement(this, new CardMovementArgs(CardMovementType.PlayerDraw, id));
-                        }
-                        else
-                        {
-                            //player discard from deck
-                            CardMovement(this, new CardMovementArgs(CardMovementType.PlayerDeckDiscard, id));
-                        }
-                        break;
-                    case "FRIENDLY HAND":
-                        if (to == "FRIENDLY DECK")
-                        {
-                            //player mulligan
-                            CardMovement(this, new CardMovementArgs(CardMovementType.PlayerMulligan, id));
-                        }
-                        else if (to == "FRIENDLY PLAY")
-                        {
-                            //player played
-                            CardMovement(this, new CardMovementArgs(CardMovementType.PlayerPlay, id));
-                        }
-                        else
+                    if (!_cardMovementRegex.IsMatch(logLine)) continue;
+
+                    var id = _cardMovementRegex.Match(logLine).Groups["Id"].Value.Trim();
+                    var player = int.Parse(_cardMovementRegex.Match(logLine).Groups["player"].Value);
+                    var from = _cardMovementRegex.Match(logLine).Groups["from"].Value.Trim();
+                    var to = _cardMovementRegex.Match(logLine).Groups["to"].Value.Trim();
+
+                    //coin
+                    if (id == "GAME_005")
+                    {
+                        if (from == "FRIENDLY HAND")
                         {
-                            //player discard from hand and spells
                             CardMovement(this, new CardMovementArgs(CardMovementType.PlayerHandDiscard, id));
                         }
-                        break;
-                    case "OPPOSING HAND":
-                        if (to == "OPPOSING DECK")
+                        else if (to == "FRIENDLY HAND")
                         {
-                            //opponent mulligan
-                            CardMovement(this, new CardMovementArgs(CardMovementType.OpponentMulligan, id));
+                            CardMovement(this, new CardMovementArgs(CardMovementType.PlayerDraw, id));
                         }
-                        else if (to == "OPPOSING PLAY")
+                        else if (from.Contains("OPPOSING"))
                         {
-                            //opponent played
                             CardMovement(this, new CardMovementArgs(CardMovementType.OpponentPlay, id));
                         }
-                        else
+                        continue;
+                    }
+
+                    //game start/end
+                    if (id.Contains("HERO"))
+                    {
+                        if (player == 1 && !from.Contains("PLAY"))
                         {
-                            //spell
-                            if (id != "")
+                            GameStateChange(this, new GameStateArgs(GameState.GameBegin));
+                        }
+                        continue;
+                    }
+
+                    switch (from)
+                    {
+                        case "FRIENDLY DECK":
+                            if (to == "FRIENDLY HAND")
+                            {
+                                //player draw
+                                CardMovement(this, new CardMovementArgs(CardMovementType.PlayerDraw, id));
+                            }
+                            else
+                            {
+                                //player discard from deck
+                                CardMovement(this, new CardMovementArgs(CardMovementType.PlayerDeckDiscard, id));
+                            }
+                            break;
+                        case "FRIENDLY HAND":
+                            if (to == "FRIENDLY DECK")
+                            {
+                                //player mulligan
+                                CardMovement(this, new CardMovementArgs(CardMovementType.PlayerMulligan, id));
+                            }
+                            else if (to == "FRIENDLY PLAY")
+                            {
+                                //player played
+                                CardMovement(this, new CardMovementArgs(CardMovementType.PlayerPlay, id));
+                            }
+                            else
+                            {
+                                //player discard from hand and spells
+                                CardMovement(this, new CardMovementArgs(CardMovementType.PlayerHandDiscard, id));
+                            }
+                            break;
+                        case "OPPOSING HAND":
+                            if (to == "OPPOSING DECK")
+                            {
+                                //opponent mulligan
+                                CardMovement(this, new CardMovementArgs(CardMovementType.OpponentMulligan, id));
+                            }
+                            else if (to == "OPPOSING PLAY")
                             {
+                                //opponent played
                                 CardMovement(this, new CardMovementArgs(CardMovementType.OpponentPlay, id));
                             }
                             else
                             {
-                                //opponent discard from hand
-                                CardMovement(this, new CardMovementArgs(CardMovementType.OpponentHandDiscard, id));
+                                //spell
+                                if (id != "")
+                                {
+                                    CardMovement(this, new CardMovementArgs(CardMovementType.OpponentPlay, id));
+                                }
+                                else
+                                {
+                                    //opponent discard from hand
+                                    CardMovement(this, new CardMovementArgs(CardMovementType.OpponentHandDiscard, id));
+                                }
                             }
-                        }
-                        break;
-                    case "OPPOSING DECK": 
-                        if (to == "OPPOSING HAND")
-                        {
-                            //opponent draw
-                            CardMovement(this, new CardMovementArgs(CardMovementType.OpponentDraw, string.Empty));
-                        }
-                        else
-                        {
-                            //opponent discard from deck
-                            CardMovement(this, new CardMovementArgs(CardMovementType.OpponentDeckDiscard, string.Empty));
-                        }
-                        break;
-                    case "OPPOSING SECRET":
-                        //opponent secret triggered
-                        CardMovement(this, new CardMovementArgs(CardMovementType.OpponentSecretTrigger, id));
-                        break;
-                    default: 
-                        if (to == "OPPOSING HAND")
-                        {
-                            //coin, thoughtsteal etc
-                            CardMovement(this, new CardMovementArgs(CardMovementType.OpponentDraw, id));
-                        }
-                        else if (to == "OPPOSING GRAVEYARD" && from == "" && id != "")
-                        {
-                            //CardMovement(this, new CardMovementArgs(CardMovementType.OpponentPlay, id));
-                        }
-                        else if (to == "FRIENDLY HAND")
-                        {
-                            //thoughtsteal etc
-                            CardMovement(this, new CardMovementArgs(CardMovementType.PlayerGet, id));
-                            Console.WriteLine("Draw " + id);
-                        }
-                        else if (to == "FRIENDLY GRAVEYARD" && from == "")
-                        {
-                           // CardMovement(this, new CardMovementArgs(CardMovementType.PlayerPlay, id));
-                        }
-                        break;
+                            break;
+                        case "OPPOSING DECK":
+                            if (to == "OPPOSING HAND")
+                            {
+                                //opponent draw
+                                CardMovement(this, new CardMovementArgs(CardMovementType.OpponentDraw, string.Empty));
+                            }
+                            else
+                            {
+                                //opponent discard from deck
+                                CardMovement(this,
+                                             new CardMovementArgs(CardMovementType.OpponentDeckDiscard, string.Empty));
+                            }
+                            break;
+                        case "OPPOSING SECRET":
+                            //opponent secret triggered
+                            CardMovement(this, new CardMovementArgs(CardMovementType.OpponentSecretTrigger, id));
+                            break;
+                        default:
+                            if (to == "OPPOSING HAND")
+                            {
+                                //coin, thoughtsteal etc
+                                CardMovement(this, new CardMovementArgs(CardMovementType.OpponentDraw, id));
+                            }
+                            else if (to == "OPPOSING GRAVEYARD" && from == "" && id != "")
+                            {
+                                //CardMovement(this, new CardMovementArgs(CardMovementType.OpponentPlay, id));
+                            }
+                            else if (to == "FRIENDLY HAND")
+                            {
+                                //thoughtsteal etc
+                                CardMovement(this, new CardMovementArgs(CardMovementType.PlayerGet, id));
+                            }
+                            else if (to == "FRIENDLY GRAVEYARD" && from == "")
+                            {
+                                // CardMovement(this, new CardMovementArgs(CardMovementType.PlayerPlay, id));
+                            }
+                            break;
+                    }
+                }
+                else if (logLine.StartsWith("[Asset]"))
+                {
+                    Regex assetReget = new Regex(@"\w*(name=(?<id>(\w*)))(\s)+\.*");
+                    if (!assetReget.IsMatch(logLine)) return;
+                    var id = assetReget.Match(logLine).Groups["id"].Value.Trim();
+                    Console.WriteLine(id);
                 }
             }
         }
diff --git a/Hearthstone Deck Tracker/MainWindow.xaml b/Hearthstone Deck Tracker/MainWindow.xaml
index a192565bb5..3d7b923e9c 100644
--- a/Hearthstone Deck Tracker/MainWindow.xaml	
+++ b/Hearthstone Deck Tracker/MainWindow.xaml	
@@ -1,7 +1,7 @@
 <Window x:Class="Hearthstone_Deck_Tracker.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib"
-        Title="Hearthstone Deck Tracker" Height="684" Width="512" Closing="Window_Closing_1" Background="DarkGray" SizeChanged="Window_SizeChanged_1" >
+        Title="Hearthstone Deck Tracker" Height="714" Width="512" Closing="Window_Closing_1" Background="DarkGray" SizeChanged="Window_SizeChanged_1" >
     <Grid>
         <TextBox Name="TextBoxDBFilter" ToolTip="If the list is down to one card ENTER will add it to the deck (or just doubleclick on any card)" VerticalContentAlignment="Center" HorizontalAlignment="Left" Height="23" Margin="307,37,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="187" TextChanged="TextBoxDBFilter_TextChanged" KeyDown="TextBoxDBFilter_KeyDown"/>
         <Button Name="BtnSaveDeck" Content="Save" HorizontalAlignment="Left" Margin="145,37,0,0" VerticalAlignment="Top" Width="50" Click="BtnSaveDeck_Click" Height="23"/>
@@ -51,7 +51,7 @@
             </ListView.Resources>
         </ListView>
 
-        <ListView Name="ListViewDB"  Background="DimGray" Foreground="White" FontWeight="Bold" BorderThickness="1" ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.CanContentScroll="True" FontFamily="Arial" Margin="255,64,0,130" MouseDoubleClick="ListViewDB_MouseDoubleClick" Width="240" HorizontalAlignment="Left">
+        <ListView Name="ListViewDB"  Background="DimGray" Foreground="White" FontWeight="Bold" BorderThickness="1" ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.CanContentScroll="True" FontFamily="Arial" Margin="255,64,0,150" MouseDoubleClick="ListViewDB_MouseDoubleClick" Width="240" HorizontalAlignment="Left">
             <ListView.View>
                 <GridView>
                     <GridViewColumn Header="cost" Width="28">
@@ -93,7 +93,7 @@
 
             </ListView.Resources>
         </ListView>
-        <ComboBox Name="ComboBoxFilterMana" HorizontalContentAlignment="Center" HorizontalAlignment="Left" Margin="255,10,0,0" VerticalAlignment="Top" Width="74" SelectedIndex="0" SelectionChanged="ComboBoxFilterMana_SelectionChanged">
+        <ComboBox Name="ComboBoxFilterMana" HorizontalContentAlignment="Center" HorizontalAlignment="Left" Margin="255,10,0,0" VerticalAlignment="Top" Width="47" SelectedIndex="0" SelectionChanged="ComboBoxFilterMana_SelectionChanged">
             <system:String>All</system:String>
             <system:String>0</system:String>
             <system:String>1</system:String>
@@ -106,7 +106,7 @@
             <system:String>8</system:String>
             <system:String>9+</system:String>
         </ComboBox>
-        <ComboBox Name="ComboBoxFilterClass" HorizontalAlignment="Left" HorizontalContentAlignment="Center" Margin="333,10,0,0" VerticalAlignment="Top" Width="161" SelectedIndex="0" SelectionChanged="ComboBoxFilterClass_SelectionChanged">
+        <ComboBox Name="ComboBoxFilterClass" HorizontalAlignment="Left" HorizontalContentAlignment="Center" Margin="307,10,0,0" VerticalAlignment="Top" Width="97" SelectedIndex="0" SelectionChanged="ComboBoxFilterClass_SelectionChanged">
             <system:String>All</system:String>
             <system:String>Neutral</system:String>
             <system:String>Druid</system:String>
@@ -120,7 +120,7 @@
             <system:String>Warrior</system:String>
         </ComboBox>
         <Button x:Name="ButtonUseDeck" Content="Use Deck" Margin="10,0,0,10" VerticalAlignment="Bottom" Width="168" Click="ButtonUseDeck_Click" Height="40" HorizontalAlignment="Left"/>
-        <CheckBox Name="CheckboxHideOverlayInMenu" IsEnabled="False" Content="Hide overlay in Menu" HorizontalAlignment="Left" Margin="255,0,0,110" VerticalAlignment="Bottom"/>
+        <CheckBox Name="CheckboxHideOverlayInMenu" Content="Highlight Overlay in Menu" HorizontalAlignment="Left" Margin="255,0,0,110" VerticalAlignment="Bottom" Checked="CheckboxHideOverlayInMenu_Checked" Unchecked="CheckboxHideOverlayInMenu_Unchecked"/>
         <CheckBox x:Name="CheckboxHideOverlayInBackground" Content="Hide Overlay if HS in Background" HorizontalAlignment="Left" Margin="255,0,0,90" VerticalAlignment="Bottom"/>
         <Button x:Name="BtnDeleteDeck" Content="Delete" HorizontalAlignment="Left" Margin="200,37,0,0" VerticalAlignment="Top" Width="50" Height="23" Click="BtnDeleteDeck_Click"/>
         <Label Content="Search:" HorizontalAlignment="Left" Margin="255,36,0,0" VerticalAlignment="Top" Width="47" Height="23"/>
@@ -129,5 +129,7 @@
         <CheckBox Name="CheckboxHidePlayerCardCounter" Content="Hide Player Card Counter" HorizontalAlignment="Left" Margin="255,0,0,50" VerticalAlignment="Bottom" Unchecked="CheckboxHidePlayerCardCounter_Unchecked" Checked="CheckboxHidePlayerCardCounter_Checked"/>
         <CheckBox Name="CheckboxHideDrawChances" Content="Hide Draw Chances" HorizontalAlignment="Left" Margin="255,0,0,70" VerticalAlignment="Bottom" Unchecked="CheckboxHideDrawChances_Unchecked" Checked="CheckboxHideDrawChances_Checked"/>
         <Button x:Name="ButtonNoDeck" ToolTip="This tracks which cards you draw rather than play. Might be good for arena, though only displays up to 2." Content="No Deck" Margin="183,0,0,10" VerticalAlignment="Bottom" Width="67" Click="ButtonNoDeck_Click" Height="40" HorizontalAlignment="Left"/>
+        <CheckBox Name="CheckboxIncludeNeutral" Content="Incl. Neutral" HorizontalAlignment="Left" Margin="409,14,0,0" VerticalAlignment="Top" IsChecked="True" Checked="CheckboxIncludeNeutral_Checked" Unchecked="CheckboxIncludeNeutral_Unchecked"/>
+        <CheckBox Name="CheckboxHighlightCardsInHand" Content="Highlight Cards in Hand" HorizontalAlignment="Left" Margin="255,0,0,130" VerticalAlignment="Bottom" Checked="CheckboxHighlightCardsInHand_Checked" Unchecked="CheckboxHighlightCardsInHand_Unchecked"/>
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/Hearthstone Deck Tracker/MainWindow.xaml.cs b/Hearthstone Deck Tracker/MainWindow.xaml.cs
index 1ba7ba3acb..7e78804a57 100644
--- a/Hearthstone Deck Tracker/MainWindow.xaml.cs	
+++ b/Hearthstone Deck Tracker/MainWindow.xaml.cs	
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -42,9 +41,33 @@ public MainWindow()
             Helper.CheckForUpdates();
 
             //check for log config and create if not existing
-            if (!File.Exists(_logConfigPath))
+            try
+            {
+                if (!File.Exists(_logConfigPath))
+                {
+                    File.Copy("log.config", _logConfigPath);
+                }
+                else
+                {
+                    //update log.config if newer
+                    var localFile = new FileInfo(_logConfigPath);
+                    var file = new FileInfo("log.config");
+                    if (file.LastWriteTime > localFile.LastWriteTime)
+                    {
+
+                        File.Copy("log.config", _logConfigPath, true);
+
+                    }
+                }
+            }
+            catch (UnauthorizedAccessException ex)
             {
-                File.Copy("log.config", _logConfigPath);
+                Console.WriteLine("Not authorized write " + _logConfigPath + ". Start as admin(?)");
+                Console.WriteLine(ex.Message);
+            }
+            catch (IOException ex)
+            {
+                Console.WriteLine(ex.Message);
             }
 
             //load config
@@ -53,6 +76,14 @@ public MainWindow()
             _config = _xmlManagerConfig.Load("config.xml");
 
             //load saved decks
+            if (!File.Exists("PlayerDecks.xml"))
+            {
+                //avoid overwriting decks file with new releases.
+                using (var sr = new StreamWriter("PlayerDecks.xml", false))
+                {
+                    sr.WriteLine("<Decks></Decks>");
+                }
+            }
             _xmlManager = new XmlManager<Decks> {Type = typeof (Decks)};
             _deckList = _xmlManager.Load("PlayerDecks.xml");
 
@@ -98,7 +129,7 @@ public MainWindow()
             _logReader = new HsLogReader(_config.HearthstoneDirectory);
             _logReader.CardMovement += LogReaderOnCardMovement;
             _logReader.GameStateChange += LogReaderOnGameStateChange;
-            _logReader.Start();
+
 
             UpdateDbListView();
 
@@ -107,9 +138,10 @@ public MainWindow()
 
             _initialized = true;
 
-
             UpdateDeckList();
             UseSelectedDeck();
+
+            _logReader.Start();
         }
 
         private void LogReaderOnGameStateChange(HsLogReader sender, GameStateArgs args)
@@ -188,7 +220,7 @@ private void LogReaderOnCardMovement(HsLogReader sender, CardMovementArgs args)
                     switch (args.MovementType)
                     {
                         case CardMovementType.PlayerGet:
-                            HandlePlayerGet();
+                            HandlePlayerGet(args.CardId);
                             break;
                         case CardMovementType.PlayerDraw:
                             HandlePlayerDraw(args.CardId);
@@ -232,9 +264,9 @@ private void LogReaderOnCardMovement(HsLogReader sender, CardMovementArgs args)
         }
 
         #region Handle Events
-        private void HandlePlayerGet()
+        private void HandlePlayerGet(string cardId)
         {
-            _hearthstone.PlayerGet();
+            _hearthstone.PlayerGet(cardId);
         }
 
         private void HandlePlayerDraw(string cardId)
@@ -446,6 +478,47 @@ private void TextBoxDBFilter_KeyDown(object sender, KeyEventArgs e)
 
         #region stupid checkboxes
 
+        private void CheckboxHighlightCardsInHand_Checked(object sender, RoutedEventArgs e)
+        {
+            if (!_initialized) return;
+            _config.HighlightCardsInHand = true;
+            Hearthstone.HighlightCardsInHand = true;
+            SaveConfigUpdateOverlay();
+        }
+
+        private void CheckboxHighlightCardsInHand_Unchecked(object sender, RoutedEventArgs e)
+        {
+            if (!_initialized) return;
+            _config.HighlightCardsInHand = false;
+            Hearthstone.HighlightCardsInHand = false;
+            SaveConfigUpdateOverlay();
+        }
+
+        private void CheckboxHideOverlayInMenu_Checked(object sender, RoutedEventArgs e)
+        {
+            if (!_initialized) return;
+            _config.HideInMenu = true;
+            SaveConfigUpdateOverlay();
+        }
+
+        private void CheckboxHideOverlayInMenu_Unchecked(object sender, RoutedEventArgs e)
+        {
+            if (!_initialized) return;
+            _config.HideInMenu = true;
+            SaveConfigUpdateOverlay();
+        }
+
+        private void CheckboxIncludeNeutral_Checked(object sender, RoutedEventArgs e)
+        {
+            if (!_initialized) return;
+            UpdateDbListView();
+        }
+
+        private void CheckboxIncludeNeutral_Unchecked(object sender, RoutedEventArgs e)
+        {
+            if (!_initialized) return;
+            UpdateDbListView();
+        }
         private void CheckboxHideDrawChances_Checked(object sender, RoutedEventArgs e)
         {
             if (!_initialized) return;
@@ -711,7 +784,8 @@ private void UpdateDbListView()
             {
                 if (!card.Name.ToLower().Contains(TextBoxDBFilter.Text.ToLower())) continue;
                 if (ComboBoxFilterClass.SelectedItem.ToString() == "All" ||
-                    ComboBoxFilterClass.SelectedItem.ToString() == card.GetPlayerClass)
+                    ComboBoxFilterClass.SelectedItem.ToString() == card.GetPlayerClass ||
+                    (CheckboxIncludeNeutral.IsChecked.Value && card.GetPlayerClass == "Neutral"))
                 {
                     if (ComboBoxFilterMana.SelectedItem.ToString() == "All")
                         ListViewDB.Items.Add(card);
@@ -738,10 +812,15 @@ private void LoadConfig()
             CheckboxHideEnemyCards.IsChecked = _config.HideEnemyCards;
             CheckboxHideEnemyCardCounter.IsChecked = _config.HideEnemyCardCount;
             CheckboxHidePlayerCardCounter.IsChecked = _config.HidePlayerCardCount;
+            CheckboxHideOverlayInMenu.IsChecked = _config.HideInMenu;
+            CheckboxHighlightCardsInHand.IsChecked = _config.HighlightCardsInHand;
             Height = _config.WindowHeight;
             _overlay.Dispatcher.BeginInvoke(new Action(() => _overlay.ShowInTaskbar = _config.ShowInTaskbar));
+            Hearthstone.HighlightCardsInHand = _config.HighlightCardsInHand;
+
         }
 
 
+
     }
 }
\ No newline at end of file
diff --git a/Hearthstone Deck Tracker/PlayerDecks.xml b/Hearthstone Deck Tracker/PlayerDecks.xml
deleted file mode 100644
index b8f6adf3a8..0000000000
--- a/Hearthstone Deck Tracker/PlayerDecks.xml	
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Decks>
-  <Deck>
-  </Deck>
-</Decks>
\ No newline at end of file
diff --git a/Hearthstone Deck Tracker/Version.xml b/Hearthstone Deck Tracker/Version.xml
index 42cf075f9a..b8b26320f6 100644
--- a/Hearthstone Deck Tracker/Version.xml	
+++ b/Hearthstone Deck Tracker/Version.xml	
@@ -2,6 +2,6 @@
 <Version>
   <Major>0</Major>
   <Minor>1</Minor>
-  <Revision>0</Revision>
+  <Revision>1</Revision>
   <Build>0</Build>
 </Version>
diff --git a/Hearthstone Deck Tracker/log.config b/Hearthstone Deck Tracker/log.config
index 29bfbe5abb..9dc35729f6 100644
--- a/Hearthstone Deck Tracker/log.config	
+++ b/Hearthstone Deck Tracker/log.config	
@@ -2,4 +2,9 @@
 LogLevel=1
 FilePrinting=false
 ConsolePrinting=true
+ScreenPrinting=false
+[Bob]
+LogLevel=1
+FilePrinting=false
+ConsolePrinting=true
 ScreenPrinting=false
\ No newline at end of file