Skip to content

Commit

Permalink
updated card dbs, fixed images names, updated ui for tgt set
Browse files Browse the repository at this point in the history
  • Loading branch information
Epix37 committed Aug 18, 2015
1 parent 1dabfd8 commit c49a69a
Show file tree
Hide file tree
Showing 23 changed files with 44,587 additions and 20,645 deletions.
3,383 changes: 3,351 additions & 32 deletions Hearthstone Deck Tracker/Files/cardDB.deDE.xml

Large diffs are not rendered by default.

3,388 changes: 3,363 additions & 25 deletions Hearthstone Deck Tracker/Files/cardDB.enGB.xml

Large diffs are not rendered by default.

3,388 changes: 3,363 additions & 25 deletions Hearthstone Deck Tracker/Files/cardDB.enUS.xml

Large diffs are not rendered by default.

3,370 changes: 3,353 additions & 17 deletions Hearthstone Deck Tracker/Files/cardDB.esES.xml

Large diffs are not rendered by default.

3,372 changes: 3,355 additions & 17 deletions Hearthstone Deck Tracker/Files/cardDB.esMX.xml

Large diffs are not rendered by default.

3,389 changes: 3,372 additions & 17 deletions Hearthstone Deck Tracker/Files/cardDB.frFR.xml

Large diffs are not rendered by default.

3,411 changes: 3,365 additions & 46 deletions Hearthstone Deck Tracker/Files/cardDB.itIT.xml

Large diffs are not rendered by default.

3,718 changes: 3,526 additions & 192 deletions Hearthstone Deck Tracker/Files/cardDB.koKR.xml

Large diffs are not rendered by default.

3,905 changes: 3,712 additions & 193 deletions Hearthstone Deck Tracker/Files/cardDB.plPL.xml

Large diffs are not rendered by default.

3,452 changes: 3,395 additions & 57 deletions Hearthstone Deck Tracker/Files/cardDB.ptBR.xml

Large diffs are not rendered by default.

19,580 changes: 0 additions & 19,580 deletions Hearthstone Deck Tracker/Files/cardDB.ptPT.xml

This file was deleted.

3,415 changes: 3,372 additions & 43 deletions Hearthstone Deck Tracker/Files/cardDB.ruRU.xml

Large diffs are not rendered by default.

3,372 changes: 3,350 additions & 22 deletions Hearthstone Deck Tracker/Files/cardDB.zhCN.xml

Large diffs are not rendered by default.

4,070 changes: 3,700 additions & 370 deletions Hearthstone Deck Tracker/Files/cardDB.zhTW.xml

Large diffs are not rendered by default.

11 changes: 4 additions & 7 deletions Hearthstone Deck Tracker/Hearthstone Deck Tracker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -675,9 +675,6 @@
<Content Include="Files\cardDB.ptBR.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Files\cardDB.ptPT.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Files\cardDB.ruRU.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down Expand Up @@ -1041,7 +1038,7 @@
<Content Include="Images\bouncing-blade.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\brave-hunter.png">
<Content Include="Images\brave-archer.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\brawl.png">
Expand Down Expand Up @@ -1095,7 +1092,7 @@
<Content Include="Images\captain-s-parrot.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\captured-cormungar.png">
<Content Include="Images\captured-jormungar.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\cenarius.png">
Expand Down Expand Up @@ -2150,7 +2147,7 @@
<Content Include="Images\lady-blaumeux.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\lance-bearer.png">
<Content Include="Images\lance-carrier.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\laughing-sister.png">
Expand Down Expand Up @@ -2831,7 +2828,7 @@
<Content Include="Images\shade-of-naxxramas.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\shado-pan-cavalry.png">
<Content Include="Images\shado-pan-rider.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\shadow-bolt.png">
Expand Down
3 changes: 2 additions & 1 deletion Hearthstone Deck Tracker/Hearthstone/CardIds.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ public class CardIds
"BRMA",
"BRMC",
"TBA",
"TB_"
"TB_",
"TBST_"
};

public static readonly List<string> SecretIdsHunter = new List<string>
Expand Down
2 changes: 2 additions & 0 deletions Hearthstone Deck Tracker/MainWindow/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@
<TextBlock Name="TextBlockIconNaxx" Text="Naxx" TextAlignment="Center" VerticalAlignment="Center" FontWeight="SemiBold" FontSize="10" Margin="2,0" ToolTip="Deck contains cards from the Curse of Naxxramas expansion."/>
<TextBlock Name="TextBlockIconGvg" Text="GvG" TextAlignment="Center" VerticalAlignment="Center" FontWeight="SemiBold" FontSize="10" Margin="2,0" ToolTip="Deck contains cards from the Goblins vs Gnomes expansion."/>
<TextBlock Name="TextBlockIconBrm" Text="BRM" TextAlignment="Center" VerticalAlignment="Center" FontWeight="SemiBold" FontSize="10" Margin="2,0" ToolTip="Deck contains cards from the Blackrock Mountain expansion."/>
<TextBlock Name="TextBlockIconTgt" Text="TGT" TextAlignment="Center" VerticalAlignment="Center" FontWeight="SemiBold" FontSize="10" Margin="2,0" ToolTip="Deck contains cards from the The Grand Tournament expansion."/>
</StackPanel>
<StackPanel DockPanel.Dock="Left" Orientation="Horizontal" >
<TextBlock Text="CARDS:" VerticalAlignment="Center" FontWeight="SemiBold" FontSize="14" Margin="5,0,0,0"/>
Expand Down Expand Up @@ -486,6 +487,7 @@
<RadioButton Content="CURSE OF NAXXRAMAS" Click="BtnFilter_OnClick" Margin="-24,0,0,0" FontSize="14" />
<RadioButton Content="GOBLINS VS GNOMES" Click="BtnFilter_OnClick" Margin="-24,0,0,0" FontSize="14" />
<RadioButton Content="BLACKROCK MOUNTAIN" Click="BtnFilter_OnClick" Margin="-24,0,0,0" FontSize="14" />
<RadioButton Content="THE GRAND TOURNAMENT" Click="BtnFilter_OnClick" Margin="-24,0,0,0" FontSize="14" />
</MenuItem>
</MenuItem>
</Menu>
Expand Down
2 changes: 2 additions & 0 deletions Hearthstone Deck Tracker/MainWindow/MainWindow_NewDeck.cs
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,13 @@ private void UpdateExpansionIcons()
{
if(_newDeck == null || !_newDeck.Cards.Any())
{
TextBlockIconTgt.Visibility = Visibility.Collapsed;
TextBlockIconBrm.Visibility = Visibility.Collapsed;
TextBlockIconGvg.Visibility = Visibility.Collapsed;
TextBlockIconNaxx.Visibility = Visibility.Collapsed;
return;
}
TextBlockIconTgt.Visibility = _newDeck.Cards.Any(card => card.Set == "The Grand Tournament") ? Visibility.Visible : Visibility.Collapsed;
TextBlockIconBrm.Visibility = _newDeck.Cards.Any(card => card.Set == "Blackrock Mountain") ? Visibility.Visible : Visibility.Collapsed;
TextBlockIconGvg.Visibility = _newDeck.Cards.Any(card => card.Set == "Goblins vs Gnomes") ? Visibility.Visible : Visibility.Collapsed;
TextBlockIconNaxx.Visibility = _newDeck.Cards.Any(card => card.Set == "Curse of Naxxramas") ? Visibility.Visible : Visibility.Collapsed;
Expand Down
1 change: 0 additions & 1 deletion Hearthstone Deck Tracker/Utility/Helper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ public static class Helper
{"Korean", "koKR"},
{"Polish", "plPL"},
{"Portuguese (Brazil)", "ptBR"},
{"Portuguese (Portugal)", "ptPT"},
{"Russian", "ruRU"},
{"Spanish (Mexico)", "esMX"},
{"Spanish (Spain)", "esES"}
Expand Down

0 comments on commit c49a69a

Please sign in to comment.