diff --git a/DamageCalculator/.vs/DamageCalculator/v17/.suo b/DamageCalculator/.vs/DamageCalculator/v17/.suo index 7f919d1..bf55c17 100644 Binary files a/DamageCalculator/.vs/DamageCalculator/v17/.suo and b/DamageCalculator/.vs/DamageCalculator/v17/.suo differ diff --git a/DamageCalculator/DamageCalculator/DamageCalculator.csproj b/DamageCalculator/DamageCalculator/DamageCalculator.csproj index 86341f4..60a88d0 100644 --- a/DamageCalculator/DamageCalculator/DamageCalculator.csproj +++ b/DamageCalculator/DamageCalculator/DamageCalculator.csproj @@ -94,6 +94,7 @@ + Designer MSBuild:Compile diff --git a/DamageCalculator/DamageCalculator/Help.xaml b/DamageCalculator/DamageCalculator/Help.xaml index 3af7d2f..44f47d3 100644 --- a/DamageCalculator/DamageCalculator/Help.xaml +++ b/DamageCalculator/DamageCalculator/Help.xaml @@ -29,7 +29,7 @@ - + diff --git a/DamageCalculator/DamageCalculator/MainWindow.xaml b/DamageCalculator/DamageCalculator/MainWindow.xaml index 84dccbe..0919c80 100644 --- a/DamageCalculator/DamageCalculator/MainWindow.xaml +++ b/DamageCalculator/DamageCalculator/MainWindow.xaml @@ -10,7 +10,8 @@ WindowStartupLocation="CenterScreen" Icon="27.ico" WindowState="Maximized" MouseMove="Window_MouseMove" - KeyDown="Window_KeyDown"> + KeyDown="Window_KeyDown" + KeyUp="Window_KeyUp"> @@ -117,12 +118,12 @@ - + - + diff --git a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs index 3ce6aa4..28b9155 100644 --- a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs +++ b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs @@ -986,6 +986,15 @@ namespace Damage_Calculator { Clipboard.SetText(txtCursorX.Text + " " + txtCursorY.Text); } + + // Pass it on for spacebar pan start + this.rightZoomBorder.KeyDown(sender, e); + } + + private void Window_KeyUp(object sender, KeyEventArgs e) + { + // Pass it on for spacebar pan stop + this.rightZoomBorder.KeyUp(sender, e); } #endregion } diff --git a/DamageCalculator/DamageCalculator/ZoomBorder.cs b/DamageCalculator/DamageCalculator/ZoomBorder.cs new file mode 100644 index 0000000..fc85b8f --- /dev/null +++ b/DamageCalculator/DamageCalculator/ZoomBorder.cs @@ -0,0 +1,161 @@ +using System.Linq; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Input; +using System.Windows.Media; + +namespace Damage_Calculator +{ + public class ZoomBorder : Border + { + private UIElement child = null; + private Point origin; + private Point start; + private bool isSpacebarPressed = false; + + private TranslateTransform GetTranslateTransform(UIElement element) + { + return (TranslateTransform)((TransformGroup)element.RenderTransform) + .Children.First(tr => tr is TranslateTransform); + } + + private ScaleTransform GetScaleTransform(UIElement element) + { + return (ScaleTransform)((TransformGroup)element.RenderTransform) + .Children.First(tr => tr is ScaleTransform); + } + + public override UIElement Child + { + get { return base.Child; } + set + { + if (value != null && value != this.Child) + this.Initialize(value); + base.Child = value; + } + } + + public void Initialize(UIElement element) + { + this.child = element; + if (child != null) + { + TransformGroup group = new TransformGroup(); + ScaleTransform st = new ScaleTransform(); + group.Children.Add(st); + TranslateTransform tt = new TranslateTransform(); + group.Children.Add(tt); + child.RenderTransform = group; + child.RenderTransformOrigin = new Point(0.0, 0.0); + this.MouseWheel += child_MouseWheel; + this.MouseLeftButtonDown += child_MouseLeftButtonDown; + this.MouseLeftButtonUp += child_MouseLeftButtonUp; + this.MouseMove += child_MouseMove; + this.PreviewMouseDown += new MouseButtonEventHandler( + child_PreviewMouseDown); + } + } + + public void Reset() + { + if (child != null) + { + // reset zoom + var st = GetScaleTransform(child); + st.ScaleX = 1.0; + st.ScaleY = 1.0; + + // reset pan + var tt = GetTranslateTransform(child); + tt.X = 0.0; + tt.Y = 0.0; + } + } + + #region Child Events + + public void KeyDown(object sender, KeyEventArgs e) + { + if (e.Key == Key.Space) + this.isSpacebarPressed = true; + } + + public void KeyUp(object sender, KeyEventArgs e) + { + if (e.Key == Key.Space) + this.isSpacebarPressed = false; + } + + private void child_MouseWheel(object sender, MouseWheelEventArgs e) + { + if (child != null) + { + var st = GetScaleTransform(child); + var tt = GetTranslateTransform(child); + + double zoom = e.Delta > 0 ? .2 : -.2; + if (!(e.Delta > 0) && (st.ScaleX < 1 || st.ScaleY < 1)) + return; + + Point relative = e.GetPosition(child); + double absoluteX; + double absoluteY; + + absoluteX = relative.X * st.ScaleX + tt.X; + absoluteY = relative.Y * st.ScaleY + tt.Y; + + st.ScaleX += zoom; + st.ScaleY += zoom; + + tt.X = absoluteX - relative.X * st.ScaleX; + tt.Y = absoluteY - relative.Y * st.ScaleY; + } + } + + private void child_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + if (child != null && this.isSpacebarPressed) + { + var tt = GetTranslateTransform(child); + start = e.GetPosition(this); + origin = new Point(tt.X, tt.Y); + this.Cursor = Cursors.Hand; + child.CaptureMouse(); + } + } + + private void child_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) + { + if (child != null) + { + child.ReleaseMouseCapture(); + this.Cursor = Cursors.Arrow; + } + } + + void child_PreviewMouseDown(object sender, MouseButtonEventArgs e) + { + if (e.ChangedButton == MouseButton.Middle && e.ButtonState == MouseButtonState.Pressed) + { + this.Reset(); + } + } + + private void child_MouseMove(object sender, MouseEventArgs e) + { + if (child != null) + { + if (child.IsMouseCaptured) + { + var tt = GetTranslateTransform(child); + Vector v = start - e.GetPosition(this); + tt.X = origin.X - v.X; + tt.Y = origin.Y - v.Y; + } + } + } + + #endregion + } +} \ No newline at end of file diff --git a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe index 1f6ea74..13b5c9e 100644 Binary files a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe and b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.exe differ diff --git a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.pdb b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.pdb index 1a06771..cb94996 100644 Binary files a/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.pdb and b/DamageCalculator/DamageCalculator/bin/Debug/CSGO Damage Calculator.pdb differ diff --git a/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.exe index 24f7325..873da36 100644 Binary files a/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.exe and b/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.exe differ diff --git a/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.pdb b/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.pdb index cf9ea12..c329b90 100644 Binary files a/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.pdb and b/DamageCalculator/DamageCalculator/bin/Release/CSGO Damage Calculator.pdb differ diff --git a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.exe index 1f6ea74..13b5c9e 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.exe and b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.exe differ diff --git a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.g.resources b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.g.resources index b9840ef..d0db7c6 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.g.resources and b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.g.resources differ diff --git a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.pdb b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.pdb index 1a06771..cb94996 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.pdb and b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator.pdb differ diff --git a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator_MarkupCompile.cache b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator_MarkupCompile.cache index f4fcd99..80ba27d 100644 --- a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator_MarkupCompile.cache +++ b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator_MarkupCompile.cache @@ -12,7 +12,7 @@ DEBUG;TRACE D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\App.xaml 8-1784528412 -31-767171675 +321055026254 15-431277860 About.xaml;ctrlPlayerSpawn.xaml;Help.xaml;MainWindow.xaml;Themes\ColourfulDarkTheme.xaml;Themes\ColourfulLightTheme.xaml;Themes\DarkTheme.xaml;Themes\LightTheme.xaml; diff --git a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator_MarkupCompile.i.cache b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator_MarkupCompile.i.cache index 5e70a74..861b0e0 100644 --- a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator_MarkupCompile.i.cache +++ b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator_MarkupCompile.i.cache @@ -12,7 +12,7 @@ DEBUG;TRACE D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\App.xaml 8-1784528412 -321154606446 +33-1318162921 15-431277860 About.xaml;ctrlPlayerSpawn.xaml;Help.xaml;MainWindow.xaml;Themes\ColourfulDarkTheme.xaml;Themes\ColourfulLightTheme.xaml;Themes\DarkTheme.xaml;Themes\LightTheme.xaml; diff --git a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator_MarkupCompile.i.lref b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator_MarkupCompile.i.lref index 969cbe4..ba0db08 100644 --- a/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator_MarkupCompile.i.lref +++ b/DamageCalculator/DamageCalculator/obj/Debug/CSGO Damage Calculator_MarkupCompile.i.lref @@ -1,6 +1,5 @@  -FD:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\ctrlPlayerSpawn.xaml;; FD:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\Help.xaml;; FD:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\MainWindow.xaml;; diff --git a/DamageCalculator/DamageCalculator/obj/Debug/DamageCalculator.csproj.CoreCompileInputs.cache b/DamageCalculator/DamageCalculator/obj/Debug/DamageCalculator.csproj.CoreCompileInputs.cache index 1ffb243..a4e1b8b 100644 --- a/DamageCalculator/DamageCalculator/obj/Debug/DamageCalculator.csproj.CoreCompileInputs.cache +++ b/DamageCalculator/DamageCalculator/obj/Debug/DamageCalculator.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -de194050420e7811f720e035cc6148d59c7ac5fb +5515329852c74d9c8e686e84375c10b470a0bbbd diff --git a/DamageCalculator/DamageCalculator/obj/Debug/DamageCalculator.csproj.FileListAbsolute.txt b/DamageCalculator/DamageCalculator/obj/Debug/DamageCalculator.csproj.FileListAbsolute.txt index fe7b0a1..cee85db 100644 --- a/DamageCalculator/DamageCalculator/obj/Debug/DamageCalculator.csproj.FileListAbsolute.txt +++ b/DamageCalculator/DamageCalculator/obj/Debug/DamageCalculator.csproj.FileListAbsolute.txt @@ -54,3 +54,4 @@ D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\ob D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Debug\ctrlPlayerSpawn.baml D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Debug\Help.g.cs D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Debug\Help.baml +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Debug\GeneratedInternalTypeHelper.g.cs diff --git a/DamageCalculator/DamageCalculator/obj/Debug/GeneratedInternalTypeHelper.g.cs b/DamageCalculator/DamageCalculator/obj/Debug/GeneratedInternalTypeHelper.g.cs new file mode 100644 index 0000000..136dd1b --- /dev/null +++ b/DamageCalculator/DamageCalculator/obj/Debug/GeneratedInternalTypeHelper.g.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { + + /// + /// CreateInstance + /// + protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { + return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) + | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); + } + + /// + /// GetPropertyValue + /// + protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { + return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// SetPropertyValue + /// + protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { + propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// CreateDelegate + /// + protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { + return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod + | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { + delegateType, + handler}, null))); + } + + /// + /// AddEventHandler + /// + protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { + eventInfo.AddEventHandler(target, handler); + } + } +} + diff --git a/DamageCalculator/DamageCalculator/obj/Debug/GeneratedInternalTypeHelper.g.i.cs b/DamageCalculator/DamageCalculator/obj/Debug/GeneratedInternalTypeHelper.g.i.cs new file mode 100644 index 0000000..136dd1b --- /dev/null +++ b/DamageCalculator/DamageCalculator/obj/Debug/GeneratedInternalTypeHelper.g.i.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace XamlGeneratedNamespace { + + + /// + /// GeneratedInternalTypeHelper + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { + + /// + /// CreateInstance + /// + protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { + return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) + | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); + } + + /// + /// GetPropertyValue + /// + protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { + return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// SetPropertyValue + /// + protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { + propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); + } + + /// + /// CreateDelegate + /// + protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { + return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod + | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { + delegateType, + handler}, null))); + } + + /// + /// AddEventHandler + /// + protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { + eventInfo.AddEventHandler(target, handler); + } + } +} + diff --git a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.baml b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.baml index d0f6e49..af57770 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.baml and b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.cs b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.cs index bd8c7f7..9c99c48 100644 --- a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.cs +++ b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9F019158B8352DCE8981F0BC66CF6ED55D2097B5B9C746213F2697B990FD5B48" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8F0F0C852384FC12CF7097D055D1358868A336EC1A1243944432FCB4A124DD23" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -41,7 +41,7 @@ namespace Damage_Calculator { public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 17 "..\..\MainWindow.xaml" + #line 18 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowBombSites; @@ -49,7 +49,7 @@ namespace Damage_Calculator { #line hidden - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowSpawnAreas; @@ -57,7 +57,7 @@ namespace Damage_Calculator { #line hidden - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowStandardSpawns; @@ -65,7 +65,7 @@ namespace Damage_Calculator { #line hidden - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShow2v2Spawns; @@ -73,7 +73,7 @@ namespace Damage_Calculator { #line hidden - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns; @@ -81,7 +81,7 @@ namespace Damage_Calculator { #line hidden - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowDrawnMarkers; @@ -89,7 +89,7 @@ namespace Damage_Calculator { #line hidden - #line 30 "..\..\MainWindow.xaml" + #line 31 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuAbout; @@ -97,7 +97,7 @@ namespace Damage_Calculator { #line hidden - #line 31 "..\..\MainWindow.xaml" + #line 32 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuHelp; @@ -105,7 +105,7 @@ namespace Damage_Calculator { #line hidden - #line 45 "..\..\MainWindow.xaml" + #line 46 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioModeShooting; @@ -113,7 +113,7 @@ namespace Damage_Calculator { #line hidden - #line 46 "..\..\MainWindow.xaml" + #line 47 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioModeBomb; @@ -121,7 +121,7 @@ namespace Damage_Calculator { #line hidden - #line 48 "..\..\MainWindow.xaml" + #line 49 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel topStackPanel; @@ -129,7 +129,7 @@ namespace Damage_Calculator { #line hidden - #line 50 "..\..\MainWindow.xaml" + #line 51 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox comboBoxMaps; @@ -137,7 +137,7 @@ namespace Damage_Calculator { #line hidden - #line 55 "..\..\MainWindow.xaml" + #line 56 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtEasterEggMetres; @@ -145,7 +145,7 @@ namespace Damage_Calculator { #line hidden - #line 56 "..\..\MainWindow.xaml" + #line 57 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock textDistanceMetres; @@ -153,7 +153,7 @@ namespace Damage_Calculator { #line hidden - #line 60 "..\..\MainWindow.xaml" + #line 61 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock textDistanceUnits; @@ -161,7 +161,7 @@ namespace Damage_Calculator { #line hidden - #line 63 "..\..\MainWindow.xaml" + #line 64 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Shapes.Rectangle rectTop; @@ -169,7 +169,7 @@ namespace Damage_Calculator { #line hidden - #line 64 "..\..\MainWindow.xaml" + #line 65 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Shapes.Rectangle rectSide; @@ -177,7 +177,7 @@ namespace Damage_Calculator { #line hidden - #line 65 "..\..\MainWindow.xaml" + #line 66 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel leftStackPanel; @@ -185,7 +185,7 @@ namespace Damage_Calculator { #line hidden - #line 69 "..\..\MainWindow.xaml" + #line 70 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel stackArmorSeparated; @@ -193,7 +193,7 @@ namespace Damage_Calculator { #line hidden - #line 70 "..\..\MainWindow.xaml" + #line 71 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHelmet; @@ -201,7 +201,7 @@ namespace Damage_Calculator { #line hidden - #line 71 "..\..\MainWindow.xaml" + #line 72 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkKevlar; @@ -209,7 +209,7 @@ namespace Damage_Calculator { #line hidden - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkArmorAny; @@ -217,7 +217,7 @@ namespace Damage_Calculator { #line hidden - #line 75 "..\..\MainWindow.xaml" + #line 76 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel stackAreaHit; @@ -225,7 +225,7 @@ namespace Damage_Calculator { #line hidden - #line 77 "..\..\MainWindow.xaml" + #line 78 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioHead; @@ -233,7 +233,7 @@ namespace Damage_Calculator { #line hidden - #line 78 "..\..\MainWindow.xaml" + #line 79 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioChestArms; @@ -241,7 +241,7 @@ namespace Damage_Calculator { #line hidden - #line 79 "..\..\MainWindow.xaml" + #line 80 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioStomach; @@ -249,7 +249,7 @@ namespace Damage_Calculator { #line hidden - #line 80 "..\..\MainWindow.xaml" + #line 81 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioLegs; @@ -257,7 +257,7 @@ namespace Damage_Calculator { #line hidden - #line 82 "..\..\MainWindow.xaml" + #line 83 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel stackWeaponUsed; @@ -265,7 +265,7 @@ namespace Damage_Calculator { #line hidden - #line 84 "..\..\MainWindow.xaml" + #line 85 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox comboWeapons; @@ -273,7 +273,7 @@ namespace Damage_Calculator { #line hidden - #line 88 "..\..\MainWindow.xaml" + #line 89 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtResult; @@ -281,7 +281,7 @@ namespace Damage_Calculator { #line hidden - #line 89 "..\..\MainWindow.xaml" + #line 90 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtResultArmor; @@ -289,7 +289,7 @@ namespace Damage_Calculator { #line hidden - #line 96 "..\..\MainWindow.xaml" + #line 97 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHasMapFile; @@ -297,7 +297,7 @@ namespace Damage_Calculator { #line hidden - #line 97 "..\..\MainWindow.xaml" + #line 98 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHasNavFile; @@ -305,7 +305,7 @@ namespace Damage_Calculator { #line hidden - #line 100 "..\..\MainWindow.xaml" + #line 101 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtBombMaxDamage; @@ -313,7 +313,7 @@ namespace Damage_Calculator { #line hidden - #line 104 "..\..\MainWindow.xaml" + #line 105 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtBombRadius; @@ -321,7 +321,7 @@ namespace Damage_Calculator { #line hidden - #line 111 "..\..\MainWindow.xaml" + #line 112 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtCursorX; @@ -329,7 +329,7 @@ namespace Damage_Calculator { #line hidden - #line 115 "..\..\MainWindow.xaml" + #line 116 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtCursorY; @@ -337,17 +337,9 @@ namespace Damage_Calculator { #line hidden - #line 120 "..\..\MainWindow.xaml" + #line 121 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Viewbox rightViewbox; - - #line default - #line hidden - - - #line 122 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Image mapImage; + internal Damage_Calculator.ZoomBorder rightZoomBorder; #line default #line hidden @@ -355,13 +347,21 @@ namespace Damage_Calculator { #line 123 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Image mapImage; + + #line default + #line hidden + + + #line 124 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas pointsCanvas; #line default #line hidden - #line 127 "..\..\MainWindow.xaml" + #line 128 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Grid gridLoading; @@ -389,6 +389,13 @@ namespace Damage_Calculator { #line hidden } + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) { + return System.Delegate.CreateDelegate(delegateType, this, handler); + } + [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] @@ -409,19 +416,25 @@ namespace Damage_Calculator { #line 13 "..\..\MainWindow.xaml" ((Damage_Calculator.MainWindow)(target)).KeyDown += new System.Windows.Input.KeyEventHandler(this.Window_KeyDown); + #line default + #line hidden + + #line 14 "..\..\MainWindow.xaml" + ((Damage_Calculator.MainWindow)(target)).KeyUp += new System.Windows.Input.KeyEventHandler(this.Window_KeyUp); + #line default #line hidden return; case 2: this.mnuShowBombSites = ((System.Windows.Controls.MenuItem)(target)); - #line 17 "..\..\MainWindow.xaml" + #line 18 "..\..\MainWindow.xaml" this.mnuShowBombSites.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 17 "..\..\MainWindow.xaml" + #line 18 "..\..\MainWindow.xaml" this.mnuShowBombSites.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -430,13 +443,13 @@ namespace Damage_Calculator { case 3: this.mnuShowSpawnAreas = ((System.Windows.Controls.MenuItem)(target)); - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" this.mnuShowSpawnAreas.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" this.mnuShowSpawnAreas.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -445,13 +458,13 @@ namespace Damage_Calculator { case 4: this.mnuShowStandardSpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" this.mnuShowStandardSpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" this.mnuShowStandardSpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -460,13 +473,13 @@ namespace Damage_Calculator { case 5: this.mnuShow2v2Spawns = ((System.Windows.Controls.MenuItem)(target)); - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" this.mnuShow2v2Spawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" this.mnuShow2v2Spawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -475,13 +488,13 @@ namespace Damage_Calculator { case 6: this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -490,13 +503,13 @@ namespace Damage_Calculator { case 7: this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target)); - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -504,7 +517,7 @@ namespace Damage_Calculator { return; case 8: - #line 25 "..\..\MainWindow.xaml" + #line 26 "..\..\MainWindow.xaml" ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); #line default @@ -512,7 +525,7 @@ namespace Damage_Calculator { return; case 9: - #line 26 "..\..\MainWindow.xaml" + #line 27 "..\..\MainWindow.xaml" ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); #line default @@ -521,7 +534,7 @@ namespace Damage_Calculator { case 10: this.mnuAbout = ((System.Windows.Controls.MenuItem)(target)); - #line 30 "..\..\MainWindow.xaml" + #line 31 "..\..\MainWindow.xaml" this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click); #line default @@ -530,7 +543,7 @@ namespace Damage_Calculator { case 11: this.mnuHelp = ((System.Windows.Controls.MenuItem)(target)); - #line 31 "..\..\MainWindow.xaml" + #line 32 "..\..\MainWindow.xaml" this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click); #line default @@ -539,7 +552,7 @@ namespace Damage_Calculator { case 12: this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target)); - #line 45 "..\..\MainWindow.xaml" + #line 46 "..\..\MainWindow.xaml" this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked); #line default @@ -548,7 +561,7 @@ namespace Damage_Calculator { case 13: this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target)); - #line 46 "..\..\MainWindow.xaml" + #line 47 "..\..\MainWindow.xaml" this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked); #line default @@ -560,7 +573,7 @@ namespace Damage_Calculator { case 15: this.comboBoxMaps = ((System.Windows.Controls.ComboBox)(target)); - #line 50 "..\..\MainWindow.xaml" + #line 51 "..\..\MainWindow.xaml" this.comboBoxMaps.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboBoxMaps_SelectionChanged); #line default @@ -590,13 +603,13 @@ namespace Damage_Calculator { case 23: this.chkHelmet = ((System.Windows.Controls.CheckBox)(target)); - #line 70 "..\..\MainWindow.xaml" + #line 71 "..\..\MainWindow.xaml" this.chkHelmet.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 70 "..\..\MainWindow.xaml" + #line 71 "..\..\MainWindow.xaml" this.chkHelmet.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -605,13 +618,13 @@ namespace Damage_Calculator { case 24: this.chkKevlar = ((System.Windows.Controls.CheckBox)(target)); - #line 71 "..\..\MainWindow.xaml" + #line 72 "..\..\MainWindow.xaml" this.chkKevlar.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 71 "..\..\MainWindow.xaml" + #line 72 "..\..\MainWindow.xaml" this.chkKevlar.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -620,13 +633,13 @@ namespace Damage_Calculator { case 25: this.chkArmorAny = ((System.Windows.Controls.CheckBox)(target)); - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" this.chkArmorAny.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" this.chkArmorAny.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -638,7 +651,7 @@ namespace Damage_Calculator { case 27: this.radioHead = ((System.Windows.Controls.RadioButton)(target)); - #line 77 "..\..\MainWindow.xaml" + #line 78 "..\..\MainWindow.xaml" this.radioHead.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -647,7 +660,7 @@ namespace Damage_Calculator { case 28: this.radioChestArms = ((System.Windows.Controls.RadioButton)(target)); - #line 78 "..\..\MainWindow.xaml" + #line 79 "..\..\MainWindow.xaml" this.radioChestArms.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -656,7 +669,7 @@ namespace Damage_Calculator { case 29: this.radioStomach = ((System.Windows.Controls.RadioButton)(target)); - #line 79 "..\..\MainWindow.xaml" + #line 80 "..\..\MainWindow.xaml" this.radioStomach.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -665,7 +678,7 @@ namespace Damage_Calculator { case 30: this.radioLegs = ((System.Windows.Controls.RadioButton)(target)); - #line 80 "..\..\MainWindow.xaml" + #line 81 "..\..\MainWindow.xaml" this.radioLegs.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -677,7 +690,7 @@ namespace Damage_Calculator { case 32: this.comboWeapons = ((System.Windows.Controls.ComboBox)(target)); - #line 84 "..\..\MainWindow.xaml" + #line 85 "..\..\MainWindow.xaml" this.comboWeapons.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboWeapons_SelectionChanged); #line default @@ -708,24 +721,24 @@ namespace Damage_Calculator { this.txtCursorY = ((System.Windows.Controls.TextBlock)(target)); return; case 41: - this.rightViewbox = ((System.Windows.Controls.Viewbox)(target)); + this.rightZoomBorder = ((Damage_Calculator.ZoomBorder)(target)); return; case 42: this.mapImage = ((System.Windows.Controls.Image)(target)); - #line 122 "..\..\MainWindow.xaml" + #line 123 "..\..\MainWindow.xaml" this.mapImage.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseLeftButtonUp); #line default #line hidden - #line 122 "..\..\MainWindow.xaml" + #line 123 "..\..\MainWindow.xaml" this.mapImage.MouseRightButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseRightButtonUp); #line default #line hidden - #line 122 "..\..\MainWindow.xaml" + #line 123 "..\..\MainWindow.xaml" this.mapImage.LayoutUpdated += new System.EventHandler(this.mapImage_LayoutUpdated); #line default diff --git a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.i.cs b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.i.cs index bd8c7f7..9c99c48 100644 --- a/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.i.cs +++ b/DamageCalculator/DamageCalculator/obj/Debug/MainWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9F019158B8352DCE8981F0BC66CF6ED55D2097B5B9C746213F2697B990FD5B48" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8F0F0C852384FC12CF7097D055D1358868A336EC1A1243944432FCB4A124DD23" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -41,7 +41,7 @@ namespace Damage_Calculator { public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 17 "..\..\MainWindow.xaml" + #line 18 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowBombSites; @@ -49,7 +49,7 @@ namespace Damage_Calculator { #line hidden - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowSpawnAreas; @@ -57,7 +57,7 @@ namespace Damage_Calculator { #line hidden - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowStandardSpawns; @@ -65,7 +65,7 @@ namespace Damage_Calculator { #line hidden - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShow2v2Spawns; @@ -73,7 +73,7 @@ namespace Damage_Calculator { #line hidden - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns; @@ -81,7 +81,7 @@ namespace Damage_Calculator { #line hidden - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuShowDrawnMarkers; @@ -89,7 +89,7 @@ namespace Damage_Calculator { #line hidden - #line 30 "..\..\MainWindow.xaml" + #line 31 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuAbout; @@ -97,7 +97,7 @@ namespace Damage_Calculator { #line hidden - #line 31 "..\..\MainWindow.xaml" + #line 32 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuHelp; @@ -105,7 +105,7 @@ namespace Damage_Calculator { #line hidden - #line 45 "..\..\MainWindow.xaml" + #line 46 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioModeShooting; @@ -113,7 +113,7 @@ namespace Damage_Calculator { #line hidden - #line 46 "..\..\MainWindow.xaml" + #line 47 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioModeBomb; @@ -121,7 +121,7 @@ namespace Damage_Calculator { #line hidden - #line 48 "..\..\MainWindow.xaml" + #line 49 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel topStackPanel; @@ -129,7 +129,7 @@ namespace Damage_Calculator { #line hidden - #line 50 "..\..\MainWindow.xaml" + #line 51 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox comboBoxMaps; @@ -137,7 +137,7 @@ namespace Damage_Calculator { #line hidden - #line 55 "..\..\MainWindow.xaml" + #line 56 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtEasterEggMetres; @@ -145,7 +145,7 @@ namespace Damage_Calculator { #line hidden - #line 56 "..\..\MainWindow.xaml" + #line 57 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock textDistanceMetres; @@ -153,7 +153,7 @@ namespace Damage_Calculator { #line hidden - #line 60 "..\..\MainWindow.xaml" + #line 61 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock textDistanceUnits; @@ -161,7 +161,7 @@ namespace Damage_Calculator { #line hidden - #line 63 "..\..\MainWindow.xaml" + #line 64 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Shapes.Rectangle rectTop; @@ -169,7 +169,7 @@ namespace Damage_Calculator { #line hidden - #line 64 "..\..\MainWindow.xaml" + #line 65 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Shapes.Rectangle rectSide; @@ -177,7 +177,7 @@ namespace Damage_Calculator { #line hidden - #line 65 "..\..\MainWindow.xaml" + #line 66 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel leftStackPanel; @@ -185,7 +185,7 @@ namespace Damage_Calculator { #line hidden - #line 69 "..\..\MainWindow.xaml" + #line 70 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel stackArmorSeparated; @@ -193,7 +193,7 @@ namespace Damage_Calculator { #line hidden - #line 70 "..\..\MainWindow.xaml" + #line 71 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHelmet; @@ -201,7 +201,7 @@ namespace Damage_Calculator { #line hidden - #line 71 "..\..\MainWindow.xaml" + #line 72 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkKevlar; @@ -209,7 +209,7 @@ namespace Damage_Calculator { #line hidden - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkArmorAny; @@ -217,7 +217,7 @@ namespace Damage_Calculator { #line hidden - #line 75 "..\..\MainWindow.xaml" + #line 76 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel stackAreaHit; @@ -225,7 +225,7 @@ namespace Damage_Calculator { #line hidden - #line 77 "..\..\MainWindow.xaml" + #line 78 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioHead; @@ -233,7 +233,7 @@ namespace Damage_Calculator { #line hidden - #line 78 "..\..\MainWindow.xaml" + #line 79 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioChestArms; @@ -241,7 +241,7 @@ namespace Damage_Calculator { #line hidden - #line 79 "..\..\MainWindow.xaml" + #line 80 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioStomach; @@ -249,7 +249,7 @@ namespace Damage_Calculator { #line hidden - #line 80 "..\..\MainWindow.xaml" + #line 81 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.RadioButton radioLegs; @@ -257,7 +257,7 @@ namespace Damage_Calculator { #line hidden - #line 82 "..\..\MainWindow.xaml" + #line 83 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel stackWeaponUsed; @@ -265,7 +265,7 @@ namespace Damage_Calculator { #line hidden - #line 84 "..\..\MainWindow.xaml" + #line 85 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ComboBox comboWeapons; @@ -273,7 +273,7 @@ namespace Damage_Calculator { #line hidden - #line 88 "..\..\MainWindow.xaml" + #line 89 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtResult; @@ -281,7 +281,7 @@ namespace Damage_Calculator { #line hidden - #line 89 "..\..\MainWindow.xaml" + #line 90 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtResultArmor; @@ -289,7 +289,7 @@ namespace Damage_Calculator { #line hidden - #line 96 "..\..\MainWindow.xaml" + #line 97 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHasMapFile; @@ -297,7 +297,7 @@ namespace Damage_Calculator { #line hidden - #line 97 "..\..\MainWindow.xaml" + #line 98 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.CheckBox chkHasNavFile; @@ -305,7 +305,7 @@ namespace Damage_Calculator { #line hidden - #line 100 "..\..\MainWindow.xaml" + #line 101 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtBombMaxDamage; @@ -313,7 +313,7 @@ namespace Damage_Calculator { #line hidden - #line 104 "..\..\MainWindow.xaml" + #line 105 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtBombRadius; @@ -321,7 +321,7 @@ namespace Damage_Calculator { #line hidden - #line 111 "..\..\MainWindow.xaml" + #line 112 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtCursorX; @@ -329,7 +329,7 @@ namespace Damage_Calculator { #line hidden - #line 115 "..\..\MainWindow.xaml" + #line 116 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtCursorY; @@ -337,17 +337,9 @@ namespace Damage_Calculator { #line hidden - #line 120 "..\..\MainWindow.xaml" + #line 121 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Viewbox rightViewbox; - - #line default - #line hidden - - - #line 122 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Image mapImage; + internal Damage_Calculator.ZoomBorder rightZoomBorder; #line default #line hidden @@ -355,13 +347,21 @@ namespace Damage_Calculator { #line 123 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Image mapImage; + + #line default + #line hidden + + + #line 124 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas pointsCanvas; #line default #line hidden - #line 127 "..\..\MainWindow.xaml" + #line 128 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Grid gridLoading; @@ -389,6 +389,13 @@ namespace Damage_Calculator { #line hidden } + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) { + return System.Delegate.CreateDelegate(delegateType, this, handler); + } + [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] @@ -409,19 +416,25 @@ namespace Damage_Calculator { #line 13 "..\..\MainWindow.xaml" ((Damage_Calculator.MainWindow)(target)).KeyDown += new System.Windows.Input.KeyEventHandler(this.Window_KeyDown); + #line default + #line hidden + + #line 14 "..\..\MainWindow.xaml" + ((Damage_Calculator.MainWindow)(target)).KeyUp += new System.Windows.Input.KeyEventHandler(this.Window_KeyUp); + #line default #line hidden return; case 2: this.mnuShowBombSites = ((System.Windows.Controls.MenuItem)(target)); - #line 17 "..\..\MainWindow.xaml" + #line 18 "..\..\MainWindow.xaml" this.mnuShowBombSites.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 17 "..\..\MainWindow.xaml" + #line 18 "..\..\MainWindow.xaml" this.mnuShowBombSites.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -430,13 +443,13 @@ namespace Damage_Calculator { case 3: this.mnuShowSpawnAreas = ((System.Windows.Controls.MenuItem)(target)); - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" this.mnuShowSpawnAreas.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 18 "..\..\MainWindow.xaml" + #line 19 "..\..\MainWindow.xaml" this.mnuShowSpawnAreas.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -445,13 +458,13 @@ namespace Damage_Calculator { case 4: this.mnuShowStandardSpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" this.mnuShowStandardSpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 19 "..\..\MainWindow.xaml" + #line 20 "..\..\MainWindow.xaml" this.mnuShowStandardSpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -460,13 +473,13 @@ namespace Damage_Calculator { case 5: this.mnuShow2v2Spawns = ((System.Windows.Controls.MenuItem)(target)); - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" this.mnuShow2v2Spawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 20 "..\..\MainWindow.xaml" + #line 21 "..\..\MainWindow.xaml" this.mnuShow2v2Spawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -475,13 +488,13 @@ namespace Damage_Calculator { case 6: this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 21 "..\..\MainWindow.xaml" + #line 22 "..\..\MainWindow.xaml" this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -490,13 +503,13 @@ namespace Damage_Calculator { case 7: this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target)); - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 22 "..\..\MainWindow.xaml" + #line 23 "..\..\MainWindow.xaml" this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default @@ -504,7 +517,7 @@ namespace Damage_Calculator { return; case 8: - #line 25 "..\..\MainWindow.xaml" + #line 26 "..\..\MainWindow.xaml" ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); #line default @@ -512,7 +525,7 @@ namespace Damage_Calculator { return; case 9: - #line 26 "..\..\MainWindow.xaml" + #line 27 "..\..\MainWindow.xaml" ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); #line default @@ -521,7 +534,7 @@ namespace Damage_Calculator { case 10: this.mnuAbout = ((System.Windows.Controls.MenuItem)(target)); - #line 30 "..\..\MainWindow.xaml" + #line 31 "..\..\MainWindow.xaml" this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click); #line default @@ -530,7 +543,7 @@ namespace Damage_Calculator { case 11: this.mnuHelp = ((System.Windows.Controls.MenuItem)(target)); - #line 31 "..\..\MainWindow.xaml" + #line 32 "..\..\MainWindow.xaml" this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click); #line default @@ -539,7 +552,7 @@ namespace Damage_Calculator { case 12: this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target)); - #line 45 "..\..\MainWindow.xaml" + #line 46 "..\..\MainWindow.xaml" this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked); #line default @@ -548,7 +561,7 @@ namespace Damage_Calculator { case 13: this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target)); - #line 46 "..\..\MainWindow.xaml" + #line 47 "..\..\MainWindow.xaml" this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked); #line default @@ -560,7 +573,7 @@ namespace Damage_Calculator { case 15: this.comboBoxMaps = ((System.Windows.Controls.ComboBox)(target)); - #line 50 "..\..\MainWindow.xaml" + #line 51 "..\..\MainWindow.xaml" this.comboBoxMaps.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboBoxMaps_SelectionChanged); #line default @@ -590,13 +603,13 @@ namespace Damage_Calculator { case 23: this.chkHelmet = ((System.Windows.Controls.CheckBox)(target)); - #line 70 "..\..\MainWindow.xaml" + #line 71 "..\..\MainWindow.xaml" this.chkHelmet.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 70 "..\..\MainWindow.xaml" + #line 71 "..\..\MainWindow.xaml" this.chkHelmet.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -605,13 +618,13 @@ namespace Damage_Calculator { case 24: this.chkKevlar = ((System.Windows.Controls.CheckBox)(target)); - #line 71 "..\..\MainWindow.xaml" + #line 72 "..\..\MainWindow.xaml" this.chkKevlar.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 71 "..\..\MainWindow.xaml" + #line 72 "..\..\MainWindow.xaml" this.chkKevlar.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -620,13 +633,13 @@ namespace Damage_Calculator { case 25: this.chkArmorAny = ((System.Windows.Controls.CheckBox)(target)); - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" this.chkArmorAny.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 73 "..\..\MainWindow.xaml" + #line 74 "..\..\MainWindow.xaml" this.chkArmorAny.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -638,7 +651,7 @@ namespace Damage_Calculator { case 27: this.radioHead = ((System.Windows.Controls.RadioButton)(target)); - #line 77 "..\..\MainWindow.xaml" + #line 78 "..\..\MainWindow.xaml" this.radioHead.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -647,7 +660,7 @@ namespace Damage_Calculator { case 28: this.radioChestArms = ((System.Windows.Controls.RadioButton)(target)); - #line 78 "..\..\MainWindow.xaml" + #line 79 "..\..\MainWindow.xaml" this.radioChestArms.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -656,7 +669,7 @@ namespace Damage_Calculator { case 29: this.radioStomach = ((System.Windows.Controls.RadioButton)(target)); - #line 79 "..\..\MainWindow.xaml" + #line 80 "..\..\MainWindow.xaml" this.radioStomach.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -665,7 +678,7 @@ namespace Damage_Calculator { case 30: this.radioLegs = ((System.Windows.Controls.RadioButton)(target)); - #line 80 "..\..\MainWindow.xaml" + #line 81 "..\..\MainWindow.xaml" this.radioLegs.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default @@ -677,7 +690,7 @@ namespace Damage_Calculator { case 32: this.comboWeapons = ((System.Windows.Controls.ComboBox)(target)); - #line 84 "..\..\MainWindow.xaml" + #line 85 "..\..\MainWindow.xaml" this.comboWeapons.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboWeapons_SelectionChanged); #line default @@ -708,24 +721,24 @@ namespace Damage_Calculator { this.txtCursorY = ((System.Windows.Controls.TextBlock)(target)); return; case 41: - this.rightViewbox = ((System.Windows.Controls.Viewbox)(target)); + this.rightZoomBorder = ((Damage_Calculator.ZoomBorder)(target)); return; case 42: this.mapImage = ((System.Windows.Controls.Image)(target)); - #line 122 "..\..\MainWindow.xaml" + #line 123 "..\..\MainWindow.xaml" this.mapImage.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseLeftButtonUp); #line default #line hidden - #line 122 "..\..\MainWindow.xaml" + #line 123 "..\..\MainWindow.xaml" this.mapImage.MouseRightButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseRightButtonUp); #line default #line hidden - #line 122 "..\..\MainWindow.xaml" + #line 123 "..\..\MainWindow.xaml" this.mapImage.LayoutUpdated += new System.EventHandler(this.mapImage_LayoutUpdated); #line default diff --git a/DamageCalculator/DamageCalculator/obj/Release/About.baml b/DamageCalculator/DamageCalculator/obj/Release/About.baml index 7e0f63f..9dc9bb2 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/About.baml and b/DamageCalculator/DamageCalculator/obj/Release/About.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/About.g.cs b/DamageCalculator/DamageCalculator/obj/Release/About.g.cs index 64696b0..df2d0b7 100644 --- a/DamageCalculator/DamageCalculator/obj/Release/About.g.cs +++ b/DamageCalculator/DamageCalculator/obj/Release/About.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\About.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6461A709CC94A0A4932F265FD1370B5FF61F10A365D5FBB5C6BCBB5CF0C3E147" +#pragma checksum "..\..\About.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "82986E0DBC50ED3A4B613F33015BC9AC5D1F983DE161E336F31FB41165D63510" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Config_Manager; +using Damage_Calculator; using System; using System.Diagnostics; using System.Windows; @@ -32,7 +32,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Config_Manager { +namespace Damage_Calculator { /// @@ -41,7 +41,7 @@ namespace Config_Manager { public partial class About : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 19 "..\..\About.xaml" + #line 21 "..\..\About.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtVersion; diff --git a/DamageCalculator/DamageCalculator/obj/Release/About.g.i.cs b/DamageCalculator/DamageCalculator/obj/Release/About.g.i.cs index 64696b0..df2d0b7 100644 --- a/DamageCalculator/DamageCalculator/obj/Release/About.g.i.cs +++ b/DamageCalculator/DamageCalculator/obj/Release/About.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\About.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6461A709CC94A0A4932F265FD1370B5FF61F10A365D5FBB5C6BCBB5CF0C3E147" +#pragma checksum "..\..\About.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "82986E0DBC50ED3A4B613F33015BC9AC5D1F983DE161E336F31FB41165D63510" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Config_Manager; +using Damage_Calculator; using System; using System.Diagnostics; using System.Windows; @@ -32,7 +32,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Config_Manager { +namespace Damage_Calculator { /// @@ -41,7 +41,7 @@ namespace Config_Manager { public partial class About : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 19 "..\..\About.xaml" + #line 21 "..\..\About.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock txtVersion; diff --git a/DamageCalculator/DamageCalculator/obj/Release/App.baml b/DamageCalculator/DamageCalculator/obj/Release/App.baml index 74722f1..346d7c2 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/App.baml and b/DamageCalculator/DamageCalculator/obj/Release/App.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/App.g.cs b/DamageCalculator/DamageCalculator/obj/Release/App.g.cs index 68dbfad..b147cce 100644 --- a/DamageCalculator/DamageCalculator/obj/Release/App.g.cs +++ b/DamageCalculator/DamageCalculator/obj/Release/App.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0FF9D30D9DA2EB74BEF621923D1BC79F1169277C3C50549C96E09A58E71EE464" +#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E4A9E95446C09434F0F7DC8F1F23ACF00873399D14C91F2C18F2357F71458A2B" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Config_Manager; +using Damage_Calculator; using System; using System.Diagnostics; using System.Windows; @@ -32,7 +32,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Config_Manager { +namespace Damage_Calculator { /// @@ -74,7 +74,7 @@ namespace Config_Manager { [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] public static void Main() { - Config_Manager.App app = new Config_Manager.App(); + Damage_Calculator.App app = new Damage_Calculator.App(); app.InitializeComponent(); app.Run(); } diff --git a/DamageCalculator/DamageCalculator/obj/Release/App.g.i.cs b/DamageCalculator/DamageCalculator/obj/Release/App.g.i.cs index 68dbfad..b147cce 100644 --- a/DamageCalculator/DamageCalculator/obj/Release/App.g.i.cs +++ b/DamageCalculator/DamageCalculator/obj/Release/App.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0FF9D30D9DA2EB74BEF621923D1BC79F1169277C3C50549C96E09A58E71EE464" +#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E4A9E95446C09434F0F7DC8F1F23ACF00873399D14C91F2C18F2357F71458A2B" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Config_Manager; +using Damage_Calculator; using System; using System.Diagnostics; using System.Windows; @@ -32,7 +32,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Config_Manager { +namespace Damage_Calculator { /// @@ -74,7 +74,7 @@ namespace Config_Manager { [System.Diagnostics.DebuggerNonUserCodeAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] public static void Main() { - Config_Manager.App app = new Config_Manager.App(); + Damage_Calculator.App app = new Damage_Calculator.App(); app.InitializeComponent(); app.Run(); } diff --git a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe index 24f7325..873da36 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe and b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.exe differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.g.resources b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.g.resources index 871d7a1..a473656 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.g.resources and b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.g.resources differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb index cf9ea12..c329b90 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb and b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator.pdb differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator_MarkupCompile.cache b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator_MarkupCompile.cache index c1f479e..601ddc9 100644 --- a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator_MarkupCompile.cache +++ b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator_MarkupCompile.cache @@ -4,17 +4,17 @@ winexe C# .cs -D:\source\repos\_Git Repos\ConfigManager\Config Manager\Config Manager\obj\Release\ -Config_Manager +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\ +Damage_Calculator none false TRACE -D:\source\repos\_Git Repos\ConfigManager\Config Manager\Config Manager\App.xaml -6-2134167639 +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\App.xaml +8-1784528412 -25-862544125 -15-2024074300 -About.xaml;MainWindow.xaml;Themes\ColourfulDarkTheme.xaml;Themes\ColourfulLightTheme.xaml;Themes\DarkTheme.xaml;Themes\LightTheme.xaml; +31-767171675 +15-431277860 +About.xaml;ctrlPlayerSpawn.xaml;Help.xaml;MainWindow.xaml;Themes\ColourfulDarkTheme.xaml;Themes\ColourfulLightTheme.xaml;Themes\DarkTheme.xaml;Themes\LightTheme.xaml; False diff --git a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator_MarkupCompile.lref b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator_MarkupCompile.lref index 311d2ee..63237a3 100644 --- a/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator_MarkupCompile.lref +++ b/DamageCalculator/DamageCalculator/obj/Release/CSGO Damage Calculator_MarkupCompile.lref @@ -1,5 +1,7 @@  -FD:\source\repos\_Git Repos\ConfigManager\Config Manager\Config Manager\App.xaml;; -FD:\source\repos\_Git Repos\ConfigManager\Config Manager\Config Manager\About.xaml;; -FD:\source\repos\_Git Repos\ConfigManager\Config Manager\Config Manager\MainWindow.xaml;; +FD:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\App.xaml;; +FD:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\About.xaml;; +FD:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\ctrlPlayerSpawn.xaml;; +FD:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\Help.xaml;; +FD:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\MainWindow.xaml;; diff --git a/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.AssemblyReference.cache b/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.AssemblyReference.cache new file mode 100644 index 0000000..319484c Binary files /dev/null and b/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.AssemblyReference.cache differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.CoreCompileInputs.cache b/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..a727ebf --- /dev/null +++ b/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +fddaf16b88da1a3e4210815ec520282e697487d3 diff --git a/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.FileListAbsolute.txt b/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..3a89a62 --- /dev/null +++ b/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.FileListAbsolute.txt @@ -0,0 +1,31 @@ +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\bin\Release\CSGO Damage Calculator.exe.config +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\bin\Release\CSGO Damage Calculator.exe +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\bin\Release\CSGO Damage Calculator.pdb +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\DamageCalculator.csproj.AssemblyReference.cache +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\DamageCalculator.csproj.SuggestedBindingRedirects.cache +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\Themes\ColourfulDarkTheme.baml +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\Themes\ColourfulLightTheme.baml +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\Themes\DarkTheme.baml +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\Themes\LightTheme.baml +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\About.g.cs +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\ctrlPlayerSpawn.g.cs +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\Help.g.cs +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\MainWindow.g.cs +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\Themes\ColourfulDarkTheme.g.cs +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\Themes\ColourfulLightTheme.g.cs +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\Themes\DarkTheme.g.cs +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\Themes\LightTheme.g.cs +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\App.g.cs +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\CSGO Damage Calculator_MarkupCompile.cache +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\CSGO Damage Calculator_MarkupCompile.lref +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\App.baml +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\About.baml +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\ctrlPlayerSpawn.baml +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\Help.baml +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\MainWindow.baml +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\CSGO Damage Calculator.g.resources +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\Damage_Calculator.Properties.Resources.resources +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\DamageCalculator.csproj.GenerateResource.cache +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\DamageCalculator.csproj.CoreCompileInputs.cache +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\CSGO Damage Calculator.exe +D:\source\repos\_Git Repos\DamageCalculator\DamageCalculator\DamageCalculator\obj\Release\CSGO Damage Calculator.pdb diff --git a/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.GenerateResource.cache b/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.GenerateResource.cache new file mode 100644 index 0000000..a619c8c Binary files /dev/null and b/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.GenerateResource.cache differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.SuggestedBindingRedirects.cache b/DamageCalculator/DamageCalculator/obj/Release/DamageCalculator.csproj.SuggestedBindingRedirects.cache new file mode 100644 index 0000000..e69de29 diff --git a/DamageCalculator/DamageCalculator/obj/Release/Damage_Calculator.Properties.Resources.resources b/DamageCalculator/DamageCalculator/obj/Release/Damage_Calculator.Properties.Resources.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/DamageCalculator/DamageCalculator/obj/Release/Damage_Calculator.Properties.Resources.resources differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/Help.baml b/DamageCalculator/DamageCalculator/obj/Release/Help.baml new file mode 100644 index 0000000..e7d75d2 Binary files /dev/null and b/DamageCalculator/DamageCalculator/obj/Release/Help.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/Help.g.cs b/DamageCalculator/DamageCalculator/obj/Release/Help.g.cs new file mode 100644 index 0000000..2f33d3c --- /dev/null +++ b/DamageCalculator/DamageCalculator/obj/Release/Help.g.cs @@ -0,0 +1,75 @@ +#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0BBD118A25710AD7297EFA440D952E55B704798D5E6B6F4E9B11039094AF8A14" +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using Damage_Calculator; +using System; +using System.Diagnostics; +using System.Windows; +using System.Windows.Automation; +using System.Windows.Controls; +using System.Windows.Controls.Primitives; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Ink; +using System.Windows.Input; +using System.Windows.Markup; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Media.Effects; +using System.Windows.Media.Imaging; +using System.Windows.Media.Media3D; +using System.Windows.Media.TextFormatting; +using System.Windows.Navigation; +using System.Windows.Shapes; +using System.Windows.Shell; + + +namespace Damage_Calculator { + + + /// + /// Help + /// + public partial class Help : System.Windows.Window, System.Windows.Markup.IComponentConnector { + + private bool _contentLoaded; + + /// + /// InitializeComponent + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + public void InitializeComponent() { + if (_contentLoaded) { + return; + } + _contentLoaded = true; + System.Uri resourceLocater = new System.Uri("/CSGO Damage Calculator;component/help.xaml", System.UriKind.Relative); + + #line 1 "..\..\Help.xaml" + System.Windows.Application.LoadComponent(this, resourceLocater); + + #line default + #line hidden + } + + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] + void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) { + this._contentLoaded = true; + } + } +} + diff --git a/DamageCalculator/DamageCalculator/obj/Release/Help.g.i.cs b/DamageCalculator/DamageCalculator/obj/Release/Help.g.i.cs new file mode 100644 index 0000000..2f33d3c --- /dev/null +++ b/DamageCalculator/DamageCalculator/obj/Release/Help.g.i.cs @@ -0,0 +1,75 @@ +#pragma checksum "..\..\Help.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0BBD118A25710AD7297EFA440D952E55B704798D5E6B6F4E9B11039094AF8A14" +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using Damage_Calculator; +using System; +using System.Diagnostics; +using System.Windows; +using System.Windows.Automation; +using System.Windows.Controls; +using System.Windows.Controls.Primitives; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Ink; +using System.Windows.Input; +using System.Windows.Markup; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Media.Effects; +using System.Windows.Media.Imaging; +using System.Windows.Media.Media3D; +using System.Windows.Media.TextFormatting; +using System.Windows.Navigation; +using System.Windows.Shapes; +using System.Windows.Shell; + + +namespace Damage_Calculator { + + + /// + /// Help + /// + public partial class Help : System.Windows.Window, System.Windows.Markup.IComponentConnector { + + private bool _contentLoaded; + + /// + /// InitializeComponent + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + public void InitializeComponent() { + if (_contentLoaded) { + return; + } + _contentLoaded = true; + System.Uri resourceLocater = new System.Uri("/CSGO Damage Calculator;component/help.xaml", System.UriKind.Relative); + + #line 1 "..\..\Help.xaml" + System.Windows.Application.LoadComponent(this, resourceLocater); + + #line default + #line hidden + } + + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] + void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) { + this._contentLoaded = true; + } + } +} + diff --git a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.baml b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.baml index a498ce7..d88b347 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.baml and b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.cs b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.cs index 6035cbc..bd8c7f7 100644 --- a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.cs +++ b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B0EBF792E0410B5EE059E35E8EF5924C4C8E4790692A28A9307AEC26FE41EA89" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9F019158B8352DCE8981F0BC66CF6ED55D2097B5B9C746213F2697B990FD5B48" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Config_Manager; +using Damage_Calculator; using System; using System.Diagnostics; using System.Windows; @@ -32,7 +32,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Config_Manager { +namespace Damage_Calculator { /// @@ -41,41 +41,73 @@ namespace Config_Manager { public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { + #line 17 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.MenuItem mnuShowBombSites; + + #line default + #line hidden + + + #line 18 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.MenuItem mnuShowSpawnAreas; + + #line default + #line hidden + + + #line 19 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.MenuItem mnuShowStandardSpawns; + + #line default + #line hidden + + + #line 20 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.MenuItem mnuShow2v2Spawns; + + #line default + #line hidden + + + #line 21 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns; + + #line default + #line hidden + + #line 22 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.MenuItem mnuShowDrawnMarkers; + + #line default + #line hidden + + + #line 30 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.MenuItem mnuAbout; + + #line default + #line hidden + + + #line 31 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuHelp; #line default #line hidden - #line 34 "..\..\MainWindow.xaml" + #line 45 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.StackPanel topStackPanel; - - #line default - #line hidden - - - #line 36 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.ComboBox comboBoxMaps; - - #line default - #line hidden - - - #line 41 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock txtEasterEggMetres; - - #line default - #line hidden - - - #line 42 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock textDistanceMetres; + internal System.Windows.Controls.RadioButton radioModeShooting; #line default #line hidden @@ -83,15 +115,15 @@ namespace Config_Manager { #line 46 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock textDistanceUnits; + internal System.Windows.Controls.RadioButton radioModeBomb; #line default #line hidden - #line 49 "..\..\MainWindow.xaml" + #line 48 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Shapes.Rectangle rectTop; + internal System.Windows.Controls.StackPanel topStackPanel; #line default #line hidden @@ -99,15 +131,7 @@ namespace Config_Manager { #line 50 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Shapes.Rectangle rectSide; - - #line default - #line hidden - - - #line 51 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.StackPanel leftStackPanel; + internal System.Windows.Controls.ComboBox comboBoxMaps; #line default #line hidden @@ -115,7 +139,7 @@ namespace Config_Manager { #line 55 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.CheckBox chkHelmet; + internal System.Windows.Controls.TextBlock txtEasterEggMetres; #line default #line hidden @@ -123,7 +147,7 @@ namespace Config_Manager { #line 56 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.CheckBox chkKevlar; + internal System.Windows.Controls.TextBlock textDistanceMetres; #line default #line hidden @@ -131,23 +155,7 @@ namespace Config_Manager { #line 60 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.RadioButton radioHead; - - #line default - #line hidden - - - #line 61 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.RadioButton radioChestArms; - - #line default - #line hidden - - - #line 62 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.RadioButton radioStomach; + internal System.Windows.Controls.TextBlock textDistanceUnits; #line default #line hidden @@ -155,15 +163,39 @@ namespace Config_Manager { #line 63 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.RadioButton radioLegs; + internal System.Windows.Shapes.Rectangle rectTop; #line default #line hidden - #line 67 "..\..\MainWindow.xaml" + #line 64 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.ComboBox comboWeapons; + internal System.Windows.Shapes.Rectangle rectSide; + + #line default + #line hidden + + + #line 65 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.StackPanel leftStackPanel; + + #line default + #line hidden + + + #line 69 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.StackPanel stackArmorSeparated; + + #line default + #line hidden + + + #line 70 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.CheckBox chkHelmet; #line default #line hidden @@ -171,15 +203,47 @@ namespace Config_Manager { #line 71 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock txtResult; + internal System.Windows.Controls.CheckBox chkKevlar; #line default #line hidden - #line 72 "..\..\MainWindow.xaml" + #line 73 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock txtResultArmor; + internal System.Windows.Controls.CheckBox chkArmorAny; + + #line default + #line hidden + + + #line 75 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.StackPanel stackAreaHit; + + #line default + #line hidden + + + #line 77 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.RadioButton radioHead; + + #line default + #line hidden + + + #line 78 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.RadioButton radioChestArms; + + #line default + #line hidden + + + #line 79 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.RadioButton radioStomach; #line default #line hidden @@ -187,7 +251,15 @@ namespace Config_Manager { #line 80 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock txtCursorX; + internal System.Windows.Controls.RadioButton radioLegs; + + #line default + #line hidden + + + #line 82 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.StackPanel stackWeaponUsed; #line default #line hidden @@ -195,15 +267,7 @@ namespace Config_Manager { #line 84 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock txtCursorY; - - #line default - #line hidden - - - #line 87 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Grid rightGrid; + internal System.Windows.Controls.ComboBox comboWeapons; #line default #line hidden @@ -211,7 +275,7 @@ namespace Config_Manager { #line 88 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Image mapImage; + internal System.Windows.Controls.TextBlock txtResult; #line default #line hidden @@ -219,13 +283,85 @@ namespace Config_Manager { #line 89 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock txtResultArmor; + + #line default + #line hidden + + + #line 96 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.CheckBox chkHasMapFile; + + #line default + #line hidden + + + #line 97 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.CheckBox chkHasNavFile; + + #line default + #line hidden + + + #line 100 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock txtBombMaxDamage; + + #line default + #line hidden + + + #line 104 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock txtBombRadius; + + #line default + #line hidden + + + #line 111 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock txtCursorX; + + #line default + #line hidden + + + #line 115 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock txtCursorY; + + #line default + #line hidden + + + #line 120 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Viewbox rightViewbox; + + #line default + #line hidden + + + #line 122 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Image mapImage; + + #line default + #line hidden + + + #line 123 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas pointsCanvas; #line default #line hidden - #line 92 "..\..\MainWindow.xaml" + #line 127 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Grid gridLoading; @@ -264,188 +400,341 @@ namespace Config_Manager { { case 1: - #line 11 "..\..\MainWindow.xaml" - ((Config_Manager.MainWindow)(target)).MouseMove += new System.Windows.Input.MouseEventHandler(this.Window_MouseMove); + #line 12 "..\..\MainWindow.xaml" + ((Damage_Calculator.MainWindow)(target)).MouseMove += new System.Windows.Input.MouseEventHandler(this.Window_MouseMove); #line default #line hidden - #line 12 "..\..\MainWindow.xaml" - ((Config_Manager.MainWindow)(target)).KeyDown += new System.Windows.Input.KeyEventHandler(this.Window_KeyDown); + #line 13 "..\..\MainWindow.xaml" + ((Damage_Calculator.MainWindow)(target)).KeyDown += new System.Windows.Input.KeyEventHandler(this.Window_KeyDown); #line default #line hidden return; case 2: + this.mnuShowBombSites = ((System.Windows.Controls.MenuItem)(target)); #line 17 "..\..\MainWindow.xaml" - ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); + this.mnuShowBombSites.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); + + #line default + #line hidden + + #line 17 "..\..\MainWindow.xaml" + this.mnuShowBombSites.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden return; case 3: + this.mnuShowSpawnAreas = ((System.Windows.Controls.MenuItem)(target)); #line 18 "..\..\MainWindow.xaml" - ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); + this.mnuShowSpawnAreas.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); + + #line default + #line hidden + + #line 18 "..\..\MainWindow.xaml" + this.mnuShowSpawnAreas.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden return; case 4: - this.mnuHelp = ((System.Windows.Controls.MenuItem)(target)); + this.mnuShowStandardSpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 22 "..\..\MainWindow.xaml" - this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click); + #line 19 "..\..\MainWindow.xaml" + this.mnuShowStandardSpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); + + #line default + #line hidden + + #line 19 "..\..\MainWindow.xaml" + this.mnuShowStandardSpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden return; case 5: - this.topStackPanel = ((System.Windows.Controls.StackPanel)(target)); + this.mnuShow2v2Spawns = ((System.Windows.Controls.MenuItem)(target)); + + #line 20 "..\..\MainWindow.xaml" + this.mnuShow2v2Spawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); + + #line default + #line hidden + + #line 20 "..\..\MainWindow.xaml" + this.mnuShow2v2Spawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); + + #line default + #line hidden return; case 6: - this.comboBoxMaps = ((System.Windows.Controls.ComboBox)(target)); + this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 36 "..\..\MainWindow.xaml" - this.comboBoxMaps.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboBoxMaps_SelectionChanged); + #line 21 "..\..\MainWindow.xaml" + this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); + + #line default + #line hidden + + #line 21 "..\..\MainWindow.xaml" + this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden return; case 7: - this.txtEasterEggMetres = ((System.Windows.Controls.TextBlock)(target)); - return; - case 8: - this.textDistanceMetres = ((System.Windows.Controls.TextBlock)(target)); - return; - case 9: - this.textDistanceUnits = ((System.Windows.Controls.TextBlock)(target)); - return; - case 10: - this.rectTop = ((System.Windows.Shapes.Rectangle)(target)); - return; - case 11: - this.rectSide = ((System.Windows.Shapes.Rectangle)(target)); - return; - case 12: - this.leftStackPanel = ((System.Windows.Controls.StackPanel)(target)); - return; - case 13: - this.chkHelmet = ((System.Windows.Controls.CheckBox)(target)); + this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target)); - #line 55 "..\..\MainWindow.xaml" - this.chkHelmet.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + #line 22 "..\..\MainWindow.xaml" + this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 55 "..\..\MainWindow.xaml" - this.chkHelmet.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); + #line 22 "..\..\MainWindow.xaml" + this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); + + #line default + #line hidden + return; + case 8: + + #line 25 "..\..\MainWindow.xaml" + ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); + + #line default + #line hidden + return; + case 9: + + #line 26 "..\..\MainWindow.xaml" + ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); + + #line default + #line hidden + return; + case 10: + this.mnuAbout = ((System.Windows.Controls.MenuItem)(target)); + + #line 30 "..\..\MainWindow.xaml" + this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click); + + #line default + #line hidden + return; + case 11: + this.mnuHelp = ((System.Windows.Controls.MenuItem)(target)); + + #line 31 "..\..\MainWindow.xaml" + this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click); + + #line default + #line hidden + return; + case 12: + this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target)); + + #line 45 "..\..\MainWindow.xaml" + this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked); + + #line default + #line hidden + return; + case 13: + this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target)); + + #line 46 "..\..\MainWindow.xaml" + this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked); #line default #line hidden return; case 14: - this.chkKevlar = ((System.Windows.Controls.CheckBox)(target)); - - #line 56 "..\..\MainWindow.xaml" - this.chkKevlar.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); - - #line default - #line hidden - - #line 56 "..\..\MainWindow.xaml" - this.chkKevlar.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); - - #line default - #line hidden + this.topStackPanel = ((System.Windows.Controls.StackPanel)(target)); return; case 15: - this.radioHead = ((System.Windows.Controls.RadioButton)(target)); + this.comboBoxMaps = ((System.Windows.Controls.ComboBox)(target)); - #line 60 "..\..\MainWindow.xaml" - this.radioHead.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + #line 50 "..\..\MainWindow.xaml" + this.comboBoxMaps.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboBoxMaps_SelectionChanged); #line default #line hidden return; case 16: - this.radioChestArms = ((System.Windows.Controls.RadioButton)(target)); - - #line 61 "..\..\MainWindow.xaml" - this.radioChestArms.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); - - #line default - #line hidden + this.txtEasterEggMetres = ((System.Windows.Controls.TextBlock)(target)); return; case 17: - this.radioStomach = ((System.Windows.Controls.RadioButton)(target)); - - #line 62 "..\..\MainWindow.xaml" - this.radioStomach.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); - - #line default - #line hidden + this.textDistanceMetres = ((System.Windows.Controls.TextBlock)(target)); return; case 18: - this.radioLegs = ((System.Windows.Controls.RadioButton)(target)); - - #line 63 "..\..\MainWindow.xaml" - this.radioLegs.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); - - #line default - #line hidden + this.textDistanceUnits = ((System.Windows.Controls.TextBlock)(target)); return; case 19: - this.comboWeapons = ((System.Windows.Controls.ComboBox)(target)); - - #line 67 "..\..\MainWindow.xaml" - this.comboWeapons.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboWeapons_SelectionChanged); - - #line default - #line hidden + this.rectTop = ((System.Windows.Shapes.Rectangle)(target)); return; case 20: - this.txtResult = ((System.Windows.Controls.TextBlock)(target)); + this.rectSide = ((System.Windows.Shapes.Rectangle)(target)); return; case 21: - this.txtResultArmor = ((System.Windows.Controls.TextBlock)(target)); + this.leftStackPanel = ((System.Windows.Controls.StackPanel)(target)); return; case 22: - this.txtCursorX = ((System.Windows.Controls.TextBlock)(target)); + this.stackArmorSeparated = ((System.Windows.Controls.StackPanel)(target)); return; case 23: - this.txtCursorY = ((System.Windows.Controls.TextBlock)(target)); + this.chkHelmet = ((System.Windows.Controls.CheckBox)(target)); + + #line 70 "..\..\MainWindow.xaml" + this.chkHelmet.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden + + #line 70 "..\..\MainWindow.xaml" + this.chkHelmet.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden return; case 24: - this.rightGrid = ((System.Windows.Controls.Grid)(target)); + this.chkKevlar = ((System.Windows.Controls.CheckBox)(target)); + + #line 71 "..\..\MainWindow.xaml" + this.chkKevlar.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden + + #line 71 "..\..\MainWindow.xaml" + this.chkKevlar.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden return; case 25: - this.mapImage = ((System.Windows.Controls.Image)(target)); + this.chkArmorAny = ((System.Windows.Controls.CheckBox)(target)); - #line 88 "..\..\MainWindow.xaml" - this.mapImage.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseLeftButtonUp); + #line 73 "..\..\MainWindow.xaml" + this.chkArmorAny.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 88 "..\..\MainWindow.xaml" - this.mapImage.MouseRightButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseRightButtonUp); - - #line default - #line hidden - - #line 88 "..\..\MainWindow.xaml" - this.mapImage.LayoutUpdated += new System.EventHandler(this.mapImage_LayoutUpdated); + #line 73 "..\..\MainWindow.xaml" + this.chkArmorAny.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden return; case 26: - this.pointsCanvas = ((System.Windows.Controls.Canvas)(target)); + this.stackAreaHit = ((System.Windows.Controls.StackPanel)(target)); return; case 27: + this.radioHead = ((System.Windows.Controls.RadioButton)(target)); + + #line 77 "..\..\MainWindow.xaml" + this.radioHead.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden + return; + case 28: + this.radioChestArms = ((System.Windows.Controls.RadioButton)(target)); + + #line 78 "..\..\MainWindow.xaml" + this.radioChestArms.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden + return; + case 29: + this.radioStomach = ((System.Windows.Controls.RadioButton)(target)); + + #line 79 "..\..\MainWindow.xaml" + this.radioStomach.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden + return; + case 30: + this.radioLegs = ((System.Windows.Controls.RadioButton)(target)); + + #line 80 "..\..\MainWindow.xaml" + this.radioLegs.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden + return; + case 31: + this.stackWeaponUsed = ((System.Windows.Controls.StackPanel)(target)); + return; + case 32: + this.comboWeapons = ((System.Windows.Controls.ComboBox)(target)); + + #line 84 "..\..\MainWindow.xaml" + this.comboWeapons.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboWeapons_SelectionChanged); + + #line default + #line hidden + return; + case 33: + this.txtResult = ((System.Windows.Controls.TextBlock)(target)); + return; + case 34: + this.txtResultArmor = ((System.Windows.Controls.TextBlock)(target)); + return; + case 35: + this.chkHasMapFile = ((System.Windows.Controls.CheckBox)(target)); + return; + case 36: + this.chkHasNavFile = ((System.Windows.Controls.CheckBox)(target)); + return; + case 37: + this.txtBombMaxDamage = ((System.Windows.Controls.TextBlock)(target)); + return; + case 38: + this.txtBombRadius = ((System.Windows.Controls.TextBlock)(target)); + return; + case 39: + this.txtCursorX = ((System.Windows.Controls.TextBlock)(target)); + return; + case 40: + this.txtCursorY = ((System.Windows.Controls.TextBlock)(target)); + return; + case 41: + this.rightViewbox = ((System.Windows.Controls.Viewbox)(target)); + return; + case 42: + this.mapImage = ((System.Windows.Controls.Image)(target)); + + #line 122 "..\..\MainWindow.xaml" + this.mapImage.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseLeftButtonUp); + + #line default + #line hidden + + #line 122 "..\..\MainWindow.xaml" + this.mapImage.MouseRightButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseRightButtonUp); + + #line default + #line hidden + + #line 122 "..\..\MainWindow.xaml" + this.mapImage.LayoutUpdated += new System.EventHandler(this.mapImage_LayoutUpdated); + + #line default + #line hidden + return; + case 43: + this.pointsCanvas = ((System.Windows.Controls.Canvas)(target)); + return; + case 44: this.gridLoading = ((System.Windows.Controls.Grid)(target)); return; } diff --git a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs index 6035cbc..bd8c7f7 100644 --- a/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs +++ b/DamageCalculator/DamageCalculator/obj/Release/MainWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B0EBF792E0410B5EE059E35E8EF5924C4C8E4790692A28A9307AEC26FE41EA89" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9F019158B8352DCE8981F0BC66CF6ED55D2097B5B9C746213F2697B990FD5B48" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -9,7 +9,7 @@ // //------------------------------------------------------------------------------ -using Config_Manager; +using Damage_Calculator; using System; using System.Diagnostics; using System.Windows; @@ -32,7 +32,7 @@ using System.Windows.Shapes; using System.Windows.Shell; -namespace Config_Manager { +namespace Damage_Calculator { /// @@ -41,41 +41,73 @@ namespace Config_Manager { public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { + #line 17 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.MenuItem mnuShowBombSites; + + #line default + #line hidden + + + #line 18 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.MenuItem mnuShowSpawnAreas; + + #line default + #line hidden + + + #line 19 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.MenuItem mnuShowStandardSpawns; + + #line default + #line hidden + + + #line 20 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.MenuItem mnuShow2v2Spawns; + + #line default + #line hidden + + + #line 21 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.MenuItem mnuAllowNonPrioritySpawns; + + #line default + #line hidden + + #line 22 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.MenuItem mnuShowDrawnMarkers; + + #line default + #line hidden + + + #line 30 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.MenuItem mnuAbout; + + #line default + #line hidden + + + #line 31 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.MenuItem mnuHelp; #line default #line hidden - #line 34 "..\..\MainWindow.xaml" + #line 45 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.StackPanel topStackPanel; - - #line default - #line hidden - - - #line 36 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.ComboBox comboBoxMaps; - - #line default - #line hidden - - - #line 41 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock txtEasterEggMetres; - - #line default - #line hidden - - - #line 42 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock textDistanceMetres; + internal System.Windows.Controls.RadioButton radioModeShooting; #line default #line hidden @@ -83,15 +115,15 @@ namespace Config_Manager { #line 46 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock textDistanceUnits; + internal System.Windows.Controls.RadioButton radioModeBomb; #line default #line hidden - #line 49 "..\..\MainWindow.xaml" + #line 48 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Shapes.Rectangle rectTop; + internal System.Windows.Controls.StackPanel topStackPanel; #line default #line hidden @@ -99,15 +131,7 @@ namespace Config_Manager { #line 50 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Shapes.Rectangle rectSide; - - #line default - #line hidden - - - #line 51 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.StackPanel leftStackPanel; + internal System.Windows.Controls.ComboBox comboBoxMaps; #line default #line hidden @@ -115,7 +139,7 @@ namespace Config_Manager { #line 55 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.CheckBox chkHelmet; + internal System.Windows.Controls.TextBlock txtEasterEggMetres; #line default #line hidden @@ -123,7 +147,7 @@ namespace Config_Manager { #line 56 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.CheckBox chkKevlar; + internal System.Windows.Controls.TextBlock textDistanceMetres; #line default #line hidden @@ -131,23 +155,7 @@ namespace Config_Manager { #line 60 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.RadioButton radioHead; - - #line default - #line hidden - - - #line 61 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.RadioButton radioChestArms; - - #line default - #line hidden - - - #line 62 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.RadioButton radioStomach; + internal System.Windows.Controls.TextBlock textDistanceUnits; #line default #line hidden @@ -155,15 +163,39 @@ namespace Config_Manager { #line 63 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.RadioButton radioLegs; + internal System.Windows.Shapes.Rectangle rectTop; #line default #line hidden - #line 67 "..\..\MainWindow.xaml" + #line 64 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.ComboBox comboWeapons; + internal System.Windows.Shapes.Rectangle rectSide; + + #line default + #line hidden + + + #line 65 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.StackPanel leftStackPanel; + + #line default + #line hidden + + + #line 69 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.StackPanel stackArmorSeparated; + + #line default + #line hidden + + + #line 70 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.CheckBox chkHelmet; #line default #line hidden @@ -171,15 +203,47 @@ namespace Config_Manager { #line 71 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock txtResult; + internal System.Windows.Controls.CheckBox chkKevlar; #line default #line hidden - #line 72 "..\..\MainWindow.xaml" + #line 73 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock txtResultArmor; + internal System.Windows.Controls.CheckBox chkArmorAny; + + #line default + #line hidden + + + #line 75 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.StackPanel stackAreaHit; + + #line default + #line hidden + + + #line 77 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.RadioButton radioHead; + + #line default + #line hidden + + + #line 78 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.RadioButton radioChestArms; + + #line default + #line hidden + + + #line 79 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.RadioButton radioStomach; #line default #line hidden @@ -187,7 +251,15 @@ namespace Config_Manager { #line 80 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock txtCursorX; + internal System.Windows.Controls.RadioButton radioLegs; + + #line default + #line hidden + + + #line 82 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.StackPanel stackWeaponUsed; #line default #line hidden @@ -195,15 +267,7 @@ namespace Config_Manager { #line 84 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.TextBlock txtCursorY; - - #line default - #line hidden - - - #line 87 "..\..\MainWindow.xaml" - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Grid rightGrid; + internal System.Windows.Controls.ComboBox comboWeapons; #line default #line hidden @@ -211,7 +275,7 @@ namespace Config_Manager { #line 88 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] - internal System.Windows.Controls.Image mapImage; + internal System.Windows.Controls.TextBlock txtResult; #line default #line hidden @@ -219,13 +283,85 @@ namespace Config_Manager { #line 89 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock txtResultArmor; + + #line default + #line hidden + + + #line 96 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.CheckBox chkHasMapFile; + + #line default + #line hidden + + + #line 97 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.CheckBox chkHasNavFile; + + #line default + #line hidden + + + #line 100 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock txtBombMaxDamage; + + #line default + #line hidden + + + #line 104 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock txtBombRadius; + + #line default + #line hidden + + + #line 111 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock txtCursorX; + + #line default + #line hidden + + + #line 115 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock txtCursorY; + + #line default + #line hidden + + + #line 120 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Viewbox rightViewbox; + + #line default + #line hidden + + + #line 122 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Image mapImage; + + #line default + #line hidden + + + #line 123 "..\..\MainWindow.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas pointsCanvas; #line default #line hidden - #line 92 "..\..\MainWindow.xaml" + #line 127 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Grid gridLoading; @@ -264,188 +400,341 @@ namespace Config_Manager { { case 1: - #line 11 "..\..\MainWindow.xaml" - ((Config_Manager.MainWindow)(target)).MouseMove += new System.Windows.Input.MouseEventHandler(this.Window_MouseMove); + #line 12 "..\..\MainWindow.xaml" + ((Damage_Calculator.MainWindow)(target)).MouseMove += new System.Windows.Input.MouseEventHandler(this.Window_MouseMove); #line default #line hidden - #line 12 "..\..\MainWindow.xaml" - ((Config_Manager.MainWindow)(target)).KeyDown += new System.Windows.Input.KeyEventHandler(this.Window_KeyDown); + #line 13 "..\..\MainWindow.xaml" + ((Damage_Calculator.MainWindow)(target)).KeyDown += new System.Windows.Input.KeyEventHandler(this.Window_KeyDown); #line default #line hidden return; case 2: + this.mnuShowBombSites = ((System.Windows.Controls.MenuItem)(target)); #line 17 "..\..\MainWindow.xaml" - ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); + this.mnuShowBombSites.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); + + #line default + #line hidden + + #line 17 "..\..\MainWindow.xaml" + this.mnuShowBombSites.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden return; case 3: + this.mnuShowSpawnAreas = ((System.Windows.Controls.MenuItem)(target)); #line 18 "..\..\MainWindow.xaml" - ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); + this.mnuShowSpawnAreas.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); + + #line default + #line hidden + + #line 18 "..\..\MainWindow.xaml" + this.mnuShowSpawnAreas.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden return; case 4: - this.mnuHelp = ((System.Windows.Controls.MenuItem)(target)); + this.mnuShowStandardSpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 22 "..\..\MainWindow.xaml" - this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click); + #line 19 "..\..\MainWindow.xaml" + this.mnuShowStandardSpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); + + #line default + #line hidden + + #line 19 "..\..\MainWindow.xaml" + this.mnuShowStandardSpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden return; case 5: - this.topStackPanel = ((System.Windows.Controls.StackPanel)(target)); + this.mnuShow2v2Spawns = ((System.Windows.Controls.MenuItem)(target)); + + #line 20 "..\..\MainWindow.xaml" + this.mnuShow2v2Spawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); + + #line default + #line hidden + + #line 20 "..\..\MainWindow.xaml" + this.mnuShow2v2Spawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); + + #line default + #line hidden return; case 6: - this.comboBoxMaps = ((System.Windows.Controls.ComboBox)(target)); + this.mnuAllowNonPrioritySpawns = ((System.Windows.Controls.MenuItem)(target)); - #line 36 "..\..\MainWindow.xaml" - this.comboBoxMaps.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboBoxMaps_SelectionChanged); + #line 21 "..\..\MainWindow.xaml" + this.mnuAllowNonPrioritySpawns.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); + + #line default + #line hidden + + #line 21 "..\..\MainWindow.xaml" + this.mnuAllowNonPrioritySpawns.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden return; case 7: - this.txtEasterEggMetres = ((System.Windows.Controls.TextBlock)(target)); - return; - case 8: - this.textDistanceMetres = ((System.Windows.Controls.TextBlock)(target)); - return; - case 9: - this.textDistanceUnits = ((System.Windows.Controls.TextBlock)(target)); - return; - case 10: - this.rectTop = ((System.Windows.Shapes.Rectangle)(target)); - return; - case 11: - this.rectSide = ((System.Windows.Shapes.Rectangle)(target)); - return; - case 12: - this.leftStackPanel = ((System.Windows.Controls.StackPanel)(target)); - return; - case 13: - this.chkHelmet = ((System.Windows.Controls.CheckBox)(target)); + this.mnuShowDrawnMarkers = ((System.Windows.Controls.MenuItem)(target)); - #line 55 "..\..\MainWindow.xaml" - this.chkHelmet.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + #line 22 "..\..\MainWindow.xaml" + this.mnuShowDrawnMarkers.Checked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); #line default #line hidden - #line 55 "..\..\MainWindow.xaml" - this.chkHelmet.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); + #line 22 "..\..\MainWindow.xaml" + this.mnuShowDrawnMarkers.Unchecked += new System.Windows.RoutedEventHandler(this.visibilityMenu_CheckChanged); + + #line default + #line hidden + return; + case 8: + + #line 25 "..\..\MainWindow.xaml" + ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); + + #line default + #line hidden + return; + case 9: + + #line 26 "..\..\MainWindow.xaml" + ((System.Windows.Controls.MenuItem)(target)).Click += new System.Windows.RoutedEventHandler(this.changeTheme_Click); + + #line default + #line hidden + return; + case 10: + this.mnuAbout = ((System.Windows.Controls.MenuItem)(target)); + + #line 30 "..\..\MainWindow.xaml" + this.mnuAbout.Click += new System.Windows.RoutedEventHandler(this.mnuAbout_Click); + + #line default + #line hidden + return; + case 11: + this.mnuHelp = ((System.Windows.Controls.MenuItem)(target)); + + #line 31 "..\..\MainWindow.xaml" + this.mnuHelp.Click += new System.Windows.RoutedEventHandler(this.mnuHelp_Click); + + #line default + #line hidden + return; + case 12: + this.radioModeShooting = ((System.Windows.Controls.RadioButton)(target)); + + #line 45 "..\..\MainWindow.xaml" + this.radioModeShooting.Checked += new System.Windows.RoutedEventHandler(this.radioModeShooting_Checked); + + #line default + #line hidden + return; + case 13: + this.radioModeBomb = ((System.Windows.Controls.RadioButton)(target)); + + #line 46 "..\..\MainWindow.xaml" + this.radioModeBomb.Checked += new System.Windows.RoutedEventHandler(this.radioModeBomb_Checked); #line default #line hidden return; case 14: - this.chkKevlar = ((System.Windows.Controls.CheckBox)(target)); - - #line 56 "..\..\MainWindow.xaml" - this.chkKevlar.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); - - #line default - #line hidden - - #line 56 "..\..\MainWindow.xaml" - this.chkKevlar.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); - - #line default - #line hidden + this.topStackPanel = ((System.Windows.Controls.StackPanel)(target)); return; case 15: - this.radioHead = ((System.Windows.Controls.RadioButton)(target)); + this.comboBoxMaps = ((System.Windows.Controls.ComboBox)(target)); - #line 60 "..\..\MainWindow.xaml" - this.radioHead.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + #line 50 "..\..\MainWindow.xaml" + this.comboBoxMaps.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboBoxMaps_SelectionChanged); #line default #line hidden return; case 16: - this.radioChestArms = ((System.Windows.Controls.RadioButton)(target)); - - #line 61 "..\..\MainWindow.xaml" - this.radioChestArms.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); - - #line default - #line hidden + this.txtEasterEggMetres = ((System.Windows.Controls.TextBlock)(target)); return; case 17: - this.radioStomach = ((System.Windows.Controls.RadioButton)(target)); - - #line 62 "..\..\MainWindow.xaml" - this.radioStomach.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); - - #line default - #line hidden + this.textDistanceMetres = ((System.Windows.Controls.TextBlock)(target)); return; case 18: - this.radioLegs = ((System.Windows.Controls.RadioButton)(target)); - - #line 63 "..\..\MainWindow.xaml" - this.radioLegs.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); - - #line default - #line hidden + this.textDistanceUnits = ((System.Windows.Controls.TextBlock)(target)); return; case 19: - this.comboWeapons = ((System.Windows.Controls.ComboBox)(target)); - - #line 67 "..\..\MainWindow.xaml" - this.comboWeapons.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboWeapons_SelectionChanged); - - #line default - #line hidden + this.rectTop = ((System.Windows.Shapes.Rectangle)(target)); return; case 20: - this.txtResult = ((System.Windows.Controls.TextBlock)(target)); + this.rectSide = ((System.Windows.Shapes.Rectangle)(target)); return; case 21: - this.txtResultArmor = ((System.Windows.Controls.TextBlock)(target)); + this.leftStackPanel = ((System.Windows.Controls.StackPanel)(target)); return; case 22: - this.txtCursorX = ((System.Windows.Controls.TextBlock)(target)); + this.stackArmorSeparated = ((System.Windows.Controls.StackPanel)(target)); return; case 23: - this.txtCursorY = ((System.Windows.Controls.TextBlock)(target)); + this.chkHelmet = ((System.Windows.Controls.CheckBox)(target)); + + #line 70 "..\..\MainWindow.xaml" + this.chkHelmet.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden + + #line 70 "..\..\MainWindow.xaml" + this.chkHelmet.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden return; case 24: - this.rightGrid = ((System.Windows.Controls.Grid)(target)); + this.chkKevlar = ((System.Windows.Controls.CheckBox)(target)); + + #line 71 "..\..\MainWindow.xaml" + this.chkKevlar.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden + + #line 71 "..\..\MainWindow.xaml" + this.chkKevlar.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden return; case 25: - this.mapImage = ((System.Windows.Controls.Image)(target)); + this.chkArmorAny = ((System.Windows.Controls.CheckBox)(target)); - #line 88 "..\..\MainWindow.xaml" - this.mapImage.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseLeftButtonUp); + #line 73 "..\..\MainWindow.xaml" + this.chkArmorAny.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden - #line 88 "..\..\MainWindow.xaml" - this.mapImage.MouseRightButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseRightButtonUp); - - #line default - #line hidden - - #line 88 "..\..\MainWindow.xaml" - this.mapImage.LayoutUpdated += new System.EventHandler(this.mapImage_LayoutUpdated); + #line 73 "..\..\MainWindow.xaml" + this.chkArmorAny.Unchecked += new System.Windows.RoutedEventHandler(this.settings_Updated); #line default #line hidden return; case 26: - this.pointsCanvas = ((System.Windows.Controls.Canvas)(target)); + this.stackAreaHit = ((System.Windows.Controls.StackPanel)(target)); return; case 27: + this.radioHead = ((System.Windows.Controls.RadioButton)(target)); + + #line 77 "..\..\MainWindow.xaml" + this.radioHead.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden + return; + case 28: + this.radioChestArms = ((System.Windows.Controls.RadioButton)(target)); + + #line 78 "..\..\MainWindow.xaml" + this.radioChestArms.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden + return; + case 29: + this.radioStomach = ((System.Windows.Controls.RadioButton)(target)); + + #line 79 "..\..\MainWindow.xaml" + this.radioStomach.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden + return; + case 30: + this.radioLegs = ((System.Windows.Controls.RadioButton)(target)); + + #line 80 "..\..\MainWindow.xaml" + this.radioLegs.Checked += new System.Windows.RoutedEventHandler(this.settings_Updated); + + #line default + #line hidden + return; + case 31: + this.stackWeaponUsed = ((System.Windows.Controls.StackPanel)(target)); + return; + case 32: + this.comboWeapons = ((System.Windows.Controls.ComboBox)(target)); + + #line 84 "..\..\MainWindow.xaml" + this.comboWeapons.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.comboWeapons_SelectionChanged); + + #line default + #line hidden + return; + case 33: + this.txtResult = ((System.Windows.Controls.TextBlock)(target)); + return; + case 34: + this.txtResultArmor = ((System.Windows.Controls.TextBlock)(target)); + return; + case 35: + this.chkHasMapFile = ((System.Windows.Controls.CheckBox)(target)); + return; + case 36: + this.chkHasNavFile = ((System.Windows.Controls.CheckBox)(target)); + return; + case 37: + this.txtBombMaxDamage = ((System.Windows.Controls.TextBlock)(target)); + return; + case 38: + this.txtBombRadius = ((System.Windows.Controls.TextBlock)(target)); + return; + case 39: + this.txtCursorX = ((System.Windows.Controls.TextBlock)(target)); + return; + case 40: + this.txtCursorY = ((System.Windows.Controls.TextBlock)(target)); + return; + case 41: + this.rightViewbox = ((System.Windows.Controls.Viewbox)(target)); + return; + case 42: + this.mapImage = ((System.Windows.Controls.Image)(target)); + + #line 122 "..\..\MainWindow.xaml" + this.mapImage.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseLeftButtonUp); + + #line default + #line hidden + + #line 122 "..\..\MainWindow.xaml" + this.mapImage.MouseRightButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.mapImage_MouseRightButtonUp); + + #line default + #line hidden + + #line 122 "..\..\MainWindow.xaml" + this.mapImage.LayoutUpdated += new System.EventHandler(this.mapImage_LayoutUpdated); + + #line default + #line hidden + return; + case 43: + this.pointsCanvas = ((System.Windows.Controls.Canvas)(target)); + return; + case 44: this.gridLoading = ((System.Windows.Controls.Grid)(target)); return; } diff --git a/DamageCalculator/DamageCalculator/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/DamageCalculator/DamageCalculator/obj/Release/TempPE/Properties.Resources.Designer.cs.dll index 4404400..5685eee 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and b/DamageCalculator/DamageCalculator/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/Themes/ColourfulDarkTheme.baml b/DamageCalculator/DamageCalculator/obj/Release/Themes/ColourfulDarkTheme.baml index 4763a97..87769f6 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/Themes/ColourfulDarkTheme.baml and b/DamageCalculator/DamageCalculator/obj/Release/Themes/ColourfulDarkTheme.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/Themes/ColourfulLightTheme.baml b/DamageCalculator/DamageCalculator/obj/Release/Themes/ColourfulLightTheme.baml index 7bb21c5..35881d6 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/Themes/ColourfulLightTheme.baml and b/DamageCalculator/DamageCalculator/obj/Release/Themes/ColourfulLightTheme.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/Themes/DarkTheme.baml b/DamageCalculator/DamageCalculator/obj/Release/Themes/DarkTheme.baml index d76bca6..8cfc46c 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/Themes/DarkTheme.baml and b/DamageCalculator/DamageCalculator/obj/Release/Themes/DarkTheme.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/Themes/LightTheme.baml b/DamageCalculator/DamageCalculator/obj/Release/Themes/LightTheme.baml index a5a54d5..30b1ab8 100644 Binary files a/DamageCalculator/DamageCalculator/obj/Release/Themes/LightTheme.baml and b/DamageCalculator/DamageCalculator/obj/Release/Themes/LightTheme.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/ctrlPlayerSpawn.baml b/DamageCalculator/DamageCalculator/obj/Release/ctrlPlayerSpawn.baml new file mode 100644 index 0000000..9732cde Binary files /dev/null and b/DamageCalculator/DamageCalculator/obj/Release/ctrlPlayerSpawn.baml differ diff --git a/DamageCalculator/DamageCalculator/obj/Release/ctrlPlayerSpawn.g.cs b/DamageCalculator/DamageCalculator/obj/Release/ctrlPlayerSpawn.g.cs new file mode 100644 index 0000000..253268d --- /dev/null +++ b/DamageCalculator/DamageCalculator/obj/Release/ctrlPlayerSpawn.g.cs @@ -0,0 +1,111 @@ +#pragma checksum "..\..\ctrlPlayerSpawn.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "52E0901CDEE7706AF64B6F086D0E28AF076F4AD2AD06D8D38CB68287ACA6ED77" +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using Damage_Calculator; +using System; +using System.Diagnostics; +using System.Windows; +using System.Windows.Automation; +using System.Windows.Controls; +using System.Windows.Controls.Primitives; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Ink; +using System.Windows.Input; +using System.Windows.Markup; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Media.Effects; +using System.Windows.Media.Imaging; +using System.Windows.Media.Media3D; +using System.Windows.Media.TextFormatting; +using System.Windows.Navigation; +using System.Windows.Shapes; +using System.Windows.Shell; + + +namespace Damage_Calculator { + + + /// + /// ctrlPlayerSpawn + /// + public partial class ctrlPlayerSpawn : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { + + + #line 10 "..\..\ctrlPlayerSpawn.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Grid gridControl; + + #line default + #line hidden + + + #line 16 "..\..\ctrlPlayerSpawn.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Shapes.Ellipse ellipse; + + #line default + #line hidden + + + #line 17 "..\..\ctrlPlayerSpawn.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Shapes.Rectangle rectangle; + + #line default + #line hidden + + private bool _contentLoaded; + + /// + /// InitializeComponent + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + public void InitializeComponent() { + if (_contentLoaded) { + return; + } + _contentLoaded = true; + System.Uri resourceLocater = new System.Uri("/CSGO Damage Calculator;component/ctrlplayerspawn.xaml", System.UriKind.Relative); + + #line 1 "..\..\ctrlPlayerSpawn.xaml" + System.Windows.Application.LoadComponent(this, resourceLocater); + + #line default + #line hidden + } + + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] + void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) { + switch (connectionId) + { + case 1: + this.gridControl = ((System.Windows.Controls.Grid)(target)); + return; + case 2: + this.ellipse = ((System.Windows.Shapes.Ellipse)(target)); + return; + case 3: + this.rectangle = ((System.Windows.Shapes.Rectangle)(target)); + return; + } + this._contentLoaded = true; + } + } +} + diff --git a/DamageCalculator/DamageCalculator/obj/Release/ctrlPlayerSpawn.g.i.cs b/DamageCalculator/DamageCalculator/obj/Release/ctrlPlayerSpawn.g.i.cs new file mode 100644 index 0000000..253268d --- /dev/null +++ b/DamageCalculator/DamageCalculator/obj/Release/ctrlPlayerSpawn.g.i.cs @@ -0,0 +1,111 @@ +#pragma checksum "..\..\ctrlPlayerSpawn.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "52E0901CDEE7706AF64B6F086D0E28AF076F4AD2AD06D8D38CB68287ACA6ED77" +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using Damage_Calculator; +using System; +using System.Diagnostics; +using System.Windows; +using System.Windows.Automation; +using System.Windows.Controls; +using System.Windows.Controls.Primitives; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Ink; +using System.Windows.Input; +using System.Windows.Markup; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Media.Effects; +using System.Windows.Media.Imaging; +using System.Windows.Media.Media3D; +using System.Windows.Media.TextFormatting; +using System.Windows.Navigation; +using System.Windows.Shapes; +using System.Windows.Shell; + + +namespace Damage_Calculator { + + + /// + /// ctrlPlayerSpawn + /// + public partial class ctrlPlayerSpawn : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { + + + #line 10 "..\..\ctrlPlayerSpawn.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.Grid gridControl; + + #line default + #line hidden + + + #line 16 "..\..\ctrlPlayerSpawn.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Shapes.Ellipse ellipse; + + #line default + #line hidden + + + #line 17 "..\..\ctrlPlayerSpawn.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Shapes.Rectangle rectangle; + + #line default + #line hidden + + private bool _contentLoaded; + + /// + /// InitializeComponent + /// + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + public void InitializeComponent() { + if (_contentLoaded) { + return; + } + _contentLoaded = true; + System.Uri resourceLocater = new System.Uri("/CSGO Damage Calculator;component/ctrlplayerspawn.xaml", System.UriKind.Relative); + + #line 1 "..\..\ctrlPlayerSpawn.xaml" + System.Windows.Application.LoadComponent(this, resourceLocater); + + #line default + #line hidden + } + + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")] + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] + void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) { + switch (connectionId) + { + case 1: + this.gridControl = ((System.Windows.Controls.Grid)(target)); + return; + case 2: + this.ellipse = ((System.Windows.Shapes.Ellipse)(target)); + return; + case 3: + this.rectangle = ((System.Windows.Shapes.Rectangle)(target)); + return; + } + this._contentLoaded = true; + } + } +} +