Cleanup todos, run VS cleanup & enforce file scoped namespacing

.editorconfig

@@ -27,6 +27,7 @@ csharp_new_line_before_finally = true
 csharp_new_line_before_members_in_object_initializers = true
 csharp_new_line_before_members_in_anonymous_types = true
 csharp_new_line_between_query_expression_clauses = true
+csharp_style_namespace_declarations = file_scoped:warning
 
 # Indentation preferences
 csharp_indent_block_contents = true

Benchmarks/ClonerBenchmarks.cs

@@ -4,7 +4,6 @@ using SPTarkov.Server.Core.Models.Spt.Templates;
 using SPTarkov.Server.Core.Utils;
 using SPTarkov.Server.Core.Utils.Cloners;
 using SPTarkov.Server.Core.Utils.Json;
-using SPTarkov.Server.Core.Utils.Json.Converters;
 
 namespace Benchmarks;
 

Libraries/SPTarkov.Server.Core/Extensions/SptModExtensions.cs

@@ -1,9 +1,4 @@
-using System;
+using SPTarkov.Server.Core.Models.Spt.Mod;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SPTarkov.Server.Core.Models.Spt.Mod;
 
 namespace SPTarkov.Server.Core.Extensions
 {

Libraries/SPTarkov.Server.Core/Generators/LootGenerator.cs

@@ -5,7 +5,6 @@ using SPTarkov.Server.Core.Helpers;
 using SPTarkov.Server.Core.Models.Common;
 using SPTarkov.Server.Core.Models.Eft.Common;
 using SPTarkov.Server.Core.Models.Eft.Common.Tables;
-using SPTarkov.Server.Core.Models.Enums;
 using SPTarkov.Server.Core.Models.Spt.Config;
 using SPTarkov.Server.Core.Models.Spt.Services;
 using SPTarkov.Server.Core.Models.Utils;

Libraries/SPTarkov.Server.Core/Generators/RagfairAssortGenerator.cs

@@ -5,7 +5,6 @@ using SPTarkov.Server.Core.Helpers;
 using SPTarkov.Server.Core.Models.Common;
 using SPTarkov.Server.Core.Models.Eft.Common;
 using SPTarkov.Server.Core.Models.Eft.Common.Tables;
-using SPTarkov.Server.Core.Models.Enums;
 using SPTarkov.Server.Core.Models.Spt.Config;
 using SPTarkov.Server.Core.Servers;
 using SPTarkov.Server.Core.Services;

Libraries/SPTarkov.Server.Core/Helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.cs

@@ -7,7 +7,6 @@ using SPTarkov.Server.Core.Models.Common;
 using SPTarkov.Server.Core.Models.Eft.Common.Tables;
 using SPTarkov.Server.Core.Models.Eft.Dialog;
 using SPTarkov.Server.Core.Models.Eft.Profile;
-using SPTarkov.Server.Core.Models.Enums;
 using SPTarkov.Server.Core.Models.Utils;
 using SPTarkov.Server.Core.Services;
 using SPTarkov.Server.Core.Utils.Cloners;

Libraries/SPTarkov.Server.Core/Helpers/PresetHelper.cs

@@ -1,7 +1,6 @@
 using SPTarkov.DI.Annotations;
 using SPTarkov.Server.Core.Models.Common;
 using SPTarkov.Server.Core.Models.Eft.Common;
-using SPTarkov.Server.Core.Models.Enums;
 using SPTarkov.Server.Core.Models.Spt.Presets;
 using SPTarkov.Server.Core.Services;
 using SPTarkov.Server.Core.Utils.Cloners;

Libraries/SPTarkov.Server.Core/Migration/Migrations/3.11/ThreeTenMinorFixes.cs

@@ -1,9 +1,4 @@
-using System;
+using System.Text.Json.Nodes;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json.Nodes;
-using System.Threading.Tasks;
 using SPTarkov.DI.Annotations;
 using SPTarkov.Server.Core.Models.Eft.Profile;
 

Libraries/SPTarkov.Server.Core/Models/Eft/Common/LocationBase.cs

@@ -83,23 +83,17 @@ public record LocationBase
     public int BotMax { get; set; }
 
     /// <summary>
-    ///     Is not used in 33420 TODO: still needed?
+    ///     Is not used in 33420
     /// </summary>
     [JsonPropertyName("BotMaxPlayer")]
     public int? BotMaxPlayer { get; set; }
 
     /// <summary>
-    ///     Is not used in 33420 TODO: still needed?
+    ///     Is not used in 33420
     /// </summary>
     [JsonPropertyName("BotMaxTimePlayer")]
     public int? BotMaxTimePlayer { get; set; }
 
-    /// <summary>
-    ///     Does not even exist in the client in 33420 TODO: still needed?
-    /// </summary>
-    [JsonPropertyName("BotMaxPvE")]
-    public int? BotMaxPvE { get; set; }
-
     /// <summary>
     ///     Weighting on how likely a bot will be Normal difficulty
     /// </summary>

Libraries/SPTarkov.Server.Core/Services/BotEquipmentModPoolService.cs

@@ -3,7 +3,6 @@ using SPTarkov.DI.Annotations;
 using SPTarkov.Server.Core.Helpers;
 using SPTarkov.Server.Core.Models.Common;
 using SPTarkov.Server.Core.Models.Eft.Common.Tables;
-using SPTarkov.Server.Core.Models.Enums;
 using SPTarkov.Server.Core.Models.Utils;
 using SPTarkov.Server.Core.Utils;
 

Libraries/SPTarkov.Server.Core/Services/BotLootCacheService.cs

@@ -4,7 +4,6 @@ using SPTarkov.Server.Core.Generators;
 using SPTarkov.Server.Core.Helpers;
 using SPTarkov.Server.Core.Models.Common;
 using SPTarkov.Server.Core.Models.Eft.Common.Tables;
-using SPTarkov.Server.Core.Models.Enums;
 using SPTarkov.Server.Core.Models.Spt.Bots;
 using SPTarkov.Server.Core.Models.Utils;
 using SPTarkov.Server.Core.Utils.Cloners;

Libraries/SPTarkov.Server.Core/Services/BotWeaponModLimitService.cs

@@ -2,7 +2,6 @@ using SPTarkov.DI.Annotations;
 using SPTarkov.Server.Core.Helpers;
 using SPTarkov.Server.Core.Models.Common;
 using SPTarkov.Server.Core.Models.Eft.Common.Tables;
-using SPTarkov.Server.Core.Models.Enums;
 using SPTarkov.Server.Core.Models.Spt.Bots;
 using SPTarkov.Server.Core.Models.Spt.Config;
 using SPTarkov.Server.Core.Models.Utils;

Libraries/SPTarkov.Server.Core/Services/PostDbLoadService.cs

@@ -514,7 +514,6 @@ public class PostDbLoadService(
                 continue;
             }
 
-            map.Base.BotMaxPvE = cap;
             map.Base.BotMax = cap;
 
             // make values no larger than 30 secs

Libraries/SPTarkov.Server.Core/Services/RagfairLinkedItemService.cs

@@ -3,7 +3,6 @@ using SPTarkov.Server.Core.Extensions;
 using SPTarkov.Server.Core.Helpers;
 using SPTarkov.Server.Core.Models.Common;
 using SPTarkov.Server.Core.Models.Eft.Common.Tables;
-using SPTarkov.Server.Core.Models.Enums;
 using SPTarkov.Server.Core.Models.Utils;
 
 namespace SPTarkov.Server.Core.Services;

Libraries/SPTarkov.Server.Core/Utils/FileUtil.cs

@@ -1,4 +1,3 @@
-using System.Security.AccessControl;
 using SPTarkov.DI.Annotations;
 
 namespace SPTarkov.Server.Core.Utils;