From 0454dbdf28228fbc607e37769733b05ff69b7e33 Mon Sep 17 00:00:00 2001 From: CWX Date: Mon, 6 Jan 2025 17:38:02 +0000 Subject: [PATCH] enum fix and imports --- Core/Models/Spt/Dialog/SendMessageDetails.cs | 27 ++++++++++--------- .../Spt/Fence/CreateFenceAssortsResult.cs | 1 + .../Spt/Generators/LocationGenerator.cs | 4 ++- .../Spt/Generators/RagfairAssortGenerator.cs | 4 ++- .../Spt/Generators/RagfairOfferGenerator.cs | 5 +++- .../Spt/Inventory/OwnerInventoryItems.cs | 1 + Core/Models/Spt/Mod/NewItemDetails.cs | 1 + 7 files changed, 27 insertions(+), 16 deletions(-) diff --git a/Core/Models/Spt/Dialog/SendMessageDetails.cs b/Core/Models/Spt/Dialog/SendMessageDetails.cs index c772dda8..a0d24b7b 100644 --- a/Core/Models/Spt/Dialog/SendMessageDetails.cs +++ b/Core/Models/Spt/Dialog/SendMessageDetails.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Tables; namespace Core.Models.Spt.Dialog; @@ -44,7 +45,7 @@ public class SendMessageDetails /// Optional - Items to send to player /// [JsonPropertyName("items")] - public List? Items { get; set; } + public List? Items { get; set; } /// /// Optional - How long items will be stored in mail before expiry @@ -62,19 +63,19 @@ public class SendMessageDetails /// Optional - ragfair related /// [JsonPropertyName("systemData")] - public ISystemData? SystemData { get; set; } + public SystemData? SystemData { get; set; } /// /// Optional - Used by ragfair messages /// [JsonPropertyName("ragfairDetails")] - public IMessageContentRagfair? RagfairDetails { get; set; } + public MessageContentRagfair? RagfairDetails { get; set; } /// /// OPTIONAL - allows modification of profile settings via mail /// [JsonPropertyName("profileChangeEvents")] - public List? ProfileChangeEvents { get; set; } + public List? ProfileChangeEvents { get; set; } } public class ProfileChangeEvent @@ -92,14 +93,14 @@ public class ProfileChangeEvent public string? Entity { get; set; } } -public struct ProfileChangeEventType +public enum ProfileChangeEventType { - public const string TRADER_SALES_SUM = "TraderSalesSum"; - public const string TRADER_STANDING = "TraderStanding"; - public const string PROFILE_LEVEL = "ProfileLevel"; - public const string SKILL_POINTS = "SkillPoints"; - public const string EXAMINE_ALL_ITEMS = "ExamineAllItems"; - public const string UNLOCK_TRADER = "UnlockTrader"; - public const string ASSORT_UNLOCK_RULE = "AssortmentUnlockRule"; - public const string HIDEOUT_AREA_LEVEL = "HideoutAreaLevel"; + TraderSalesSum, + TraderStanding, + ProfileLevel, + SkillPoints, + ExamineAllItems, + UnlockTrader, + AssortmentUnlockRule, + HideoutAreaLevel } \ No newline at end of file diff --git a/Core/Models/Spt/Fence/CreateFenceAssortsResult.cs b/Core/Models/Spt/Fence/CreateFenceAssortsResult.cs index e5b12a29..2d0c2eed 100644 --- a/Core/Models/Spt/Fence/CreateFenceAssortsResult.cs +++ b/Core/Models/Spt/Fence/CreateFenceAssortsResult.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Tables; namespace Core.Models.Spt.Fence; diff --git a/Core/Models/Spt/Generators/LocationGenerator.cs b/Core/Models/Spt/Generators/LocationGenerator.cs index 944a4422..8885a98a 100644 --- a/Core/Models/Spt/Generators/LocationGenerator.cs +++ b/Core/Models/Spt/Generators/LocationGenerator.cs @@ -1,4 +1,6 @@ -namespace Core.Models.Spt.Generators; +using Core.Models.Eft.Common; + +namespace Core.Models.Spt.Generators; public class LocationGenerator { diff --git a/Core/Models/Spt/Generators/RagfairAssortGenerator.cs b/Core/Models/Spt/Generators/RagfairAssortGenerator.cs index d4e9b76c..15ac2bf9 100644 --- a/Core/Models/Spt/Generators/RagfairAssortGenerator.cs +++ b/Core/Models/Spt/Generators/RagfairAssortGenerator.cs @@ -1,4 +1,6 @@ -namespace Core.Models.Spt.Generators; +using Core.Models.Eft.Common.Tables; + +namespace Core.Models.Spt.Generators; public class RagfairAssortGenerator { diff --git a/Core/Models/Spt/Generators/RagfairOfferGenerator.cs b/Core/Models/Spt/Generators/RagfairOfferGenerator.cs index 59bcd20c..aae34448 100644 --- a/Core/Models/Spt/Generators/RagfairOfferGenerator.cs +++ b/Core/Models/Spt/Generators/RagfairOfferGenerator.cs @@ -1,4 +1,7 @@ -namespace Core.Models.Spt.Generators; +using Core.Models.Eft.Common.Tables; +using Core.Models.Eft.Ragfair; + +namespace Core.Models.Spt.Generators; public class RagfairOfferGenerator { diff --git a/Core/Models/Spt/Inventory/OwnerInventoryItems.cs b/Core/Models/Spt/Inventory/OwnerInventoryItems.cs index 390d2701..02f5e2ae 100644 --- a/Core/Models/Spt/Inventory/OwnerInventoryItems.cs +++ b/Core/Models/Spt/Inventory/OwnerInventoryItems.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common.Tables; namespace Core.Models.Spt.Inventory; diff --git a/Core/Models/Spt/Mod/NewItemDetails.cs b/Core/Models/Spt/Mod/NewItemDetails.cs index 5c8dd015..d2617d07 100644 --- a/Core/Models/Spt/Mod/NewItemDetails.cs +++ b/Core/Models/Spt/Mod/NewItemDetails.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using Core.Models.Eft.Common; namespace Core.Models.Spt.Mod;