From 4c80ca242c6dc3d18f9d15b4a7a1d7df8e31fb5d Mon Sep 17 00:00:00 2001 From: Chomp Date: Sat, 30 Aug 2025 15:42:48 +0100 Subject: [PATCH] Updated various enums with values from live --- .../Helpers/RagfairOfferHelper.cs | 4 +-- .../GlobalSettings/BotGlobalsMindSettings.cs | 9 ++++-- .../Models/Eft/Common/Tables/BotBase.cs | 10 +++---- .../Models/Eft/Common/Tables/Item.cs | 2 +- .../Models/Eft/Common/Tables/TemplateItem.cs | 6 ---- .../Models/Eft/Game/GameModeResponse.cs | 4 +-- .../Models/Eft/Ragfair/SearchRequestData.cs | 6 ++-- .../Models/Enums/DogtagExchangeSide.cs | 4 +-- .../Models/Enums/HealthFactor.cs | 2 +- .../Models/Enums/Hideout/RequirementType.cs | 1 + .../Models/Enums/MessageType.cs | 28 +++++++++---------- .../Models/Enums/ProfileStatus.cs | 10 +++---- .../Models/Enums/QuestTypeEnum.cs | 2 ++ .../Models/Enums/RaidMode.cs | 7 +++-- .../Enums/{BuffType.cs => RepairBuffType.cs} | 2 +- .../Services/RagfairCategoriesService.cs | 4 +-- .../Services/RagfairTaxService.cs | 6 ++-- .../Services/RepairService.cs | 2 +- 18 files changed, 55 insertions(+), 54 deletions(-) rename Libraries/SPTarkov.Server.Core/Models/Enums/{BuffType.cs => RepairBuffType.cs} (87%) diff --git a/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs index 0b4c4049..e18aba73 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs @@ -856,13 +856,13 @@ public class RagfairOfferHelper( } var isTraderOffer = offer.IsTraderOffer(); - if (searchRequest.OfferOwnerType == OfferOwnerType.TRADEROWNERTYPE && !isTraderOffer) + if (searchRequest.OfferOwnerType == OfferOwnerType.TraderOwnerType && !isTraderOffer) // don't include player offers { return false; } - if (searchRequest.OfferOwnerType == OfferOwnerType.PLAYEROWNERTYPE && isTraderOffer) + if (searchRequest.OfferOwnerType == OfferOwnerType.PlayerOwnerType && isTraderOffer) // don't include trader offers { return false; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GlobalSettings/BotGlobalsMindSettings.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GlobalSettings/BotGlobalsMindSettings.cs index 91ab58f1..7fedb3ba 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GlobalSettings/BotGlobalsMindSettings.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GlobalSettings/BotGlobalsMindSettings.cs @@ -421,9 +421,12 @@ public record BotGlobalsMindSettings public enum EWarnBehaviour { - Neutral, - Warn, - AlwaysEnemies, + Default = 1, + Neutral = 2, + Warn = 4, + AlwaysEnemies = 8, + AlwaysFriends = 16, + ChancedEnemies = 32, } public enum EBotEnemyCause diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs index 3b36304e..871ab978 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotBase.cs @@ -879,11 +879,11 @@ public record Notes public enum SurvivorClass { - UNKNOWN = 0, - NEUTRALIZER = 1, - MARAUDER = 2, - PARAMEDIC = 3, - SURVIVOR = 4, + Unknown, + Neutralizer, + Marauder, + Paramedic, + Survivor, } public record TraderInfo diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs index 9dd62da2..2791cf6e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/Item.cs @@ -200,7 +200,7 @@ public record UpdBuff [JsonPropertyName("BuffType")] [JsonConverter(typeof(JsonStringEnumConverter))] - public BuffType? BuffType { get; set; } + public RepairBuffType? BuffType { get; set; } [JsonPropertyName("Value")] public double? Value { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs index 8b00ccb5..df9d9e4b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/TemplateItem.cs @@ -1956,9 +1956,3 @@ public record ShotsGroupSettings [JsonPropertyName("StartShotIndex")] public double? StartShotIndex { get; set; } } - -public enum ItemType -{ - NODE = 1, - ITEM = 2, -} diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs index 6fd580ac..b26b7363 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Game/GameModeResponse.cs @@ -4,8 +4,8 @@ namespace SPTarkov.Server.Core.Models.Eft.Game; public enum SessionMode { - REGULAR, - PVE, + Regular, + Pve, } public record GameModeResponse diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs index e153c617..5278bfb2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Ragfair/SearchRequestData.cs @@ -82,7 +82,7 @@ public record SearchRequestData : IRequestData public enum OfferOwnerType { - ANYOWNERTYPE = 0, - TRADEROWNERTYPE = 1, - PLAYEROWNERTYPE = 2, + AnyOwnerType, + TraderOwnerType, + PlayerOwnerType, } diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/DogtagExchangeSide.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/DogtagExchangeSide.cs index e54a91a2..a1f7488a 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/DogtagExchangeSide.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/DogtagExchangeSide.cs @@ -2,7 +2,7 @@ public enum DogtagExchangeSide { - Usec, + Usec = 1, Bear, - Any, + Any = 4, } diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/HealthFactor.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/HealthFactor.cs index d57109aa..518a96e9 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/HealthFactor.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/HealthFactor.cs @@ -9,5 +9,5 @@ public enum HealthFactor Radiation, Temperature, Poisoning, - Effect, + Effect = 100, } diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/RequirementType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/RequirementType.cs index 7b265f30..2f5e596b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/RequirementType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/Hideout/RequirementType.cs @@ -12,4 +12,5 @@ public enum RequirementType QuestComplete, Health, BodyPartBuff, + GameVersion, } diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/MessageType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/MessageType.cs index 607a63f8..bc4634fa 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/MessageType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/MessageType.cs @@ -3,18 +3,18 @@ public enum MessageType { UserMessage = 1, - NpcTraderMessage = 2, - AuctionMessage = 3, - FleamarketMessage = 4, - AdminMessage = 5, - GroupChatMessage = 6, - SystemMessage = 7, - InsuranceReturn = 8, - GlobalChat = 9, - QuestStart = 10, - QuestFail = 11, - QuestSuccess = 12, - MessageWithItems = 13, - InitialSupport = 14, - BtrItemsDelivery = 15, + NpcTraderMessage, + AuctionMessage, + FleamarketMessage, + AdminMessage, + GroupChatMessage, + SystemMessage, + InsuranceReturn, + GlobalChat, + QuestStart, + QuestFail, + QuestSuccess, + MessageWithItems, + InitialSupport, + BtrItemsDelivery, } diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/ProfileStatus.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/ProfileStatus.cs index 38dcde60..f67db48e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/ProfileStatus.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/ProfileStatus.cs @@ -2,9 +2,9 @@ public enum ProfileStatus { - FREE, - MATCH_WAIT, - BUSY, - LEAVING, - TRANSFER, + Free, + MatchWait, + Busy, + Leaving, + Transfer, } diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/QuestTypeEnum.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/QuestTypeEnum.cs index f4968046..4043ae93 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/QuestTypeEnum.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/QuestTypeEnum.cs @@ -15,4 +15,6 @@ public enum QuestTypeEnum Skill, Multi, WeaponAssembly, + ArenaWinMatch, + ArenaWinRound, } diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/RaidMode.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidMode.cs index 4d4ad090..cef31d24 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/RaidMode.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RaidMode.cs @@ -2,7 +2,8 @@ public enum RaidMode { - ONLINE, - LOCAL, - COOP, + Online, + Local, + Coop, + Narrate, } diff --git a/Libraries/SPTarkov.Server.Core/Models/Enums/BuffType.cs b/Libraries/SPTarkov.Server.Core/Models/Enums/RepairBuffType.cs similarity index 87% rename from Libraries/SPTarkov.Server.Core/Models/Enums/BuffType.cs rename to Libraries/SPTarkov.Server.Core/Models/Enums/RepairBuffType.cs index 97e7a651..4ee13a6f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Enums/BuffType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Enums/RepairBuffType.cs @@ -1,6 +1,6 @@ namespace SPTarkov.Server.Core.Models.Enums; -public enum BuffType +public enum RepairBuffType { WeaponSpread, DamageReduction, diff --git a/Libraries/SPTarkov.Server.Core/Services/RagfairCategoriesService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairCategoriesService.cs index 5d253842..12885dc8 100644 --- a/Libraries/SPTarkov.Server.Core/Services/RagfairCategoriesService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/RagfairCategoriesService.cs @@ -49,13 +49,13 @@ public class RagfairCategoriesService(ISptLogger logge } // Remove when filter set to players only + offer is from trader - if (searchRequestData.OfferOwnerType == OfferOwnerType.PLAYEROWNERTYPE && isTraderOffer) + if (searchRequestData.OfferOwnerType == OfferOwnerType.PlayerOwnerType && isTraderOffer) { return false; } // Remove when filter set to traders only + offer is not from trader - if (searchRequestData.OfferOwnerType == OfferOwnerType.TRADEROWNERTYPE && !isTraderOffer) + if (searchRequestData.OfferOwnerType == OfferOwnerType.TraderOwnerType && !isTraderOffer) { return false; } diff --git a/Libraries/SPTarkov.Server.Core/Services/RagfairTaxService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairTaxService.cs index 60a9bace..7b0dbbc0 100644 --- a/Libraries/SPTarkov.Server.Core/Services/RagfairTaxService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/RagfairTaxService.cs @@ -98,9 +98,9 @@ public class RagfairTaxService( var itemEnhancementSettings = databaseService.GetGlobals().Configuration.RepairSettings.ItemEnhancementSettings; var priceModiferValue = buffType switch { - BuffType.DamageReduction => itemEnhancementSettings.DamageReduction.PriceModifierValue, - BuffType.MalfunctionProtections => itemEnhancementSettings.MalfunctionProtections.PriceModifierValue, - BuffType.WeaponSpread => itemEnhancementSettings.WeaponSpread.PriceModifierValue, + RepairBuffType.DamageReduction => itemEnhancementSettings.DamageReduction.PriceModifierValue, + RepairBuffType.MalfunctionProtections => itemEnhancementSettings.MalfunctionProtections.PriceModifierValue, + RepairBuffType.WeaponSpread => itemEnhancementSettings.WeaponSpread.PriceModifierValue, _ => 1d, }; discountedTax *= 1.0 + Math.Abs(item.Upd.Buff.Value.Value - 1.0) * priceModiferValue; diff --git a/Libraries/SPTarkov.Server.Core/Services/RepairService.cs b/Libraries/SPTarkov.Server.Core/Services/RepairService.cs index cba32808..04e2bead 100644 --- a/Libraries/SPTarkov.Server.Core/Services/RepairService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/RepairService.cs @@ -482,7 +482,7 @@ public class RepairService( item.Upd.Buff = new UpdBuff { Rarity = bonusRarityName, - BuffType = Enum.Parse(bonusTypeName), + BuffType = Enum.Parse(bonusTypeName), Value = bonusValue, ThresholdDurability = randomUtil.GetPercentOfValue(bonusThresholdPercent, item.Upd.Repairable.Durability.Value, 0), };