Updated various enums with values from live

2025-08-30 15:42:48 +01:00
parent 62e0454bec
commit 4c80ca242c
18 changed files with 55 additions and 54 deletions
@@ -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;
@@ -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
@@ -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
@@ -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; }
@@ -1956,9 +1956,3 @@ public record ShotsGroupSettings
    [JsonPropertyName("StartShotIndex")]
    public double? StartShotIndex { get; set; }
 }
-
-public enum ItemType
-{
-    NODE = 1,
-    ITEM = 2,
-}
@@ -4,8 +4,8 @@ namespace SPTarkov.Server.Core.Models.Eft.Game;

 public enum SessionMode
 {
-    REGULAR,
-    PVE,
+    Regular,
+    Pve,
 }

 public record GameModeResponse
@@ -82,7 +82,7 @@ public record SearchRequestData : IRequestData

 public enum OfferOwnerType
 {
-    ANYOWNERTYPE = 0,
-    TRADEROWNERTYPE = 1,
-    PLAYEROWNERTYPE = 2,
+    AnyOwnerType,
+    TraderOwnerType,
+    PlayerOwnerType,
 }
@@ -2,7 +2,7 @@

 public enum DogtagExchangeSide
 {
-    Usec,
+    Usec = 1,
    Bear,
-    Any,
+    Any = 4,
 }
@@ -9,5 +9,5 @@ public enum HealthFactor
    Radiation,
    Temperature,
    Poisoning,
-    Effect,
+    Effect = 100,
 }
@@ -12,4 +12,5 @@ public enum RequirementType
    QuestComplete,
    Health,
    BodyPartBuff,
+    GameVersion,
 }
@@ -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,
 }
@@ -2,9 +2,9 @@

 public enum ProfileStatus
 {
-    FREE,
-    MATCH_WAIT,
-    BUSY,
-    LEAVING,
-    TRANSFER,
+    Free,
+    MatchWait,
+    Busy,
+    Leaving,
+    Transfer,
 }
@@ -15,4 +15,6 @@ public enum QuestTypeEnum
    Skill,
    Multi,
    WeaponAssembly,
+    ArenaWinMatch,
+    ArenaWinRound,
 }
@@ -2,7 +2,8 @@

 public enum RaidMode
 {
-    ONLINE,
-    LOCAL,
-    COOP,
+    Online,
+    Local,
+    Coop,
+    Narrate,
 }
@@ -1,6 +1,6 @@
 namespace SPTarkov.Server.Core.Models.Enums;

-public enum BuffType
+public enum RepairBuffType
 {
    WeaponSpread,
    DamageReduction,
@@ -49,13 +49,13 @@ public class RagfairCategoriesService(ISptLogger<RagfairCategoriesService> 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;
                }
@@ -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;
@@ -482,7 +482,7 @@ public class RepairService(
        item.Upd.Buff = new UpdBuff
        {
            Rarity = bonusRarityName,
-            BuffType = Enum.Parse<BuffType>(bonusTypeName),
+            BuffType = Enum.Parse<RepairBuffType>(bonusTypeName),
            Value = bonusValue,
            ThresholdDurability = randomUtil.GetPercentOfValue(bonusThresholdPercent, item.Upd.Repairable.Durability.Value, 0),
        };