Arena updates

rembound · Oct 25, 2018 · 42b9dcb · 42b9dcb
1 parent 4d11afd
commit 42b9dcb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/ArenaWindow.xaml b/ArenaWindow.xaml
@@ -61,11 +61,10 @@
                         <Run Text="with support from the community at GitHub." />
                         <Run Text="Thanks go out to Grinning Goat for providing " /><Hyperlink NavigateUri="{Binding StringTierList}" RequestNavigate="Hyperlink_RequestNavigate" Style="{StaticResource HyperlinkAboutStyle}">Hearthstone Arena Tier List</Hyperlink><Run Text="!" />
                         <LineBreak /><LineBreak />
-                        <Run Text="Thanks for your support! Any " /><Hyperlink NavigateUri="{Binding StringDonate}" RequestNavigate="Hyperlink_RequestNavigate" Style="{StaticResource HyperlinkAboutStyle}">donation</Hyperlink><Run Text=" is greatly appreciated." />
+                        <Run Text="Thanks for your support!" />
                     </TextBlock>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                        <Button Name="AboutDonate" Content="donate" Width="60" Margin="0,0,0,0" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutDonate_Click"/>
-                        <Button Name="AboutVisitWebsite" Content="rembound.com" Margin="10,0,0,0" Width="100" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutVisitWebsite_Click"/>
+                        <Button Name="AboutVisitWebsite" Content="rembound.com" Margin="0,0,0,0" Width="100" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutVisitWebsite_Click"/>
                         <Button Name="AboutVisitGitHub" Content="github" Width="60" Margin="10,0,0,0" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutVisitGitHub_Click"/>
                         <Button Name="AboutButtonClose" Content="close" Width="60" Margin="10,0,0,0" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutButtonClose_Click"/>
                     </StackPanel>
@@ -93,11 +92,10 @@
                         <Run Text="The tier list and card data was updated to the latest version." />
                         <Run Text="More info about the tier list can be found at: " /><Hyperlink NavigateUri="{Binding StringTierList}" RequestNavigate="Hyperlink_RequestNavigate" Style="{StaticResource HyperlinkAboutStyle}">Hearthstone Arena Tier List</Hyperlink>
                         <LineBreak /><LineBreak />
-                        <Run Text="Thanks for your support! Any " /><Hyperlink NavigateUri="{Binding StringDonate}" RequestNavigate="Hyperlink_RequestNavigate" Style="{StaticResource HyperlinkAboutStyle}">donation</Hyperlink><Run Text=" is greatly appreciated." />
+                        <Run Text="Thanks for your support!" />
                     </TextBlock>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                        <Button Name="DataUpdateDonate" Content="donate" Width="60" Margin="0,0,0,0" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutDonate_Click"/>
-                        <Button Name="DataUpdateWebsite" Content="rembound.com" Margin="10,0,0,0" Width="100" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutVisitWebsite_Click"/>
+                        <Button Name="DataUpdateWebsite" Content="rembound.com" Margin="0,0,0,0" Width="100" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutVisitWebsite_Click"/>
                         <Button Name="DataUpdateGitHub" Content="github" Width="60" Margin="10,0,0,0" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="AboutVisitGitHub_Click"/>
                         <Button Name="DataUpdateClose" Content="close" Width="60" Margin="10,0,0,0" Height="30" Style="{DynamicResource SquareButtonStyle}" Click="DataUpdateClose_Click"/>
                     </StackPanel>

diff --git a/ArenaWindow.xaml.cs b/ArenaWindow.xaml.cs
@@ -92,11 +92,6 @@ public Card Card2
             }
         }
 
-        public string StringDonate
-        {
-            get { return "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=info%40rembound%2ecom&lc=NL&item_name=Rembound%2ecom&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted"; }
-        }
-
         public string StringWebsite
         {
             get { return "http://rembound.com/?from=ArenaHelper"; }
@@ -155,11 +150,6 @@ private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e
         }
 
         // About
-        private void AboutDonate_Click(object sender, RoutedEventArgs e)
-        {
-            Process.Start(StringDonate);
-        }
-
         private void AboutVisitWebsite_Click(object sender, RoutedEventArgs e)
         {
             Process.Start(StringWebsite);

diff --git a/Plugin.cs b/Plugin.cs
@@ -214,7 +214,7 @@ public string Author
 
         public Version Version
         {
-            get { return new Version("0.9.1"); }
+            get { return new Version("0.9.2"); }
         }
 
         public MenuItem MenuItem
@@ -1427,7 +1427,8 @@ private async Task SearchCards()
             {
                 cards[i] = GetCard(choices[i].Id);
 
-                if (cards[i].Type != "Hero") {
+                if (cards[i].Type != "Hero" && cards[i].Type != "Hero Power")
+                {
                     validCards++;
                     Log.Info("Choice: " + choices[i].Id);
                 }