Chore: Disable winterpie theme (#346)

* Hotfix(Core): Fixed maximum possible health * Chore: Disabled WinterPie seasonal theme
HunterPie · Jan 14, 2023 · d444a33 · d444a33
1 parent bc3aa3b
commit d444a33
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 55 deletions.
diff --git a/HunterPie.Core/HunterPie.Core.csproj b/HunterPie.Core/HunterPie.Core.csproj
@@ -5,8 +5,8 @@
     <Authors>Haato</Authors>
     <Configurations>Debug;Release;Deploy</Configurations>
     <Version>2.2022.1208.2323</Version>
-    <AssemblyVersion>2.6.0.166</AssemblyVersion>
-    <FileVersion>2.6.0.166</FileVersion>
+	  <AssemblyVersion>2.6.0.167</AssemblyVersion>
+    <FileVersion>2.6.0.167</FileVersion>
 	<LangVersion>10.0</LangVersion>
     <IncrementVersionOnBuild>2.yyyy.Mdd.Hmm</IncrementVersionOnBuild>
  </PropertyGroup>

diff --git a/HunterPie.Integrations/HunterPie.Integrations.csproj b/HunterPie.Integrations/HunterPie.Integrations.csproj
@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>2.6.0.167</AssemblyVersion>
-    <FileVersion>2.6.0.167</FileVersion>
+    <AssemblyVersion>2.6.0.168</AssemblyVersion>
+    <FileVersion>2.6.0.168</FileVersion>
 	<Authors>Haato</Authors>
-    <Description></Description>
+	<Description></Description>
     <Version>2.2022.1208.2323</Version>
     <IncrementVersionOnBuild>2.yyyy.Mdd.Hmm</IncrementVersionOnBuild>
   </PropertyGroup>

diff --git a/HunterPie.UI/HunterPie.UI.csproj b/HunterPie.UI/HunterPie.UI.csproj
@@ -5,9 +5,9 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
     <Configurations>Debug;Release;Deploy</Configurations>
-    <AssemblyVersion>2.6.0.167</AssemblyVersion>
-    <FileVersion>2.6.0.167</FileVersion>
-    <Version>2.2022.1208.2323</Version>
+	<AssemblyVersion>2.6.0.168</AssemblyVersion>
+    <FileVersion>2.6.0.168</FileVersion>
+	<Version>2.2022.1208.2323</Version>
     <LangVersion>10.0</LangVersion>
     <Authors>Haato</Authors>
     <IncrementVersionOnBuild>2.yyyy.Mdd.Hmm</IncrementVersionOnBuild>

diff --git a/HunterPie/App.xaml b/HunterPie/App.xaml
@@ -13,8 +13,10 @@
                     Spooky season
                 <ResourceDictionary Source="pack://application:,,,/HunterPie.UI;component/Resources/Seasons/SpookyPie.xaml"/>
                 -->
-                <!-- Winter season -->
+                <!-- 
+                    Winter season 
                 <ResourceDictionary Source="pack://application:,,,/HunterPie.UI;component/Resources/Seasons/WinterPie.xaml"/>
+                -->
                 <ResourceDictionary Source="pack://application:,,,/HunterPie.UI;component/Resources/Styles.xaml"/>
                 <ResourceDictionary Source="pack://application:,,,/HunterPie.UI;component/Resources/Abnormalities.xaml"/>
                 <ResourceDictionary Source="pack://application:,,,/HunterPie.UI;component/Resources/Interface.xaml"/>

diff --git a/HunterPie/MainWindow.xaml b/HunterPie/MainWindow.xaml
@@ -72,48 +72,6 @@
 
         <Grid Background="{StaticResource GRAY_300}" 
               Margin="0,25,0,0">
-
-            <!-- WinterPie -->
-            <image:Icon Image="{StaticResource SNOWFLAKE}"
-                        Height="30"
-                        Width="30"
-                        VerticalAlignment="Top"
-                        HorizontalAlignment="Left"
-                        Foreground="{StaticResource GRAY}" 
-                        Margin="65,15,0,0"/>
-
-            <image:Icon Image="{StaticResource SNOWFLAKE}"
-                        Height="50"
-                        Width="50"
-                        VerticalAlignment="Top"
-                        HorizontalAlignment="Left"
-                        Foreground="{StaticResource GRAY_50}" 
-                        Margin="300,50,0,0"/>
-
-            <image:Icon Image="{StaticResource SNOWFLAKE}"
-                        Height="150"
-                        Width="150"
-                        VerticalAlignment="Top"
-                        HorizontalAlignment="Left"
-                        Foreground="{StaticResource GRAY_100}" 
-                        Margin="400,25,0,0"/>
-
-            <image:Icon Image="{StaticResource SNOWFLAKE}"
-                        Height="30"
-                        Width="30"
-                        VerticalAlignment="Top"
-                        HorizontalAlignment="Left"
-                        Foreground="{StaticResource GRAY_100}" 
-                        Margin="700,25,0,0"/>
-
-            <image:Icon Image="{StaticResource SNOWFLAKE}"
-                        Height="45"
-                        Width="45"
-                        VerticalAlignment="Top"
-                        HorizontalAlignment="Left"
-                        Foreground="{StaticResource GRAY}" 
-                        Margin="630,50,0,0"/>
-
             <StackPanel Orientation="Horizontal" 
                         VerticalAlignment="Center"
                         HorizontalAlignment="Left"

diff --git a/HunterPie/Properties/AssemblyInfo.cs b/HunterPie/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@
                                               // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyVersion("2.6.0.162")]
-[assembly: AssemblyFileVersion("2.6.0.162")]
+[assembly: AssemblyVersion("2.6.0.163")]
+[assembly: AssemblyFileVersion("2.6.0.163")]
diff --git a/Localization b/Localization