diff --git a/DamageCalculator/DamageCalculator.sln b/DamageCalculator/DamageCalculator.sln index 103c065..0f08ba4 100644 --- a/DamageCalculator/DamageCalculator.sln +++ b/DamageCalculator/DamageCalculator.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.1.32228.430 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DamageCalculator", "DamageCalculator\DamageCalculator.csproj", "{7A7AE40F-8677-44E3-873A-4AB7C9FCFEB4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamHelpers", "..\Shared\SteamHelpers\SteamHelpers\SteamHelpers.csproj", "{3632D445-DC7D-43FC-AC66-8503F50FCA2A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamShared", "..\SteamShared\SteamShared\SteamShared\SteamShared.csproj", "{3632D445-DC7D-43FC-AC66-8503F50FCA2A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/DamageCalculator/DamageCalculator/DamageCalculator - Backup.csproj b/DamageCalculator/DamageCalculator/DamageCalculator - Backup.csproj index 5b51864..ae8908e 100644 --- a/DamageCalculator/DamageCalculator/DamageCalculator - Backup.csproj +++ b/DamageCalculator/DamageCalculator/DamageCalculator - Backup.csproj @@ -37,7 +37,7 @@ - + diff --git a/DamageCalculator/DamageCalculator/DamageCalculator.csproj b/DamageCalculator/DamageCalculator/DamageCalculator.csproj index b36596a..5b0672e 100644 --- a/DamageCalculator/DamageCalculator/DamageCalculator.csproj +++ b/DamageCalculator/DamageCalculator/DamageCalculator.csproj @@ -39,7 +39,7 @@ - + diff --git a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs index 1ad9146..b0639e8 100644 --- a/DamageCalculator/DamageCalculator/MainWindow.xaml.cs +++ b/DamageCalculator/DamageCalculator/MainWindow.xaml.cs @@ -14,8 +14,8 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -using Shared.Models; -using Shared.ZatVdfParser; +using SteamShared.Models; +using SteamShared.ZatVdfParser; using System.Xml.Serialization; using System.Globalization; using System.Collections.ObjectModel; @@ -94,8 +94,8 @@ namespace Damage_Calculator InitializeComponent(); Globals.LoadSettings(); - Shared.Globals.Settings.CsgoHelper.CsgoPath = Shared.Globals.Settings.SteamHelper.GetGamePathFromExactName("Counter-Strike: Global Offensive"); - if (Shared.Globals.Settings.CsgoHelper.CsgoPath == null) + SteamShared.Globals.Settings.CsgoHelper.CsgoPath = SteamShared.Globals.Settings.SteamHelper.GetGamePathFromExactName("Counter-Strike: Global Offensive"); + if (SteamShared.Globals.Settings.CsgoHelper.CsgoPath == null) { MessageBox.Show("Make sure you have installed CS:GO and Steam correctly.", "Error", MessageBoxButton.OK, MessageBoxImage.Error); this.Close(); @@ -289,13 +289,13 @@ namespace Damage_Calculator private void BgWorker_DoWork(object sender, DoWorkEventArgs e) { - var maps = Shared.Globals.Settings.CsgoHelper.GetMaps(); + var maps = SteamShared.Globals.Settings.CsgoHelper.GetMaps(); bgWorker.ReportProgress(0, maps); var serializer = new XmlSerializer(typeof(List)); List weapons; - string itemsFile = System.IO.Path.Combine(Shared.Globals.Settings.CsgoHelper.CsgoPath, "csgo\\scripts\\items\\items_game.txt"); + string itemsFile = System.IO.Path.Combine(SteamShared.Globals.Settings.CsgoHelper.CsgoPath, "csgo\\scripts\\items\\items_game.txt"); string saveFileDir = MainWindow.FilesPath; string currentHash = calculateMD5(itemsFile); @@ -329,7 +329,7 @@ namespace Damage_Calculator } // We didn't return cause we didn't find an up-to-date WPD file so parse new weapon data - weapons = Shared.Globals.Settings.CsgoHelper.GetWeapons(); + weapons = SteamShared.Globals.Settings.CsgoHelper.GetWeapons(); serializer.Serialize(new FileStream(System.IO.Path.Combine(saveFileDir, currentHash + MainWindow.WeaponsFileExtension), FileMode.Create), weapons); bgWorker.ReportProgress(1, weapons); } @@ -426,7 +426,7 @@ namespace Damage_Calculator map.AmountHostages = 0; map.SpawnPoints.Clear(); - map.EntityList = Shared.Globals.Settings.CsgoHelper.ReadEntityListFromBsp(map.BspFilePath); + map.EntityList = SteamShared.Globals.Settings.CsgoHelper.ReadEntityListFromBsp(map.BspFilePath); // Current format for one entity is: // @@ -543,7 +543,7 @@ namespace Damage_Calculator if (map.NavFilePath == null || map.AinFilePath == null) { // If either no NAV or no AIN file has been found, try to update them via the BSP pakfile - var navFilesFound = Shared.Globals.Settings.CsgoHelper.ReadIfPackedNavFilesInBsp(map.BspFilePath); + var navFilesFound = SteamShared.Globals.Settings.CsgoHelper.ReadIfPackedNavFilesInBsp(map.BspFilePath); if (navFilesFound.Item1) { map.NavFileBspPacked = true; @@ -560,7 +560,7 @@ namespace Damage_Calculator if(map.NavFilePath != null && !map.NavFileBspPacked) { // Nav file not packed and a file path for it is existent so parse it here - map.NavMesh = Shared.NavFile.Parse(new FileStream(map.NavFilePath, FileMode.Open)); + map.NavMesh = SteamShared.NavFile.Parse(new FileStream(map.NavFilePath, FileMode.Open)); } } @@ -701,14 +701,14 @@ namespace Damage_Calculator } } - if (Globals.Settings.NavDisplayMode != Shared.NavDisplayModes.None && navMeshesInCanvas.Count > 0 && this.mapCanvas.ActualWidth > 0 && this.mapCanvas.ActualHeight > 0) + if (Globals.Settings.NavDisplayMode != SteamShared.NavDisplayModes.None && navMeshesInCanvas.Count > 0 && this.mapCanvas.ActualWidth > 0 && this.mapCanvas.ActualHeight > 0) // Canvas has already settled - no need to redraw return; // Remove all NAV meshes from canvas navMeshesInCanvas.ForEach(navMesh => canvasRemove(navMesh)); - if (Globals.Settings.NavDisplayMode == Shared.NavDisplayModes.None) + if (Globals.Settings.NavDisplayMode == SteamShared.NavDisplayModes.None) // Don't draw and NAV areas if disabled return; @@ -721,7 +721,7 @@ namespace Damage_Calculator { // Don't draw area if it's not in the threshold that's set in the settings // First get the percentage of the average area height between the min and max area - double heightPercentage = Shared.Globals.Map(area.MedianPosition.Z, this.loadedMap.NavMesh.MinZ ?? 0, this.loadedMap.NavMesh.MaxZ ?? 0, 0, 1); + double heightPercentage = SteamShared.Globals.Map(area.MedianPosition.Z, this.loadedMap.NavMesh.MinZ ?? 0, this.loadedMap.NavMesh.MaxZ ?? 0, 0, 1); if (heightPercentage < Globals.Settings.ShowNavAreasAbove || heightPercentage > Globals.Settings.ShowNavAreasBelow) continue; @@ -1059,8 +1059,8 @@ namespace Damage_Calculator private void calculateDistanceDuration() { double timeRunning = this.unitsDistance / this.selectedWeapon.RunningSpeed; - double timeWalking = this.unitsDistance / (this.selectedWeapon.RunningSpeed * Shared.CsgoHelper.WalkModifier); - double timeCrouching = this.unitsDistance / (this.selectedWeapon.RunningSpeed * Shared.CsgoHelper.DuckModifier); + double timeWalking = this.unitsDistance / (this.selectedWeapon.RunningSpeed * SteamShared.CsgoHelper.WalkModifier); + double timeCrouching = this.unitsDistance / (this.selectedWeapon.RunningSpeed * SteamShared.CsgoHelper.DuckModifier); this.txtTimeRunning.Text = getTimeStringFromSeconds(timeRunning); this.txtTimeWalking.Text = getTimeStringFromSeconds(timeWalking); @@ -1254,8 +1254,8 @@ namespace Damage_Calculator foreach (Vector3[] group in groups) { - float xWeight = Shared.Globals.Map(x, group[1].X, group[0].X, 0, 1); - float yWeight = Shared.Globals.Map(y, group[2].Y, group[0].Y, 0, 1); + float xWeight = SteamShared.Globals.Map(x, group[1].X, group[0].X, 0, 1); + float yWeight = SteamShared.Globals.Map(y, group[2].Y, group[0].Y, 0, 1); float combinedWeight = xWeight * yWeight; resultHeight += combinedWeight * group[0].Z; @@ -1404,21 +1404,21 @@ namespace Damage_Calculator else { // Map average area height between two configurable colours - byte newA = (byte)Shared.Globals.Map(area.MedianPosition.Z, loadedMap.NavMesh.MinZ ?? 0, loadedMap.NavMesh.MaxZ ?? 0, Globals.Settings.NavLowColour.A, Globals.Settings.NavHighColour.A); - byte newR = (byte)Shared.Globals.Map(area.MedianPosition.Z, loadedMap.NavMesh.MinZ ?? 0, loadedMap.NavMesh.MaxZ ?? 0, Globals.Settings.NavLowColour.R, Globals.Settings.NavHighColour.R); - byte newG = (byte)Shared.Globals.Map(area.MedianPosition.Z, loadedMap.NavMesh.MinZ ?? 0, loadedMap.NavMesh.MaxZ ?? 0, Globals.Settings.NavLowColour.G, Globals.Settings.NavHighColour.G); - byte newB = (byte)Shared.Globals.Map(area.MedianPosition.Z, loadedMap.NavMesh.MinZ ?? 0, loadedMap.NavMesh.MaxZ ?? 0, Globals.Settings.NavLowColour.B, Globals.Settings.NavHighColour.B); + byte newA = (byte)SteamShared.Globals.Map(area.MedianPosition.Z, loadedMap.NavMesh.MinZ ?? 0, loadedMap.NavMesh.MaxZ ?? 0, Globals.Settings.NavLowColour.A, Globals.Settings.NavHighColour.A); + byte newR = (byte)SteamShared.Globals.Map(area.MedianPosition.Z, loadedMap.NavMesh.MinZ ?? 0, loadedMap.NavMesh.MaxZ ?? 0, Globals.Settings.NavLowColour.R, Globals.Settings.NavHighColour.R); + byte newG = (byte)SteamShared.Globals.Map(area.MedianPosition.Z, loadedMap.NavMesh.MinZ ?? 0, loadedMap.NavMesh.MaxZ ?? 0, Globals.Settings.NavLowColour.G, Globals.Settings.NavHighColour.G); + byte newB = (byte)SteamShared.Globals.Map(area.MedianPosition.Z, loadedMap.NavMesh.MinZ ?? 0, loadedMap.NavMesh.MaxZ ?? 0, Globals.Settings.NavLowColour.B, Globals.Settings.NavHighColour.B); newColour = Color.FromArgb(newA, newR, newG, newB); } switch (Globals.Settings.NavDisplayMode) { - case Shared.NavDisplayModes.Wireframe: + case SteamShared.NavDisplayModes.Wireframe: pathOfArea.Stroke = new SolidColorBrush(newColour); pathOfArea.StrokeThickness = 1; pathOfArea.Fill = null; break; - case Shared.NavDisplayModes.Filled: + case SteamShared.NavDisplayModes.Filled: pathOfArea.Stroke = null; pathOfArea.StrokeThickness = 0; pathOfArea.Fill = new SolidColorBrush(newColour); @@ -1440,7 +1440,7 @@ namespace Damage_Calculator if (this.hoveredNavAreas.Count > 0) { this.txtNavAreasAmount.Text = $"{(this.currentHeightLayer < 0 ? 0 : this.currentHeightLayer + 1)}/{this.hoveredNavAreas.Count}"; - this.txtNavAreaHeightPercentage.Text = Math.Round(Shared.Globals.Map(this.hoveredNavAreas[this.currentHeightLayer].MedianPosition.Z, this.loadedMap.NavMesh.MinZ ?? 0, this.loadedMap.NavMesh.MaxZ ?? 0, 0, 100), 1).ToString(CultureInfo.InvariantCulture) + " %"; + this.txtNavAreaHeightPercentage.Text = Math.Round(SteamShared.Globals.Map(this.hoveredNavAreas[this.currentHeightLayer].MedianPosition.Z, this.loadedMap.NavMesh.MinZ ?? 0, this.loadedMap.NavMesh.MaxZ ?? 0, 0, 100), 1).ToString(CultureInfo.InvariantCulture) + " %"; this.txtNavAreaID.Text = this.hoveredNavAreas[this.currentHeightLayer].ID.ToString(); this.txtNavAreaConnectionsAmount.Text = this.hoveredNavAreas[this.currentHeightLayer].ConnectionData.Sum(direction => direction.Count).ToString(); this.txtNavAreaPlace.Text = this.hoveredNavAreas[this.currentHeightLayer].PlaceID == 0 ? "None" : this.loadedMap.NavMesh.Header.PlacesNames[this.hoveredNavAreas[this.currentHeightLayer].PlaceID - 1]; diff --git a/DamageCalculator/DamageCalculator/Settings.cs b/DamageCalculator/DamageCalculator/Settings.cs index 4b6b4fb..1954a56 100644 --- a/DamageCalculator/DamageCalculator/Settings.cs +++ b/DamageCalculator/DamageCalculator/Settings.cs @@ -17,7 +17,7 @@ namespace Damage_Calculator // VISUAL SETTINGS public REghZyFramework.Themes.ThemesController.ThemeTypes Theme { get; set; } = REghZyFramework.Themes.ThemesController.ThemeTypes.Dark; - public List MapCoordinateOffsets { get; set; } = new(); + public List MapCoordinateOffsets { get; set; } = new(); public bool ShowBombSites { get; set; } = true; public bool ShowSpawnAreas { get; set; } = true; public bool ShowStandardSpawns { get; set; } = true; @@ -27,7 +27,7 @@ namespace Damage_Calculator public System.Windows.Media.Color NavLowColour { get; set; } = System.Windows.Media.Color.FromArgb(255, 20, 20, 20); public System.Windows.Media.Color NavHighColour { get; set; } = System.Windows.Media.Color.FromArgb(140, 255, 255, 255); public System.Windows.Media.Color NavHoverColour { get; set; } = System.Windows.Media.Color.FromArgb(140, 255, 165, 0); - public Shared.NavDisplayModes NavDisplayMode { get; set; } = Shared.NavDisplayModes.None; + public SteamShared.NavDisplayModes NavDisplayMode { get; set; } = SteamShared.NavDisplayModes.None; public double ShowNavAreasAbove { get; set; } = 0; public double ShowNavAreasBelow { get; set; } = 1; diff --git a/DamageCalculator/DamageCalculator/wndSettings.xaml.cs b/DamageCalculator/DamageCalculator/wndSettings.xaml.cs index 8328000..6a3c2c9 100644 --- a/DamageCalculator/DamageCalculator/wndSettings.xaml.cs +++ b/DamageCalculator/DamageCalculator/wndSettings.xaml.cs @@ -27,14 +27,14 @@ namespace Damage_Calculator /// /// We need this to set the map coordinate offsets for each map respectively. /// - private Shared.Models.CsgoMap currentMap = null; + private SteamShared.Models.CsgoMap currentMap = null; private string getCurrentMapDDSName() { return System.IO.Path.GetFileNameWithoutExtension(currentMap.MapImagePath); } - public wndSettings(Shared.Models.CsgoMap currentMap) + public wndSettings(SteamShared.Models.CsgoMap currentMap) { InitializeComponent(); this.currentMap = currentMap; @@ -80,7 +80,7 @@ namespace Damage_Calculator this.colourNavHigh.SelectedColor = this.settings.NavHighColour; this.colourNavHover.SelectedColor = this.settings.NavHoverColour; - foreach(string navDisplayMode in Enum.GetNames(typeof(Shared.NavDisplayModes))) + foreach(string navDisplayMode in Enum.GetNames(typeof(SteamShared.NavDisplayModes))) { comboNavDisplayModes.Items.Add(navDisplayMode); if (navDisplayMode == Enum.GetName(this.settings.NavDisplayMode)) @@ -124,7 +124,7 @@ namespace Damage_Calculator } else { - this.settings.MapCoordinateOffsets.Add(new Shared.Models.MapCustomOverwriteMapping { DDSFileName = getCurrentMapDDSName(), CoordOffset = newCoords, MapScale = (float)this.intCurrentMapMultiplierOverride.Value }); + this.settings.MapCoordinateOffsets.Add(new SteamShared.Models.MapCustomOverwriteMapping { DDSFileName = getCurrentMapDDSName(), CoordOffset = newCoords, MapScale = (float)this.intCurrentMapMultiplierOverride.Value }); } this.currentMap.MapOverwrite.CoordOffset = newCoords; this.currentMap.MapOverwrite.MapScale = (float)this.intCurrentMapMultiplierOverride.Value; @@ -140,7 +140,7 @@ namespace Damage_Calculator this.settings.NavHighColour = this.colourNavHigh.SelectedColor ?? Globals.Settings.NavHighColour; this.settings.NavHoverColour = this.colourNavHover.SelectedColor ?? Globals.Settings.NavHoverColour; - this.settings.NavDisplayMode = (Shared.NavDisplayModes)Enum.Parse(typeof(Shared.NavDisplayModes), comboNavDisplayModes.SelectedItem.ToString()); + this.settings.NavDisplayMode = (SteamShared.NavDisplayModes)Enum.Parse(typeof(SteamShared.NavDisplayModes), comboNavDisplayModes.SelectedItem.ToString()); this.settings.ShowNavAreasAbove = sliderNavAbove.Value / 100f; this.settings.ShowNavAreasBelow = sliderNavBelow.Value / 100f; diff --git a/DamagePrinter/DamagePrinter.sln b/DamagePrinter/DamagePrinter.sln index 7e7a7b2..4691bd8 100644 --- a/DamagePrinter/DamagePrinter.sln +++ b/DamagePrinter/DamagePrinter.sln @@ -5,9 +5,9 @@ VisualStudioVersion = 17.1.32407.343 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamagePrinter", "DamagePrinter\DamagePrinter.csproj", "{AF6F5837-94D3-4D44-9D1C-6B5CD600C698}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamShared", "..\Shared\SteamHelpers\SteamHelpers\SteamShared.csproj", "{4DB55154-E33B-49D8-BE05-DC11CA5B32A4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamShared", "..\SteamShared\SteamShared\SteamShared\SteamShared.csproj", "{4DB55154-E33B-49D8-BE05-DC11CA5B32A4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoreSoft.MathExpressions", "..\Shared\LoreSoft.MathExpressions\LoreSoft.MathExpressions.csproj", "{B6813448-FCE2-429C-81B5-9722FEA839B8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoreSoft.MathExpressions", "..\SteamShared\LoreSoft.MathExpressions\LoreSoft.MathExpressions.csproj", "{B6813448-FCE2-429C-81B5-9722FEA839B8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/DamagePrinter/DamagePrinter/DamagePrinter.csproj b/DamagePrinter/DamagePrinter/DamagePrinter.csproj index c5d95e5..f12b574 100644 --- a/DamagePrinter/DamagePrinter/DamagePrinter.csproj +++ b/DamagePrinter/DamagePrinter/DamagePrinter.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/Shared/LoreSoft.MathExpressions/ConvertExpression.cs b/SteamShared/LoreSoft.MathExpressions/ConvertExpression.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/ConvertExpression.cs rename to SteamShared/LoreSoft.MathExpressions/ConvertExpression.cs diff --git a/Shared/LoreSoft.MathExpressions/ExpressionBase.cs b/SteamShared/LoreSoft.MathExpressions/ExpressionBase.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/ExpressionBase.cs rename to SteamShared/LoreSoft.MathExpressions/ExpressionBase.cs diff --git a/Shared/LoreSoft.MathExpressions/FunctionExpression.cs b/SteamShared/LoreSoft.MathExpressions/FunctionExpression.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/FunctionExpression.cs rename to SteamShared/LoreSoft.MathExpressions/FunctionExpression.cs diff --git a/Shared/LoreSoft.MathExpressions/GlobalSuppressions.cs b/SteamShared/LoreSoft.MathExpressions/GlobalSuppressions.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/GlobalSuppressions.cs rename to SteamShared/LoreSoft.MathExpressions/GlobalSuppressions.cs diff --git a/Shared/LoreSoft.MathExpressions/IExpression.cs b/SteamShared/LoreSoft.MathExpressions/IExpression.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/IExpression.cs rename to SteamShared/LoreSoft.MathExpressions/IExpression.cs diff --git a/Shared/LoreSoft.MathExpressions/LoreSoft.MathExpressions.csproj b/SteamShared/LoreSoft.MathExpressions/LoreSoft.MathExpressions.csproj similarity index 100% rename from Shared/LoreSoft.MathExpressions/LoreSoft.MathExpressions.csproj rename to SteamShared/LoreSoft.MathExpressions/LoreSoft.MathExpressions.csproj diff --git a/Shared/LoreSoft.MathExpressions/MathEvaluate.cs b/SteamShared/LoreSoft.MathExpressions/MathEvaluate.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/MathEvaluate.cs rename to SteamShared/LoreSoft.MathExpressions/MathEvaluate.cs diff --git a/Shared/LoreSoft.MathExpressions/MathEvaluator.cs b/SteamShared/LoreSoft.MathExpressions/MathEvaluator.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/MathEvaluator.cs rename to SteamShared/LoreSoft.MathExpressions/MathEvaluator.cs diff --git a/Shared/LoreSoft.MathExpressions/MathExpressions.snk b/SteamShared/LoreSoft.MathExpressions/MathExpressions.snk similarity index 100% rename from Shared/LoreSoft.MathExpressions/MathExpressions.snk rename to SteamShared/LoreSoft.MathExpressions/MathExpressions.snk diff --git a/Shared/LoreSoft.MathExpressions/MathOperators.cs b/SteamShared/LoreSoft.MathExpressions/MathOperators.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/MathOperators.cs rename to SteamShared/LoreSoft.MathExpressions/MathOperators.cs diff --git a/Shared/LoreSoft.MathExpressions/Metadata/AbbreviationAttribute.cs b/SteamShared/LoreSoft.MathExpressions/Metadata/AbbreviationAttribute.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/Metadata/AbbreviationAttribute.cs rename to SteamShared/LoreSoft.MathExpressions/Metadata/AbbreviationAttribute.cs diff --git a/Shared/LoreSoft.MathExpressions/Metadata/AttributeReader.cs b/SteamShared/LoreSoft.MathExpressions/Metadata/AttributeReader.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/Metadata/AttributeReader.cs rename to SteamShared/LoreSoft.MathExpressions/Metadata/AttributeReader.cs diff --git a/Shared/LoreSoft.MathExpressions/NumberExpression.cs b/SteamShared/LoreSoft.MathExpressions/NumberExpression.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/NumberExpression.cs rename to SteamShared/LoreSoft.MathExpressions/NumberExpression.cs diff --git a/Shared/LoreSoft.MathExpressions/OperatorExpression.cs b/SteamShared/LoreSoft.MathExpressions/OperatorExpression.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/OperatorExpression.cs rename to SteamShared/LoreSoft.MathExpressions/OperatorExpression.cs diff --git a/Shared/LoreSoft.MathExpressions/ParseException.cs b/SteamShared/LoreSoft.MathExpressions/ParseException.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/ParseException.cs rename to SteamShared/LoreSoft.MathExpressions/ParseException.cs diff --git a/Shared/LoreSoft.MathExpressions/Properties/AssemblyInfo.cs b/SteamShared/LoreSoft.MathExpressions/Properties/AssemblyInfo.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/Properties/AssemblyInfo.cs rename to SteamShared/LoreSoft.MathExpressions/Properties/AssemblyInfo.cs diff --git a/Shared/LoreSoft.MathExpressions/Properties/Resources.Designer.cs b/SteamShared/LoreSoft.MathExpressions/Properties/Resources.Designer.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/Properties/Resources.Designer.cs rename to SteamShared/LoreSoft.MathExpressions/Properties/Resources.Designer.cs diff --git a/Shared/LoreSoft.MathExpressions/Properties/Resources.resx b/SteamShared/LoreSoft.MathExpressions/Properties/Resources.resx similarity index 100% rename from Shared/LoreSoft.MathExpressions/Properties/Resources.resx rename to SteamShared/LoreSoft.MathExpressions/Properties/Resources.resx diff --git a/Shared/LoreSoft.MathExpressions/UnitConversion/LengthConverter.cs b/SteamShared/LoreSoft.MathExpressions/UnitConversion/LengthConverter.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/UnitConversion/LengthConverter.cs rename to SteamShared/LoreSoft.MathExpressions/UnitConversion/LengthConverter.cs diff --git a/Shared/LoreSoft.MathExpressions/UnitConversion/MassConverter.cs b/SteamShared/LoreSoft.MathExpressions/UnitConversion/MassConverter.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/UnitConversion/MassConverter.cs rename to SteamShared/LoreSoft.MathExpressions/UnitConversion/MassConverter.cs diff --git a/Shared/LoreSoft.MathExpressions/UnitConversion/SpeedConverter.cs b/SteamShared/LoreSoft.MathExpressions/UnitConversion/SpeedConverter.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/UnitConversion/SpeedConverter.cs rename to SteamShared/LoreSoft.MathExpressions/UnitConversion/SpeedConverter.cs diff --git a/Shared/LoreSoft.MathExpressions/UnitConversion/TemperatureConverter.cs b/SteamShared/LoreSoft.MathExpressions/UnitConversion/TemperatureConverter.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/UnitConversion/TemperatureConverter.cs rename to SteamShared/LoreSoft.MathExpressions/UnitConversion/TemperatureConverter.cs diff --git a/Shared/LoreSoft.MathExpressions/UnitConversion/TimeConverter.cs b/SteamShared/LoreSoft.MathExpressions/UnitConversion/TimeConverter.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/UnitConversion/TimeConverter.cs rename to SteamShared/LoreSoft.MathExpressions/UnitConversion/TimeConverter.cs diff --git a/Shared/LoreSoft.MathExpressions/UnitConversion/UnitType.cs b/SteamShared/LoreSoft.MathExpressions/UnitConversion/UnitType.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/UnitConversion/UnitType.cs rename to SteamShared/LoreSoft.MathExpressions/UnitConversion/UnitType.cs diff --git a/Shared/LoreSoft.MathExpressions/UnitConversion/VolumeConverter.cs b/SteamShared/LoreSoft.MathExpressions/UnitConversion/VolumeConverter.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/UnitConversion/VolumeConverter.cs rename to SteamShared/LoreSoft.MathExpressions/UnitConversion/VolumeConverter.cs diff --git a/Shared/LoreSoft.MathExpressions/VariableDictionary.cs b/SteamShared/LoreSoft.MathExpressions/VariableDictionary.cs similarity index 100% rename from Shared/LoreSoft.MathExpressions/VariableDictionary.cs rename to SteamShared/LoreSoft.MathExpressions/VariableDictionary.cs diff --git a/Shared/SteamHelpers/SteamHelpers.sln b/SteamShared/SteamShared/SteamShared.sln similarity index 87% rename from Shared/SteamHelpers/SteamHelpers.sln rename to SteamShared/SteamShared/SteamShared.sln index b81ee37..742f60b 100644 --- a/Shared/SteamHelpers/SteamHelpers.sln +++ b/SteamShared/SteamShared/SteamShared.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.32228.430 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamHelpers", "SteamHelpers\SteamHelpers.csproj", "{BC940FCA-87A6-41DB-A428-795B33268A22}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamShared", "SteamShared\SteamShared.csproj", "{BC940FCA-87A6-41DB-A428-795B33268A22}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Shared/SteamHelpers/SteamHelpers/CsgoHelper.cs b/SteamShared/SteamShared/SteamShared/CsgoHelper.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/CsgoHelper.cs rename to SteamShared/SteamShared/SteamShared/CsgoHelper.cs diff --git a/Shared/SteamHelpers/SteamHelpers/DDSImageParser.cs b/SteamShared/SteamShared/SteamShared/DDSImageParser.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/DDSImageParser.cs rename to SteamShared/SteamShared/SteamShared/DDSImageParser.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Globals.cs b/SteamShared/SteamShared/SteamShared/Globals.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Globals.cs rename to SteamShared/SteamShared/SteamShared/Globals.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/BSPHeader.cs b/SteamShared/SteamShared/SteamShared/Models/BSPHeader.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/BSPHeader.cs rename to SteamShared/SteamShared/SteamShared/Models/BSPHeader.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/BSPLump.cs b/SteamShared/SteamShared/SteamShared/Models/BSPLump.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/BSPLump.cs rename to SteamShared/SteamShared/SteamShared/Models/BSPLump.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/CsgoMap.cs b/SteamShared/SteamShared/SteamShared/Models/CsgoMap.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/CsgoMap.cs rename to SteamShared/SteamShared/SteamShared/Models/CsgoMap.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/CsgoWeapon.cs b/SteamShared/SteamShared/SteamShared/Models/CsgoWeapon.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/CsgoWeapon.cs rename to SteamShared/SteamShared/SteamShared/Models/CsgoWeapon.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/MapCustomOverwriteMapping.cs b/SteamShared/SteamShared/SteamShared/Models/MapCustomOverwriteMapping.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/MapCustomOverwriteMapping.cs rename to SteamShared/SteamShared/SteamShared/Models/MapCustomOverwriteMapping.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/MapPoint.cs b/SteamShared/SteamShared/SteamShared/Models/MapPoint.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/MapPoint.cs rename to SteamShared/SteamShared/SteamShared/Models/MapPoint.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/NavApproachSpot.cs b/SteamShared/SteamShared/SteamShared/Models/NavApproachSpot.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/NavApproachSpot.cs rename to SteamShared/SteamShared/SteamShared/Models/NavApproachSpot.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/NavArea.cs b/SteamShared/SteamShared/SteamShared/Models/NavArea.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/NavArea.cs rename to SteamShared/SteamShared/SteamShared/Models/NavArea.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/NavAreaBind.cs b/SteamShared/SteamShared/SteamShared/Models/NavAreaBind.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/NavAreaBind.cs rename to SteamShared/SteamShared/SteamShared/Models/NavAreaBind.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/NavConnectionData.cs b/SteamShared/SteamShared/SteamShared/Models/NavConnectionData.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/NavConnectionData.cs rename to SteamShared/SteamShared/SteamShared/Models/NavConnectionData.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/NavEncounterPath.cs b/SteamShared/SteamShared/SteamShared/Models/NavEncounterPath.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/NavEncounterPath.cs rename to SteamShared/SteamShared/SteamShared/Models/NavEncounterPath.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/NavEncounterSpot.cs b/SteamShared/SteamShared/SteamShared/Models/NavEncounterSpot.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/NavEncounterSpot.cs rename to SteamShared/SteamShared/SteamShared/Models/NavEncounterSpot.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/NavHeader.cs b/SteamShared/SteamShared/SteamShared/Models/NavHeader.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/NavHeader.cs rename to SteamShared/SteamShared/SteamShared/Models/NavHeader.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/NavHidingSpot.cs b/SteamShared/SteamShared/SteamShared/Models/NavHidingSpot.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/NavHidingSpot.cs rename to SteamShared/SteamShared/SteamShared/Models/NavHidingSpot.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/NavLadder.cs b/SteamShared/SteamShared/SteamShared/Models/NavLadder.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/NavLadder.cs rename to SteamShared/SteamShared/SteamShared/Models/NavLadder.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/NavLadderIDSequence.cs b/SteamShared/SteamShared/SteamShared/Models/NavLadderIDSequence.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/NavLadderIDSequence.cs rename to SteamShared/SteamShared/SteamShared/Models/NavLadderIDSequence.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/NavMesh.cs b/SteamShared/SteamShared/SteamShared/Models/NavMesh.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/NavMesh.cs rename to SteamShared/SteamShared/SteamShared/Models/NavMesh.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/PlayerSpawn.cs b/SteamShared/SteamShared/SteamShared/Models/PlayerSpawn.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/PlayerSpawn.cs rename to SteamShared/SteamShared/SteamShared/Models/PlayerSpawn.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/Settings.cs b/SteamShared/SteamShared/SteamShared/Models/Settings.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/Settings.cs rename to SteamShared/SteamShared/SteamShared/Models/Settings.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/SteamGame.cs b/SteamShared/SteamShared/SteamShared/Models/SteamGame.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/SteamGame.cs rename to SteamShared/SteamShared/SteamShared/Models/SteamGame.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/SteamLibrary.cs b/SteamShared/SteamShared/SteamShared/Models/SteamLibrary.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/SteamLibrary.cs rename to SteamShared/SteamShared/SteamShared/Models/SteamLibrary.cs diff --git a/Shared/SteamHelpers/SteamHelpers/Models/Vector3.cs b/SteamShared/SteamShared/SteamShared/Models/Vector3.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/Models/Vector3.cs rename to SteamShared/SteamShared/SteamShared/Models/Vector3.cs diff --git a/Shared/SteamHelpers/SteamHelpers/NavFile.cs b/SteamShared/SteamShared/SteamShared/NavFile.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/NavFile.cs rename to SteamShared/SteamShared/SteamShared/NavFile.cs diff --git a/Shared/SteamHelpers/SteamHelpers/SourceCFG/SourceCFG.cs b/SteamShared/SteamShared/SteamShared/SourceCFG/SourceCFG.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/SourceCFG/SourceCFG.cs rename to SteamShared/SteamShared/SteamShared/SourceCFG/SourceCFG.cs diff --git a/Shared/SteamHelpers/SteamHelpers/SteamHelper.cs b/SteamShared/SteamShared/SteamShared/SteamHelper.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/SteamHelper.cs rename to SteamShared/SteamShared/SteamShared/SteamHelper.cs diff --git a/Shared/SteamHelpers/SteamHelpers/SteamShared.csproj b/SteamShared/SteamShared/SteamShared/SteamShared.csproj similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/SteamShared.csproj rename to SteamShared/SteamShared/SteamShared/SteamShared.csproj diff --git a/Shared/SteamHelpers/SteamHelpers/ZatVdfParser/BackupVdfReader.cs b/SteamShared/SteamShared/SteamShared/ZatVdfParser/BackupVdfReader.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/ZatVdfParser/BackupVdfReader.cs rename to SteamShared/SteamShared/SteamShared/ZatVdfParser/BackupVdfReader.cs diff --git a/Shared/SteamHelpers/SteamHelpers/ZatVdfParser/Element.cs b/SteamShared/SteamShared/SteamShared/ZatVdfParser/Element.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/ZatVdfParser/Element.cs rename to SteamShared/SteamShared/SteamShared/ZatVdfParser/Element.cs diff --git a/Shared/SteamHelpers/SteamHelpers/ZatVdfParser/VdfFile.cs b/SteamShared/SteamShared/SteamShared/ZatVdfParser/VdfFile.cs similarity index 100% rename from Shared/SteamHelpers/SteamHelpers/ZatVdfParser/VdfFile.cs rename to SteamShared/SteamShared/SteamShared/ZatVdfParser/VdfFile.cs