diff --git a/src/ARKServerManager.Common/Utils/GameDataUtils.cs b/src/ARKServerManager.Common/Utils/GameDataUtils.cs index e2aa7bcc..ed64ca61 100644 --- a/src/ARKServerManager.Common/Utils/GameDataUtils.cs +++ b/src/ARKServerManager.Common/Utils/GameDataUtils.cs @@ -37,7 +37,7 @@ namespace ServerManagerTool.Utils data.SupplyCrates.AddRange(fileData.SupplyCrates); data.Inventories.AddRange(fileData.Inventories); data.GameMaps.AddRange(fileData.GameMaps); - data.Mods.AddRange(fileData.Mods); + data.TotalConversions.AddRange(fileData.TotalConversions); data.PlayerLevels.AddRange(fileData.PlayerLevels); data.CreatureLevels.AddRange(fileData.CreatureLevels); data.Branches.AddRange(fileData.Branches); @@ -117,7 +117,7 @@ namespace ServerManagerTool.Utils public List GameMaps = new List(); [DataMember(IsRequired = false)] - public List Mods = new List(); + public List TotalConversions = new List(); [DataMember(IsRequired = false)] public List PlayerLevels = new List(); @@ -153,7 +153,7 @@ namespace ServerManagerTool.Utils data.SupplyCrates.ForEach(c => c.IsUserData = isUserData); data.Inventories.ForEach(c => c.IsUserData = isUserData); data.GameMaps.ForEach(c => c.IsUserData = isUserData); - data.Mods.ForEach(c => c.IsUserData = isUserData); + data.TotalConversions.ForEach(c => c.IsUserData = isUserData); data.Branches.ForEach(c => c.IsUserData = isUserData); data.Events.ForEach(c => c.IsUserData = isUserData); data.OfficialMods.ForEach(c => c.IsUserData = isUserData); diff --git a/src/ARKServerManager/GameData/PrimitivePlus.gamedata b/src/ARKServerManager/GameData/PrimitivePlus.gamedata index 75294eb7..92248bf2 100644 --- a/src/ARKServerManager/GameData/PrimitivePlus.gamedata +++ b/src/ARKServerManager/GameData/PrimitivePlus.gamedata @@ -3148,7 +3148,7 @@ "Mod": "PrimitivePlus" } ], - "Mods": [ + "TotalConversions": [ { "IsSotF": false, "ClassName": "111111111", diff --git a/src/ARKServerManager/Lib/GameData.cs b/src/ARKServerManager/Lib/GameData.cs index 5ad10edc..28386946 100644 --- a/src/ARKServerManager/Lib/GameData.cs +++ b/src/ARKServerManager/Lib/GameData.cs @@ -86,14 +86,14 @@ namespace ServerManagerTool.Lib } // total conversion mods - gameData.Mods.AddRange(userGameData.Mods); + gameData.TotalConversions.AddRange(userGameData.TotalConversions); - if (gameData.Mods.Count > 0) + if (gameData.TotalConversions.Count > 0) { var mods1 = totalConversions.ToList(); - mods1.AddRange(gameData.Mods.Where(item => !item.IsSotF).ToList().ConvertAll(item => new ComboBoxItem { ValueMember = item.ClassName, DisplayMember = item.Description })); + mods1.AddRange(gameData.TotalConversions.Where(item => !item.IsSotF).ToList().ConvertAll(item => new ComboBoxItem { ValueMember = item.ClassName, DisplayMember = item.Description })); var mods2 = totalConversionsSotF.ToList(); - mods2.AddRange(gameData.Mods.Where(item => item.IsSotF).ToList().ConvertAll(item => new ComboBoxItem { ValueMember = item.ClassName, DisplayMember = item.Description })); + mods2.AddRange(gameData.TotalConversions.Where(item => item.IsSotF).ToList().ConvertAll(item => new ComboBoxItem { ValueMember = item.ClassName, DisplayMember = item.Description })); totalConversions = mods1.ToArray(); totalConversionsSotF = mods2.ToArray(); @@ -279,7 +279,7 @@ namespace ServerManagerTool.Lib public static IEnumerable GetTotalConversions() => totalConversions.Select(d => d.Duplicate()); - public static string FriendlyTotalConversionNameForClass(string className, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("TotalConv_" + className) ?? gameData?.Mods?.FirstOrDefault(i => i.ClassName.Equals(className) && !i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : className); + public static string FriendlyTotalConversionNameForClass(string className, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("TotalConv_" + className) ?? gameData?.TotalConversions?.FirstOrDefault(i => i.ClassName.Equals(className) && !i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : className); private static ComboBoxItem[] totalConversionsSotF = new[] { @@ -288,7 +288,7 @@ namespace ServerManagerTool.Lib public static IEnumerable GetTotalConversionsSotF() => totalConversionsSotF.Select(d => d.Duplicate()); - public static string FriendlyTotalConversionSotFNameForClass(string className, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("TotalConv_" + className) ?? gameData?.Mods?.FirstOrDefault(i => i.ClassName.Equals(className) && i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : className); + public static string FriendlyTotalConversionSotFNameForClass(string className, bool returnEmptyIfNotFound = false) => string.IsNullOrWhiteSpace(className) ? string.Empty : GlobalizedApplication.Instance.GetResourceString("TotalConv_" + className) ?? gameData?.TotalConversions?.FirstOrDefault(i => i.ClassName.Equals(className) && i.IsSotF)?.Description ?? (returnEmptyIfNotFound ? string.Empty : className); #endregion #region Stats Multipliers