From b26072d43031734423a50886c3fe5709ee293b2b Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Wed, 30 Oct 2024 21:05:30 +0600
Subject: [PATCH 01/19] fix for loading hideout productions

---
 SPT-AKI Profile Editor.Tests/Hepers/TestHelpers.cs     |  2 +-
 SPT-AKI Profile Editor/Core/AppData.cs                 |  4 ++--
 .../Core/ServerClasses/Hideout/HideoutProductions.cs   | 10 ++++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 SPT-AKI Profile Editor/Core/ServerClasses/Hideout/HideoutProductions.cs

diff --git a/SPT-AKI Profile Editor.Tests/Hepers/TestHelpers.cs b/SPT-AKI Profile Editor.Tests/Hepers/TestHelpers.cs
index a5b0a7bc..7a8d9d92 100644
--- a/SPT-AKI Profile Editor.Tests/Hepers/TestHelpers.cs	
+++ b/SPT-AKI Profile Editor.Tests/Hepers/TestHelpers.cs	
@@ -11,7 +11,7 @@ namespace SPT_AKI_Profile_Editor.Tests.Hepers
     internal class TestHelpers
     {
         public static readonly JsonSerializerSettings seriSettings = new() { Formatting = Formatting.Indented, Converters = new List<JsonConverter>() { new StringEnumConverterExt() } };
-        public static readonly string profileFile = @"D:\SPT\user\profiles\668a193f0002aeaa425816ac.json";
+        public static readonly string profileFile = @"D:\SPT\user\profiles\670243b60004ce099760c812.json";
         public static readonly string serverPath = @"D:\SPT";
         public static readonly string wrongServerPath = @"D:\WinSetupFromUSB";
         public static readonly string profileWithDuplicatedItems = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "testFiles", "profileWithDuplicatedItems.json");
diff --git a/SPT-AKI Profile Editor/Core/AppData.cs b/SPT-AKI Profile Editor/Core/AppData.cs
index 3ad72be0..e1f88ae5 100644
--- a/SPT-AKI Profile Editor/Core/AppData.cs	
+++ b/SPT-AKI Profile Editor/Core/AppData.cs	
@@ -262,8 +262,8 @@ private static void LoadHideoutProduction()
                 : Path.Combine(AppSettings.ServerPath, AppSettings.FilesList[SPTServerFile.production]);
             try
             {
-                HideoutProduction[] HideoutProduction = JsonConvert.DeserializeObject<HideoutProduction[]>(File.ReadAllText(path));
-                ServerDatabase.HideoutProduction = HideoutProduction;
+                HideoutProductions HideoutProductions = JsonConvert.DeserializeObject<HideoutProductions>(File.ReadAllText(path));
+                ServerDatabase.HideoutProduction = HideoutProductions.Recipes;
             }
             catch (Exception ex) { Logger.Log($"ServerDatabase HideoutProduction ({path}) loading error: {ex.Message}"); }
         }
diff --git a/SPT-AKI Profile Editor/Core/ServerClasses/Hideout/HideoutProductions.cs b/SPT-AKI Profile Editor/Core/ServerClasses/Hideout/HideoutProductions.cs
new file mode 100644
index 00000000..15ca796d
--- /dev/null
+++ b/SPT-AKI Profile Editor/Core/ServerClasses/Hideout/HideoutProductions.cs	
@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace SPT_AKI_Profile_Editor.Core.ServerClasses.Hideout
+{
+    public class HideoutProductions
+    {
+        [JsonProperty("recipes")]
+        public HideoutProduction[] Recipes { get; set; }
+    }
+}
\ No newline at end of file

From 42188586f2ec54757e0cb7daf69ef1b5da8d0be5 Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sun, 5 Jan 2025 00:17:17 +0600
Subject: [PATCH 02/19] update for 3.10 ragfair standing

---
 .../Hepers/TestHelpers.cs                     |  2 +-
 SPT-AKI Profile Editor.Tests/ProfileTests.cs  | 23 +++++++++++-------
 SPT-AKI Profile Editor/Core/AppSettings.cs    | 10 --------
 .../Core/CleaningService.cs                   |  2 +-
 SPT-AKI Profile Editor/Core/DefaultValues.cs  |  1 -
 .../Core/ProfileClasses/Character.cs          |  3 +--
 .../CharacterTraderStandingExtended.cs        | 15 ++++--------
 .../Views/MerchantsTab.xaml                   | 24 ++++++++++++++++---
 8 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/SPT-AKI Profile Editor.Tests/Hepers/TestHelpers.cs b/SPT-AKI Profile Editor.Tests/Hepers/TestHelpers.cs
index 7a8d9d92..46c5a625 100644
--- a/SPT-AKI Profile Editor.Tests/Hepers/TestHelpers.cs	
+++ b/SPT-AKI Profile Editor.Tests/Hepers/TestHelpers.cs	
@@ -11,7 +11,7 @@ namespace SPT_AKI_Profile_Editor.Tests.Hepers
     internal class TestHelpers
     {
         public static readonly JsonSerializerSettings seriSettings = new() { Formatting = Formatting.Indented, Converters = new List<JsonConverter>() { new StringEnumConverterExt() } };
-        public static readonly string profileFile = @"D:\SPT\user\profiles\670243b60004ce099760c812.json";
+        public static readonly string profileFile = @"D:\SPT\user\profiles\67796e1f0004b59665cc84f3.json";
         public static readonly string serverPath = @"D:\SPT";
         public static readonly string wrongServerPath = @"D:\WinSetupFromUSB";
         public static readonly string profileWithDuplicatedItems = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "testFiles", "profileWithDuplicatedItems.json");
diff --git a/SPT-AKI Profile Editor.Tests/ProfileTests.cs b/SPT-AKI Profile Editor.Tests/ProfileTests.cs
index 8a85f857..5e7bf654 100644
--- a/SPT-AKI Profile Editor.Tests/ProfileTests.cs	
+++ b/SPT-AKI Profile Editor.Tests/ProfileTests.cs	
@@ -147,12 +147,6 @@ public void UnlockedInfoLoadsCorrectly()
         public void RagfairInfoNotNull()
             => Assert.That(AppData.Profile.Characters.Pmc.RagfairInfo, Is.Not.Null, "RagfairInfo is null");
 
-        [Test]
-        public void RagfairStandingLoadCorrectly() =>
-            Assert.That(AppData.Profile.Characters.Pmc.TraderStandingsExt.First(x => x.Id == AppData.AppSettings.RagfairTraderId).Standing,
-                        Is.EqualTo(AppData.Profile.Characters.Pmc.RagfairInfo.Rating),
-                        "Ragfair standing not load correctly");
-
         [Test]
         public void QuestsLoadCorrectly()
         {
@@ -489,8 +483,7 @@ public void ProfileSavesCorrectly()
         public void TraderSalesSumAndStandingCanIncreaseLevel()
         {
             static bool CanBeUsedForTest(CharacterTraderStandingExtended x)
-                => x.Id != AppData.AppSettings.RagfairTraderId
-                && x.LoyaltyLevel < 2
+                => x.LoyaltyLevel < 2
                 && x.TraderBase.LoyaltyLevels.Count > x.LoyaltyLevel;
 
             AppData.Profile.Load(TestHelpers.profileFile);
@@ -524,7 +517,7 @@ public void TradersLoadedCorrectly()
             Assert.That(AppData.Profile.Characters.Pmc.TraderStandingsExt.Any(x => x.BitmapImage == null),
                         Is.False,
                         "Traders BitmapImage's not loaded");
-            Assert.That(AppData.Profile.Characters.Pmc.TraderStandingsExt.Any(x => x.Id != AppData.AppSettings.RagfairTraderId && x.LocalizedName == x.Id),
+            Assert.That(AppData.Profile.Characters.Pmc.TraderStandingsExt.Any(x => x.LocalizedName == x.Id),
                         Is.False,
                         "Traders LocalizedName's not loaded");
             Assert.That(AppData.Profile.Characters.Pmc.TraderStandingsExt.Any(x => x.SalesSum != x.TraderStanding.SalesSum),
@@ -543,6 +536,18 @@ public void TradersSavesCorrectly()
                         "TraderStandingsExt not in max levels");
         }
 
+        [Test]
+        public void RagfairStandingSavesCorrectly()
+        {
+            AppData.Profile.Load(TestHelpers.profileFile);
+            var startingRating = AppData.Profile.Characters.Pmc.RagfairInfo.Rating;
+            AppData.Profile.Characters.Pmc.RagfairInfo.Rating += 3;
+            TestHelpers.SaveAndLoadProfile("testRagfairStanding.json");
+            Assert.That(AppData.Profile.Characters.Pmc.RagfairInfo.Rating,
+                Is.EqualTo(startingRating + 3),
+                "Ragfair standing not saves correctly");
+        }
+
         [Test]
         public void ChangeFenceStandingAffectScavCharacter()
         {
diff --git a/SPT-AKI Profile Editor/Core/AppSettings.cs b/SPT-AKI Profile Editor/Core/AppSettings.cs
index 0f2d7539..3a00f747 100644
--- a/SPT-AKI Profile Editor/Core/AppSettings.cs	
+++ b/SPT-AKI Profile Editor/Core/AppSettings.cs	
@@ -205,8 +205,6 @@ public bool AutoAddMissingScavSkills
 
         public string MoneysEurosTpl { get; set; }
 
-        public string RagfairTraderId { get; set; }
-
         public string EndlessDevBackpackId { get; set; }
 
         public string BearDogtagTpl { get; set; }
@@ -277,7 +275,6 @@ public string GetStamp()
                 + MoneysDollarsTpl
                 + MoneysEurosTpl
                 + MoneysRublesTpl
-                + RagfairTraderId
                 + BearDogtagTpl
                 + EndlessDevBackpackId
                 + FenceTraderId;
@@ -406,7 +403,6 @@ private void ApplyLoadedValues(AppSettings loaded)
             MoneysDollarsTpl = loaded.MoneysDollarsTpl;
             MoneysEurosTpl = loaded.MoneysEurosTpl;
             MoneysRublesTpl = loaded.MoneysRublesTpl;
-            RagfairTraderId = loaded.RagfairTraderId;
             BannedItems = loaded.BannedItems;
             IssuesAction = loaded.IssuesAction;
             BearDogtagTpl = loaded.BearDogtagTpl;
@@ -553,11 +549,6 @@ private bool CheckValues()
                 CheckUpdates = DefaultValues.CheckUpdates;
                 _needReSave = true;
             }
-            if (RagfairTraderId == null)
-            {
-                RagfairTraderId = DefaultValues.RagfairTraderId;
-                _needReSave = true;
-            }
             if (BearDogtagTpl == null)
             {
                 BearDogtagTpl = DefaultValues.BearDogtagTpl;
@@ -610,7 +601,6 @@ private void CreateDefault()
             MoneysDollarsTpl = DefaultValues.MoneysDollarsTpl;
             MoneysEurosTpl = DefaultValues.MoneysEurosTpl;
             MoneysRublesTpl = DefaultValues.MoneysRublesTpl;
-            RagfairTraderId = DefaultValues.RagfairTraderId;
             BannedItems = DefaultValues.BannedItems;
             IssuesAction = DefaultValues.DefaultIssuesAction;
             BearDogtagTpl = DefaultValues.BearDogtagTpl;
diff --git a/SPT-AKI Profile Editor/Core/CleaningService.cs b/SPT-AKI Profile Editor/Core/CleaningService.cs
index a049eb6f..c9e12c91 100644
--- a/SPT-AKI Profile Editor/Core/CleaningService.cs	
+++ b/SPT-AKI Profile Editor/Core/CleaningService.cs	
@@ -160,7 +160,7 @@ private void GetModdedMerchants(IEnumerable<string> merchantIds, ObservableColle
         {
             if (merchantIds != null && AppData.ServerDatabase?.LocalesGlobal != null)
                 AddModdedEntity(merchantIds,
-                                x => x != AppData.AppSettings.RagfairTraderId && !AppData.ServerDatabase.LocalesGlobal.ContainsKey(x.Nickname()),
+                                x => !AppData.ServerDatabase.LocalesGlobal.ContainsKey(x.Nickname()),
                                 x => x,
                                 ModdedEntityType.Merchant,
                                 compositeCollection);
diff --git a/SPT-AKI Profile Editor/Core/DefaultValues.cs b/SPT-AKI Profile Editor/Core/DefaultValues.cs
index 484a4bbc..a77b63ce 100644
--- a/SPT-AKI Profile Editor/Core/DefaultValues.cs	
+++ b/SPT-AKI Profile Editor/Core/DefaultValues.cs	
@@ -30,7 +30,6 @@ public static class DefaultValues
         public const string MoneysDollarsTpl = "5696686a4bdc2da3298b456a";
         public const string MoneysRublesTpl = "5449016a4bdc2d6f028b456f";
         public const string MoneysEurosTpl = "569668774bdc2da2298b4568";
-        public const string RagfairTraderId = "ragfair";
         public const string EndlessDevBackpackId = "56e294cdd2720b603a8b4575";
         public const string BearDogtagTpl = "59f32bb586f774757e1e8442";
         public const float CommonSkillMaxValue = 5100;
diff --git a/SPT-AKI Profile Editor/Core/ProfileClasses/Character.cs b/SPT-AKI Profile Editor/Core/ProfileClasses/Character.cs
index e31703e6..bd82286a 100644
--- a/SPT-AKI Profile Editor/Core/ProfileClasses/Character.cs	
+++ b/SPT-AKI Profile Editor/Core/ProfileClasses/Character.cs	
@@ -211,8 +211,7 @@ public int StashRowsBonusCount
         public ObservableCollection<CharacterTraderStandingExtended> TraderStandingsExt =>
             new(TraderStandings?.Select(x => new CharacterTraderStandingExtended(x.Value,
                                                                                 x.Key,
-                                                                                GetTraderInfo(x.Key),
-                                                                                RagfairInfo?.Rating ?? 0f)));
+                                                                                GetTraderInfo(x.Key))));
 
         [JsonIgnore]
         public IEnumerable<ExaminedItem> ExaminedItems => Encyclopedia?
diff --git a/SPT-AKI Profile Editor/Core/ProfileClasses/CharacterTraderStandingExtended.cs b/SPT-AKI Profile Editor/Core/ProfileClasses/CharacterTraderStandingExtended.cs
index 31bc55bb..0150845a 100644
--- a/SPT-AKI Profile Editor/Core/ProfileClasses/CharacterTraderStandingExtended.cs	
+++ b/SPT-AKI Profile Editor/Core/ProfileClasses/CharacterTraderStandingExtended.cs	
@@ -15,10 +15,10 @@ public class CharacterTraderStandingExtended : BindableEntity
         private bool? unlockedStart;
         private int? levelStart;
 
-        public CharacterTraderStandingExtended(CharacterTraderStanding standing, string id, TraderBase traderBase, float ragfairRating)
+        public CharacterTraderStandingExtended(CharacterTraderStanding standing, string id, TraderBase traderBase)
         {
             TraderStanding = standing;
-            Standing = id == AppData.AppSettings.RagfairTraderId ? ragfairRating : standing.Standing;
+            Standing = standing.Standing;
             Id = id;
             TraderBase = traderBase;
             MaxLevel = Math.Max(TraderBase?.LoyaltyLevels.Count ?? 0, TraderStanding.LoyaltyLevel);
@@ -55,14 +55,9 @@ public float Standing
             set
             {
                 TraderStanding.Standing = value;
-                if (Id == AppData.AppSettings.RagfairTraderId)
-                    AppData.Profile.Characters.Pmc.RagfairInfo.Rating = value;
-                if (Id == AppData.AppSettings.FenceTraderId)
-                {
-                    // Must add rep to scav profile to ensure consistency
-                    if (AppData.Profile.Characters.Scav.TraderStandings.ContainsKey(Id))
-                        AppData.Profile.Characters.Scav.TraderStandings[Id].Standing = value;
-                }
+                // Must add rep to scav profile to ensure consistency
+                if (Id == AppData.AppSettings.FenceTraderId && AppData.Profile.Characters.Scav.TraderStandings.ContainsKey(Id))
+                    AppData.Profile.Characters.Scav.TraderStandings[Id].Standing = value;
                 OnPropertyChanged(nameof(Standing));
                 SetLevel();
             }
diff --git a/SPT-AKI Profile Editor/Views/MerchantsTab.xaml b/SPT-AKI Profile Editor/Views/MerchantsTab.xaml
index c24f07d8..d937eb95 100644
--- a/SPT-AKI Profile Editor/Views/MerchantsTab.xaml	
+++ b/SPT-AKI Profile Editor/Views/MerchantsTab.xaml	
@@ -8,15 +8,33 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:views="clr-namespace:SPT_AKI_Profile_Editor.Views"
     x:Name="Control"
+    d:Background="White"
     d:DataContext="{d:DesignInstance Type=views:MerchantsTabViewModel}"
+    d:Width="500"
     mc:Ignorable="d">
     <Grid>
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
             <RowDefinition />
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
+        <DockPanel Grid.Row="0" HorizontalAlignment="Center">
+            <Label
+                Margin="0,5,5,0"
+                Content="{Binding ServerDatabase.LocalesGlobal[RAG FAIR], FallbackValue=RAG FAIR}"
+                FontWeight="Bold" />
+            <extendedcontrols:NumericUpDownExt
+                Width="80"
+                Margin="5,5,5,0"
+                Interval="0.01"
+                Minimum="-20"
+                NumericInputMode="Decimal"
+                StringFormat="N2"
+                TextAlignment="Left"
+                Value="{Binding Path=Profile.Characters.Pmc.RagfairInfo.Rating, UpdateSourceTrigger=PropertyChanged}" />
+        </DockPanel>
         <ListBox
-            Grid.Row="0"
+            Grid.Row="1"
             d:ItemsSource="{d:SampleData ItemCount=4}"
             ItemContainerStyle="{StaticResource NoHoverListBox}"
             ItemsSource="{Binding Profile.Characters.Pmc.TraderStandingsExt}"
@@ -151,12 +169,12 @@
             </ListBox.ItemsPanel>
         </ListBox>
         <Button
-            Grid.Row="1"
+            Grid.Row="2"
             Width="200"
             Height="30"
             Margin="10,10,10,0"
             HorizontalAlignment="Center"
             Command="{Binding SetAllMaxCommand}"
-            Content="{Binding AppLocalization.Translations[tab_hideout_maximum_button]}" />
+            Content="{Binding AppLocalization.Translations[tab_hideout_maximum_button], FallbackValue=tab_hideout_maximum_button}" />
     </Grid>
 </UserControl>
\ No newline at end of file

From 0381f81b5420bec238afcbb45affec9ecdc8f8ae Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sun, 5 Jan 2025 00:35:52 +0600
Subject: [PATCH 03/19] fix for test weapon build values

---
 SPT-AKI Profile Editor.Tests/ProfileTests.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SPT-AKI Profile Editor.Tests/ProfileTests.cs b/SPT-AKI Profile Editor.Tests/ProfileTests.cs
index 5e7bf654..c3a8e213 100644
--- a/SPT-AKI Profile Editor.Tests/ProfileTests.cs	
+++ b/SPT-AKI Profile Editor.Tests/ProfileTests.cs	
@@ -1039,8 +1039,8 @@ public void WeaponBuildCalculatingCorrectly()
             var build = AppData.Profile.UserBuilds.WeaponBuilds.Where(x => x.Name == "TestBuild").FirstOrDefault();
             Assert.That(build, Is.Not.Null);
             Assert.That(build.Ergonomics, Is.EqualTo(36));
-            Assert.That(build.RecoilForceUp, Is.EqualTo(36));
-            Assert.That(build.RecoilForceBack, Is.EqualTo(145));
+            Assert.That(build.RecoilForceUp, Is.EqualTo(68));
+            Assert.That(build.RecoilForceBack, Is.EqualTo(193));
         }
 
         [Test]

From 77f6bb3a0d62cfca942103b14d038b0d0cdb2e7e Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sun, 5 Jan 2025 00:52:43 +0600
Subject: [PATCH 04/19] fix for issue with update pmc level for event quests

---
 SPT-AKI Profile Editor/Core/IssuesService.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SPT-AKI Profile Editor/Core/IssuesService.cs b/SPT-AKI Profile Editor/Core/IssuesService.cs
index b3573224..700b09a3 100644
--- a/SPT-AKI Profile Editor/Core/IssuesService.cs	
+++ b/SPT-AKI Profile Editor/Core/IssuesService.cs	
@@ -74,6 +74,8 @@ private void GetQuestIssues(Character character)
                     switch (condition.Type)
                     {
                         case QuestConditionType.Level:
+                            if (condition.RequiredValue > AppData.ServerDatabase.ServerGlobals.Config.Exp.Level.MaxLevel)
+                                condition.RequiredValue = AppData.ServerDatabase.ServerGlobals.Config.Exp.Level.MaxLevel;
                             if (!(condition?.CheckRequiredValue(character.Info?.Level ?? 1) ?? true))
                                 profileIssues.Add(new PMCLevelIssue(quest, condition.GetNearestValue()));
                             break;

From a4a2faf92c7da0b656a4042540b86bf79a35aac2 Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sun, 5 Jan 2025 02:26:46 +0600
Subject: [PATCH 05/19] WIP: Fix for update hideout areas with stashes

---
 SPT-AKI Profile Editor.Tests/ProfileTests.cs  | 11 +++
 .../Core/ProfileClasses/CharacterInventory.cs |  3 +
 .../Core/ProfileClasses/ProfileSaver.cs       | 79 +++++++++++++++++--
 .../ServerClasses/Hideout/HideoutAreaInfo.cs  |  3 +
 4 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/SPT-AKI Profile Editor.Tests/ProfileTests.cs b/SPT-AKI Profile Editor.Tests/ProfileTests.cs
index c3a8e213..9425aa15 100644
--- a/SPT-AKI Profile Editor.Tests/ProfileTests.cs	
+++ b/SPT-AKI Profile Editor.Tests/ProfileTests.cs	
@@ -634,6 +634,17 @@ public void HideoutAreaLevelsSavesCorrectly()
             TestHelpers.SaveAndLoadProfile("testHideouts.json");
             Assert.That(AppData.Profile.Characters.Pmc.Hideout.Areas
                 .All(x => x.Level == x.MaxLevel || !x.CanSetMaxLevel), Is.True);
+            Assert.That(AppData.Profile.Characters.Pmc.Inventory.HideoutAreaStashes,
+                        Is.Not.Empty,
+                        "Stashes for hideout areas not writed");
+            Assert.That(AppData.Profile.Characters.Pmc.Inventory.HideoutAreaStashes.Count,
+                        Is.GreaterThan(1),
+                        "Stashes for hideout areas not writed");
+            foreach (var hideoutAreaStash in AppData.Profile.Characters.Pmc.Inventory.HideoutAreaStashes)
+            {
+                var item = AppData.Profile.Characters.Pmc.Inventory.Items.FirstOrDefault(x => x.Id == hideoutAreaStash.Value);
+                Assert.That(item, Is.Not.Null, "Inventory not contains stash for hideout area");
+            }
         }
 
         [Test]
diff --git a/SPT-AKI Profile Editor/Core/ProfileClasses/CharacterInventory.cs b/SPT-AKI Profile Editor/Core/ProfileClasses/CharacterInventory.cs
index 15e53d88..58c54d94 100644
--- a/SPT-AKI Profile Editor/Core/ProfileClasses/CharacterInventory.cs	
+++ b/SPT-AKI Profile Editor/Core/ProfileClasses/CharacterInventory.cs	
@@ -27,6 +27,9 @@ public InventoryItem[] Items
             }
         }
 
+        [JsonProperty("hideoutAreaStashes")]
+        public Dictionary<string, string> HideoutAreaStashes { get; set; }
+
         [JsonProperty("stash")]
         public string Stash
         {
diff --git a/SPT-AKI Profile Editor/Core/ProfileClasses/ProfileSaver.cs b/SPT-AKI Profile Editor/Core/ProfileClasses/ProfileSaver.cs
index 18124809..f1fb1fab 100644
--- a/SPT-AKI Profile Editor/Core/ProfileClasses/ProfileSaver.cs	
+++ b/SPT-AKI Profile Editor/Core/ProfileClasses/ProfileSaver.cs	
@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using SPT_AKI_Profile_Editor.Core.Enums;
+using SPT_AKI_Profile_Editor.Core.ServerClasses;
 using SPT_AKI_Profile_Editor.Helpers;
 using System;
 using System.Collections.Generic;
@@ -98,7 +99,7 @@ public List<SaveException> Save(string targetPath, string savePath = null)
             WriteTraders(pmc, profile.Characters.Pmc);
             WriteTraders(scav, profile.Characters.Scav);
             WriteQuests(pmc);
-            WriteHideout(pmc, out string newStash);
+            WriteHideout(pmc, profile.Characters.Pmc.Inventory, out string newStash);
             WriteHideoutCrafts(pmc);
             WriteSkills(profile.Characters.Pmc.Skills.Common, pmc, "Common", SaveEntry.CommonSkillsPmc);
             WriteSkills(profile.Characters.Scav.Skills.Common, scav, "Common", SaveEntry.CommonSkillsScav);
@@ -106,6 +107,7 @@ public List<SaveException> Save(string targetPath, string savePath = null)
             WriteSkills(profile.Characters.Scav.Skills.Mastering, scav, "Mastering", SaveEntry.MasteringSkillsScav);
             WriteSuits(jobject);
             WriteStashBonus(pmc);
+            // Stash writing always must be after after writing hideout due to update stashes by hideout area stages
             WriteStash(pmc, profile.Characters.Pmc.Inventory, newStash, SaveEntry.StashPmc);
             WriteStash(scav, profile.Characters.Scav.Inventory, null, SaveEntry.StashScav);
             WriteUserBuilds(jobject);
@@ -340,7 +342,8 @@ private void WriteStash(JToken characterToken, CharacterInventory inventory, str
             try
             {
                 List<JToken> ForRemove = new();
-                JToken itemsToken = characterToken.SelectToken("Inventory")?.SelectToken("items");
+                var inventoryToken = characterToken.SelectToken("Inventory");
+                JToken itemsToken = inventoryToken?.SelectToken("items");
                 var itemsObject = itemsToken.ToObject<InventoryItem[]>();
                 if (itemsObject.Length > 0)
                 {
@@ -363,11 +366,12 @@ private void WriteStash(JToken characterToken, CharacterInventory inventory, str
                     foreach (var item in inventory.Items.Where(x => !itemsObject.Any(y => y.Id == x.Id)))
                         itemsToken?.LastOrDefault()?.AddAfterSelf(JObject.FromObject(item, serializer).RemoveNullAndEmptyProperties());
                 }
+                inventoryToken?.SelectToken("hideoutAreaStashes").Replace(JToken.FromObject(inventory.HideoutAreaStashes));
             }
             catch (Exception ex) { exceptions.Add(new(entry, ex)); }
         }
 
-        private void WriteHideout(JToken pmc, out string newStash)
+        private void WriteHideout(JToken pmc, CharacterInventory inventory, out string newStash)
         {
             newStash = string.Empty;
             try
@@ -381,17 +385,18 @@ private void WriteHideout(JToken pmc, out string newStash)
                     var areaInfo = profile.Characters.Pmc.Hideout.Areas.Where(x => x.Type == probe.Type).FirstOrDefault();
                     if (areaInfo == null)
                         continue;
+                    var areaDBInfo = AppData.ServerDatabase.HideoutAreaInfos
+                        .Where(x => x.Type == probe.Type)
+                        .FirstOrDefault();
                     if (areaInfo.Level > 0 && areaInfo.Level > probe.Level)
                     {
                         for (int l = probe.Level; l <= areaInfo.Level; l++)
                         {
-                            var areaBonuses = AppData.ServerDatabase.HideoutAreaInfos
-                                .Where(x => x.Type == probe.Type)
-                                .FirstOrDefault()
-                                .Stages[l.ToString()];
+                            var areaBonuses = areaDBInfo.Stages[l.ToString()];
                             if (areaBonuses == null)
                                 continue;
-                            var BonusesList = JObject.Parse(areaBonuses.ToString()).SelectToken("bonuses").ToObject<List<JToken>>();
+                            var areaInfoObject = JObject.Parse(areaBonuses.ToString());
+                            var BonusesList = areaInfoObject.SelectToken("bonuses").ToObject<List<JToken>>();
                             if (BonusesList == null || BonusesList.Count == 0)
                                 continue;
                             foreach (var listItem in BonusesList)
@@ -414,11 +419,69 @@ private void WriteHideout(JToken pmc, out string newStash)
                         }
                     }
                     areaToken["level"] = areaInfo.Level;
+                    UpdateStashForHideoutArea(areaDBInfo, areaInfo.Type.ToString(), areaInfo.Level, inventory);
                 }
             }
             catch (Exception ex) { exceptions.Add(new(SaveEntry.Hideout, ex)); }
         }
 
+        private void UpdateStashForHideoutArea(HideoutAreaInfo hideoutAreaInfo, string type, int level, CharacterInventory inventory)
+        {
+            var areaInfoObject = JObject.Parse(hideoutAreaInfo.Stages[level.ToString()].ToString());
+            var areaStageContainer = areaInfoObject.SelectToken("container").ToObject<string>();
+            if (!string.IsNullOrEmpty(areaStageContainer))
+            {
+                inventory.HideoutAreaStashes[type] = hideoutAreaInfo.Id;
+                var inventoryItem = inventory.Items.FirstOrDefault(x => x.Id == hideoutAreaInfo.Id);
+                if (inventoryItem != null)
+                    inventoryItem.Tpl = areaStageContainer;
+                else
+                    inventory.Items = inventory.Items.Append(new InventoryItem() { Id = hideoutAreaInfo.Id, Tpl = areaStageContainer }).ToArray();
+            }
+            else
+            {
+                inventory.HideoutAreaStashes.Remove(type);
+                inventory.Items = inventory.Items.Where(x => x.Id != hideoutAreaInfo.Id).ToArray();
+            }
+
+            /****
+             * from Hideout controller
+             * // Edge case, add/update `stand1/stand2/stand3` children
+        if (dbHideoutArea.type === HideoutAreas.EQUIPMENT_PRESETS_STAND) {
+            // Can have multiple 'standx' children depending on upgrade level
+            this.addMissingPresetStandItemsToProfile(sessionID, hideoutStage, pmcData, dbHideoutArea, output);
+        }
+
+        // Dont inform client when upgraded area is hall of fame or equipment stand, BSG doesn't inform client this specifc upgrade has occurred
+        // will break client if sent
+        if (![HideoutAreas.PLACE_OF_FAME].includes(dbHideoutArea.type)) {
+            this.addContainerUpgradeToClientOutput(sessionID, dbHideoutArea.type, dbHideoutArea, hideoutStage, output);
+        }
+
+        // Some hideout areas (Gun stand) have child areas linked to it
+        const childDbArea = this.databaseService
+            .getHideout()
+            .areas.find((area) => area.parentArea === dbHideoutArea._id);
+        if (childDbArea) {
+            // Add key/value to `hideoutAreaStashes` dictionary - used to link hideout area to inventory stash by its id
+            if (!pmcData.Inventory.hideoutAreaStashes[childDbArea.type]) {
+                pmcData.Inventory.hideoutAreaStashes[childDbArea.type] = childDbArea._id;
+            }
+
+            // Set child area level to same as parent area
+            pmcData.Hideout.Areas.find((hideoutArea) => hideoutArea.type === childDbArea.type).level =
+                pmcData.Hideout.Areas.find((x) => x.type === profileParentHideoutArea.type).level;
+
+            // Add/upgrade stash item in player inventory
+            const childDbAreaStage = childDbArea.stages[profileParentHideoutArea.level];
+            this.addUpdateInventoryItemToProfile(sessionID, pmcData, childDbArea, childDbAreaStage);
+
+            // Inform client of the changes
+            this.addContainerUpgradeToClientOutput(sessionID, childDbArea.type, childDbArea, childDbAreaStage, output);
+        }
+            ***/
+        }
+
         private void WriteHideoutCrafts(JToken pmc)
         {
             try
diff --git a/SPT-AKI Profile Editor/Core/ServerClasses/Hideout/HideoutAreaInfo.cs b/SPT-AKI Profile Editor/Core/ServerClasses/Hideout/HideoutAreaInfo.cs
index 073b11e4..e1066168 100644
--- a/SPT-AKI Profile Editor/Core/ServerClasses/Hideout/HideoutAreaInfo.cs	
+++ b/SPT-AKI Profile Editor/Core/ServerClasses/Hideout/HideoutAreaInfo.cs	
@@ -5,6 +5,9 @@ namespace SPT_AKI_Profile_Editor.Core.ServerClasses
 {
     public class HideoutAreaInfo
     {
+        [JsonProperty("_id")]
+        public string Id { get; set; }
+
         [JsonProperty("type")]
         public int Type { get; set; }
 

From e337474b4f4d71c0ee1f61ff8bf3dda898921134 Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sun, 5 Jan 2025 02:37:05 +0600
Subject: [PATCH 06/19] version bump for test build

---
 SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj b/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj
index ca44c048..f198b581 100644
--- a/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj	
+++ b/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj	
@@ -6,7 +6,7 @@
     <RootNamespace>SPT_AKI_Profile_Editor</RootNamespace>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
-    <Version>3.0.0</Version>
+    <Version>3.0.1</Version>
     <ApplicationIcon>Resources\killa_ico_k3r_icon.ico</ApplicationIcon>
     <PackageId>SPT-AKI Profile Editor</PackageId>
     <Authors>SkiTles55</Authors>

From 39d03a179747df32f179209846e49285acba5527 Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sun, 5 Jan 2025 15:48:10 +0600
Subject: [PATCH 07/19] Fix for update hideout areas with stashes

---
 SPT-AKI Profile Editor.Tests/ProfileTests.cs  |  17 ++-
 .../ServerDatabaseTests.cs                    |   5 +
 .../HideoutTabViewModelTests.cs               |   2 +-
 SPT-AKI Profile Editor/Core/AppSettings.cs    |  52 +++----
 SPT-AKI Profile Editor/Core/DefaultValues.cs  |   2 +
 .../Core/ProfileClasses/Character.cs          |   3 +-
 .../Core/ProfileClasses/HideoutArea.cs        |  19 ++-
 .../Core/ProfileClasses/Profile.cs            |   2 +-
 .../Core/ProfileClasses/ProfileSaver.cs       | 127 ++++++++++--------
 .../ServerClasses/Hideout/HideoutAreaInfo.cs  |   3 +
 .../ItemsDB/TarkovItemProperties.cs           |   6 +-
 .../ServerClasses/ItemsDB/TarkovItemSlot.cs   |  10 ++
 SPT-AKI Profile Editor/Resources/Labels.xaml  |   3 +-
 .../Resources/Localizations/en.json           |   2 +-
 14 files changed, 144 insertions(+), 109 deletions(-)
 create mode 100644 SPT-AKI Profile Editor/Core/ServerClasses/ItemsDB/TarkovItemSlot.cs

diff --git a/SPT-AKI Profile Editor.Tests/ProfileTests.cs b/SPT-AKI Profile Editor.Tests/ProfileTests.cs
index 9425aa15..af9bf717 100644
--- a/SPT-AKI Profile Editor.Tests/ProfileTests.cs	
+++ b/SPT-AKI Profile Editor.Tests/ProfileTests.cs	
@@ -633,18 +633,25 @@ public void HideoutAreaLevelsSavesCorrectly()
             AppData.Profile.Characters.Pmc.SetAllHideoutAreasMax();
             TestHelpers.SaveAndLoadProfile("testHideouts.json");
             Assert.That(AppData.Profile.Characters.Pmc.Hideout.Areas
-                .All(x => x.Level == x.MaxLevel || !x.CanSetMaxLevel), Is.True);
-            Assert.That(AppData.Profile.Characters.Pmc.Inventory.HideoutAreaStashes,
+                .All(x => x.Level == x.MaxLevel), Is.True);
+            var inventory = AppData.Profile.Characters.Pmc.Inventory;
+            Assert.That(inventory.HideoutAreaStashes,
                         Is.Not.Empty,
                         "Stashes for hideout areas not writed");
-            Assert.That(AppData.Profile.Characters.Pmc.Inventory.HideoutAreaStashes.Count,
+            Assert.That(inventory.HideoutAreaStashes.Count,
                         Is.GreaterThan(1),
                         "Stashes for hideout areas not writed");
-            foreach (var hideoutAreaStash in AppData.Profile.Characters.Pmc.Inventory.HideoutAreaStashes)
+            foreach (var hideoutAreaStash in inventory.HideoutAreaStashes)
             {
-                var item = AppData.Profile.Characters.Pmc.Inventory.Items.FirstOrDefault(x => x.Id == hideoutAreaStash.Value);
+                var item = inventory.Items.FirstOrDefault(x => x.Id == hideoutAreaStash.Value);
                 Assert.That(item, Is.Not.Null, "Inventory not contains stash for hideout area");
             }
+
+            var mannequinItems = inventory.Items.Where(x => x.Tpl == AppData.AppSettings.MannequinInventoryTpl);
+            Assert.That(mannequinItems.Count(), Is.GreaterThan(1), "Mannequins not added");
+
+            var pocketItems = inventory.Items.Where(x => x.Tpl == inventory.Pockets);
+            Assert.That(pocketItems.Count(), Is.GreaterThan(1), "Pockets for mannequins not added");
         }
 
         [Test]
diff --git a/SPT-AKI Profile Editor.Tests/ServerDatabaseTests.cs b/SPT-AKI Profile Editor.Tests/ServerDatabaseTests.cs
index 34d66f54..79fceecd 100644
--- a/SPT-AKI Profile Editor.Tests/ServerDatabaseTests.cs	
+++ b/SPT-AKI Profile Editor.Tests/ServerDatabaseTests.cs	
@@ -227,6 +227,11 @@ public void ItemsDBHaveItemsWithDescription()
             => Assert.That(AppData.ServerDatabase.ItemsDB.Any(x => x.Value.LocalizedDescription != x.Value.Id),
                            Is.True);
 
+        [Test]
+        public void ItemsDBHaveItemsWithSlots()
+            => Assert.That(AppData.ServerDatabase.ItemsDB.Any(x => x.Value.Properties?.Slots?.Any() ?? false),
+                           Is.True);
+
         [Test]
         public void PocketsNotNul() => Assert.That(AppData.ServerDatabase.Pockets, Is.Not.Null);
 
diff --git a/SPT-AKI Profile Editor.Tests/ViewModelsTests/HideoutTabViewModelTests.cs b/SPT-AKI Profile Editor.Tests/ViewModelsTests/HideoutTabViewModelTests.cs
index 8f04a804..2094abdf 100644
--- a/SPT-AKI Profile Editor.Tests/ViewModelsTests/HideoutTabViewModelTests.cs	
+++ b/SPT-AKI Profile Editor.Tests/ViewModelsTests/HideoutTabViewModelTests.cs	
@@ -20,7 +20,7 @@ public void CanSetAllAreasMax()
         {
             TestHelpers.LoadDatabase();
             HideoutTabViewModel.SetAllMaxCommand.Execute(null);
-            Assert.That(AppData.Profile.Characters.Pmc.Hideout.Areas.All(x => x.Level == x.MaxLevel || !x.CanSetMaxLevel),
+            Assert.That(AppData.Profile.Characters.Pmc.Hideout.Areas.All(x => x.Level == x.MaxLevel),
                         Is.True);
         }
 
diff --git a/SPT-AKI Profile Editor/Core/AppSettings.cs b/SPT-AKI Profile Editor/Core/AppSettings.cs
index 3a00f747..d305a427 100644
--- a/SPT-AKI Profile Editor/Core/AppSettings.cs	
+++ b/SPT-AKI Profile Editor/Core/AppSettings.cs	
@@ -226,6 +226,10 @@ public IssuesAction IssuesAction
 
         public List<string> SkipMigrationTags { get; set; }
 
+        public string MannequinInventoryTpl { get; set; }
+
+        public int HideoutAreaEquipmentPresetsType { get; set; }
+
         [JsonIgnore]
         public Dictionary<string, string> ServerProfiles
         {
@@ -248,37 +252,7 @@ public bool FastModeOpened
             }
         }
 
-        public string GetStamp()
-        {
-            return ServerPath
-                + DefaultProfile
-                + Language
-                + UsingModHelper
-                + AutoAddMissingMasterings.ToString()
-                + AutoAddMissingScavSkills.ToString()
-                + CommonSkillMaxValue.ToString()
-                + PocketsContainerTpl
-                + PocketsSlotId
-                + EarpieceSlotId
-                + HeadwearSlotId
-                + FaceCoverSlotId
-                + TacticalVestSlotId
-                + FirstPrimaryWeaponSlotId
-                + BackpackSlotId
-                + SecuredContainerSlotId
-                + EyewearSlotId
-                + ArmorVestSlotId
-                + SecondPrimaryWeaponSlotId
-                + HolsterSlotId
-                + ScabbardSlotId
-                + ArmBandSlotId
-                + MoneysDollarsTpl
-                + MoneysEurosTpl
-                + MoneysRublesTpl
-                + BearDogtagTpl
-                + EndlessDevBackpackId
-                + FenceTraderId;
-        }
+        public string GetStamp() => JsonConvert.SerializeObject(this, Formatting.None);
 
         public bool ServerHaveProfiles() => ServerProfiles != null && ServerProfiles.Count > 0;
 
@@ -409,6 +383,8 @@ private void ApplyLoadedValues(AppSettings loaded)
             EndlessDevBackpackId = loaded.EndlessDevBackpackId;
             FenceTraderId = loaded.FenceTraderId;
             SkipMigrationTags = loaded.SkipMigrationTags;
+            MannequinInventoryTpl = loaded.MannequinInventoryTpl;
+            HideoutAreaEquipmentPresetsType = loaded.HideoutAreaEquipmentPresetsType;
         }
 
         private bool CheckValues()
@@ -566,7 +542,17 @@ private bool CheckValues()
             }
             if (SkipMigrationTags == null)
             {
-                SkipMigrationTags = new ();
+                SkipMigrationTags = new();
+                _needReSave = true;
+            }
+            if (MannequinInventoryTpl == null)
+            {
+                MannequinInventoryTpl = DefaultValues.MannequinInventoryTpl;
+                _needReSave = true;
+            }
+            if (HideoutAreaEquipmentPresetsType == 0)
+            {
+                HideoutAreaEquipmentPresetsType = DefaultValues.HideoutAreaEquipmentPresetsType;
                 _needReSave = true;
             }
             return _needReSave;
@@ -607,6 +593,8 @@ private void CreateDefault()
             EndlessDevBackpackId = DefaultValues.EndlessDevBackpackId;
             FenceTraderId = DefaultValues.FenceTraderId;
             SkipMigrationTags = new();
+            MannequinInventoryTpl = DefaultValues.MannequinInventoryTpl;
+            HideoutAreaEquipmentPresetsType = DefaultValues.HideoutAreaEquipmentPresetsType;
             Logger.Log($"Default configuration file created");
             Save();
         }
diff --git a/SPT-AKI Profile Editor/Core/DefaultValues.cs b/SPT-AKI Profile Editor/Core/DefaultValues.cs
index a77b63ce..30dfca19 100644
--- a/SPT-AKI Profile Editor/Core/DefaultValues.cs	
+++ b/SPT-AKI Profile Editor/Core/DefaultValues.cs	
@@ -35,6 +35,8 @@ public static class DefaultValues
         public const float CommonSkillMaxValue = 5100;
         public const IssuesAction DefaultIssuesAction = IssuesAction.AlwaysShow;
         public const string FenceTraderId = "579dc571d53a0658a154fbec";
+        public const string MannequinInventoryTpl = "55d7217a4bdc2d86028b456d";
+        public const int HideoutAreaEquipmentPresetsType = 26;
 
         public static readonly string AppDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SPT-AKI Profile Editor");
 
diff --git a/SPT-AKI Profile Editor/Core/ProfileClasses/Character.cs b/SPT-AKI Profile Editor/Core/ProfileClasses/Character.cs
index bd82286a..f68ae8e0 100644
--- a/SPT-AKI Profile Editor/Core/ProfileClasses/Character.cs	
+++ b/SPT-AKI Profile Editor/Core/ProfileClasses/Character.cs	
@@ -321,8 +321,7 @@ public void SetAllQuests(QuestStatus status)
         public void SetAllHideoutAreasMax()
         {
             foreach (var area in Hideout?.Areas)
-                if (area.CanSetMaxLevel)
-                    area.Level = area.MaxLevel;
+                area.Level = area.MaxLevel;
         }
 
         public void SetAllCommonSkills(float value)
diff --git a/SPT-AKI Profile Editor/Core/ProfileClasses/HideoutArea.cs b/SPT-AKI Profile Editor/Core/ProfileClasses/HideoutArea.cs
index 03e4fa0c..c55c2986 100644
--- a/SPT-AKI Profile Editor/Core/ProfileClasses/HideoutArea.cs	
+++ b/SPT-AKI Profile Editor/Core/ProfileClasses/HideoutArea.cs	
@@ -8,14 +8,13 @@ namespace SPT_AKI_Profile_Editor.Core.ProfileClasses
     public class HideoutArea : BindableEntity
     {
         private int type;
-
         private int level;
 
         [JsonConstructor]
         public HideoutArea(int type, int level)
         {
-            Type = type;
-            Level = level;
+            this.type = type;
+            this.level = level;
         }
 
         [JsonProperty("type")]
@@ -37,6 +36,17 @@ public int Level
             {
                 level = Math.Min(value, MaxLevel);
                 OnPropertyChanged(nameof(Level));
+                var areaInfo = AppData.ServerDatabase.HideoutAreaInfos.FirstOrDefault(x => x.Type == type);
+                if (!string.IsNullOrEmpty(areaInfo?.Id))
+                {
+                    var childAreaType = AppData.ServerDatabase.HideoutAreaInfos.FirstOrDefault(x => x.ParentArea == areaInfo.Id)?.Type;
+                    if (childAreaType != null)
+                    {
+                        var childArea = AppData.Profile.Characters?.Pmc?.Hideout?.Areas.FirstOrDefault(x => x.Type == childAreaType);
+                        if (childArea != null)
+                            childArea.Level = level;
+                    }
+                }
             }
         }
 
@@ -48,9 +58,6 @@ public int Level
         [JsonIgnore]
         public int MaxLevel => GetMaxLevel();
 
-        [JsonIgnore]
-        public bool CanSetMaxLevel => Type != 25;
-
         private int GetMaxLevel()
         {
             var areaInfo = AppData.ServerDatabase?.HideoutAreaInfos?.Where(x => x.Type == Type).FirstOrDefault();
diff --git a/SPT-AKI Profile Editor/Core/ProfileClasses/Profile.cs b/SPT-AKI Profile Editor/Core/ProfileClasses/Profile.cs
index e980691f..bc84dfa8 100644
--- a/SPT-AKI Profile Editor/Core/ProfileClasses/Profile.cs	
+++ b/SPT-AKI Profile Editor/Core/ProfileClasses/Profile.cs	
@@ -119,7 +119,7 @@ bool NeedToAddMissingMasteringsSkills() => AppData.AppSettings.AutoAddMissingMas
         }
 
         public List<SaveException> Save(string targetPath, string savePath = null)
-            => new ProfileSaver(this).Save(targetPath, savePath);
+            => new ProfileSaver(this, AppData.AppSettings, AppData.ServerDatabase).Save(targetPath, savePath);
 
         public bool IsProfileChanged()
             => ProfileHash != 0 && ProfileHash != JsonConvert.SerializeObject(this).ToString().GetHashCode();
diff --git a/SPT-AKI Profile Editor/Core/ProfileClasses/ProfileSaver.cs b/SPT-AKI Profile Editor/Core/ProfileClasses/ProfileSaver.cs
index f1fb1fab..35d8dd14 100644
--- a/SPT-AKI Profile Editor/Core/ProfileClasses/ProfileSaver.cs	
+++ b/SPT-AKI Profile Editor/Core/ProfileClasses/ProfileSaver.cs	
@@ -53,8 +53,15 @@ public class ProfileSaver
     {
         private readonly Profile profile;
         private readonly List<SaveException> exceptions = new();
+        private readonly AppSettings appSettings;
+        private readonly ServerDatabase serverDatabase;
 
-        public ProfileSaver(Profile profile) => this.profile = profile;
+        public ProfileSaver(Profile profile, AppSettings appSettings, ServerDatabase serverDatabase)
+        {
+            this.profile = profile;
+            this.appSettings = appSettings;
+            this.serverDatabase = serverDatabase;
+        }
 
         public enum SaveEntry
         {
@@ -138,6 +145,65 @@ private static string SerializeProfile(JObject profileObject)
             return sw.ToString();
         }
 
+        private void UpdateStashForHideoutArea(HideoutAreaInfo hideoutAreaInfo, string type, int level, CharacterInventory inventory)
+        {
+            var areaInfoObject = JObject.Parse(hideoutAreaInfo.Stages[level.ToString()].ToString());
+            var areaStageContainer = areaInfoObject.SelectToken("container").ToObject<string>();
+            if (!string.IsNullOrEmpty(areaStageContainer))
+            {
+                var inventoryItemsList = inventory.Items.ToList();
+                inventory.HideoutAreaStashes[type] = hideoutAreaInfo.Id;
+                var inventoryItem = inventory.Items.FirstOrDefault(x => x.Id == hideoutAreaInfo.Id);
+                if (inventoryItem != null)
+                    inventoryItem.Tpl = areaStageContainer;
+                else
+                    inventoryItemsList.Add(new InventoryItem() { Id = hideoutAreaInfo.Id, Tpl = areaStageContainer });
+
+                if (type == appSettings.HideoutAreaEquipmentPresetsType.ToString() && serverDatabase.ItemsDB.ContainsKey(areaStageContainer))
+                    AddMissingPresetStandItems(areaStageContainer, inventoryItemsList, hideoutAreaInfo.Id, inventory.Pockets);
+                inventory.Items = inventoryItemsList.ToArray();
+            }
+            else
+            {
+                inventory.HideoutAreaStashes.Remove(type);
+                inventory.Items = inventory.Items.Where(x => x.Id != hideoutAreaInfo.Id).ToArray();
+            }
+        }
+
+        private void AddMissingPresetStandItems(string container, List<InventoryItem> inventoryItemsList, string areaId, string pocketsTpl)
+        {
+            var slots = serverDatabase.ItemsDB[container].Properties?.Slots;
+            if (slots == null)
+                return;
+            foreach (var mannequinSlot in slots)
+            {
+                if (inventoryItemsList.FirstOrDefault(x => x.ParentId == areaId && x.SlotId == mannequinSlot.Name) == null)
+                {
+                    List<string> iDs = inventoryItemsList.Select(x => x.Id).ToList();
+                    string newId = ExtMethods.GenerateNewId(iDs);
+                    InventoryItem mannequinToAdd = new()
+                    {
+                        Id = newId,
+                        Tpl = appSettings.MannequinInventoryTpl,
+                        ParentId = areaId,
+                        SlotId = mannequinSlot.Name
+                    };
+                    inventoryItemsList.Add(mannequinToAdd);
+                    iDs.Add(newId);
+                    // Add pocket child item
+                    string mannequinPocketId = ExtMethods.GenerateNewId(iDs);
+                    InventoryItem mannequinPocketItemToAdd = new()
+                    {
+                        Id = mannequinPocketId,
+                        Tpl = pocketsTpl,
+                        ParentId = newId,
+                        SlotId = appSettings.PocketsSlotId
+                    };
+                    inventoryItemsList.Add(mannequinPocketItemToAdd);
+                }
+            }
+        }
+
         private void WriteSuits(JObject jobject)
         {
             try { jobject.SelectToken("suits").Replace(JToken.FromObject(profile.Suits.ToArray())); }
@@ -385,7 +451,7 @@ private void WriteHideout(JToken pmc, CharacterInventory inventory, out string n
                     var areaInfo = profile.Characters.Pmc.Hideout.Areas.Where(x => x.Type == probe.Type).FirstOrDefault();
                     if (areaInfo == null)
                         continue;
-                    var areaDBInfo = AppData.ServerDatabase.HideoutAreaInfos
+                    var areaDBInfo = serverDatabase.HideoutAreaInfos
                         .Where(x => x.Type == probe.Type)
                         .FirstOrDefault();
                     if (areaInfo.Level > 0 && areaInfo.Level > probe.Level)
@@ -425,63 +491,6 @@ private void WriteHideout(JToken pmc, CharacterInventory inventory, out string n
             catch (Exception ex) { exceptions.Add(new(SaveEntry.Hideout, ex)); }
         }
 
-        private void UpdateStashForHideoutArea(HideoutAreaInfo hideoutAreaInfo, string type, int level, CharacterInventory inventory)
-        {
-            var areaInfoObject = JObject.Parse(hideoutAreaInfo.Stages[level.ToString()].ToString());
-            var areaStageContainer = areaInfoObject.SelectToken("container").ToObject<string>();
-            if (!string.IsNullOrEmpty(areaStageContainer))
-            {
-                inventory.HideoutAreaStashes[type] = hideoutAreaInfo.Id;
-                var inventoryItem = inventory.Items.FirstOrDefault(x => x.Id == hideoutAreaInfo.Id);
-                if (inventoryItem != null)
-                    inventoryItem.Tpl = areaStageContainer;
-                else
-                    inventory.Items = inventory.Items.Append(new InventoryItem() { Id = hideoutAreaInfo.Id, Tpl = areaStageContainer }).ToArray();
-            }
-            else
-            {
-                inventory.HideoutAreaStashes.Remove(type);
-                inventory.Items = inventory.Items.Where(x => x.Id != hideoutAreaInfo.Id).ToArray();
-            }
-
-            /****
-             * from Hideout controller
-             * // Edge case, add/update `stand1/stand2/stand3` children
-        if (dbHideoutArea.type === HideoutAreas.EQUIPMENT_PRESETS_STAND) {
-            // Can have multiple 'standx' children depending on upgrade level
-            this.addMissingPresetStandItemsToProfile(sessionID, hideoutStage, pmcData, dbHideoutArea, output);
-        }
-
-        // Dont inform client when upgraded area is hall of fame or equipment stand, BSG doesn't inform client this specifc upgrade has occurred
-        // will break client if sent
-        if (![HideoutAreas.PLACE_OF_FAME].includes(dbHideoutArea.type)) {
-            this.addContainerUpgradeToClientOutput(sessionID, dbHideoutArea.type, dbHideoutArea, hideoutStage, output);
-        }
-
-        // Some hideout areas (Gun stand) have child areas linked to it
-        const childDbArea = this.databaseService
-            .getHideout()
-            .areas.find((area) => area.parentArea === dbHideoutArea._id);
-        if (childDbArea) {
-            // Add key/value to `hideoutAreaStashes` dictionary - used to link hideout area to inventory stash by its id
-            if (!pmcData.Inventory.hideoutAreaStashes[childDbArea.type]) {
-                pmcData.Inventory.hideoutAreaStashes[childDbArea.type] = childDbArea._id;
-            }
-
-            // Set child area level to same as parent area
-            pmcData.Hideout.Areas.find((hideoutArea) => hideoutArea.type === childDbArea.type).level =
-                pmcData.Hideout.Areas.find((x) => x.type === profileParentHideoutArea.type).level;
-
-            // Add/upgrade stash item in player inventory
-            const childDbAreaStage = childDbArea.stages[profileParentHideoutArea.level];
-            this.addUpdateInventoryItemToProfile(sessionID, pmcData, childDbArea, childDbAreaStage);
-
-            // Inform client of the changes
-            this.addContainerUpgradeToClientOutput(sessionID, childDbArea.type, childDbArea, childDbAreaStage, output);
-        }
-            ***/
-        }
-
         private void WriteHideoutCrafts(JToken pmc)
         {
             try
diff --git a/SPT-AKI Profile Editor/Core/ServerClasses/Hideout/HideoutAreaInfo.cs b/SPT-AKI Profile Editor/Core/ServerClasses/Hideout/HideoutAreaInfo.cs
index e1066168..69269564 100644
--- a/SPT-AKI Profile Editor/Core/ServerClasses/Hideout/HideoutAreaInfo.cs	
+++ b/SPT-AKI Profile Editor/Core/ServerClasses/Hideout/HideoutAreaInfo.cs	
@@ -8,6 +8,9 @@ public class HideoutAreaInfo
         [JsonProperty("_id")]
         public string Id { get; set; }
 
+        [JsonProperty("parentArea")]
+        public string ParentArea { get; set; }
+
         [JsonProperty("type")]
         public int Type { get; set; }
 
diff --git a/SPT-AKI Profile Editor/Core/ServerClasses/ItemsDB/TarkovItemProperties.cs b/SPT-AKI Profile Editor/Core/ServerClasses/ItemsDB/TarkovItemProperties.cs
index fcc309c8..6b089fbc 100644
--- a/SPT-AKI Profile Editor/Core/ServerClasses/ItemsDB/TarkovItemProperties.cs	
+++ b/SPT-AKI Profile Editor/Core/ServerClasses/ItemsDB/TarkovItemProperties.cs	
@@ -1,4 +1,6 @@
-namespace SPT_AKI_Profile_Editor.Core.ServerClasses
+using SPT_AKI_Profile_Editor.Core.ServerClasses.ItemsDB;
+
+namespace SPT_AKI_Profile_Editor.Core.ServerClasses
 {
     public class TarkovItemProperties
     {
@@ -39,5 +41,7 @@ public class TarkovItemProperties
         public float Recoil { get; set; }
 
         public bool DogTagQualities { get; set; }
+
+        public TarkovItemSlot[] Slots { get; set; }
     }
 }
\ No newline at end of file
diff --git a/SPT-AKI Profile Editor/Core/ServerClasses/ItemsDB/TarkovItemSlot.cs b/SPT-AKI Profile Editor/Core/ServerClasses/ItemsDB/TarkovItemSlot.cs
new file mode 100644
index 00000000..52580774
--- /dev/null
+++ b/SPT-AKI Profile Editor/Core/ServerClasses/ItemsDB/TarkovItemSlot.cs	
@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace SPT_AKI_Profile_Editor.Core.ServerClasses.ItemsDB
+{
+    public class TarkovItemSlot
+    {
+        [JsonProperty("_name")]
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/SPT-AKI Profile Editor/Resources/Labels.xaml b/SPT-AKI Profile Editor/Resources/Labels.xaml
index 6cc17aeb..9f166eac 100644
--- a/SPT-AKI Profile Editor/Resources/Labels.xaml	
+++ b/SPT-AKI Profile Editor/Resources/Labels.xaml	
@@ -1,4 +1,5 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ControlTemplate x:Key="TitleLabel" TargetType="Label">
         <Label
             Margin="10,0,0,0"
diff --git a/SPT-AKI Profile Editor/Resources/Localizations/en.json b/SPT-AKI Profile Editor/Resources/Localizations/en.json
index b3429494..be954249 100644
--- a/SPT-AKI Profile Editor/Resources/Localizations/en.json	
+++ b/SPT-AKI Profile Editor/Resources/Localizations/en.json	
@@ -261,6 +261,6 @@
     "migration_to_3.9.0_title": "Current settings are not compatible with SPT version 3.9.0 and higher",
     "migration_to_3.9.0_message": "Make the required changes?\n\nRelative paths to server files will be corrected\nLocalization files will be reset\nThe program will automatically restart",
     "checkbox_dont_ask_again": "Don't ask again",
-    "server_select_help":  "Need help?"
+    "server_select_help": "Need help?"
   }
 }
\ No newline at end of file

From b27255880182347ef8c1287082190411baa5784b Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sun, 5 Jan 2025 19:12:25 +0600
Subject: [PATCH 08/19] correctly load empty profiles

---
 .../Core/CleaningService.cs                   |  4 +--
 .../Core/ProfileClasses/Character.cs          | 27 +++++++++++++------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/SPT-AKI Profile Editor/Core/CleaningService.cs b/SPT-AKI Profile Editor/Core/CleaningService.cs
index c9e12c91..cfc47f37 100644
--- a/SPT-AKI Profile Editor/Core/CleaningService.cs	
+++ b/SPT-AKI Profile Editor/Core/CleaningService.cs	
@@ -43,10 +43,10 @@ public ObservableCollection<ModdedEntity> ModdedEntities
         public void LoadEntitiesList()
         {
             var compositeCollection = new ObservableCollection<ModdedEntity>();
-            GetModdedInventoryItems(AppData.Profile?.Characters?.Pmc?.Inventory.Items,
+            GetModdedInventoryItems(AppData.Profile?.Characters?.Pmc?.Inventory?.Items,
                                     ModdedEntityType.PmcInventoryItem,
                                     compositeCollection);
-            GetModdedInventoryItems(AppData.Profile?.Characters?.Scav?.Inventory.Items,
+            GetModdedInventoryItems(AppData.Profile?.Characters?.Scav?.Inventory?.Items,
                                     ModdedEntityType.ScavInventoryItem,
                                     compositeCollection);
             GetModdedQuests(AppData.Profile?.Characters?.Pmc?.Quests, compositeCollection);
diff --git a/SPT-AKI Profile Editor/Core/ProfileClasses/Character.cs b/SPT-AKI Profile Editor/Core/ProfileClasses/Character.cs
index f68ae8e0..e2dbf26d 100644
--- a/SPT-AKI Profile Editor/Core/ProfileClasses/Character.cs	
+++ b/SPT-AKI Profile Editor/Core/ProfileClasses/Character.cs	
@@ -30,7 +30,7 @@ public class Character : BindableEntity
         private CharacterBonus[] bonuses;
 
         [JsonIgnore]
-        public bool IsScav => Info.Side == "Savage";
+        public bool IsScav => Info?.Side == "Savage";
 
         [JsonProperty("aid")]
         public string Aid
@@ -192,7 +192,7 @@ public int StashRowsBonusCount
         {
             get
             {
-                var bonus = Bonuses.FirstOrDefault(x => x.Type == CharacterBonus.StashRowsType);
+                var bonus = Bonuses?.FirstOrDefault(x => x.Type == CharacterBonus.StashRowsType);
                 return (int)(bonus?.Value ?? 0);
             }
             set
@@ -208,10 +208,17 @@ public int StashRowsBonusCount
         }
 
         [JsonIgnore]
-        public ObservableCollection<CharacterTraderStandingExtended> TraderStandingsExt =>
-            new(TraderStandings?.Select(x => new CharacterTraderStandingExtended(x.Value,
-                                                                                x.Key,
-                                                                                GetTraderInfo(x.Key))));
+        public ObservableCollection<CharacterTraderStandingExtended> TraderStandingsExt
+        {
+            get
+            {
+                if (TraderStandings == null)
+                    return new ObservableCollection<CharacterTraderStandingExtended>();
+                return new(TraderStandings.Select(x => new CharacterTraderStandingExtended(x.Value,
+                                                                                           x.Key,
+                                                                                           GetTraderInfo(x.Key))));
+            }
+        }
 
         [JsonIgnore]
         public IEnumerable<ExaminedItem> ExaminedItems => Encyclopedia?
@@ -247,7 +254,7 @@ public void AddAllMisingQuests(bool eventQuests)
         public IEnumerable<string> MissingQuests(bool eventQuests)
         {
             bool QuestIsMissing(bool eventQuests, string qid)
-                => Quests.FirstOrDefault(y => y.Qid == qid) == null
+                => Quests?.FirstOrDefault(y => y.Qid == qid) == null
                 && AppData.ServerConfigs.Quest.EventQuests.ContainsKey(qid) == eventQuests;
 
             return AppData.ServerDatabase.QuestsData
@@ -382,6 +389,10 @@ public void SetupHideoutProductions()
         }
 
         private static TraderBase GetTraderInfo(string key)
-                            => AppData.ServerDatabase.TraderInfos.ContainsKey(key) ? AppData.ServerDatabase.TraderInfos[key] : null;
+        {
+            if (key == null)
+                return null;
+            return AppData.ServerDatabase.TraderInfos.ContainsKey(key) ? AppData.ServerDatabase.TraderInfos[key] : null;
+        }
     }
 }
\ No newline at end of file

From d1ea9f82eac6b49d4aa22e11657cef5c4970c36b Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sun, 5 Jan 2025 19:24:59 +0600
Subject: [PATCH 09/19] Fix for ProgressTransferService tests

---
 SPT-AKI Profile Editor.Tests/ProgressTransferServiceTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SPT-AKI Profile Editor.Tests/ProgressTransferServiceTests.cs b/SPT-AKI Profile Editor.Tests/ProgressTransferServiceTests.cs
index b3e9c234..315b01ef 100644
--- a/SPT-AKI Profile Editor.Tests/ProgressTransferServiceTests.cs	
+++ b/SPT-AKI Profile Editor.Tests/ProgressTransferServiceTests.cs	
@@ -303,7 +303,7 @@ private void PrepareTestProfile()
 
             foreach (var suit in AppData.ServerDatabase.TraderSuits.Where(x => !x.Boughted).Take(4))
                 suit.Boughted = true;
-            suitsList = AppData.ServerDatabase.TraderSuits.Where(x => x.Boughted).Select(x => x.SuiteId).ToArray();
+            suitsList = AppData.ServerDatabase.TraderSuits.Where(x => x.Boughted).Select(x => x.SuiteId).Union(AppData.Profile.Suits).ToArray();
 
             pmc.SetAllCommonSkills(500);
             pmcCommonSkills = pmc.Skills.Common.ToDictionary(x => x.Id, y => y.Progress);

From 6a974d97a4e2edbfaafe20c44f8b611220680891 Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sun, 5 Jan 2025 20:01:40 +0600
Subject: [PATCH 10/19] code cleaning

---
 SPT-AKI Profile Editor.Tests/ProfileTests.cs  | 18 ++++----
 .../Core/ProfileClasses/HideoutArea.cs        | 18 ++++----
 .../Core/ProfileClasses/ProfileSaver.cs       | 45 +++++++++----------
 3 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/SPT-AKI Profile Editor.Tests/ProfileTests.cs b/SPT-AKI Profile Editor.Tests/ProfileTests.cs
index af9bf717..dc9a3cf2 100644
--- a/SPT-AKI Profile Editor.Tests/ProfileTests.cs	
+++ b/SPT-AKI Profile Editor.Tests/ProfileTests.cs	
@@ -544,8 +544,8 @@ public void RagfairStandingSavesCorrectly()
             AppData.Profile.Characters.Pmc.RagfairInfo.Rating += 3;
             TestHelpers.SaveAndLoadProfile("testRagfairStanding.json");
             Assert.That(AppData.Profile.Characters.Pmc.RagfairInfo.Rating,
-                Is.EqualTo(startingRating + 3),
-                "Ragfair standing not saves correctly");
+                        Is.EqualTo(startingRating + 3),
+                        "Ragfair standing not saves correctly");
         }
 
         [Test]
@@ -635,9 +635,6 @@ public void HideoutAreaLevelsSavesCorrectly()
             Assert.That(AppData.Profile.Characters.Pmc.Hideout.Areas
                 .All(x => x.Level == x.MaxLevel), Is.True);
             var inventory = AppData.Profile.Characters.Pmc.Inventory;
-            Assert.That(inventory.HideoutAreaStashes,
-                        Is.Not.Empty,
-                        "Stashes for hideout areas not writed");
             Assert.That(inventory.HideoutAreaStashes.Count,
                         Is.GreaterThan(1),
                         "Stashes for hideout areas not writed");
@@ -647,11 +644,14 @@ public void HideoutAreaLevelsSavesCorrectly()
                 Assert.That(item, Is.Not.Null, "Inventory not contains stash for hideout area");
             }
 
-            var mannequinItems = inventory.Items.Where(x => x.Tpl == AppData.AppSettings.MannequinInventoryTpl);
-            Assert.That(mannequinItems.Count(), Is.GreaterThan(1), "Mannequins not added");
+            void CheckItemsAmount(string tpl, string failMessage)
+            {
+                var items = inventory.Items.Where(x => x.Tpl == tpl);
+                Assert.That(items.Count(), Is.GreaterThan(1), failMessage);
+            }
 
-            var pocketItems = inventory.Items.Where(x => x.Tpl == inventory.Pockets);
-            Assert.That(pocketItems.Count(), Is.GreaterThan(1), "Pockets for mannequins not added");
+            CheckItemsAmount(AppData.AppSettings.MannequinInventoryTpl, "Mannequins not added");
+            CheckItemsAmount(inventory.Pockets, "Pockets for mannequins not added");
         }
 
         [Test]
diff --git a/SPT-AKI Profile Editor/Core/ProfileClasses/HideoutArea.cs b/SPT-AKI Profile Editor/Core/ProfileClasses/HideoutArea.cs
index c55c2986..6d48e77c 100644
--- a/SPT-AKI Profile Editor/Core/ProfileClasses/HideoutArea.cs	
+++ b/SPT-AKI Profile Editor/Core/ProfileClasses/HideoutArea.cs	
@@ -37,16 +37,14 @@ public int Level
                 level = Math.Min(value, MaxLevel);
                 OnPropertyChanged(nameof(Level));
                 var areaInfo = AppData.ServerDatabase.HideoutAreaInfos.FirstOrDefault(x => x.Type == type);
-                if (!string.IsNullOrEmpty(areaInfo?.Id))
-                {
-                    var childAreaType = AppData.ServerDatabase.HideoutAreaInfos.FirstOrDefault(x => x.ParentArea == areaInfo.Id)?.Type;
-                    if (childAreaType != null)
-                    {
-                        var childArea = AppData.Profile.Characters?.Pmc?.Hideout?.Areas.FirstOrDefault(x => x.Type == childAreaType);
-                        if (childArea != null)
-                            childArea.Level = level;
-                    }
-                }
+                if (string.IsNullOrEmpty(areaInfo?.Id))
+                    return;
+                var childAreaType = AppData.ServerDatabase.HideoutAreaInfos.FirstOrDefault(x => x.ParentArea == areaInfo.Id)?.Type;
+                if (childAreaType == null)
+                    return;
+                var childArea = AppData.Profile.Characters?.Pmc?.Hideout?.Areas.FirstOrDefault(x => x.Type == childAreaType);
+                if (childArea != null)
+                    childArea.Level = level;
             }
         }
 
diff --git a/SPT-AKI Profile Editor/Core/ProfileClasses/ProfileSaver.cs b/SPT-AKI Profile Editor/Core/ProfileClasses/ProfileSaver.cs
index 35d8dd14..0fe469b3 100644
--- a/SPT-AKI Profile Editor/Core/ProfileClasses/ProfileSaver.cs	
+++ b/SPT-AKI Profile Editor/Core/ProfileClasses/ProfileSaver.cs	
@@ -175,32 +175,29 @@ private void AddMissingPresetStandItems(string container, List<InventoryItem> in
             var slots = serverDatabase.ItemsDB[container].Properties?.Slots;
             if (slots == null)
                 return;
-            foreach (var mannequinSlot in slots)
+
+            void AddItem(string id, string tpl, string parentId, string slotId)
             {
-                if (inventoryItemsList.FirstOrDefault(x => x.ParentId == areaId && x.SlotId == mannequinSlot.Name) == null)
+                InventoryItem newItem = new()
                 {
-                    List<string> iDs = inventoryItemsList.Select(x => x.Id).ToList();
-                    string newId = ExtMethods.GenerateNewId(iDs);
-                    InventoryItem mannequinToAdd = new()
-                    {
-                        Id = newId,
-                        Tpl = appSettings.MannequinInventoryTpl,
-                        ParentId = areaId,
-                        SlotId = mannequinSlot.Name
-                    };
-                    inventoryItemsList.Add(mannequinToAdd);
-                    iDs.Add(newId);
-                    // Add pocket child item
-                    string mannequinPocketId = ExtMethods.GenerateNewId(iDs);
-                    InventoryItem mannequinPocketItemToAdd = new()
-                    {
-                        Id = mannequinPocketId,
-                        Tpl = pocketsTpl,
-                        ParentId = newId,
-                        SlotId = appSettings.PocketsSlotId
-                    };
-                    inventoryItemsList.Add(mannequinPocketItemToAdd);
-                }
+                    Id = id,
+                    Tpl = tpl,
+                    ParentId = parentId,
+                    SlotId = slotId
+                };
+                inventoryItemsList.Add(newItem);
+            }
+
+            foreach (var mannequinSlot in slots)
+            {
+                if (inventoryItemsList.FirstOrDefault(x => x.ParentId == areaId && x.SlotId == mannequinSlot.Name) != null)
+                    continue;
+                List<string> iDs = inventoryItemsList.Select(x => x.Id).ToList();
+                string newId = ExtMethods.GenerateNewId(iDs);
+                AddItem(newId, appSettings.MannequinInventoryTpl, areaId, mannequinSlot.Name);
+                iDs.Add(newId);
+                // Add pocket child item
+                AddItem(ExtMethods.GenerateNewId(iDs), pocketsTpl, newId, appSettings.PocketsSlotId);
             }
         }
 

From 3ec352f0db6c481ba77a9370949b0e251fffb4c9 Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sun, 5 Jan 2025 23:50:51 +0600
Subject: [PATCH 11/19] update parent hideout area level

---
 .../Core/ProfileClasses/HideoutArea.cs        | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/SPT-AKI Profile Editor/Core/ProfileClasses/HideoutArea.cs b/SPT-AKI Profile Editor/Core/ProfileClasses/HideoutArea.cs
index 6d48e77c..62a99ee1 100644
--- a/SPT-AKI Profile Editor/Core/ProfileClasses/HideoutArea.cs	
+++ b/SPT-AKI Profile Editor/Core/ProfileClasses/HideoutArea.cs	
@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using SPT_AKI_Profile_Editor.Core.HelperClasses;
+using SPT_AKI_Profile_Editor.Core.ServerClasses;
 using System;
 using System.Linq;
 
@@ -37,14 +38,10 @@ public int Level
                 level = Math.Min(value, MaxLevel);
                 OnPropertyChanged(nameof(Level));
                 var areaInfo = AppData.ServerDatabase.HideoutAreaInfos.FirstOrDefault(x => x.Type == type);
-                if (string.IsNullOrEmpty(areaInfo?.Id))
-                    return;
-                var childAreaType = AppData.ServerDatabase.HideoutAreaInfos.FirstOrDefault(x => x.ParentArea == areaInfo.Id)?.Type;
-                if (childAreaType == null)
-                    return;
-                var childArea = AppData.Profile.Characters?.Pmc?.Hideout?.Areas.FirstOrDefault(x => x.Type == childAreaType);
-                if (childArea != null)
-                    childArea.Level = level;
+                if (!string.IsNullOrEmpty(areaInfo?.Id))
+                    SetAreaLevel(x => x.ParentArea == areaInfo.Id);
+                if (!string.IsNullOrEmpty(areaInfo?.ParentArea))
+                    SetAreaLevel(x => x.Id == areaInfo.ParentArea);
             }
         }
 
@@ -56,6 +53,16 @@ public int Level
         [JsonIgnore]
         public int MaxLevel => GetMaxLevel();
 
+        private void SetAreaLevel(Func<HideoutAreaInfo, bool> predicate)
+        {
+            var areaType = AppData.ServerDatabase.HideoutAreaInfos.FirstOrDefault(predicate)?.Type;
+            if (areaType == null)
+                return;
+            var area = AppData.Profile.Characters?.Pmc?.Hideout?.Areas.FirstOrDefault(x => x.Type == areaType);
+            if (area != null && area.Level != level)
+                area.Level = level;
+        }
+
         private int GetMaxLevel()
         {
             var areaInfo = AppData.ServerDatabase?.HideoutAreaInfos?.Where(x => x.Type == Type).FirstOrDefault();

From 3dca859cb33b4ea65a3026ce9402b4ee396a4e76 Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Tue, 7 Jan 2025 21:23:23 +0600
Subject: [PATCH 12/19] version bump for test build

---
 SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj b/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj
index f198b581..b1eba9db 100644
--- a/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj	
+++ b/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj	
@@ -6,7 +6,7 @@
     <RootNamespace>SPT_AKI_Profile_Editor</RootNamespace>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <ApplicationIcon>Resources\killa_ico_k3r_icon.ico</ApplicationIcon>
     <PackageId>SPT-AKI Profile Editor</PackageId>
     <Authors>SkiTles55</Authors>

From 80e3515ee991bed8fe6890a79cbcc85904f30d61 Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sat, 11 Jan 2025 19:19:51 +0600
Subject: [PATCH 13/19] Fix for Japanese localization

---
 SPT-AKI Profile Editor/Core/DefaultValues.cs         | 2 +-
 SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/SPT-AKI Profile Editor/Core/DefaultValues.cs b/SPT-AKI Profile Editor/Core/DefaultValues.cs
index 30dfca19..a786ee0f 100644
--- a/SPT-AKI Profile Editor/Core/DefaultValues.cs	
+++ b/SPT-AKI Profile Editor/Core/DefaultValues.cs	
@@ -82,7 +82,7 @@ public static class DefaultValues
         public static List<AppLocalization> DefaultLocalizations()
         {
             List<AppLocalization> loaded = new();
-            foreach (var file in new string[] { "en.json", "ru.json", "ch.json" })
+            foreach (var file in new string[] { "en.json", "ru.json", "ch.json", "jp.json" })
             {
                 try
                 {
diff --git a/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj b/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj
index b1eba9db..76b4a986 100644
--- a/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj	
+++ b/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj	
@@ -23,6 +23,7 @@
     <None Remove="Resources\Images\server_folder.jpg" />
     <None Remove="Resources\Localizations\ch.json" />
     <None Remove="Resources\Localizations\en.json" />
+    <None Remove="Resources\Localizations\jp.json" />
     <None Remove="Resources\Localizations\ru.json" />
   </ItemGroup>
 
@@ -38,6 +39,7 @@
     <Resource Include="Resources\Images\server_folder.jpg" />
     <EmbeddedResource Include="Resources\Localizations\ch.json" />
     <EmbeddedResource Include="Resources\Localizations\en.json" />
+    <EmbeddedResource Include="Resources\Localizations\jp.json" />
     <EmbeddedResource Include="Resources\Localizations\ru.json" />
   </ItemGroup>
 

From 207ea53147c7ac0cdb3a3400a75ccd591cacb51d Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sat, 11 Jan 2025 19:30:25 +0600
Subject: [PATCH 14/19] fast mode rework

---
 .../ViewModelsTests/FastModeViewModelTests.cs |   16 +-
 SPT-AKI Profile Editor/Resources/Borders.xaml |    4 +-
 .../Resources/Localizations/ch.json           |    4 +-
 .../Resources/Localizations/en.json           |    4 +-
 .../Resources/Localizations/jp.json           |    4 +-
 .../Resources/Localizations/ru.json           |    4 +-
 SPT-AKI Profile Editor/Views/FastMode.xaml    | 1178 +++++++++--------
 .../Views/FastModeViewModel.cs                |   58 +-
 8 files changed, 717 insertions(+), 555 deletions(-)

diff --git a/SPT-AKI Profile Editor.Tests/ViewModelsTests/FastModeViewModelTests.cs b/SPT-AKI Profile Editor.Tests/ViewModelsTests/FastModeViewModelTests.cs
index 7cfe2186..ba74fd2c 100644
--- a/SPT-AKI Profile Editor.Tests/ViewModelsTests/FastModeViewModelTests.cs	
+++ b/SPT-AKI Profile Editor.Tests/ViewModelsTests/FastModeViewModelTests.cs	
@@ -10,11 +10,12 @@ namespace SPT_AKI_Profile_Editor.Tests.ViewModelsTests
     internal class FastModeViewModelTests
     {
         [OneTimeSetUp]
-        public void Setup() => TestHelpers.LoadDatabaseAndProfile();
+        public void Setup() => TestHelpers.LoadDatabase();
 
         [Test]
         public void CanInitialize()
         {
+            AppData.Profile.Load(TestHelpers.profileFile);
             FastModeViewModel viewModel = new(null);
             Assert.That(viewModel, Is.Not.Null);
             Assert.That(viewModel.Pmc, Is.Not.Null);
@@ -40,6 +41,7 @@ public void HasNeededData()
         [Test]
         public void CanDidOpenningRefresh()
         {
+            AppData.Profile.Load(TestHelpers.profileFile);
             FastModeViewModel viewModel = new(null);
             viewModel.OpenningRefresh.Execute(null);
             Assert.That(viewModel, Is.Not.Null);
@@ -52,17 +54,23 @@ public void CanDidOpenningRefresh()
         }
 
         [Test]
-        public void CanSaveProfile()
+        public void CanApplyAndSaveProfile() => CheckApplyExecution(true);
+
+        [Test]
+        public void CanApplyWithoutSave() => CheckApplyExecution(false);
+
+        private static void CheckApplyExecution(bool withSave)
         {
+            AppData.Profile.Load(TestHelpers.profileFile);
             bool saveExecuted = false;
             RelayCommand command = new((obj) => saveExecuted = true);
             FastModeViewModel viewModel = new(command);
             viewModel.OpenningRefresh.Execute(null);
             var expectedExp = viewModel.Pmc.Experience;
             Assert.That(AppData.Profile.Characters.Pmc.Info.Experience, Is.Not.EqualTo(expectedExp));
-            viewModel.SaveProfile.Execute(null);
+            viewModel.SaveProfile.Execute(withSave);
             Assert.That(AppData.Profile.Characters.Pmc.Info.Experience, Is.EqualTo(expectedExp));
-            Assert.That(saveExecuted, Is.True);
+            Assert.That(saveExecuted, Is.EqualTo(withSave));
         }
     }
 }
\ No newline at end of file
diff --git a/SPT-AKI Profile Editor/Resources/Borders.xaml b/SPT-AKI Profile Editor/Resources/Borders.xaml
index bbf9cc95..ac1de725 100644
--- a/SPT-AKI Profile Editor/Resources/Borders.xaml	
+++ b/SPT-AKI Profile Editor/Resources/Borders.xaml	
@@ -1,8 +1,8 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Style x:Key="GroupBorder" TargetType="Border">
         <Setter Property="Margin" Value="5" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Accent}" />
         <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="CornerRadius" Value="3" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/SPT-AKI Profile Editor/Resources/Localizations/ch.json b/SPT-AKI Profile Editor/Resources/Localizations/ch.json
index 4320a0bf..2a375f32 100644
--- a/SPT-AKI Profile Editor/Resources/Localizations/ch.json	
+++ b/SPT-AKI Profile Editor/Resources/Localizations/ch.json	
@@ -261,6 +261,8 @@
     "migration_to_3.9.0_title": "当前设置与 SPT 3.9.0 及更高版本不兼容",
     "migration_to_3.9.0_message": "进行自动修正吗？\n\n服务器文件的相对路径将会更正\n本地化文件也会重置\n程序会在执行上述动作后自动重新启动",
     "checkbox_dont_ask_again": "不再询问",
-    "server_select_help": "Need help?"
+    "server_select_help": "Need help?",
+    "fast_mode_apply_and_save": "Apply and save profile",
+    "fast_mode_apply_without_save": "Apply without saving"
   }
 }
\ No newline at end of file
diff --git a/SPT-AKI Profile Editor/Resources/Localizations/en.json b/SPT-AKI Profile Editor/Resources/Localizations/en.json
index be954249..f3432b03 100644
--- a/SPT-AKI Profile Editor/Resources/Localizations/en.json	
+++ b/SPT-AKI Profile Editor/Resources/Localizations/en.json	
@@ -261,6 +261,8 @@
     "migration_to_3.9.0_title": "Current settings are not compatible with SPT version 3.9.0 and higher",
     "migration_to_3.9.0_message": "Make the required changes?\n\nRelative paths to server files will be corrected\nLocalization files will be reset\nThe program will automatically restart",
     "checkbox_dont_ask_again": "Don't ask again",
-    "server_select_help": "Need help?"
+    "server_select_help": "Need help?",
+    "fast_mode_apply_and_save": "Apply and save profile",
+    "fast_mode_apply_without_save": "Apply without saving"
   }
 }
\ No newline at end of file
diff --git a/SPT-AKI Profile Editor/Resources/Localizations/jp.json b/SPT-AKI Profile Editor/Resources/Localizations/jp.json
index 9ba4e1ba..201c4ece 100644
--- a/SPT-AKI Profile Editor/Resources/Localizations/jp.json	
+++ b/SPT-AKI Profile Editor/Resources/Localizations/jp.json	
@@ -260,6 +260,8 @@
     "tab_quests_add_all_missing_event_quests": "紛失したイベントクエストを加える",
     "migration_to_3.9.0_title": "今のアプリ設置は SPT 3.9.0 以上のバージョンに不適用となり",
     "migration_to_3.9.0_message": "自動的不具合を修正する？\n\nそうすればサーバー位置を自動的特定し\n言語ファイルもリセットし\nアプリを再開する",
-    "checkbox_dont_ask_again": "二度と聞かない"
+    "checkbox_dont_ask_again": "二度と聞かない",
+    "fast_mode_apply_and_save": "Apply and save profile",
+    "fast_mode_apply_without_save": "Apply without saving"
   }
 }
\ No newline at end of file
diff --git a/SPT-AKI Profile Editor/Resources/Localizations/ru.json b/SPT-AKI Profile Editor/Resources/Localizations/ru.json
index 555f4111..29ba5fa8 100644
--- a/SPT-AKI Profile Editor/Resources/Localizations/ru.json	
+++ b/SPT-AKI Profile Editor/Resources/Localizations/ru.json	
@@ -261,6 +261,8 @@
     "migration_to_3.9.0_title": "Текущие настройки несовместимы с SPT версии 3.9.0 и выше",
     "migration_to_3.9.0_message": "Внести требуемые изменения?\n\nОтносительные пути к файлам сервера будут исправлены\nФайлы локализации будут сброшены\nПрограмма автоматически перезапустится",
     "checkbox_dont_ask_again": "Больше не спрашивать",
-    "server_select_help": "Нужна помощь?"
+    "server_select_help": "Нужна помощь?",
+    "fast_mode_apply_and_save": "Применить и сохранить профиль",
+    "fast_mode_apply_without_save": "Применить без сохранения"
   }
 }
\ No newline at end of file
diff --git a/SPT-AKI Profile Editor/Views/FastMode.xaml b/SPT-AKI Profile Editor/Views/FastMode.xaml
index 416e9f42..16a47e80 100644
--- a/SPT-AKI Profile Editor/Views/FastMode.xaml	
+++ b/SPT-AKI Profile Editor/Views/FastMode.xaml	
@@ -2,6 +2,7 @@
     x:Class="SPT_AKI_Profile_Editor.Views.FastMode"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:System="clr-namespace:System;assembly=netstandard"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:extendedcontrols="clr-namespace:SPT_AKI_Profile_Editor.Views.ExtendedControls"
     xmlns:helpers="clr-namespace:SPT_AKI_Profile_Editor.Helpers"
@@ -11,6 +12,9 @@
     xmlns:views="clr-namespace:SPT_AKI_Profile_Editor.Views"
     HorizontalContentAlignment="Stretch"
     d:DataContext="{d:DesignInstance Type=views:FastModeViewModel}"
+    d:Height="600"
+    d:IsOpen="True"
+    d:Width="800"
     AnimateOpacity="True"
     CloseButtonIsCancel="True"
     Header="{Binding AppLocalization.Translations[button_fast_mode]}"
@@ -19,546 +23,658 @@
     mc:Ignorable="d">
     <mah:Flyout.Resources>
         <helpers:QuestStatusValueConverter x:Key="QuestStatusValueConverter" />
+        <System:Boolean x:Key="FalseValue">False</System:Boolean>
+        <System:Boolean x:Key="TrueValue">True</System:Boolean>
     </mah:Flyout.Resources>
     <i:Interaction.Triggers>
         <i:EventTrigger EventName="IsOpenChanged">
             <i:InvokeCommandAction Command="{Binding OpenningRefresh}" />
         </i:EventTrigger>
     </i:Interaction.Triggers>
-    <Grid Margin="10,10">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="90" />
-            <ColumnDefinition />
-            <ColumnDefinition Width="2*" />
-            <ColumnDefinition Width="40" />
-            <ColumnDefinition />
-            <ColumnDefinition Width="2*" />
-            <ColumnDefinition Width="40" />
-        </Grid.ColumnDefinitions>
+    <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
             <RowDefinition />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <Label
-            Grid.Column="1"
-            Grid.ColumnSpan="2"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_info_pmc]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <Label
-            Grid.Row="1"
-            Grid.Column="0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_info_level]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <extendedcontrols:NumericUpDownExt
-            Grid.Row="1"
-            Grid.Column="1"
-            Grid.ColumnSpan="2"
-            Margin="0,5"
-            VerticalAlignment="Center"
-            Culture="ru-RU"
-            FontWeight="Bold"
-            Interval="1"
-            IsEnabled="{Binding PmcLevel}"
-            Maximum="{Binding ServerDatabase.ServerGlobals.Config.Exp.Level.MaxLevel}"
-            Minimum="1"
-            NumericInputMode="Numbers"
-            StringFormat="N0"
-            TextAlignment="Left"
-            Value="{Binding Pmc.Level, UpdateSourceTrigger=PropertyChanged}" />
-        <CheckBox
-            Grid.Row="1"
-            Grid.Column="3"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            IsChecked="{Binding PmcLevel}" />
-        <Label
-            Grid.Row="2"
-            Grid.Column="0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_info_experience]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <Grid
-            Grid.Row="2"
-            Grid.Column="1"
-            Grid.ColumnSpan="2">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <extendedcontrols:NumericUpDownExt
-                Grid.Column="0"
-                Width="120"
-                Margin="0,5,10,5"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Culture="ru-RU"
-                FontWeight="Bold"
-                Interval="1000"
-                IsEnabled="{Binding PmcLevel}"
-                Maximum="{Binding ServerDatabase.ServerGlobals.Config.Exp.Level.MaxExp}"
-                Minimum="0"
-                NumericInputMode="Numbers"
-                StringFormat="N0"
-                TextAlignment="Left"
-                Value="{Binding Pmc.Experience, UpdateSourceTrigger=PropertyChanged}" />
-            <Slider
-                Grid.Column="1"
-                Margin="2,5"
-                VerticalAlignment="Center"
-                IsEnabled="{Binding PmcLevel}"
-                Maximum="{Binding ServerDatabase.ServerGlobals.Config.Exp.Level.MaxExp}"
-                TickFrequency="2000000"
-                TickPlacement="BottomRight"
-                Value="{Binding Pmc.Experience}" />
-        </Grid>
-        <Label
-            Grid.Row="3"
-            Grid.Column="0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_skills_title]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <Label
-            Grid.Row="3"
-            Grid.Column="1"
-            Margin="0,5"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_skills_set_all]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <Grid Grid.Row="3" Grid.Column="2">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="90" />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <extendedcontrols:NumericUpDownExt
-                Grid.Column="0"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                Culture="ru-RU"
-                FontWeight="Bold"
-                Interval="100"
-                IsEnabled="{Binding PmcCommonSkills}"
-                Maximum="{Binding AppSettings.CommonSkillMaxValue}"
-                Minimum="0"
-                NumericInputMode="Numbers"
-                StringFormat="N0"
-                TextAlignment="Left"
-                Value="{Binding SetAllPmcSkillsValue, UpdateSourceTrigger=PropertyChanged}" />
-            <Slider
-                Grid.Column="1"
-                Margin="10,0,0,0"
-                VerticalAlignment="Center"
-                IsEnabled="{Binding PmcCommonSkills}"
-                Maximum="{Binding AppSettings.CommonSkillMaxValue}"
-                TickFrequency="200"
-                TickPlacement="BottomRight"
-                Value="{Binding SetAllPmcSkillsValue, UpdateSourceTrigger=PropertyChanged}" />
-        </Grid>
-        <CheckBox
-            Grid.Row="3"
-            Grid.Column="3"
-            Margin="5"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            IsChecked="{Binding PmcCommonSkills}" />
-        <Label
-            Grid.Row="4"
-            Grid.Column="0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_mastering_title]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <Label
-            Grid.Row="4"
-            Grid.Column="1"
-            Margin="0,5"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_mastering_set_all]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <Grid Grid.Row="4" Grid.Column="2">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="90" />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <extendedcontrols:NumericUpDownExt
-                Grid.Column="0"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                Culture="ru-RU"
-                FontWeight="Bold"
-                Interval="100"
-                IsEnabled="{Binding PmcMasteringsSkills}"
-                Maximum="{Binding ServerDatabase.ServerGlobals.Config.MaxProgressValue}"
-                Minimum="0"
-                NumericInputMode="Numbers"
-                StringFormat="N0"
-                TextAlignment="Left"
-                Value="{Binding SetAllPmcMasteringsValue, UpdateSourceTrigger=PropertyChanged}" />
-            <Slider
-                Grid.Column="1"
-                Margin="10,0,0,0"
-                VerticalAlignment="Center"
-                IsEnabled="{Binding PmcMasteringsSkills}"
-                Maximum="{Binding ServerDatabase.ServerGlobals.Config.MaxProgressValue}"
-                TickFrequency="200"
-                TickPlacement="BottomRight"
-                Value="{Binding SetAllPmcMasteringsValue, UpdateSourceTrigger=PropertyChanged}" />
-        </Grid>
-        <CheckBox
-            Grid.Row="4"
-            Grid.Column="3"
-            Margin="5"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            IsChecked="{Binding PmcMasteringsSkills}" />
-        <Label
-            Grid.Row="5"
-            Grid.Column="0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_quests_title]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <Label
-            Grid.Row="5"
-            Grid.Column="1"
-            Margin="0,5"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_quests_mark_all]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <ComboBox
-            Grid.Row="5"
-            Grid.Column="2"
-            MaxHeight="25"
-            IsEnabled="{Binding PmcQuests}"
-            ItemsSource="{Binding Source={StaticResource QuestStatusValueConverter}, Path=Strings}"
-            SelectedItem="{Binding SetAllQuestsValue, Converter={StaticResource QuestStatusValueConverter}}" />
-        <CheckBox
-            Grid.Row="5"
-            Grid.Column="3"
-            Margin="5"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            IsChecked="{Binding PmcQuests}" />
-        <Label
-            Grid.Row="6"
-            Grid.Column="0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_examined_items_title]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <Label
-            Grid.Row="6"
-            Grid.Column="1"
-            Margin="0,5"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_examined_items_examine_all_button]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <mah:ToggleSwitch
-            Grid.Row="6"
-            Grid.Column="2"
-            IsOn="{Binding ExamineAll}"
-            OffContent="{Binding AppLocalization.Translations[button_no]}"
-            OnContent="{Binding AppLocalization.Translations[button_yes]}" />
-        <Label
-            Grid.Row="7"
-            Grid.Column="0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_clothing_title]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <Label
-            Grid.Row="7"
-            Grid.Column="1"
-            Margin="0,5"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_clothing_acquire_all]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <mah:ToggleSwitch
-            Grid.Row="7"
-            Grid.Column="2"
-            IsOn="{Binding AcquireAll}"
-            OffContent="{Binding AppLocalization.Translations[button_no]}"
-            OnContent="{Binding AppLocalization.Translations[button_yes]}" />
-        <Label
-            Grid.Row="8"
-            Grid.Column="0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_merchants_title]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <Label
-            Grid.Row="8"
-            Grid.Column="1"
-            Margin="0,5"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_hideout_maximum_button]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <mah:ToggleSwitch
-            Grid.Row="8"
-            Grid.Column="2"
-            IsOn="{Binding SetMerchantsMax}"
-            OffContent="{Binding AppLocalization.Translations[button_no]}"
-            OnContent="{Binding AppLocalization.Translations[button_yes]}" />
-        <Label
-            Grid.Row="9"
-            Grid.Column="0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_hideout_title]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <Label
-            Grid.Row="9"
-            Grid.Column="1"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_hideout_maximum_button]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <mah:ToggleSwitch
-            Grid.Row="9"
-            Grid.Column="2"
-            IsOn="{Binding SetHideoutMax}"
-            OffContent="{Binding AppLocalization.Translations[button_no]}"
-            OnContent="{Binding AppLocalization.Translations[button_yes]}" />
-        <Label
-            Grid.Column="4"
-            Grid.ColumnSpan="2"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_info_scav]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <extendedcontrols:NumericUpDownExt
-            Grid.Row="1"
-            Grid.Column="4"
-            Grid.ColumnSpan="2"
-            Margin="0,5"
-            VerticalAlignment="Center"
-            Culture="ru-RU"
-            FontWeight="Bold"
-            Interval="1"
-            IsEnabled="{Binding ScavLevel}"
-            Maximum="{Binding ServerDatabase.ServerGlobals.Config.Exp.Level.MaxLevel}"
-            Minimum="1"
-            NumericInputMode="Numbers"
-            StringFormat="N0"
-            TextAlignment="Left"
-            Value="{Binding Scav.Level, UpdateSourceTrigger=PropertyChanged}" />
-        <CheckBox
+        <ScrollViewer Grid.Row="0">
+            <Grid Margin="10,5,5,5">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="80" />
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="40" />
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="40" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Border
+                    Grid.Row="0"
+                    Grid.RowSpan="5"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="3"
+                    Style="{StaticResource GroupBorder}" />
+                <Border
+                    Grid.Row="0"
+                    Grid.RowSpan="5"
+                    Grid.Column="4"
+                    Grid.ColumnSpan="3"
+                    Style="{StaticResource GroupBorder}" />
+                <Border
+                    Grid.Row="5"
+                    Grid.RowSpan="3"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="6"
+                    Style="{StaticResource GroupBorder}" />
+                <Border
+                    Grid.Row="8"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="6"
+                    Style="{StaticResource GroupBorder}" />
+                <Border
+                    Grid.Row="9"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="6"
+                    Style="{StaticResource GroupBorder}" />
+                <Border
+                    Grid.Row="10"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="6"
+                    Style="{StaticResource GroupBorder}" />
+                <Border
+                    Grid.Row="11"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="6"
+                    Style="{StaticResource GroupBorder}" />
+                <Label
+                    Grid.Column="1"
+                    Grid.ColumnSpan="3"
+                    Margin="0,5,0,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_info_pmc], FallbackValue=tab_info_pmc}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <Label
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_info_level], FallbackValue=tab_info_level}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <extendedcontrols:NumericUpDownExt
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="2"
+                    Margin="12,5,0,5"
+                    VerticalAlignment="Center"
+                    Culture="ru-RU"
+                    FontWeight="Bold"
+                    Interval="1"
+                    IsEnabled="{Binding PmcLevel}"
+                    Maximum="{Binding ServerDatabase.ServerGlobals.Config.Exp.Level.MaxLevel}"
+                    Minimum="1"
+                    NumericInputMode="Numbers"
+                    StringFormat="N0"
+                    TextAlignment="Left"
+                    Value="{Binding Pmc.Level, UpdateSourceTrigger=PropertyChanged}" />
+                <CheckBox
+                    Grid.Row="1"
+                    Grid.Column="3"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    IsChecked="{Binding PmcLevel}" />
+                <Label
+                    Grid.Row="2"
+                    Grid.Column="0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_info_experience], FallbackValue=tab_info_experience}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <Grid
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <extendedcontrols:NumericUpDownExt
+                        Grid.Column="0"
+                        Width="120"
+                        Margin="12,5,10,5"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Culture="ru-RU"
+                        FontWeight="Bold"
+                        Interval="1000"
+                        IsEnabled="{Binding PmcLevel}"
+                        Maximum="{Binding ServerDatabase.ServerGlobals.Config.Exp.Level.MaxExp}"
+                        Minimum="0"
+                        NumericInputMode="Numbers"
+                        StringFormat="N0"
+                        TextAlignment="Left"
+                        Value="{Binding Pmc.Experience, UpdateSourceTrigger=PropertyChanged}" />
+                    <Slider
+                        Grid.Column="1"
+                        Margin="2,5"
+                        VerticalAlignment="Center"
+                        IsEnabled="{Binding PmcLevel}"
+                        Maximum="{Binding ServerDatabase.ServerGlobals.Config.Exp.Level.MaxExp}"
+                        TickFrequency="2000000"
+                        TickPlacement="BottomRight"
+                        Value="{Binding Pmc.Experience}" />
+                </Grid>
+                <Label
+                    Grid.Row="3"
+                    Grid.Column="0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_skills_title], FallbackValue=tab_skills_title}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <Label
+                    Grid.Row="3"
+                    Grid.Column="1"
+                    Margin="8,5,5,5"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_skills_set_all], FallbackValue=tab_skills_set_all}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <Grid Grid.Row="3" Grid.Column="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="90" />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <extendedcontrols:NumericUpDownExt
+                        Grid.Column="0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Center"
+                        Culture="ru-RU"
+                        FontWeight="Bold"
+                        Interval="100"
+                        IsEnabled="{Binding PmcCommonSkills}"
+                        Maximum="{Binding AppSettings.CommonSkillMaxValue}"
+                        Minimum="0"
+                        NumericInputMode="Numbers"
+                        StringFormat="N0"
+                        TextAlignment="Left"
+                        Value="{Binding SetAllPmcSkillsValue, UpdateSourceTrigger=PropertyChanged}" />
+                    <Slider
+                        Grid.Column="1"
+                        Margin="10,0,0,0"
+                        VerticalAlignment="Center"
+                        IsEnabled="{Binding PmcCommonSkills}"
+                        Maximum="{Binding AppSettings.CommonSkillMaxValue}"
+                        TickFrequency="200"
+                        TickPlacement="BottomRight"
+                        Value="{Binding SetAllPmcSkillsValue, UpdateSourceTrigger=PropertyChanged}" />
+                </Grid>
+                <CheckBox
+                    Grid.Row="3"
+                    Grid.Column="3"
+                    Margin="5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    IsChecked="{Binding PmcCommonSkills}" />
+                <Label
+                    Grid.Row="4"
+                    Grid.Column="0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_mastering_title], FallbackValue=tab_mastering_title}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <Label
+                    Grid.Row="4"
+                    Grid.Column="1"
+                    Margin="8,5,5,10"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_mastering_set_all], FallbackValue=tab_mastering_set_all}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <Grid Grid.Row="4" Grid.Column="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="90" />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <extendedcontrols:NumericUpDownExt
+                        Grid.Column="0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Center"
+                        Culture="ru-RU"
+                        FontWeight="Bold"
+                        Interval="100"
+                        IsEnabled="{Binding PmcMasteringsSkills}"
+                        Maximum="{Binding ServerDatabase.ServerGlobals.Config.MaxProgressValue}"
+                        Minimum="0"
+                        NumericInputMode="Numbers"
+                        StringFormat="N0"
+                        TextAlignment="Left"
+                        Value="{Binding SetAllPmcMasteringsValue, UpdateSourceTrigger=PropertyChanged}" />
+                    <Slider
+                        Grid.Column="1"
+                        Margin="10,0,0,0"
+                        VerticalAlignment="Center"
+                        IsEnabled="{Binding PmcMasteringsSkills}"
+                        Maximum="{Binding ServerDatabase.ServerGlobals.Config.MaxProgressValue}"
+                        TickFrequency="200"
+                        TickPlacement="BottomRight"
+                        Value="{Binding SetAllPmcMasteringsValue, UpdateSourceTrigger=PropertyChanged}" />
+                </Grid>
+                <CheckBox
+                    Grid.Row="4"
+                    Grid.Column="3"
+                    Margin="5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    IsChecked="{Binding PmcMasteringsSkills}" />
+                <Label
+                    Grid.Row="5"
+                    Grid.Column="0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_quests_title], FallbackValue=tab_quests_title}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <Label
+                    Grid.Row="5"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="3"
+                    Margin="8,10,5,5"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_quests_add_all_missing_quests], FallbackValue=tab_quests_add_all_missing_quests}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <mah:ToggleSwitch
+                    Grid.Row="5"
+                    Grid.Column="4"
+                    Margin="12,10,5,5"
+                    IsEnabled="{Binding PmcQuests}"
+                    IsOn="{Binding PmcAddMissingQuests}"
+                    OffContent="{Binding AppLocalization.Translations[button_no]}"
+                    OnContent="{Binding AppLocalization.Translations[button_yes]}" />
+                <Label
+                    Grid.Row="6"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="3"
+                    Margin="8,5,5,5"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_quests_add_all_missing_event_quests], FallbackValue=tab_quests_add_all_missing_event_quests}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <mah:ToggleSwitch
+                    Grid.Row="6"
+                    Grid.Column="4"
+                    Margin="12,5,5,5"
+                    IsEnabled="{Binding PmcQuests}"
+                    IsOn="{Binding PmcAddMissingEventQuests}"
+                    OffContent="{Binding AppLocalization.Translations[button_no]}"
+                    OnContent="{Binding AppLocalization.Translations[button_yes]}" />
+                <Label
+                    Grid.Row="7"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="3"
+                    Margin="8,5,5,15"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_quests_mark_all], FallbackValue=tab_quests_mark_all}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <ComboBox
+                    Grid.Row="7"
+                    Grid.Column="4"
+                    Grid.ColumnSpan="2"
+                    MaxHeight="25"
+                    Margin="12,5,5,15"
+                    IsEnabled="{Binding PmcQuests}"
+                    ItemsSource="{Binding Source={StaticResource QuestStatusValueConverter}, Path=Strings}"
+                    SelectedItem="{Binding SetAllQuestsValue, Converter={StaticResource QuestStatusValueConverter}}" />
+                <CheckBox
+                    Grid.Row="5"
+                    Grid.Column="6"
+                    Margin="5,10,5,5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    IsChecked="{Binding PmcQuests}" />
+                <Label
+                    Grid.Row="8"
+                    Grid.Column="0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_examined_items_title], FallbackValue=tab_examined_items_title}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <Label
+                    Grid.Row="8"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="3"
+                    Margin="8,5,5,5"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_examined_items_examine_all_button], FallbackValue=tab_examined_items_examine_all_button}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <mah:ToggleSwitch
+                    Grid.Row="8"
+                    Grid.Column="4"
+                    Margin="12,10,5,10"
+                    IsOn="{Binding ExamineAll}"
+                    OffContent="{Binding AppLocalization.Translations[button_no]}"
+                    OnContent="{Binding AppLocalization.Translations[button_yes]}" />
+                <Label
+                    Grid.Row="9"
+                    Grid.Column="0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_clothing_title], FallbackValue=tab_clothing_title}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <Label
+                    Grid.Row="9"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="3"
+                    Margin="8,5,5,5"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_clothing_acquire_all], FallbackValue=tab_clothing_acquire_all}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <mah:ToggleSwitch
+                    Grid.Row="9"
+                    Grid.Column="4"
+                    Margin="12,10,5,10"
+                    IsOn="{Binding AcquireAll}"
+                    OffContent="{Binding AppLocalization.Translations[button_no]}"
+                    OnContent="{Binding AppLocalization.Translations[button_yes]}" />
+                <Label
+                    Grid.Row="10"
+                    Grid.Column="0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_merchants_title], FallbackValue=tab_merchants_title}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <Label
+                    Grid.Row="10"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="3"
+                    Margin="8,5,5,5"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_hideout_maximum_button], FallbackValue=tab_hideout_maximum_button}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <mah:ToggleSwitch
+                    Grid.Row="10"
+                    Grid.Column="4"
+                    Margin="12,10,5,10"
+                    IsOn="{Binding SetMerchantsMax}"
+                    OffContent="{Binding AppLocalization.Translations[button_no]}"
+                    OnContent="{Binding AppLocalization.Translations[button_yes]}" />
+                <Label
+                    Grid.Row="11"
+                    Grid.Column="0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_hideout_title], FallbackValue=tab_hideout_title}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <Label
+                    Grid.Row="11"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="3"
+                    Margin="8,5,5,5"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_hideout_maximum_button], FallbackValue=tab_hideout_maximum_button}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <mah:ToggleSwitch
+                    Grid.Row="11"
+                    Grid.Column="4"
+                    Margin="12,10,5,10"
+                    IsOn="{Binding SetHideoutMax}"
+                    OffContent="{Binding AppLocalization.Translations[button_no]}"
+                    OnContent="{Binding AppLocalization.Translations[button_yes]}" />
+                <Label
+                    Grid.Column="4"
+                    Grid.ColumnSpan="3"
+                    Margin="0,5,0,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_info_scav], FallbackValue=tab_info_scav}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <extendedcontrols:NumericUpDownExt
+                    Grid.Row="1"
+                    Grid.Column="4"
+                    Grid.ColumnSpan="2"
+                    Margin="12,5,0,5"
+                    VerticalAlignment="Center"
+                    Culture="ru-RU"
+                    FontWeight="Bold"
+                    Interval="1"
+                    IsEnabled="{Binding ScavLevel}"
+                    Maximum="{Binding ServerDatabase.ServerGlobals.Config.Exp.Level.MaxLevel}"
+                    Minimum="1"
+                    NumericInputMode="Numbers"
+                    StringFormat="N0"
+                    TextAlignment="Left"
+                    Value="{Binding Scav.Level, UpdateSourceTrigger=PropertyChanged}" />
+                <CheckBox
+                    Grid.Row="1"
+                    Grid.Column="6"
+                    Margin="5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    IsChecked="{Binding ScavLevel}" />
+                <Grid
+                    Grid.Row="2"
+                    Grid.Column="4"
+                    Grid.ColumnSpan="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <extendedcontrols:NumericUpDownExt
+                        Grid.Column="0"
+                        Width="120"
+                        Margin="12,5,10,5"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Culture="ru-RU"
+                        FontWeight="Bold"
+                        Interval="1000"
+                        IsEnabled="{Binding ScavLevel}"
+                        Maximum="{Binding ServerDatabase.ServerGlobals.Config.Exp.Level.MaxExp}"
+                        Minimum="0"
+                        NumericInputMode="Numbers"
+                        StringFormat="N0"
+                        TextAlignment="Left"
+                        Value="{Binding Scav.Experience, UpdateSourceTrigger=PropertyChanged}" />
+                    <Slider
+                        Grid.Column="1"
+                        Margin="2,5"
+                        VerticalAlignment="Center"
+                        IsEnabled="{Binding ScavLevel}"
+                        Maximum="{Binding ServerDatabase.ServerGlobals.Config.Exp.Level.MaxExp}"
+                        TickFrequency="2000000"
+                        TickPlacement="BottomRight"
+                        Value="{Binding Scav.Experience}" />
+                </Grid>
+                <Label
+                    Grid.Row="3"
+                    Grid.Column="4"
+                    Margin="8,5,5,5"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_skills_set_all], FallbackValue=tab_skills_set_all}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <Grid Grid.Row="3" Grid.Column="5">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="90" />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <extendedcontrols:NumericUpDownExt
+                        Grid.Column="0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Center"
+                        Culture="ru-RU"
+                        FontWeight="Bold"
+                        Interval="100"
+                        IsEnabled="{Binding ScavCommonSkills}"
+                        Maximum="{Binding AppSettings.CommonSkillMaxValue}"
+                        Minimum="0"
+                        NumericInputMode="Numbers"
+                        StringFormat="N0"
+                        TextAlignment="Left"
+                        Value="{Binding SetAllScavSkillsValue, UpdateSourceTrigger=PropertyChanged}" />
+                    <Slider
+                        Grid.Column="1"
+                        Margin="10,0,0,0"
+                        VerticalAlignment="Center"
+                        IsEnabled="{Binding ScavCommonSkills}"
+                        Maximum="{Binding AppSettings.CommonSkillMaxValue}"
+                        TickFrequency="200"
+                        TickPlacement="BottomRight"
+                        Value="{Binding SetAllScavSkillsValue, UpdateSourceTrigger=PropertyChanged}" />
+                </Grid>
+                <CheckBox
+                    Grid.Row="3"
+                    Grid.Column="6"
+                    Margin="5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    IsChecked="{Binding ScavCommonSkills}" />
+                <Label
+                    Grid.Row="4"
+                    Grid.Column="4"
+                    Margin="8,5,5,10"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_mastering_set_all], FallbackValue=tab_mastering_set_all}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <Grid Grid.Row="4" Grid.Column="5">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="90" />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <extendedcontrols:NumericUpDownExt
+                        Grid.Column="0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Center"
+                        Culture="ru-RU"
+                        FontWeight="Bold"
+                        Interval="100"
+                        IsEnabled="{Binding ScavMasteringsSkills}"
+                        Maximum="{Binding ServerDatabase.ServerGlobals.Config.MaxProgressValue}"
+                        Minimum="0"
+                        NumericInputMode="Numbers"
+                        StringFormat="N0"
+                        TextAlignment="Left"
+                        Value="{Binding SetAllScavMasteringsValue, UpdateSourceTrigger=PropertyChanged}" />
+                    <Slider
+                        Grid.Column="1"
+                        Margin="10,0,0,0"
+                        VerticalAlignment="Center"
+                        IsEnabled="{Binding ScavMasteringsSkills}"
+                        Maximum="{Binding ServerDatabase.ServerGlobals.Config.MaxProgressValue}"
+                        TickFrequency="200"
+                        TickPlacement="BottomRight"
+                        Value="{Binding SetAllScavMasteringsValue, UpdateSourceTrigger=PropertyChanged}" />
+                </Grid>
+                <CheckBox
+                    Grid.Row="4"
+                    Grid.Column="6"
+                    Margin="5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    IsChecked="{Binding ScavMasteringsSkills}" />
+
+            </Grid>
+        </ScrollViewer>
+        <StackPanel
             Grid.Row="1"
-            Grid.Column="6"
-            Margin="5"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            IsChecked="{Binding ScavLevel}" />
-        <Grid
-            Grid.Row="2"
-            Grid.Column="4"
-            Grid.ColumnSpan="2">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <extendedcontrols:NumericUpDownExt
-                Grid.Column="0"
-                Width="120"
-                Margin="0,5,10,5"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Culture="ru-RU"
-                FontWeight="Bold"
-                Interval="1000"
-                IsEnabled="{Binding ScavLevel}"
-                Maximum="{Binding ServerDatabase.ServerGlobals.Config.Exp.Level.MaxExp}"
-                Minimum="0"
-                NumericInputMode="Numbers"
-                StringFormat="N0"
-                TextAlignment="Left"
-                Value="{Binding Scav.Experience, UpdateSourceTrigger=PropertyChanged}" />
-            <Slider
-                Grid.Column="1"
-                Margin="2,5"
-                VerticalAlignment="Center"
-                IsEnabled="{Binding ScavLevel}"
-                Maximum="{Binding ServerDatabase.ServerGlobals.Config.Exp.Level.MaxExp}"
-                TickFrequency="2000000"
-                TickPlacement="BottomRight"
-                Value="{Binding Scav.Experience}" />
-        </Grid>
-        <Label
-            Grid.Row="3"
-            Grid.Column="4"
-            Margin="0,5"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_skills_set_all]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <Grid Grid.Row="3" Grid.Column="5">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="90" />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <extendedcontrols:NumericUpDownExt
-                Grid.Column="0"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                Culture="ru-RU"
-                FontWeight="Bold"
-                Interval="100"
-                IsEnabled="{Binding ScavCommonSkills}"
-                Maximum="{Binding AppSettings.CommonSkillMaxValue}"
-                Minimum="0"
-                NumericInputMode="Numbers"
-                StringFormat="N0"
-                TextAlignment="Left"
-                Value="{Binding SetAllScavSkillsValue, UpdateSourceTrigger=PropertyChanged}" />
-            <Slider
-                Grid.Column="1"
-                Margin="10,0,0,0"
-                VerticalAlignment="Center"
-                IsEnabled="{Binding ScavCommonSkills}"
-                Maximum="{Binding AppSettings.CommonSkillMaxValue}"
-                TickFrequency="200"
-                TickPlacement="BottomRight"
-                Value="{Binding SetAllScavSkillsValue, UpdateSourceTrigger=PropertyChanged}" />
-        </Grid>
-        <CheckBox
-            Grid.Row="3"
-            Grid.Column="6"
-            Margin="5"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            IsChecked="{Binding ScavCommonSkills}" />
-        <Label
-            Grid.Row="4"
-            Grid.Column="4"
-            Margin="0,5"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            FontWeight="Bold">
-            <Label.Content>
-                <TextBlock Text="{Binding AppLocalization.Translations[tab_mastering_set_all]}" TextWrapping="Wrap" />
-            </Label.Content>
-        </Label>
-        <Grid Grid.Row="4" Grid.Column="5">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="90" />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <extendedcontrols:NumericUpDownExt
-                Grid.Column="0"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                Culture="ru-RU"
-                FontWeight="Bold"
-                Interval="100"
-                IsEnabled="{Binding ScavMasteringsSkills}"
-                Maximum="{Binding ServerDatabase.ServerGlobals.Config.MaxProgressValue}"
-                Minimum="0"
-                NumericInputMode="Numbers"
-                StringFormat="N0"
-                TextAlignment="Left"
-                Value="{Binding SetAllScavMasteringsValue, UpdateSourceTrigger=PropertyChanged}" />
-            <Slider
-                Grid.Column="1"
-                Margin="10,0,0,0"
-                VerticalAlignment="Center"
-                IsEnabled="{Binding ScavMasteringsSkills}"
-                Maximum="{Binding ServerDatabase.ServerGlobals.Config.MaxProgressValue}"
-                TickFrequency="200"
-                TickPlacement="BottomRight"
-                Value="{Binding SetAllScavMasteringsValue, UpdateSourceTrigger=PropertyChanged}" />
-        </Grid>
-        <CheckBox
-            Grid.Row="4"
-            Grid.Column="6"
-            Margin="5"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            IsChecked="{Binding ScavMasteringsSkills}" />
-        <Button
-            Grid.Row="10"
-            Grid.Column="5"
-            Grid.ColumnSpan="2"
-            Margin="5,5,15,5"
-            VerticalAlignment="Bottom"
-            Command="{Binding SaveProfile}"
-            Content="{Binding AppLocalization.Translations[button_save_profile]}"
-            Style="{DynamicResource MahApps.Styles.Button.Dialogs.Accent}" />
+            Margin="5,5,27,10"
+            HorizontalAlignment="Right"
+            Orientation="Horizontal">
+            <Button
+                Margin="0,0,10,0"
+                Command="{Binding SaveProfile}"
+                CommandParameter="{StaticResource FalseValue}"
+                Content="{Binding AppLocalization.Translations[fast_mode_apply_without_save], FallbackValue=fast_mode_apply_without_save}"
+                Style="{DynamicResource MahApps.Styles.Button.Dialogs.Accent}" />
+            <Button
+                Command="{Binding SaveProfile}"
+                CommandParameter="{StaticResource TrueValue}"
+                Content="{Binding AppLocalization.Translations[fast_mode_apply_and_save], FallbackValue=fast_mode_apply_and_save}"
+                Style="{DynamicResource MahApps.Styles.Button.Dialogs.Accent}" />
+        </StackPanel>
     </Grid>
 </mah:Flyout>
\ No newline at end of file
diff --git a/SPT-AKI Profile Editor/Views/FastModeViewModel.cs b/SPT-AKI Profile Editor/Views/FastModeViewModel.cs
index dfd96668..9fcfd94b 100644
--- a/SPT-AKI Profile Editor/Views/FastModeViewModel.cs	
+++ b/SPT-AKI Profile Editor/Views/FastModeViewModel.cs	
@@ -21,6 +21,8 @@ public class FastModeViewModel : BindableViewModel
         private bool pmcLevel = true;
         private bool scavLevel = true;
         private bool pmcQuests = true;
+        private bool pmcAddMissingQuests = true;
+        private bool pmcAddMissingEvenQuests = false;
         private bool pmcCommonSkills = true;
         private bool scavCommonSkills = true;
         private bool pmcMasteringsSkills = true;
@@ -57,7 +59,7 @@ public CharacterInfo Pmc
             set
             {
                 pmc = value;
-                OnPropertyChanged("Pmc");
+                OnPropertyChanged(nameof(Pmc));
             }
         }
 
@@ -67,7 +69,7 @@ public CharacterInfo Scav
             set
             {
                 scav = value;
-                OnPropertyChanged("Scav");
+                OnPropertyChanged(nameof(Scav));
             }
         }
 
@@ -83,7 +85,7 @@ public float SetAllPmcSkillsValue
             set
             {
                 setAllPmcSkillsValue = Math.Min(AppSettings.CommonSkillMaxValue, value);
-                OnPropertyChanged("SetAllPmcSkillsValue");
+                OnPropertyChanged(nameof(SetAllPmcSkillsValue));
             }
         }
 
@@ -93,7 +95,7 @@ public float SetAllScavSkillsValue
             set
             {
                 setAllScavSkillsValue = Math.Min(AppSettings.CommonSkillMaxValue, value);
-                OnPropertyChanged("SetAllScavSkillsValue");
+                OnPropertyChanged(nameof(SetAllScavSkillsValue));
             }
         }
 
@@ -103,7 +105,7 @@ public float SetAllPmcMasteringsValue
             set
             {
                 setAllPmcMasteringsValue = Math.Min(ServerDatabase.ServerGlobals.Config.MaxProgressValue, value);
-                OnPropertyChanged("SetAllPmcMasteringsValue");
+                OnPropertyChanged(nameof(SetAllPmcMasteringsValue));
             }
         }
 
@@ -113,7 +115,7 @@ public float SetAllScavMasteringsValue
             set
             {
                 setAllScavMasteringsValue = Math.Min(ServerDatabase.ServerGlobals.Config.MaxProgressValue, value);
-                OnPropertyChanged("SetAllScavMasteringsValue");
+                OnPropertyChanged(nameof(SetAllScavMasteringsValue));
             }
         }
 
@@ -127,7 +129,7 @@ public bool PmcLevel
             set
             {
                 pmcLevel = value;
-                OnPropertyChanged("PmcLevel");
+                OnPropertyChanged(nameof(PmcLevel));
             }
         }
 
@@ -137,7 +139,7 @@ public bool ScavLevel
             set
             {
                 scavLevel = value;
-                OnPropertyChanged("ScavLevel");
+                OnPropertyChanged(nameof(ScavLevel));
             }
         }
 
@@ -147,7 +149,27 @@ public bool PmcQuests
             set
             {
                 pmcQuests = value;
-                OnPropertyChanged("PmcQuests");
+                OnPropertyChanged(nameof(PmcQuests));
+            }
+        }
+
+        public bool PmcAddMissingQuests
+        {
+            get => pmcAddMissingQuests;
+            set
+            {
+                pmcAddMissingQuests = value;
+                OnPropertyChanged(nameof(PmcAddMissingQuests));
+            }
+        }
+
+        public bool PmcAddMissingEventQuests
+        {
+            get => pmcAddMissingEvenQuests;
+            set
+            {
+                pmcAddMissingEvenQuests = value;
+                OnPropertyChanged(nameof(PmcAddMissingEventQuests));
             }
         }
 
@@ -157,7 +179,7 @@ public bool PmcCommonSkills
             set
             {
                 pmcCommonSkills = value;
-                OnPropertyChanged("PmcCommonSkills");
+                OnPropertyChanged(nameof(PmcCommonSkills));
             }
         }
 
@@ -167,7 +189,7 @@ public bool ScavCommonSkills
             set
             {
                 scavCommonSkills = value;
-                OnPropertyChanged("ScavCommonSkills");
+                OnPropertyChanged(nameof(ScavCommonSkills));
             }
         }
 
@@ -177,7 +199,7 @@ public bool PmcMasteringsSkills
             set
             {
                 pmcMasteringsSkills = value;
-                OnPropertyChanged("PmcMasteringsSkills");
+                OnPropertyChanged(nameof(PmcMasteringsSkills));
             }
         }
 
@@ -187,12 +209,13 @@ public bool ScavMasteringsSkills
             set
             {
                 scavMasteringsSkills = value;
-                OnPropertyChanged("ScavMasteringsSkills");
+                OnPropertyChanged(nameof(ScavMasteringsSkills));
             }
         }
 
         public RelayCommand SaveProfile => new(obj =>
         {
+            var needSave = obj != null && ((obj as bool?) ?? false);
             if (PmcLevel)
             {
                 Profile.Characters.Pmc.Info.Level = Pmc.Level;
@@ -206,7 +229,13 @@ public bool ScavMasteringsSkills
             if (SetMerchantsMax)
                 Profile.Characters.Pmc.SetAllTradersMax();
             if (PmcQuests)
+            {
+                if (PmcAddMissingQuests)
+                    Profile.Characters.Pmc.AddAllMisingQuests(false);
+                if (PmcAddMissingEventQuests)
+                    Profile.Characters.Pmc.AddAllMisingQuests(true);
                 Profile.Characters.Pmc.SetAllQuests(SetAllQuestsValue);
+            }
             if (SetHideoutMax)
                 Profile.Characters.Pmc.SetAllHideoutAreasMax();
             if (PmcCommonSkills)
@@ -222,7 +251,8 @@ public bool ScavMasteringsSkills
             if (AcquireAll)
                 ServerDatabase.AcquireAllClothing();
             AppSettings.FastModeOpened = false;
-            _saveCommand.Execute(null);
+            if (needSave)
+                _saveCommand.Execute(null);
         });
     }
 }
\ No newline at end of file

From d87a39e6267933358764738ad66afa256912fe1a Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sat, 11 Jan 2025 19:57:43 +0600
Subject: [PATCH 15/19] added ragfair standing in fast mode

---
 SPT-AKI Profile Editor/Views/FastMode.xaml    | 57 +++++++++++++++++--
 .../Views/FastModeViewModel.cs                | 21 ++++++-
 2 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/SPT-AKI Profile Editor/Views/FastMode.xaml b/SPT-AKI Profile Editor/Views/FastMode.xaml
index 16a47e80..b4047fad 100644
--- a/SPT-AKI Profile Editor/Views/FastMode.xaml	
+++ b/SPT-AKI Profile Editor/Views/FastMode.xaml	
@@ -12,7 +12,7 @@
     xmlns:views="clr-namespace:SPT_AKI_Profile_Editor.Views"
     HorizontalContentAlignment="Stretch"
     d:DataContext="{d:DesignInstance Type=views:FastModeViewModel}"
-    d:Height="600"
+    d:Height="900"
     d:IsOpen="True"
     d:Width="800"
     AnimateOpacity="True"
@@ -60,6 +60,7 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <Border
                     Grid.Row="0"
@@ -91,11 +92,12 @@
                     Style="{StaticResource GroupBorder}" />
                 <Border
                     Grid.Row="10"
+                    Grid.RowSpan="2"
                     Grid.Column="1"
                     Grid.ColumnSpan="6"
                     Style="{StaticResource GroupBorder}" />
                 <Border
-                    Grid.Row="11"
+                    Grid.Row="12"
                     Grid.Column="1"
                     Grid.ColumnSpan="6"
                     Style="{StaticResource GroupBorder}" />
@@ -461,12 +463,57 @@
                 <mah:ToggleSwitch
                     Grid.Row="10"
                     Grid.Column="4"
-                    Margin="12,10,5,10"
+                    Margin="12,10,5,5"
+                    IsEnabled="{Binding PmcMerchants}"
                     IsOn="{Binding SetMerchantsMax}"
                     OffContent="{Binding AppLocalization.Translations[button_no]}"
                     OnContent="{Binding AppLocalization.Translations[button_yes]}" />
                 <Label
                     Grid.Row="11"
+                    Grid.Column="1"
+                    Margin="8,5,5,10"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding ServerDatabase.LocalesGlobal[RAG FAIR], FallbackValue=RAG FAIR}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <Label
+                    Grid.Row="11"
+                    Grid.Column="2"
+                    Grid.ColumnSpan="2"
+                    Margin="0,5,5,10"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontWeight="Bold">
+                    <Label.Content>
+                        <TextBlock Text="{Binding AppLocalization.Translations[tab_merchants_standing], FallbackValue=tab_merchants_standing}" TextWrapping="Wrap" />
+                    </Label.Content>
+                </Label>
+                <extendedcontrols:NumericUpDownExt
+                    Grid.Row="11"
+                    Grid.Column="4"
+                    Grid.ColumnSpan="2"
+                    Width="80"
+                    Margin="12,5,5,10"
+                    HorizontalAlignment="Left"
+                    Interval="0.01"
+                    IsEnabled="{Binding PmcMerchants}"
+                    Minimum="-20"
+                    NumericInputMode="Decimal"
+                    StringFormat="N2"
+                    TextAlignment="Left"
+                    Value="{Binding RagfairStanding}" />
+                <CheckBox
+                    Grid.Row="10"
+                    Grid.Column="6"
+                    Margin="5,10,5,5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    IsChecked="{Binding PmcMerchants}" />
+                <Label
+                    Grid.Row="12"
                     Grid.Column="0"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
@@ -476,7 +523,7 @@
                     </Label.Content>
                 </Label>
                 <Label
-                    Grid.Row="11"
+                    Grid.Row="12"
                     Grid.Column="1"
                     Grid.ColumnSpan="3"
                     Margin="8,5,5,5"
@@ -488,7 +535,7 @@
                     </Label.Content>
                 </Label>
                 <mah:ToggleSwitch
-                    Grid.Row="11"
+                    Grid.Row="12"
                     Grid.Column="4"
                     Margin="12,10,5,10"
                     IsOn="{Binding SetHideoutMax}"
diff --git a/SPT-AKI Profile Editor/Views/FastModeViewModel.cs b/SPT-AKI Profile Editor/Views/FastModeViewModel.cs
index 9fcfd94b..2f073bcc 100644
--- a/SPT-AKI Profile Editor/Views/FastModeViewModel.cs	
+++ b/SPT-AKI Profile Editor/Views/FastModeViewModel.cs	
@@ -27,6 +27,7 @@ public class FastModeViewModel : BindableViewModel
         private bool scavCommonSkills = true;
         private bool pmcMasteringsSkills = true;
         private bool scavMasteringsSkills = true;
+        private bool pmcMerchants = true;
 
         public FastModeViewModel(RelayCommand saveCommand)
         {
@@ -213,6 +214,18 @@ public bool ScavMasteringsSkills
             }
         }
 
+        public bool PmcMerchants
+        {
+            get => pmcMerchants;
+            set
+            {
+                pmcMerchants = value;
+                OnPropertyChanged(nameof(PmcMerchants));
+            }
+        }
+
+        public float RagfairStanding { get; set; } = 8.0f;
+
         public RelayCommand SaveProfile => new(obj =>
         {
             var needSave = obj != null && ((obj as bool?) ?? false);
@@ -226,8 +239,12 @@ public bool ScavMasteringsSkills
                 Profile.Characters.Scav.Info.Level = Scav.Level;
                 Profile.Characters.Scav.Info.Experience = Scav.Experience;
             }
-            if (SetMerchantsMax)
-                Profile.Characters.Pmc.SetAllTradersMax();
+            if (pmcMerchants)
+            {
+                if (SetMerchantsMax)
+                    Profile.Characters.Pmc.SetAllTradersMax();
+                Profile.Characters.Pmc.RagfairInfo.Rating = RagfairStanding;
+            }
             if (PmcQuests)
             {
                 if (PmcAddMissingQuests)

From c241e1c74e2a44cc0d4c2f675fd2bf3b2e88153f Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sat, 11 Jan 2025 20:09:30 +0600
Subject: [PATCH 16/19] version bump

---
 CHREADME.md                                                 | 4 +---
 ENGREADME.md                                                | 4 +---
 JPREADME.md                                                 | 6 ++----
 README.md                                                   | 4 +---
 .../SPT-AKI Profile Editor.Installer.vdproj                 | 6 +++---
 SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj        | 2 +-
 6 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/CHREADME.md b/CHREADME.md
index b2b19fa1..fe26aef1 100644
--- a/CHREADME.md
+++ b/CHREADME.md
@@ -20,6 +20,7 @@ LTC: MNtz8Zz1cPD1CZadoc38jT5qeqeFBS6Aif\
 
 ### [提交Bug报告 \ 功能要求](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/issues/new/choose)
 
+### [版本 3.1 适配服务器 SPT 3.10.5](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/3.1)
 ### [版本 3.0 适配服务器 SPT 3.9.0](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/3.0)
 ### [版本 2.9.3 适配服务器 SPT-AKI 3.8.0 - 3.8.3](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.9.3)
 ### [版本 2.8.6 适配服务器 SPT-AKI 3.7.0 - 3.7.6](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.8.6)
@@ -74,6 +75,3 @@ Lomenot - 中文本地化
 ![Screenshot5](/screenshots/5CH.png?raw=true)
 ![Screenshot6](/screenshots/6CH.png?raw=true)
 ![Screenshot7](/screenshots/7CH.png?raw=true)
-
-### 其他有用的模组
-[Weapon builds for Mechanic quests (by Clerance)](https://hub.sp-tarkov.com/files/file/1310-gunsmith-presets-updated/)
diff --git a/ENGREADME.md b/ENGREADME.md
index 7b9a0366..48b21db6 100644
--- a/ENGREADME.md
+++ b/ENGREADME.md
@@ -20,6 +20,7 @@ LTC: MNtz8Zz1cPD1CZadoc38jT5qeqeFBS6Aif\
 
 ### [Submit a bug report \ Feature request](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/issues/new/choose)
 
+### [Version 3.1 for server SPT 3.10.5](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/3.1)
 ### [Version 3.0 for server SPT 3.9.0](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/3.0)
 ### [Version 2.9.3 for server SPT-AKI 3.8.0 - 3.8.3](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.9.3)
 ### [Version 2.8.6 for server SPT-AKI 3.7.0 - 3.7.6](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.8.6)
@@ -74,6 +75,3 @@ Lomenot - Chinese localization
 ![Screenshot5](/screenshots/5EN.PNG?raw=true)
 ![Screenshot6](/screenshots/6EN.PNG?raw=true)
 ![Screenshot7](/screenshots/7EN.PNG?raw=true)
-
-### Helpful
-[Weapon builds for Mechanic quests (by Clerance)](https://hub.sp-tarkov.com/files/file/1310-gunsmith-presets-updated/)
diff --git a/JPREADME.md b/JPREADME.md
index 7c795044..752d5f6d 100644
--- a/JPREADME.md
+++ b/JPREADME.md
@@ -20,7 +20,8 @@ LTC: MNtz8Zz1cPD1CZadoc38jT5qeqeFBS6Aif\
 
 ### [アプリ不具合 \ 追加したい機能](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/issues/new/choose)
 
-### [バージョン 3.0 サーバー SPT-AKI 3.9.0 適用](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/3.0)
+### [バージョン 3.1 サーバー SPT 3.10.5 適用](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/3.1)
+### [バージョン 3.0 サーバー SPT 3.9.0 適用](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/3.0)
 ### [バージョン 2.9.3 サーバー SPT-AKI 3.8.0 - 3.8.3 適用](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.9.3)
 ### [バージョン 2.8.6 サーバー SPT-AKI 3.7.0 - 3.7.6 適用](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.8.6)
 ### [バージョン 2.7 サーバー SPT-AKI 3.4.0 - 3.6.1 適用](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.7)
@@ -74,6 +75,3 @@ Lomenot - 日本語&中国語の翻訳
 ![Screenshot5](/screenshots/5CH.png?raw=true)
 ![Screenshot6](/screenshots/6CH.png?raw=true)
 ![Screenshot7](/screenshots/7CH.png?raw=true)
-
-### その他の便利なMOD
-[Weapon builds for Mechanic quests (by Clerance)](https://hub.sp-tarkov.com/files/file/1310-gunsmith-presets-updated/)
diff --git a/README.md b/README.md
index 7832f5cd..22083489 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ LTC: MNtz8Zz1cPD1CZadoc38jT5qeqeFBS6Aif\
 
 ### [Отправить баг репорт \ Предложить новую функцию](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/issues/new/choose)
 
+### [Версия 3.1 для сервера SPT 3.10.5](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/3.1)
 ### [Версия 3.0 для сервера SPT 3.9.0](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/3.0)
 ### [Версия 2.9.3 для сервера SPT-AKI 3.8.0 - 3.8.3](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.9.3)
 ### [Версия 2.8.6 для сервера SPT-AKI 3.7.0 - 3.7.6](https://github.com/SkiTles55/SPT-AKI-Profile-Editor/releases/tag/2.8.6)
@@ -74,6 +75,3 @@ Lomenot - Китайская локализация
 ![Скриншот5](/screenshots/5.PNG?raw=true)
 ![Скриншот6](/screenshots/6.PNG?raw=true)
 ![Скриншот7](/screenshots/7.PNG?raw=true)
-
-### Полезное
-[Сборки оружия для квестов Механика (by Clerance)](https://hub.sp-tarkov.com/files/file/1310-gunsmith-presets-updated/)
diff --git a/SPT-AKI Profile Editor.Installer/SPT-AKI Profile Editor.Installer.vdproj b/SPT-AKI Profile Editor.Installer/SPT-AKI Profile Editor.Installer.vdproj
index 85deeddd..b97e05c1 100644
--- a/SPT-AKI Profile Editor.Installer/SPT-AKI Profile Editor.Installer.vdproj	
+++ b/SPT-AKI Profile Editor.Installer/SPT-AKI Profile Editor.Installer.vdproj	
@@ -188,15 +188,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:SPT-AKI Profile Editor"
-        "ProductCode" = "8:{60FA71FE-89B9-45C0-9D7E-04B3CCECA2D8}"
-        "PackageCode" = "8:{DEE5B707-289B-485E-A344-EF8ACAE13C69}"
+        "ProductCode" = "8:{4E0E512F-DF9F-439D-9B78-5DC55CB3741E}"
+        "PackageCode" = "8:{98881099-AEFE-451C-9160-1113A9D8F48B}"
         "UpgradeCode" = "8:{1F669B59-9085-4108-BADB-9359D4FBA0D0}"
         "AspNetVersion" = "8:"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:3.0.0"
+        "ProductVersion" = "8:3.1.0"
         "Manufacturer" = "8:SkiTles"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://github.com/SkiTles55/SPT-AKI-Profile-Editor"
diff --git a/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj b/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj
index 76b4a986..98b95f88 100644
--- a/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj	
+++ b/SPT-AKI Profile Editor/SPT-AKI Profile Editor.csproj	
@@ -6,7 +6,7 @@
     <RootNamespace>SPT_AKI_Profile_Editor</RootNamespace>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
-    <Version>3.0.2</Version>
+    <Version>3.1.0</Version>
     <ApplicationIcon>Resources\killa_ico_k3r_icon.ico</ApplicationIcon>
     <PackageId>SPT-AKI Profile Editor</PackageId>
     <Authors>SkiTles55</Authors>

From ca33228407bdd8ca6965dbf1c2853715e5b5eb4c Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sun, 12 Jan 2025 13:53:44 +0600
Subject: [PATCH 17/19] update CH and JP localizations

---
 SPT-AKI Profile Editor/Resources/Localizations/ch.json | 6 +++---
 SPT-AKI Profile Editor/Resources/Localizations/jp.json | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/SPT-AKI Profile Editor/Resources/Localizations/ch.json b/SPT-AKI Profile Editor/Resources/Localizations/ch.json
index 2a375f32..9199c4cb 100644
--- a/SPT-AKI Profile Editor/Resources/Localizations/ch.json	
+++ b/SPT-AKI Profile Editor/Resources/Localizations/ch.json	
@@ -261,8 +261,8 @@
     "migration_to_3.9.0_title": "当前设置与 SPT 3.9.0 及更高版本不兼容",
     "migration_to_3.9.0_message": "进行自动修正吗？\n\n服务器文件的相对路径将会更正\n本地化文件也会重置\n程序会在执行上述动作后自动重新启动",
     "checkbox_dont_ask_again": "不再询问",
-    "server_select_help": "Need help?",
-    "fast_mode_apply_and_save": "Apply and save profile",
-    "fast_mode_apply_without_save": "Apply without saving"
+    "server_select_help": "需要帮助？",
+    "fast_mode_apply_and_save": "应用并保存",
+    "fast_mode_apply_without_save": "应用，但不要保存"
   }
 }
\ No newline at end of file
diff --git a/SPT-AKI Profile Editor/Resources/Localizations/jp.json b/SPT-AKI Profile Editor/Resources/Localizations/jp.json
index 201c4ece..294000d8 100644
--- a/SPT-AKI Profile Editor/Resources/Localizations/jp.json	
+++ b/SPT-AKI Profile Editor/Resources/Localizations/jp.json	
@@ -261,7 +261,8 @@
     "migration_to_3.9.0_title": "今のアプリ設置は SPT 3.9.0 以上のバージョンに不適用となり",
     "migration_to_3.9.0_message": "自動的不具合を修正する？\n\nそうすればサーバー位置を自動的特定し\n言語ファイルもリセットし\nアプリを再開する",
     "checkbox_dont_ask_again": "二度と聞かない",
-    "fast_mode_apply_and_save": "Apply and save profile",
-    "fast_mode_apply_without_save": "Apply without saving"
+    "server_select_help": "ヘルプ",
+    "fast_mode_apply_and_save": "変更適用にしセーブする",
+    "fast_mode_apply_without_save": "変更適用、でもセーブしない"
   }
 }
\ No newline at end of file

From d2fbdd52b7db4fb1bac8b84f6e9e8d8488d41af1 Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sun, 12 Jan 2025 13:53:59 +0600
Subject: [PATCH 18/19] added BotTypeAppearanceConverter

---
 .../BotTypes/BotTypeAppearance.cs             | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/SPT-AKI Profile Editor/Core/ServerClasses/BotTypes/BotTypeAppearance.cs b/SPT-AKI Profile Editor/Core/ServerClasses/BotTypes/BotTypeAppearance.cs
index d477b300..c819cba1 100644
--- a/SPT-AKI Profile Editor/Core/ServerClasses/BotTypes/BotTypeAppearance.cs	
+++ b/SPT-AKI Profile Editor/Core/ServerClasses/BotTypes/BotTypeAppearance.cs	
@@ -1,8 +1,11 @@
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
 
 namespace SPT_AKI_Profile_Editor.Core.ServerClasses
 {
+    [JsonConverter(typeof(BotTypeAppearanceConverter))]
     internal class BotTypeAppearance
     {
         [JsonProperty("head")]
@@ -11,4 +14,31 @@ internal class BotTypeAppearance
         [JsonProperty("voice")]
         public Dictionary<string, int> Voices { get; set; }
     }
+
+    internal class BotTypeAppearanceConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType) => objectType == typeof(BotTypeAppearance);
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            JObject jo = JObject.Load(reader);
+            var botTypeAppearance = new BotTypeAppearance
+            {
+                Heads = jo["head"].Type == JTokenType.Array ? new Dictionary<string, int>() : jo["head"].ToObject<Dictionary<string, int>>(),
+                Voices = jo["voice"].Type == JTokenType.Array ? new Dictionary<string, int>() : jo["voice"].ToObject<Dictionary<string, int>>()
+            };
+            return botTypeAppearance;
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var botTypeAppearance = (BotTypeAppearance)value;
+            JObject jo = new()
+            {
+                { "head", JToken.FromObject(botTypeAppearance.Heads) },
+                { "voice", JToken.FromObject(botTypeAppearance.Voices) }
+            };
+            jo.WriteTo(writer);
+        }
+    }
 }
\ No newline at end of file

From 98076d966aff09f98278b00870357145e1dcf7b3 Mon Sep 17 00:00:00 2001
From: Dmitry Khudyakov <skit.92@mail.com>
Date: Sun, 12 Jan 2025 14:04:57 +0600
Subject: [PATCH 19/19] detect special slots in pockets

---
 SPT-AKI Profile Editor/Core/AppData.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/SPT-AKI Profile Editor/Core/AppData.cs b/SPT-AKI Profile Editor/Core/AppData.cs
index e1f88ae5..1179f67c 100644
--- a/SPT-AKI Profile Editor/Core/AppData.cs	
+++ b/SPT-AKI Profile Editor/Core/AppData.cs	
@@ -287,8 +287,18 @@ private static void FindPockets() => ServerDatabase.Pockets = ServerDatabase.Ite
             .OrderBy(x => x.Value.SlotsCount)
             .ToDictionary(x => x.Key, x => GetPocketsName(x.Value));
 
-        private static string GetPocketsName(TarkovItem x) =>
-            $"{x.LocalizedName} ({x.SlotsCount})";
+        private static string GetPocketsName(TarkovItem x)
+        {
+            var name = $"{x.LocalizedName} ({x.SlotsCount})";
+            var specSlotsCount = x.Properties?.Slots?.Where(x => x.Name.StartsWith("SpecialSlot")).Count() ?? 0;
+            if (specSlotsCount > 0)
+            {
+                var key = "InventoryScreen/SpecialSlotsHeader";
+                var header = ServerDatabase.LocalesGlobal.ContainsKey(key) ? ServerDatabase.LocalesGlobal[key] : "special slots";
+                name += $" + {header} ({specSlotsCount})";
+            }
+            return name;
+        }
 
         private static void LoadTraderSuits()
         {