Merge pull request #225 from iAmAsval/dev

Dev
4sval · Dec 16, 2021 · 5db52e7 · 5db52e7
2 parents 7b56359 + 609e3e6
commit 5db52e7
Show file tree

Hide file tree

Showing 42 changed files with 962 additions and 857 deletions.
diff --git a/CUE4Parse b/CUE4Parse
diff --git a/FModel/App.xaml.cs b/FModel/App.xaml.cs
@@ -44,9 +44,9 @@ protected override void OnStartup(StartupEventArgs e)
             }
 
             if (!Directory.Exists(UserSettings.Default.OutputDirectory))
-            {
                 UserSettings.Default.OutputDirectory = Path.Combine(Directory.GetCurrentDirectory(), "Output");
-            }
+            if (!Directory.Exists(UserSettings.Default.ModelDirectory))
+                UserSettings.Default.ModelDirectory = Path.Combine(UserSettings.Default.OutputDirectory, "Saves");
 
             Directory.CreateDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "FModel"));
             Directory.CreateDirectory(Path.Combine(UserSettings.Default.OutputDirectory, "Backups"));

diff --git a/FModel/Creator/Bases/FN/BaseCommunity.cs b/FModel/Creator/Bases/FN/BaseCommunity.cs
@@ -102,10 +102,19 @@ private string GetCosmeticSeason(string seasonNumber, bool bShort)
             if (!bShort) return base.GetCosmeticSeason(seasonNumber);
             var s = seasonNumber["Cosmetics.Filter.Season.".Length..];
             var number = int.Parse(s);
-            if (number == 10)
-                s = "X";
 
-            return number > 10 ? $"C{number / 10 + 1} S{s[^1..]}" : $"C1 S{s}";
+            switch (number)
+            {
+                case 10:
+                    s = "X";
+                    break;
+                case > 18:
+                    number += 2;
+                    s = number.ToString();
+                    break;
+            }
+
+            return $"C{number / 10 + 1} S{s[^1..]}";
         }
 
         private new void DrawBackground(SKCanvas c)

diff --git a/FModel/Creator/Bases/FN/BaseIcon.cs b/FModel/Creator/Bases/FN/BaseIcon.cs
@@ -199,8 +199,17 @@ protected string GetCosmeticSeason(string seasonNumber)
         {
             var s = seasonNumber["Cosmetics.Filter.Season.".Length..];
             var number = int.Parse(s);
-            if (number == 10)
-                s = "X";
+
+            switch (number)
+            {
+                case 10:
+                    s = "X";
+                    break;
+                case > 18:
+                    number += 2;
+                    s = number.ToString();
+                    break;
+            }
 
             var season = Utils.GetLocalizedResource("AthenaSeasonItemDefinitionInternal", "SeasonTextFormat", "Season {0}");
             var introduced = Utils.GetLocalizedResource("Fort.Cosmetics", "CosmeticItemDescription_Season", "\nIntroduced in <SeasonText>{0}</>.");

diff --git a/FModel/Creator/Bases/FN/BaseIconStats.cs b/FModel/Creator/Bases/FN/BaseIconStats.cs
@@ -142,10 +142,10 @@ private bool TryGetCurveTableStat(FStructFallback property, out float statValue)
             if (property.TryGetValue(out FStructFallback curve, "Curve") &&
                 curve.TryGetValue(out FName rowName, "RowName") &&
                 curve.TryGetValue(out UCurveTable curveTable, "CurveTable") &&
-                curveTable.TryGetCurveTableRow(rowName.Text, StringComparison.OrdinalIgnoreCase, out var rowValue) &&
-                rowValue.TryGetValue(out FSimpleCurveKey[] keys, "Keys") && keys.Length > 0)
+                curveTable.TryFindCurve(rowName, out var rowValue) &&
+                rowValue is FSimpleCurve s && s.Keys.Length > 0)
             {
-                statValue = keys[0].Value;
+                statValue = s.Keys[0].Value;
                 return true;
             }
 
@@ -274,6 +274,8 @@ public void Draw(SKCanvas c, SKColor sliderColor, int width, int height, ref flo
             c.DrawText(_value.ToString(), new SKPoint(width - 50, y + 10), _statPaint);
 
             if (_maxValue < 1 || !float.TryParse(_value.ToString(), out var floatValue)) return;
+            if (floatValue < 0)
+                floatValue = 0;
             var sliderWidth = (sliderRight - height * 2) * (floatValue / _maxValue);
             c.DrawRect(new SKRect(height * 2, y, Math.Min(height * 2 + sliderWidth, sliderRight), y + 5), _statPaint);
         }

diff --git a/FModel/Creator/Bases/SOD2/BaseDecayIcon.cs b/FModel/Creator/Bases/SOD2/BaseDecayIcon.cs
diff --git a/FModel/Creator/CreatorPackage.cs b/FModel/Creator/CreatorPackage.cs
@@ -5,7 +5,6 @@
 using FModel.Creator.Bases.BB;
 using FModel.Creator.Bases.FN;
 using FModel.Creator.Bases.SB;
-using FModel.Creator.Bases.SOD2;
 
 namespace FModel.Creator
 {
@@ -230,38 +229,6 @@ public bool TryConstructCreator(out UCreator creator)
                 case "GLeagueDivision":
                     creator = new BaseDivision(_object, EIconStyle.Default);
                     return true;
-                // State of Decay 2
-                case "CureItem":
-                case "AmmoItem":
-                case "Pro_Brake_C":
-                case "BackpackItem":
-                case "MagicAmmoItem":
-                case "ConsumableItem":
-                case "MeleeWeaponItem":
-                case "CloseCombatItem":
-                case "FacilityModItem":
-                case "RangedWeaponItem":
-                case "MiscellaneousItem":
-                case "RepairVehicleItem":
-                case "ResourceItemBase_C":
-                case "FuelResourceBase_C":
-                case "MedsResourceBase_C":
-                case "PartsResourceBase_C":
-                case "RangedWeaponModItem":
-                case "VehicleDeliveryItem":
-                case "ConsumableBase_BP_C":
-                case "SmallBackpackBase_C":
-                case "LargeBackpackBase_C":
-                case "MediumBackpackBase_C":
-                case "ConsumableMedsBase_BP_C":
-                case "MaterialsResourceBase_C":
-                case "ExtraLargeBackpackBase_C":
-                case "ExtraSmallBackpackBase_C":
-                case "ConsumableStimsBase_BP_C":
-                case "Consumable_TimedStatBuff_Base_BP_C":
-                case "Consumable_SuspendFatigue_Base_BP_C":
-                    creator = new BaseDecayIcon(_object, EIconStyle.Default);
-                    return true;
                 default:
                     creator = null;
                     return false;

diff --git a/FModel/Enums.cs b/FModel/Enums.cs
@@ -20,6 +20,7 @@ public enum SettingsOut
     {
         Restart,
         ReloadLocres,
+        CheckForUpdates,
         Nothing
     }
 

diff --git a/FModel/Extensions/EnumExtensions.cs b/FModel/Extensions/EnumExtensions.cs
@@ -1,8 +1,8 @@
-using FModel.Properties;
 using System;
 using System.ComponentModel;
 using System.Resources;
 using System.Runtime.CompilerServices;
+using FModel.Properties;
 
 namespace FModel.Extensions
 {
@@ -47,12 +47,12 @@ public static string GetLocalizedCategory(this Enum value, ResourceManager resou
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static T ToEnum<T>(this string value, T defaultValue)
+        public static T ToEnum<T>(this string value, T defaultValue) where T : struct
         {
-            if (!Enum.TryParse(typeof(T), value, true, out var ret))
+            if (!Enum.TryParse(value, true, out T ret))
                 return defaultValue;
 
-            return (T) ret;
+            return ret;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -81,4 +81,4 @@ public static T Previous<T>(this Enum value)
             return i == -1 ? (T) values.GetValue(values.Length - 1) : (T) values.GetValue(i);
         }
     }
-}
+}
diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
@@ -5,13 +5,13 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>FModel.ico</ApplicationIcon>
-    <Version>4.0.0</Version>
-    <AssemblyVersion>4.0.2.0</AssemblyVersion>
-    <FileVersion>4.0.2.0</FileVersion>
+    <Version>4.2.0</Version>
+    <AssemblyVersion>4.2.0.0</AssemblyVersion>
+    <FileVersion>4.2.0.0</FileVersion>
     <IsPackable>false</IsPackable>
     <IsPublishable>true</IsPublishable>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <PublishSingleFile>true</PublishSingleFile>
+    <PublishSingleFile Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">true</PublishSingleFile>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     <StartupObject>FModel.App</StartupObject>
   </PropertyGroup>
@@ -110,12 +110,12 @@
     <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
     <PackageReference Include="EpicManifestParser" Version="1.2.70-temp" />
     <PackageReference Include="HelixToolkit.SharpDX.Core.Wpf" Version="2.20.0" />
-    <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.2.15" />
+    <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.2.16" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NVorbis" Version="0.10.4" />
     <PackageReference Include="Oodle.NET" Version="1.0.1" />
     <PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.0" />
-    <PackageReference Include="RestSharp" Version="106.13.0" />
+    <PackageReference Include="RestSharp" Version="106.15.0" />
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.3" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ public enum SettingsOut @@
         {
             Restart,
             ReloadLocres,
+            CheckForUpdates,
             Nothing
         }
@@ Expand Down @@