- add storage editing (unlimited logs, sticks etc.)

- add selection of Kelvin's and Virginia's outfit
- add editing of Virginias equipped items
- add editing of influences that the player / enemies have to your followers (e.g.: "Player" brings "Fear" to her if the value is high)
- add experiment to reset kill statistics
- add experiment to reset number of cut trees
- add experiment so that enemies fear the player (hopefully...)
- add experiment so that enemies have no fear and are very angry (hopefully...)
- add experiment to remove all actors and spawn points except for Kelvin and Virginia
- some cosmetical improvements
- add menu bar
- add option to open the currently selected savegame dir in Explorer
- the window title now changes dynamically after loading
- backup can now be toggled in menu
- add option to delete all *.bak* files in savegame dir
- add links to all sites where the editor is hosted
- add update check (checks automatically, can be turned off)
- move savegame selection to its own window, freeing space
- in the new savegame selection, the current directory is more prominent
- Savegames are now grouped by SinglePlayer, Multiplayer or MP_Client
- A lot of background improvements
- Removed locks for now, as everything does not need to be synchronized right now
- Downgrade MVVM Toolkit to 8.0.0 due to compilation issues

Author: codengine

CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## v0.5.0
+- add storage editing (unlimited logs, sticks etc.)
+- add selection of Kelvin's and Virginia's outfit
+- add editing of Virginias equipped items
+- add editing of influences that the player / enemies have to your followers (e.g.: "Player" brings "Fear" to her if the value is high)
+- add experiment to reset kill statistics
+- add experiment to reset number of cut trees
+- add experiment so that enemies fear the player (hopefully...)
+- add experiment so that enemies have no fear and are very angry (hopefully...)
+- add experiment to remove all actors and spawn points except for Kelvin and Virginia
+- some cosmetical improvements
+- add menu bar
+- add option to open the currently selected savegame dir in Explorer
+- the window title now changes dynamically after loading
+- backup can now be toggled in menu
+- add option to delete all *.bak* files in savegame dir
+- add links to all sites where the editor is hosted
+- add update check (checks automatically, can be turned off)
+- move savegame selection to its own window, freeing space
+- in the new savegame selection, the current directory is more prominent
+- Savegames are now grouped by SinglePlayer, Multiplayer or MP_Client
+- A lot of background improvements
+- Removed locks for now, as everything does not need to be synchronized right now
+- Downgrade MVVM Toolkit to 8.0.0 due to compilation issues
+
 ## v0.4.0
 - add player tab, allowing editing of player stats as well as positioning
 - move armor tab to player tab
@@ -19,7 +44,6 @@
 ## v0.2.1
 - add detailed options to regrow trees instead of reviving all, resolves
 
-
 ## v0.2.0
 - misc fixes
 - add markers for non-inventory items

README.md

@@ -36,6 +36,11 @@ This project is in no way or form associated with the developers of the game. It
 - Edit Armor Data (Add Armor Pieces, change durability)
 - Edit Weather Data (Weather, Seasons...)
 - Edit Game State Data (Playtime,..)
+- Edit Storage Data (Unlimited Logs, sticks etc.)
+- Edit Influences of Players towards Kelvin and Virginia
+- Modify Virginias equipped items
+- Change Virginias and Kelvins outfits
+- Several experiments
 - Revive Virginia & Kelvin
 - Set stats for Virginia & Kelvin
 - Move Kelvin & Virginia to Player or each other

SOTFEdit/App.config

@@ -20,6 +20,9 @@
       <setting name="BackupFiles" serializeAs="String">
         <value>True</value>
       </setting>
+      <setting name="CheckForUpdates" serializeAs="String">
+        <value>True</value>
+      </setting>
     </SOTFEdit.Settings>
   </userSettings>
 </configuration>

SOTFEdit/App.xaml.cs

@@ -10,6 +10,7 @@
 using Newtonsoft.Json;
 using NLog;
 using SOTFEdit.Model;
+using SOTFEdit.Model.Storage;
 using SOTFEdit.ViewModel;
 
 namespace SOTFEdit;
@@ -19,7 +20,7 @@ namespace SOTFEdit;
 /// </summary>
 public partial class App
 {
-    private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+    private static readonly ILogger Logger = LogManager.GetCurrentClassLogger();
 
     public App()
     {
@@ -48,15 +49,19 @@ private static void ConfigureServices()
         services.AddSingleton<InventoryPageViewModel>();
         services.AddSingleton<PlayerPageViewModel>();
         services.AddSingleton<WeatherPageViewModel>();
-        services.AddSingleton(_ => BuildItemListInstance());
+        services.AddSingleton<StoragePageViewModel>();
+        services.AddSingleton(_ => BuildGameDataInstance() ?? throw new Exception("Unable to load Game Data"));
+        services.AddSingleton<StorageFactory>();
+        services.AddSingleton<UpdateChecker>();
+        services.AddSingleton<LabExperiments>();
+        services.AddTransient<SelectSavegameViewModel>();
         Ioc.Default.ConfigureServices(services.BuildServiceProvider());
     }
 
-    private static ItemList BuildItemListInstance()
+    private static GameData? BuildGameDataInstance()
     {
-        var json = File.ReadAllText(@"items.json");
-        var items = JsonConvert.DeserializeObject<Item[]>(json);
-        return items != null ? new ItemList(items) : new ItemList();
+        var json = File.ReadAllText(@"data.json");
+        return JsonConvert.DeserializeObject<GameData>(json);
     }
 
     protected override void OnStartup(StartupEventArgs e)
@@ -69,16 +74,16 @@ protected override void OnStartup(StartupEventArgs e)
 
     private void SetupExceptionHandling()
     {
-        AppDomain.CurrentDomain.UnhandledException += (s, e) =>
+        AppDomain.CurrentDomain.UnhandledException += (_, e) =>
             LogUnhandledException((Exception)e.ExceptionObject, "AppDomain.CurrentDomain.UnhandledException");
 
-        DispatcherUnhandledException += (s, e) =>
+        DispatcherUnhandledException += (_, e) =>
         {
             LogUnhandledException(e.Exception, "Application.Current.DispatcherUnhandledException");
             e.Handled = true;
         };
 
-        TaskScheduler.UnobservedTaskException += (s, e) =>
+        TaskScheduler.UnobservedTaskException += (_, e) =>
         {
             LogUnhandledException(e.Exception, "TaskScheduler.UnobservedTaskException");
             e.SetObserved();

SOTFEdit/AssemblyInfo.cs

@@ -12,11 +12,11 @@
     // app, or any theme specific resource dictionaries)
 )]
 [assembly: AssemblyCompany("codengine")]
-[assembly: AssemblyFileVersion("0.4.0")]
-[assembly: AssemblyInformationalVersion("0.4.0")]
+[assembly: AssemblyFileVersion("0.5.0")]
+[assembly: AssemblyInformationalVersion("0.5.0")]
 [assembly: AssemblyProduct("SOTFEdit")]
 [assembly: AssemblyTitle("SOTFEdit")]
-[assembly: AssemblyVersion("0.4.0")]
+[assembly: AssemblyVersion("0.5.0")]
 [assembly: TargetPlatform("Windows7.0")]
 [assembly: SupportedOSPlatform("Windows7.0")]
 [assembly: Guid("d59ec208-5fc6-4336-a9db-dbeb36938f78")]

SOTFEdit/GlobalSuppressions.cs

@@ -0,0 +1,16 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly:
+    SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "<Pending>", Scope = "member",
+        Target = "~P:SOTFEdit.ViewModel.SelectSavegameViewModel.SaveDir")]
+[assembly:
+    SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "<Pending>", Scope = "member",
+        Target = "~M:SOTFEdit.ViewModel.SelectSavegameViewModel.SelectSavegameDir")]
+[assembly:
+    SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "<Pending>", Scope = "member",
+        Target = "~M:SOTFEdit.ViewModel.SelectSavegameViewModel.SelectSavegame(SOTFEdit.Model.Savegame)")]

SOTFEdit/Infrastructure/FolderPicker.cs

@@ -7,36 +7,30 @@
 
 namespace SOTFEdit.Infrastructure;
 
-// for WPF support
-
-// for WPF support
-
 //Source: https://stackoverflow.com/questions/11624298/how-do-i-use-openfiledialog-to-select-a-folder
 public class FolderPicker
 {
-#pragma warning disable IDE1006 // Naming Styles
-    private const int ERROR_CANCELLED = unchecked((int)0x800704C7);
-#pragma warning restore IDE1006 // Naming Styles
-    public virtual string ResultPath { get; protected set; }
-    public virtual string ResultName { get; protected set; }
-    public virtual string InputPath { get; set; }
+    private const int ErrorCancelled = unchecked((int)0x800704C7);
+    public virtual string? ResultPath { get; protected set; }
+    public virtual string? ResultName { get; protected set; }
+    public virtual string? InputPath { get; set; }
     public virtual bool ForceFileSystem { get; set; }
-    public virtual string Title { get; set; }
-    public virtual string OkButtonLabel { get; set; }
-    public virtual string FileNameLabel { get; set; }
+    public virtual string? Title { get; set; }
+    public virtual string? OkButtonLabel { get; set; }
+    public virtual string? FileNameLabel { get; set; }
 
     protected virtual int SetOptions(int options)
     {
         if (ForceFileSystem)
         {
-            options |= (int)FOS.FOS_FORCEFILESYSTEM;
+            options |= (int)Fos.FosForcefilesystem;
         }
 
         return options;
     }
 
     // for WPF support
-    public bool? ShowDialog(Window owner = null, bool throwOnError = false)
+    public bool? ShowDialog(Window? owner = null, bool throwOnError = false)
     {
         owner ??= Application.Current.MainWindow;
         return ShowDialog(owner != null ? new WindowInteropHelper(owner).Handle : IntPtr.Zero, throwOnError);
@@ -45,6 +39,7 @@ protected virtual int SetOptions(int options)
     // for all .NET
     public virtual bool? ShowDialog(IntPtr owner, bool throwOnError = false)
     {
+        // ReSharper disable once SuspiciousTypeConversion.Global
         var dialog = (IFileOpenDialog)new FileOpenDialog();
         if (!string.IsNullOrEmpty(InputPath))
         {
@@ -57,8 +52,8 @@ protected virtual int SetOptions(int options)
             dialog.SetFolder(item);
         }
 
-        var options = FOS.FOS_PICKFOLDERS;
-        options = (FOS)SetOptions((int)options);
+        var options = Fos.FosPickfolders;
+        options = (Fos)SetOptions((int)options);
         dialog.SetOptions(options);
 
         if (Title != null)
@@ -86,7 +81,7 @@ protected virtual int SetOptions(int options)
         }
 
         var hr = dialog.Show(owner);
-        if (hr == ERROR_CANCELLED)
+        if (hr == ErrorCancelled)
         {
             return null;
         }
@@ -101,14 +96,14 @@ protected virtual int SetOptions(int options)
             return null;
         }
 
-        if (CheckHr(result.GetDisplayName(SIGDN.SIGDN_DESKTOPABSOLUTEPARSING, out var path), throwOnError) != 0)
+        if (CheckHr(result.GetDisplayName(Sigdn.SigdnDesktopabsoluteparsing, out var path), throwOnError) != 0)
         {
             return null;
         }
 
         ResultPath = path;
 
-        if (CheckHr(result.GetDisplayName(SIGDN.SIGDN_DESKTOPABSOLUTEEDITING, out path), false) == 0)
+        if (CheckHr(result.GetDisplayName(Sigdn.SigdnDesktopabsoluteediting, out path), false) == 0)
         {
             ResultName = path;
         }
@@ -130,8 +125,8 @@ private static int CheckHr(int hr, bool throwOnError)
     }
 
     [DllImport("shell32")]
-    private static extern int SHCreateItemFromParsingName([MarshalAs(UnmanagedType.LPWStr)] string pszPath,
-        IBindCtx pbc, [MarshalAs(UnmanagedType.LPStruct)] Guid riid, out IShellItem ppv);
+    private static extern int SHCreateItemFromParsingName([MarshalAs(UnmanagedType.LPWStr)] string? pszPath,
+        IBindCtx? pbc, [MarshalAs(UnmanagedType.LPStruct)] Guid riid, out IShellItem ppv);
 
     [DllImport("user32")]
     private static extern IntPtr GetDesktopWindow();
@@ -166,10 +161,10 @@ private interface IFileOpenDialog
         int Unadvise();
 
         [PreserveSig]
-        int SetOptions(FOS fos);
+        int SetOptions(Fos fos);
 
         [PreserveSig]
-        int GetOptions(out FOS pfos);
+        int GetOptions(out Fos pfos);
 
         [PreserveSig]
         int SetDefaultFolder(IShellItem psi);
@@ -184,16 +179,16 @@ private interface IFileOpenDialog
         int GetCurrentSelection(out IShellItem ppsi);
 
         [PreserveSig]
-        int SetFileName([MarshalAs(UnmanagedType.LPWStr)] string pszName);
+        int SetFileName([MarshalAs(UnmanagedType.LPWStr)] string? pszName);
 
         [PreserveSig]
         int GetFileName([MarshalAs(UnmanagedType.LPWStr)] out string pszName);
 
         [PreserveSig]
-        int SetTitle([MarshalAs(UnmanagedType.LPWStr)] string pszTitle);
+        int SetTitle([MarshalAs(UnmanagedType.LPWStr)] string? pszTitle);
 
         [PreserveSig]
-        int SetOkButtonLabel([MarshalAs(UnmanagedType.LPWStr)] string pszText);
+        int SetOkButtonLabel([MarshalAs(UnmanagedType.LPWStr)] string? pszText);
 
         [PreserveSig]
         int SetFileNameLabel([MarshalAs(UnmanagedType.LPWStr)] string pszLabel);
@@ -238,7 +233,7 @@ private interface IShellItem
         int GetParent(); // not fully defined
 
         [PreserveSig]
-        int GetDisplayName(SIGDN sigdnName, [MarshalAs(UnmanagedType.LPWStr)] out string ppszName);
+        int GetDisplayName(Sigdn sigdnName, [MarshalAs(UnmanagedType.LPWStr)] out string? ppszName);
 
         [PreserveSig]
         int GetAttributes(); // not fully defined
@@ -248,45 +243,49 @@ private interface IShellItem
     }
 
 #pragma warning disable CA1712 // Do not prefix enum values with type name
-    private enum SIGDN : uint
+    private enum Sigdn : uint
     {
-        SIGDN_DESKTOPABSOLUTEEDITING = 0x8004c000,
-        SIGDN_DESKTOPABSOLUTEPARSING = 0x80028000,
-        SIGDN_FILESYSPATH = 0x80058000,
-        SIGDN_NORMALDISPLAY = 0,
-        SIGDN_PARENTRELATIVE = 0x80080001,
-        SIGDN_PARENTRELATIVEEDITING = 0x80031001,
-        SIGDN_PARENTRELATIVEFORADDRESSBAR = 0x8007c001,
-        SIGDN_PARENTRELATIVEPARSING = 0x80018001,
-        SIGDN_URL = 0x80068000
+        SigdnDesktopabsoluteediting = 0x8004c000,
+
+        SigdnDesktopabsoluteparsing = 0x80028000
+        /*
+        SigdnFilesyspath = 0x80058000,
+        SigdnNormaldisplay = 0,
+        SigdnParentrelative = 0x80080001,
+        SigdnParentrelativeediting = 0x80031001,
+        SigdnParentrelativeforaddressbar = 0x8007c001,
+        SigdnParentrelativeparsing = 0x80018001,
+        SigdnUrl = 0x80068000*/
     }
 
     [Flags]
-    private enum FOS
+    private enum Fos
     {
-        FOS_OVERWRITEPROMPT = 0x2,
-        FOS_STRICTFILETYPES = 0x4,
-        FOS_NOCHANGEDIR = 0x8,
-        FOS_PICKFOLDERS = 0x20,
-        FOS_FORCEFILESYSTEM = 0x40,
-        FOS_ALLNONSTORAGEITEMS = 0x80,
-        FOS_NOVALIDATE = 0x100,
-        FOS_ALLOWMULTISELECT = 0x200,
-        FOS_PATHMUSTEXIST = 0x800,
-        FOS_FILEMUSTEXIST = 0x1000,
-        FOS_CREATEPROMPT = 0x2000,
-        FOS_SHAREAWARE = 0x4000,
-        FOS_NOREADONLYRETURN = 0x8000,
-        FOS_NOTESTFILECREATE = 0x10000,
-        FOS_HIDEMRUPLACES = 0x20000,
-        FOS_HIDEPINNEDPLACES = 0x40000,
-        FOS_NODEREFERENCELINKS = 0x100000,
-        FOS_OKBUTTONNEEDSINTERACTION = 0x200000,
-        FOS_DONTADDTORECENT = 0x2000000,
-        FOS_FORCESHOWHIDDEN = 0x10000000,
-        FOS_DEFAULTNOMINIMODE = 0x20000000,
-        FOS_FORCEPREVIEWPANEON = 0x40000000,
-        FOS_SUPPORTSTREAMABLEITEMS = unchecked((int)0x80000000)
+        /*
+        FosOverwriteprompt = 0x2,
+        FosStrictfiletypes = 0x4,
+        FosNochangedir = 0x8,*/
+        FosPickfolders = 0x20,
+
+        FosForcefilesystem = 0x40
+        /*FosAllnonstorageitems = 0x80,
+        FosNovalidate = 0x100,
+        FosAllowmultiselect = 0x200,
+        FosPathmustexist = 0x800,
+        FosFilemustexist = 0x1000,
+        FosCreateprompt = 0x2000,
+        FosShareaware = 0x4000,
+        FosNoreadonlyreturn = 0x8000,
+        FosNotestfilecreate = 0x10000,
+        FosHidemruplaces = 0x20000,
+        FosHidepinnedplaces = 0x40000,
+        FosNodereferencelinks = 0x100000,
+        FosOkbuttonneedsinteraction = 0x200000,
+        FosDontaddtorecent = 0x2000000,
+        FosForceshowhidden = 0x10000000,
+        FosDefaultnominimode = 0x20000000,
+        FosForcepreviewpaneon = 0x40000000,
+        FosSupportstreamableitems = unchecked((int)0x80000000)*/
     }
 #pragma warning restore CA1712 // Do not prefix enum values with type name
 }