From 9d9ee10afc86309997b93565c680b1fb62ec9a0d Mon Sep 17 00:00:00 2001 From: Tyfon <29051038+tyfon7@users.noreply.github.com> Date: Mon, 13 May 2024 18:48:47 -0700 Subject: [PATCH] clean up, rev version to 1.4.0 --- README.md | 15 ++++++--- Settings.cs | 88 ++++++++++++++++++++++++++------------------------ UIFixes.csproj | 2 +- 3 files changed, 57 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index da10568..2bc0fbe 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ Tarkov is full of annoyances but we can fix them! Sometimes. - Swap items in place! Drag an item over another one and they'll swap positions if possible. Items that already have an interaction with each other (e.g. bullets and magazines) are unaffected. - Rebind Home/End, PageUp/PageDown to work like they do in every other app ever released in the history of the world. - Customizable mouse scrolling speed -- ✨ Fix item tooltips if your mouse goes through the Quest/FoundInRaid icon (great for MoreCheckmarks) -- ✨ Allow found in raid money and ammo automatically stack with non-found-in-raid items (stops containers making extra stacks!) +- Fix item tooltips if your mouse goes through the Quest/FoundInRaid icon (great for MoreCheckmarks) +- Allow found in raid money and ammo automatically stack with non-found-in-raid items (stops containers making extra stacks!) ## Doors - Remove the unimplemented actions like "Bang & clear" that, lets face it, are never going to happen anyway. @@ -22,14 +22,19 @@ Tarkov is full of annoyances but we can fix them! Sometimes. - Enable zooming with mousewheel - Skips needless unsaved changes warnings when navigating to another screen from a weapon preset (optional, defaults ON) - Skip all unsaved changes warnings when closing a weapon preset (optional, defaults OFF) -- ✨ Show the total stats (including sub-mods) when inspecting mods (optional, toggleable *in* the inspect pane with a new button!) -- ✨ See stats change as you add/remove mods, with color-coded deltas! + +## Inspect windows +- Show the total stats (including sub-mods) when inspecting mods (optional, toggleable *in* the inspect pane with a new button!) +- See stats change as you add/remove mods, with color-coded deltas! +- ✨ Remember last window size when you change it, with restore button to resize to default +- ✨ Move left and move right buttons to quickly snap inspect windows to the left or right half of the screen, for easy comparisons +- ✨ Auto-expand descriptions when possible (great for showing extra text from mods like Item Info) ## Mail - Skips "You can return to this later" warnings when not transferring all items (optional, defaults ON) - "Receive All" button no longer shows up when there is nothing to receive. ## Misc -- ✨ Confirm dialogs with Return/Enter instead of just Y +- Confirm dialogs with Return/Enter instead of just Y ## More to come... ? \ No newline at end of file diff --git a/Settings.cs b/Settings.cs index 0698ca2..1675505 100644 --- a/Settings.cs +++ b/Settings.cs @@ -24,16 +24,13 @@ namespace UIFixes private const string GeneralSection = "1. General"; private const string InputSection = "2. Input"; private const string InventorySection = "3. Inventory"; - private const string InRaidSection = "4. In Raid"; - private const string AdvancedSection = "5. Advanced"; + private const string InspectSection = "4. Inspect Windows"; + private const string InRaidSection = "5. In Raid"; + private const string AdvancedSection = "6. Advanced"; // General public static ConfigEntry ShowPresetConfirmations { get; set; } public static ConfigEntry ShowTransferConfirmations { get; set; } - public static ConfigEntry ShowModStats { get; set; } - public static ConfigEntry RememberInspectSize { get; set; } - public static ConfigEntry LockInspectPreviewSize { get; set; } - public static ConfigEntry ExpandDescriptionHeight { get; set; } // Input public static ConfigEntry UseHomeEnd { get; set; } @@ -47,6 +44,12 @@ namespace UIFixes public static ConfigEntry MergeFIRAmmo { get; set; } public static ConfigEntry MergeFIROther { get; set; } + // Inspect Panels + public static ConfigEntry ShowModStats { get; set; } + public static ConfigEntry RememberInspectSize { get; set; } + public static ConfigEntry LockInspectPreviewSize { get; set; } + public static ConfigEntry ExpandDescriptionHeight { get; set; } + // In Raid public static ConfigEntry RemoveDisabledActions { get; set; } @@ -76,42 +79,6 @@ namespace UIFixes null, new ConfigurationManagerAttributes { }))); - configEntries.Add(ShowModStats = config.Bind( - GeneralSection, - "Show Total Stats on Mods", - true, - new ConfigDescription( - "Item mods will show stats that include mods attached to them (you can also control this from a mod's inspect window)", - null, - new ConfigurationManagerAttributes { }))); - - configEntries.Add(RememberInspectSize = config.Bind( - GeneralSection, - "Remember Inspect Panel Size", - true, - new ConfigDescription( - "Save the size of the inspect panel when you resize it", - null, - new ConfigurationManagerAttributes { }))); - - configEntries.Add(LockInspectPreviewSize = config.Bind( - GeneralSection, - "Lock Inspect Preview Size", - true, - new ConfigDescription( - "Keep the 3D preview from growing when you resize inspect panels", - null, - new ConfigurationManagerAttributes { }))); - - configEntries.Add(ExpandDescriptionHeight = config.Bind( - GeneralSection, - "Auto-expand to Fit Description", - true, - new ConfigDescription( - "Automatically stretch the inspect panel to fit as much of the description as possible", - null, - new ConfigurationManagerAttributes { }))); - // Input configEntries.Add(UseHomeEnd = config.Bind( InputSection, @@ -186,6 +153,43 @@ namespace UIFixes null, new ConfigurationManagerAttributes { }))); + // Inspect + configEntries.Add(ShowModStats = config.Bind( + InspectSection, + "Show Total Stats on Mods", + true, + new ConfigDescription( + "Item mods will show stats that include mods attached to them (you can also control this from a mod's inspect window)", + null, + new ConfigurationManagerAttributes { }))); + + configEntries.Add(RememberInspectSize = config.Bind( + InspectSection, + "Remember Window Size", + true, + new ConfigDescription( + "Save the size of the inspect window when you resize it", + null, + new ConfigurationManagerAttributes { }))); + + configEntries.Add(LockInspectPreviewSize = config.Bind( + InspectSection, + "Lock Inspect Preview Size", + true, + new ConfigDescription( + "Keep the 3D preview from growing when you resize inspect windows", + null, + new ConfigurationManagerAttributes { }))); + + configEntries.Add(ExpandDescriptionHeight = config.Bind( + InspectSection, + "Auto-expand to Fit Description", + true, + new ConfigDescription( + "Automatically stretch the inspect window to fit as much of the description as possible", + null, + new ConfigurationManagerAttributes { }))); + // In Raid configEntries.Add(RemoveDisabledActions = config.Bind( InRaidSection, diff --git a/UIFixes.csproj b/UIFixes.csproj index c4c8854..85313a8 100644 --- a/UIFixes.csproj +++ b/UIFixes.csproj @@ -4,7 +4,7 @@ net471 Tyfon.UIFixes SPT UI Fixes - 1.3.5 + 1.4.0 true latest Debug;Release;Dist