Skip to content
This repository has been archived by the owner on Feb 3, 2024. It is now read-only.

Commit

Permalink
Cleanups and added Alatreon's Explosion Weakening part
Browse files Browse the repository at this point in the history
  • Loading branch information
Haato3o committed Jul 10, 2020
1 parent d472bac commit 550cec9
Show file tree
Hide file tree
Showing 28 changed files with 12 additions and 88 deletions.
1 change: 0 additions & 1 deletion HunterPie/App.xaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Application x:Class="HunterPie.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:HunterPie"
StartupUri="Hunterpie.xaml">
<Application.Resources>
<ResourceDictionary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
xmlns:widget="clr-namespace:HunterPie.GUI"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Title="AbnormalityContainer" Top="500" Left="300" MinHeight="40" MinWidth="40" SizeToContent="WidthAndHeight" Background="{x:Null}" WindowStyle="None" AllowsTransparency="True" ShowInTaskbar="False" Topmost="True" Closing="OnClosing" MouseDown="OnMouseDown" MouseWheel="OnMouseWheel" SizeChanged="OnSizeChange">
<Grid x:Name="ContentHolder">
<Rectangle x:Name="BackgroundTray" Fill="#FF0E0E0E" Stroke="#99000000"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:widget="clr-namespace:HunterPie.GUI"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:Custom="clr-namespace:HunterPie.GUIControls.Custom_Controls"
x:Class="HunterPie.GUI.Widgets.Abnormality_Widget.AbnormalityTraySettings"
mc:Ignorable="d"
Title="Abnormality Tray Settings" Height="580" Width="843" Background="#FA0C0C0C" Foreground="{x:Null}" WindowStyle="None" BorderThickness="1" AllowsTransparency="True" Topmost="True" ResizeMode="CanResizeWithGrip" MinWidth="600" MinHeight="400" Closing="OnClosing" DataContext="{StaticResource Localization}">
<widget:WidgetSettings.Resources>
<ResourceDictionary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<UserControl x:Class="HunterPie.GUI.Widgets.Abnormality_Widget.Parts.AbnormalityControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets.Abnormality_Widget.Parts"
xmlns:helpers="clr-namespace:HunterPie.GUI.Helpers"
mc:Ignorable="d" Height="45">
Height="45">
<DockPanel>
<Canvas x:Name="Abnormality" RenderTransformOrigin="0.5,0.5" Width="36" DockPanel.Dock="Left">
<Ellipse Width="30" Height="30" Fill="#66000000" Canvas.Left="3" Canvas.Top="1"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<UserControl x:Class="HunterPie.GUI.Widgets.Abnormality_Widget.Parts.AbnormalitySettingControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets.Abnormality_Widget.Parts"
mc:Ignorable="d"
Height="46" Width="46">
<Canvas x:Name="AbnormDisplay" Cursor="Hand" Margin="3" MouseLeftButtonDown="OnMouseClick">
<Image x:Name="AbnormalityIcon" Width="40" Height="40" RenderTransformOrigin="0.5,0.5">
Expand Down
3 changes: 0 additions & 3 deletions HunterPie/GUI/Widgets/ClassWidget/ClassWidgetContainer.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
xmlns:widget="clr-namespace:HunterPie.GUI"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Title="ClassWidgetContainer" SizeToContent="WidthAndHeight" ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" ShowInTaskbar="False" Topmost="True" Closing="OnClosing" Background="{x:Null}" MouseDown="OnMouseDown" MouseWheel="OnMouseWheel">
<StackPanel x:Name="Container">

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<local:ClassControl x:Name="CBControl" x:Class="HunterPie.GUI.Widgets.ClassWidget.Parts.ChargeBladeControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets.ClassWidget.Parts"
mc:Ignorable="d"
>
<Grid Height="139" Width="139">
<!-- Safi counter -->
Expand Down
3 changes: 0 additions & 3 deletions HunterPie/GUI/Widgets/ClassWidget/Parts/DualBladeControl.xaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<local:ClassControl x:Name="DBControl" x:Class="HunterPie.GUI.Widgets.ClassWidget.Parts.DualBladeControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets.ClassWidget.Parts"
mc:Ignorable="d"
>
<Grid Width="250" Height="100">
<Canvas Opacity="0" HorizontalAlignment="Left" Width="46" Height="46" VerticalAlignment="Top" Margin="112,34,0,0">
Expand Down
3 changes: 0 additions & 3 deletions HunterPie/GUI/Widgets/ClassWidget/Parts/GunLanceControl.xaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<local:ClassControl x:Name="GLControl" x:Class="HunterPie.GUI.Widgets.ClassWidget.Parts.GunLanceControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets.ClassWidget.Parts"
mc:Ignorable="d"
xmlns:helper="clr-namespace:HunterPie.GUI.Helpers">
<Grid Width="150" Height="100">

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<local:ClassControl x:Name="IGControl" x:Class="HunterPie.GUI.Widgets.ClassWidget.Parts.InsectGlaiveControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets.ClassWidget.Parts"
mc:Ignorable="d"
>
<Grid Width="210" Height="80">
<!-- Safi buff -->
Expand Down
3 changes: 0 additions & 3 deletions HunterPie/GUI/Widgets/ClassWidget/Parts/LanceControl.xaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<local:ClassControl x:Class="HunterPie.GUI.Widgets.ClassWidget.Parts.LanceControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets.ClassWidget.Parts"
mc:Ignorable="d"
x:Name="LControl">
<Grid Height="150" Width="200">
<Canvas Opacity="0" HorizontalAlignment="Left" Width="46" Height="46" VerticalAlignment="Top" Margin="22,27,0,0">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<local:ClassControl x:Name="LSControl" x:Class="HunterPie.GUI.Widgets.ClassWidget.Parts.LongswordControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets.ClassWidget.Parts"
xmlns:helper="clr-namespace:HunterPie.GUI.Helpers"
mc:Ignorable="d" Loaded="LSControl_Loaded">
Loaded="LSControl_Loaded">
<Grid Width="200" Height="100">
<!-- Safi counter-->
<Canvas Opacity="0" HorizontalAlignment="Left" Width="46" Height="46" VerticalAlignment="Top" Margin="77,38,0,0">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<local:ClassControl x:Name="SAControl" x:Class="HunterPie.GUI.Widgets.ClassWidget.Parts.SwitchAxeControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets.ClassWidget.Parts"
xmlns:helper="clr-namespace:HunterPie.GUI.Helpers"
mc:Ignorable="d" Loaded="SAControl_Loaded">
Loaded="SAControl_Loaded">
<Grid Width="154" Height="120" SnapsToDevicePixels="True">
<!-- Safi Counter -->
<Canvas Opacity="0" HorizontalAlignment="Left" Width="46" Height="46" VerticalAlignment="Top" Margin="6,10,0,0">
Expand Down
4 changes: 1 addition & 3 deletions HunterPie/GUI/Widgets/DPSMeter/Meter.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
xmlns:src="clr-namespace:HunterPie.GUI"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d" Width="324" MinHeight="20" ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" ShowInTaskbar="False" Topmost="True" Closing="OnClosing" Background="{x:Null}" MouseDown="OnMouseDown" MouseWheel="OnMouseWheel" SizeToContent="Height">
Width="324" MinHeight="20" ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" ShowInTaskbar="False" Topmost="True" Closing="OnClosing" Background="{x:Null}" MouseDown="OnMouseDown" MouseWheel="OnMouseWheel" SizeToContent="Height">
<StackPanel x:Name="DamageContainer" VerticalAlignment="Top" Background="#7F000000">
<StackPanel Orientation="Horizontal" Visibility="{Binding ElementName=DamageMeter, Path=TimerVisibility}">
<Image Source="{StaticResource ICON_STOPWATCH}" Width="20" Height="20" Margin="5,0,0,0"/>
Expand Down
5 changes: 0 additions & 5 deletions HunterPie/GUI/Widgets/DPSMeter/Parts/PartyMember.xaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<UserControl x:Class="HunterPie.GUI.Widgets.DPSMeter.Parts.PartyMember"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets.DPSMeter.Parts"
xmlns:converters="clr-namespace:HunterPie.GUI.Helpers"
mc:Ignorable="d"
x:Name="PlayerContainer" Height="46" Foreground="{x:Null}">
<Canvas ClipToBounds="True" Width="320" Height="46">
<Rectangle x:Name="PlayerDPSBar" ClipToBounds="True" Opacity="0.8" Height="46" MaxWidth="322" HorizontalAlignment="Left">
Expand Down
4 changes: 0 additions & 4 deletions HunterPie/GUI/Widgets/Harvest Box/HarvestBox.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
xmlns:src="clr-namespace:HunterPie.GUI"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:Part="clr-namespace:HunterPie.GUI.Widgets.Harvest_Box.Parts"
mc:Ignorable="d"
Width="230" Height="205" Background="#33000000" DataContext="{StaticResource Localization}" ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" ShowInTaskbar="False" Topmost="True" Closing="OnClosing" MouseDown="OnMouseDown" MouseWheel="OnMouseWheel" BorderBrush="#00000000" SizeToContent="Height">
<Grid x:Name="HarvestBoxComponent" HorizontalAlignment="Left" Width="230">
<Rectangle x:Name="HarvestBoxContainer" Fill="#FF111111" Stroke="#DD171717" Margin="0,0,0,4"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
<UserControl x:Class="HunterPie.GUI.Widgets.Harvest_Box.Parts.FertilizerControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets.Harvest_Box.Parts"
mc:Ignorable="d"
d:DesignHeight="29" Margin="0,3,0,0">
Margin="0,3,0,0">
<DockPanel x:Name="FertilizerHolder" Width="230">
<Image x:Name="FertilizerIcon" Source="{StaticResource ICON_FERTILIZER_2}" DockPanel.Dock="Left" Visibility="Visible" Height="25" Margin="4,0,0,0"/>
<TextBlock x:Name="FertilizerName" DockPanel.Dock="Left" Text="Fertilizer Name" FontSize="14" Foreground="#FFEEEEEE" Margin="0" Padding="5,5,2,0" FontWeight="Light" TextTrimming="CharacterEllipsis" MaxWidth="170"/>
Expand Down
5 changes: 0 additions & 5 deletions HunterPie/GUI/Widgets/MantleTimer.xaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
<src:Widget x:Class="HunterPie.GUI.Widgets.MantleTimer"
xmlns:src="clr-namespace:HunterPie.GUI"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets"
xmlns:helpers="clr-namespace:HunterPie.GUI.Helpers"
Width="230" Height="38" ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" ShowInTaskbar="False" Topmost="True" Closing="OnClosing" Background="{x:Null}" MouseDown="OnMouseDown" MouseWheel="OnMouseWheel">
<Canvas x:Name="MantleContainer" Height="38">
<Canvas Height="23" Width="204" Canvas.Top="8" Canvas.Left="16" ClipToBounds="True">
Expand Down
4 changes: 0 additions & 4 deletions HunterPie/GUI/Widgets/Monster Widget/MonsterContainer.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
xmlns:src="clr-namespace:HunterPie.GUI"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets"
mc:Ignorable="d"
MinWidth="895" MinHeight="80" ResizeMode="NoResize" SizeToContent="WidthAndHeight" WindowStyle="None" AllowsTransparency="True" ShowInTaskbar="False" Topmost="True" Closing="OnClosing" Background="{x:Null}" MouseDown="OnMouseDown" MouseWheel="OnMouseWheel" SnapsToDevicePixels="True">
<StackPanel x:Name="Container" Orientation="Horizontal" SnapsToDevicePixels="True" RenderTransformOrigin="0.5,0.5" Margin="0" VerticalAlignment="Top" HorizontalAlignment="Center" Style="{StaticResource OVERLAY_MONSTER_BACKGROUND}"/>
</src:Widget>
7 changes: 1 addition & 6 deletions HunterPie/GUI/Widgets/Monster Widget/MonsterHealth.xaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
<UserControl x:Name="MonsterComponent" x:Class="HunterPie.GUI.Widgets.MonsterHealth"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets"
xmlns:Parts="clr-namespace:HunterPie.GUI.Widgets.Monster_Widget.Parts"
xmlns:Custom="clr-namespace:HunterPie.GUIControls.Custom_Controls"
xmlns:Helpers="clr-namespace:HunterPie.GUI.Helpers"
mc:Ignorable="d" BorderThickness="1" Margin="3,0,0,0" Width="300" RenderTransformOrigin="0.5,0.5" >
BorderThickness="1" Margin="3,0,0,0" Width="300" RenderTransformOrigin="0.5,0.5" >
<DockPanel>
<Grid x:Name="MonsterHealthContainer" DockPanel.Dock="Top" Margin="-3,0,0,0">
<Grid.ColumnDefinitions>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<UserControl x:Class="HunterPie.GUI.Widgets.Monster_Widget.Parts.MonsterAilment"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets.Monster_Widget.Parts"
xmlns:Custom="clr-namespace:HunterPie.GUIControls.Custom_Controls"
mc:Ignorable="d" d:DesignWidth="260" Height="30">
Height="30">
<Grid>
<Custom:MinimalHealthBar Color="{StaticResource OVERLAY_MONSTER_AILMENT_BAR_COLOR}" x:Name="AilmentBar" Margin="30,13,5,0" RenderTransformOrigin="0.5,0.5" Height="3" VerticalAlignment="Top" >
<Custom:MinimalHealthBar.RenderTransform>
Expand Down
6 changes: 1 addition & 5 deletions HunterPie/GUI/Widgets/Monster Widget/Parts/MonsterPart.xaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<UserControl x:Class="HunterPie.GUI.Widgets.Monster_Widget.Parts.MonsterPart"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets.Monster_Widget.Parts"
xmlns:Custom="clr-namespace:HunterPie.GUIControls.Custom_Controls"
mc:Ignorable="d"
d:DesignHeight="30" d:DesignWidth="260" SnapsToDevicePixels="True">
SnapsToDevicePixels="True">
<Grid>
<Custom:MinimalHealthBar Color="{StaticResource OVERLAY_MONSTER_PART_BAR_COLOR}" x:Name="PartHealth" Margin="32,13,5,0" RenderTransformOrigin="0.5,0.5" Height="3" VerticalAlignment="Top" >
<Custom:MinimalHealthBar.RenderTransform>
Expand Down
2 changes: 0 additions & 2 deletions HunterPie/GUI/Widgets/Notification Widget/DiscordNotify.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:HunterPie.GUI.Widgets.Notification_Widget"
xmlns:custom="clr-namespace:HunterPie.GUIControls.Custom_Controls"
mc:Ignorable="d"
Title="Notification - Discord" Height="150" Width="300" ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" ShowInTaskbar="False" Topmost="True" BorderBrush="#CC000000" Foreground="Black" BorderThickness="2" Left="0" Top="-300" Background="{x:Null}" DataContext="{StaticResource Localization}" Closing="OnClosing">
<src:Widget.Resources>
Expand Down
1 change: 0 additions & 1 deletion HunterPie/GUIControls/Changelog.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:HunterPie.GUI"
xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800" Foreground="#FFF0F0F0">
Expand Down
1 change: 1 addition & 0 deletions HunterPie/HunterPie.Resources/Data/MonsterData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,7 @@
<Part Name="MONSTER_PART_REMOVABLE_TAIL" IsRemovable="True">
<Break Threshold="1"/>
</Part>
<Part Name="MONSTER_PART_EXPLOSION_WEAKENING" IsRemovable="True" Index="3"/>
<Part Name="MONSTER_PART_HEAD" Group="HEAD"/>
<Part Name="MONSTER_PART_CHEST" Group="BODY"/>
<Part Name="MONSTER_PART_WINGS" Group="WING">
Expand Down
Loading

0 comments on commit 550cec9

Please sign in to comment.