diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/bot.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/bot.json index 116a11d4..ab662867 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/bot.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/bot.json @@ -436,27 +436,7 @@ "weaponModLimits": { "lightLaserLimit": 2, "scopeLimit": 1 - }, - "weightingAdjustmentsByPlayerLevel": [ - { - "equipment": { - "add": {}, - "edit": { - "FaceCover": { - "572b7fa524597762b747ce82": 30 - }, - "FirstPrimaryWeapon": { - "54491c4f4bdc2db1078b4568": 90, - "5a38e6bac4a2826c6e06d79b": 90 - } - } - }, - "levelRange": { - "max": 6, - "min": 1 - } - } - ] + } }, "assaultgroup": {}, "bossboar": { @@ -2853,45 +2833,6 @@ "tagillaHelperAgro": 5, "test": 30 }, - "revenge": { - "arenaFighter": [ - "pmcBot", - "gifter" - ], - "arenaFighterEvent": [ - "pmcBot", - "gifter" - ], - "bossKnight": [ - "exUsec", - "gifter", - "bossKnight", - "followerBigPipe", - "followerBirdEye" - ], - "exUsec": [ - "exUsec", - "gifter", - "bossKnight", - "followerBigPipe", - "followerBirdEye" - ], - "followerBigPipe": [ - "exUsec", - "gifter", - "bossKnight", - "followerBigPipe", - "followerBirdEye" - ], - "pmcBot": [ - "pmcBot", - "gifter" - ], - "spiritWinter": [ - "pmcBot", - "gifter" - ] - }, "secureContainerAmmoStackCount": 20, "showTypeInNickname": false, "walletLoot": { diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/gifts.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/gifts.json index 5962ad47..581cc735 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/gifts.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/gifts.json @@ -439,7 +439,6 @@ ], "sender": "System", "messageText": "Merry christmas!", - "timestampToSend": 42069, "associatedEvent": "Christmas", "collectionTimeHours": 48, "maxToSendPlayer": 1 @@ -579,7 +578,6 @@ ], "sender": "System", "messageText": "1CLICKDRESSUP", - "timestampToSend": 42069, "collectionTimeHours": 48, "associatedEvent": "Promo", "maxToSendPlayer": 1 @@ -722,7 +720,6 @@ ], "sender": "System", "messageText": "BARMALEY", - "timestampToSend": 42069, "collectionTimeHours": 48, "associatedEvent": "Promo", "maxToSendPlayer": 1 @@ -792,7 +789,6 @@ ], "sender": "System", "messageText": "S00NS00N", - "timestampToSend": 42069, "collectionTimeHours": 48, "associatedEvent": "Promo", "maxToSendPlayer": 1 @@ -942,7 +938,6 @@ ], "sender": "System", "messageText": "TRAMBON", - "timestampToSend": 42069, "collectionTimeHours": 48, "associatedEvent": "Promo", "maxToSendPlayer": 1 @@ -1020,7 +1015,6 @@ ], "sender": "System", "messageText": "PINEWOOD", - "timestampToSend": 42069, "collectionTimeHours": 48, "associatedEvent": "Promo", "maxToSendPlayer": 1 @@ -1428,7 +1422,6 @@ "messageText": "JONKLER NO", "collectionTimeHours": 48, "associatedEvent": "Promo", - "maxToSendToPlayer": 1, "maxToSendPlayer": 1 }, "BSGBIRTHDAY2023": { diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/health.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/health.json index 75ae173e..f82ebfe4 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/health.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/health.json @@ -1,10 +1,8 @@ { "healthMultipliers": { - "death": 0.3, "blacked": 0.1 }, "save": { - "health": true, - "effects": true + "health": true } } diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json index 05bf1c75..a1aa746e 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json @@ -17,7 +17,6 @@ "max": 1.4 }, "bonusChanceMultiplier": 0.25, - "bonusAmountMultiplier": 0.43, "highValueThresholdRub": 70000, "hideoutTaskRewardTimeSeconds": 21600, "hideoutCraftSacrificeThresholdRub": 400000, diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/http.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/http.json index 0b36d56f..417ef9e8 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/http.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/http.json @@ -3,8 +3,6 @@ "port": 6969, "backendIp": "127.0.0.1", "backendPort": 6969, - "webSocketPingDelayMs": 90000, "logRequests": true, - "serverImagePathOverride": {}, - "certificatePassword": "" + "serverImagePathOverride": {} } diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/inraid.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/inraid.json index a7768ad6..bb54d3c6 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/inraid.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/inraid.json @@ -9,9 +9,6 @@ "randomWeather": false, "randomTime": false }, - "save": { - "loot": true - }, "carExtracts": ["Dorms V-Ex", "PP Exfil", "V-Ex_light", "South V-Ex", "E7_car", "Sandbox_VExit", "Shorl_V-Ex"], "coopExtracts": [ "Interchange Cooperation", @@ -25,7 +22,6 @@ "carExtractBaseStandingGain": 0.2, "coopExtractBaseStandingGain": 0.25, "scavExtractStandingGain": 0.01, - "pmcKillProbabilityForScavGain": 0.2, "keepFiRSecureContainerOnDeath": false, "alwaysKeepFoundInRaidOnRaidEnd": false, "playerScavHostileChancePercent": 15 diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/insurance.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/insurance.json index 5662ae01..4a18b982 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/insurance.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/insurance.json @@ -3,8 +3,6 @@ "54cb50c76803fa8b248b4571": 85, "54cb57776803fa99248b456e": 95 }, - "blacklistedEquipment": ["SpecialSlot1", "SpecialSlot2", "SpecialSlot3"], - "slotIdsToAlwaysRemove": ["cartridges", "patron_in_weapon"], "returnTimeOverrideSeconds": 0, "storageTimeOverrideSeconds": 0, "runIntervalSeconds": 600, diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/inventory.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/inventory.json index 96b67461..abf5417a 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/inventory.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/inventory.json @@ -1,5 +1,4 @@ { - "newItemsMarkedFound": false, "randomLootContainers": { "634959225289190e5e773b3b": { "rewardCount": 6, diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/match.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/match.json index ab130d0a..a82d0fb2 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/match.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/match.json @@ -1,15 +1,3 @@ { - "enabled": false, - "randomiseMapContainers": { - "tarkovstreets": false, - "factory4_day": false, - "factory4_night": false, - "bigmap": false, - "woods": false, - "shoreline": false, - "interchange": false, - "lighthouse": false, - "laboratory": false, - "rezervbase": false - } + "enabled": false } diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/playerscav.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/playerscav.json index 742d94a7..181fae95 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/playerscav.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/playerscav.json @@ -77,7 +77,6 @@ "whitelist": {} } }, - "labsAccessCardChancePercent": 0, "lootItemsToAddChancePercent": {} }, "-6": { diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/pmc.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/pmc.json index f900bcfd..915a6780 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/pmc.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/pmc.json @@ -420,7 +420,6 @@ } }, "forceHealingItemsIntoSecure": true, - "addPrefixToSameNamePMCAsPlayerChance": 40, "allPMCsHavePlayerNameWithRandomPrefixChance": 1, "locationSpecificPmcLevelOverride": { "sandbox": { diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/repair.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/repair.json index 19cc8ec5..3594f8d9 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/repair.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/repair.json @@ -1,7 +1,6 @@ { "priceMultiplier": 1, "applyRandomizeDurabilityLoss": true, - "weaponSkillRepairGain": 4.06, "armorKitSkillPointGainPerRepairPointMultiplier": 0.05, "repairKitIntellectGainMultiplier": { "weapon": 0.045, diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs index 1a4f8c2a..40155f3f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/BotConfig.cs @@ -38,13 +38,6 @@ public record BotConfig : BaseConfig RandomisedResourceDetails > LootItemResourceRandomization { get; set; } - /// - /// Control what bots are added to a bots revenge list
- /// key: bottype, value: bottypes to revenge on seeing their death - ///
- [JsonPropertyName("revenge")] - public required Dictionary> Revenge { get; set; } - /// /// Control how many items are allowed to spawn on a bot
/// key: bottype, value:
@@ -162,7 +155,7 @@ public record WeeklyBossSettings /// Bosses that can be picked ///
[JsonPropertyName("bossPool")] - public List BossPool { get; set; } + public required List BossPool { get; set; } /// /// Day of week boss choice resets @@ -172,150 +165,6 @@ public record WeeklyBossSettings public DayOfWeek ResetDay { get; set; } } -/// -/// Number of bots to generate and store in cache on raid start per bot type -/// -public record PresetBatch -{ - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - - [JsonPropertyName("assault")] - public int Assault { get; set; } - - [JsonPropertyName("bossBully")] - public int BossBully { get; set; } - - [JsonPropertyName("bossGluhar")] - public int BossGluhar { get; set; } - - [JsonPropertyName("bossKilla")] - public int BossKilla { get; set; } - - [JsonPropertyName("bossKojaniy")] - public int BossKojaniy { get; set; } - - [JsonPropertyName("bossSanitar")] - public int BossSanitar { get; set; } - - [JsonPropertyName("bossTagilla")] - public int BossTagilla { get; set; } - - [JsonPropertyName("bossKnight")] - public int BossKnight { get; set; } - - [JsonPropertyName("bossZryachiy")] - public int BossZryachiy { get; set; } - - [JsonPropertyName("bossKolontay")] - public int BossKolontay { get; set; } - - [JsonPropertyName("bossPartisan")] - public int BossPartisan { get; set; } - - [JsonPropertyName("bossTest")] - public int BossTest { get; set; } - - [JsonPropertyName("cursedAssault")] - public int CursedAssault { get; set; } - - [JsonPropertyName("followerBully")] - public int FollowerBully { get; set; } - - [JsonPropertyName("followerGluharAssault")] - public int FollowerGluharAssault { get; set; } - - [JsonPropertyName("followerGluharScout")] - public int FollowerGluharScout { get; set; } - - [JsonPropertyName("followerGluharSecurity")] - public int FollowerGluharSecurity { get; set; } - - [JsonPropertyName("followerGluharSnipe")] - public int FollowerGluharSnipe { get; set; } - - [JsonPropertyName("followerKojaniy")] - public int FollowerKojaniy { get; set; } - - [JsonPropertyName("followerSanitar")] - public int FollowerSanitar { get; set; } - - [JsonPropertyName("followerTagilla")] - public int FollowerTagilla { get; set; } - - [JsonPropertyName("followerBirdEye")] - public int FollowerBirdEye { get; set; } - - [JsonPropertyName("followerBigPipe")] - public int FollowerBigPipe { get; set; } - - [JsonPropertyName("followerTest")] - public int FollowerTest { get; set; } - - [JsonPropertyName("followerBoar")] - public int FollowerBoar { get; set; } - - [JsonPropertyName("followerBoarClose1")] - public int FollowerBoarClose1 { get; set; } - - [JsonPropertyName("followerBoarClose2")] - public int FollowerBoarClose2 { get; set; } - - [JsonPropertyName("followerZryachiy")] - public int FollowerZryachiy { get; set; } - - [JsonPropertyName("followerKolontayAssault")] - public int FollowerKolontayAssault { get; set; } - - [JsonPropertyName("followerKolontaySecurity")] - public int FollowerKolontaySecurity { get; set; } - - [JsonPropertyName("marksman")] - public int Marksman { get; set; } - - [JsonPropertyName("pmcBot")] - public int PmcBot { get; set; } - - [JsonPropertyName("sectantPriest")] - public int SectantPriest { get; set; } - - [JsonPropertyName("sectantWarrior")] - public int SectantWarrior { get; set; } - - [JsonPropertyName("gifter")] - public int Gifter { get; set; } - - [JsonPropertyName("test")] - public int Test { get; set; } - - [JsonPropertyName("exUsec")] - public int ExUsec { get; set; } - - [JsonPropertyName("arenaFighterEvent")] - public int ArenaFighterEvent { get; set; } - - [JsonPropertyName("arenaFighter")] - public int ArenaFighter { get; set; } - - [JsonPropertyName("crazyAssaultEvent")] - public int CrazyAssaultEvent { get; set; } - - [JsonPropertyName("bossBoar")] - public int BossBoar { get; set; } - - [JsonPropertyName("bossBoarSniper")] - public int BossBoarSniper { get; set; } - - [JsonPropertyName("pmcUSEC")] - public int PmcUSEC { get; set; } - - [JsonPropertyName("pmcBEAR")] - public int PmcBEAR { get; set; } - - [JsonPropertyName("shooterBTR")] - public int ShooterBTR { get; set; } -} - public record WalletLootSettings { [JsonExtensionData] @@ -352,49 +201,13 @@ public record EquipmentFilters /// Limits for mod types per weapon .e.g. scopes /// [JsonPropertyName("weaponModLimits")] - public ModLimits WeaponModLimits { get; set; } + public ModLimits? WeaponModLimits { get; set; } /// /// Whitelist for weapon sight types allowed per gun /// [JsonPropertyName("weaponSightWhitelist")] - public Dictionary> WeaponSightWhitelist { get; set; } - - /// - /// Chance face shield is down/active - /// - [JsonPropertyName("faceShieldIsActiveChancePercent")] - public double? FaceShieldIsActiveChancePercent { get; set; } - - /// - /// Chance gun flashlight is active during the day - /// - [JsonPropertyName("lightIsActiveDayChancePercent")] - public double? LightIsActiveDayChancePercent { get; set; } - - /// - /// Chance gun flashlight is active during the night - /// - [JsonPropertyName("lightIsActiveNightChancePercent")] - public double? LightIsActiveNightChancePercent { get; set; } - - /// - /// Chance gun laser is active during the day - /// - [JsonPropertyName("laserIsActiveChancePercent")] - public double? LaserIsActiveChancePercent { get; set; } - - /// - /// Chance NODS are down/active during the day - /// - [JsonPropertyName("nvgIsActiveChanceDayPercent")] - public double? NvgIsActiveChanceDayPercent { get; set; } - - /// - /// Chance NODS are down/active during the night - /// - [JsonPropertyName("nvgIsActiveChanceNightPercent")] - public double? NvgIsActiveChanceNightPercent { get; set; } + public Dictionary>? WeaponSightWhitelist { get; set; } [JsonPropertyName("forceOnlyArmoredRigWhenNoArmor")] public bool? ForceOnlyArmoredRigWhenNoArmor { get; set; } @@ -415,31 +228,25 @@ public record EquipmentFilters /// Adjust weighting/chances of items on bot by level of bot /// [JsonPropertyName("randomisation")] - public List Randomisation { get; set; } + public List? Randomisation { get; set; } /// /// Blacklist equipment by level of bot /// [JsonPropertyName("blacklist")] - public List Blacklist { get; set; } + public List? Blacklist { get; set; } /// /// Whitelist equipment by level of bot /// [JsonPropertyName("whitelist")] - public List Whitelist { get; set; } + public List? Whitelist { get; set; } /// /// Adjust equipment/ammo /// [JsonPropertyName("weightingAdjustmentsByBotLevel")] - public List WeightingAdjustmentsByBotLevel { get; set; } - - /// - /// Same as weightingAdjustments but based on player level instead of bot level - /// - [JsonPropertyName("weightingAdjustmentsByPlayerLevel")] - public List? WeightingAdjustmentsByPlayerLevel { get; set; } + public List? WeightingAdjustmentsByBotLevel { get; set; } /// /// Should the stock mod be forced to spawn on bot @@ -481,7 +288,7 @@ public record RandomisationDetails /// Between what levels do these randomisation setting apply to /// [JsonPropertyName("levelRange")] - public MinMax LevelRange { get; set; } + public required MinMax LevelRange { get; set; } [JsonPropertyName("generation")] public Dictionary? Generation { get; set; } @@ -535,10 +342,7 @@ public record NighttimeChanges /// Applies changes to values stored in equipmentMods /// [JsonPropertyName("equipmentModsModifiers")] - public Dictionary EquipmentModsModifiers { get; set; } - - [JsonPropertyName("weaponModsModifiers")] - public Dictionary WeaponModsModifiers { get; set; } // TODO: currently not in use anywhere + public required Dictionary EquipmentModsModifiers { get; set; } } public record EquipmentFilterDetails @@ -580,7 +384,7 @@ public record WeightingAdjustmentDetails /// Between what levels do these weight settings apply to /// [JsonPropertyName("levelRange")] - public MinMax LevelRange { get; set; } + public required MinMax LevelRange { get; set; } /// /// Key: ammo type e.g. Caliber556x45NATO, value: item tpl + weight @@ -607,10 +411,10 @@ public record AdjustmentDetails public Dictionary? ExtensionData { get; set; } [JsonPropertyName("add")] - public Dictionary> Add { get; set; } + public Dictionary>? Add { get; set; } [JsonPropertyName("edit")] - public Dictionary> Edit { get; set; } + public Dictionary>? Edit { get; set; } } public class ArmorPlateWeights @@ -619,10 +423,10 @@ public class ArmorPlateWeights public Dictionary? ExtensionData { get; set; } [JsonPropertyName("levelRange")] - public MinMax LevelRange { get; set; } + public required MinMax LevelRange { get; set; } [JsonPropertyName("values")] - public Dictionary> Values { get; set; } + public required Dictionary> Values { get; set; } } public record RandomisedResourceDetails @@ -631,10 +435,10 @@ public record RandomisedResourceDetails public Dictionary? ExtensionData { get; set; } [JsonPropertyName("food")] - public RandomisedResourceValues Food { get; set; } + public RandomisedResourceValues? Food { get; set; } [JsonPropertyName("meds")] - public RandomisedResourceValues Meds { get; set; } + public RandomisedResourceValues? Meds { get; set; } } public record RandomisedResourceValues diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs index 8a70f92b..de7b8b85 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/GiftsConfig.cs @@ -32,12 +32,6 @@ public record Gift [JsonPropertyName("sender")] public GiftSenderType Sender { get; set; } - /// - /// Optional - supply a users id to send from, not necessary when sending from SYSTEM or TRADER - /// - [JsonPropertyName("senderId")] - public string? SenderId { get; set; } - [JsonPropertyName("senderDetails")] public UserDialogInfo? SenderDetails { get; set; } @@ -56,12 +50,6 @@ public record Gift [JsonPropertyName("localeTextId")] public string? LocaleTextId { get; set; } - /// - /// Optional - Used by Seasonal events to send on specific day - /// - [JsonPropertyName("timestampToSend")] - public long? TimestampToSend { get; set; } - [JsonPropertyName("associatedEvent")] public SeasonalEventType AssociatedEvent { get; set; } @@ -76,7 +64,4 @@ public record Gift [JsonPropertyName("maxToSendPlayer")] public int? MaxToSendPlayer { get; set; } - - [JsonPropertyName("maxToSendToPlayer")] - public int? MaxToSendToPlayer { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs index 8d007534..8aaebd5b 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HealthConfig.cs @@ -19,9 +19,6 @@ public record HealthMultipliers [JsonExtensionData] public Dictionary? ExtensionData { get; set; } - [JsonPropertyName("death")] - public double Death { get; set; } - [JsonPropertyName("blacked")] public double Blacked { get; set; } } @@ -33,7 +30,4 @@ public record HealthSave [JsonPropertyName("health")] public bool Health { get; set; } - - [JsonPropertyName("effects")] - public bool Effects { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs index 7fbdf409..404a590e 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HideoutConfig.cs @@ -81,12 +81,6 @@ public record CultistCircleSettings [JsonPropertyName("rewardPriceMultiplerMinMax")] public required MinMax RewardPriceMultiplierMinMax { get; set; } - /// - /// The odds that meeting the highest threshold gives you a bonus to crafting time - /// - [JsonPropertyName("bonusAmountMultiplier")] - public double BonusAmountMultiplier { get; set; } - [JsonPropertyName("bonusChanceMultiplier")] public double BonusChanceMultiplier { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HttpConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HttpConfig.cs index 0e3c6072..9875a1b5 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HttpConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/HttpConfig.cs @@ -25,9 +25,6 @@ public record HttpConfig : BaseConfig [JsonPropertyName("backendPort")] public required int BackendPort { get; set; } - [JsonPropertyName("webSocketPingDelayMs")] - public required int WebSocketPingDelayMs { get; set; } - [JsonPropertyName("logRequests")] public required bool LogRequests { get; set; } @@ -36,7 +33,4 @@ public record HttpConfig : BaseConfig /// [JsonPropertyName("serverImagePathOverride")] public required Dictionary ServerImagePathOverride { get; set; } - - [JsonPropertyName("certificatePassword")] - public required string CertificatePassword { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs index ba59287c..bb695cd0 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InRaidConfig.cs @@ -13,12 +13,6 @@ public record InRaidConfig : BaseConfig [JsonPropertyName("raidMenuSettings")] public required RaidMenuSettings RaidMenuSettings { get; set; } - /// - /// What effects should be saved post-raid - /// - [JsonPropertyName("save")] - public RaidSave Save { get; set; } - /// /// Names of car extracts /// @@ -49,12 +43,6 @@ public record InRaidConfig : BaseConfig [JsonPropertyName("scavExtractStandingGain")] public double ScavExtractStandingGain { get; set; } - /// - /// The likelihood of PMC eliminating a minimum of 2 scavs while you engage them as a pscav. - /// - [JsonPropertyName("pmcKillProbabilityForScavGain")] - public double PmcKillProbabilityForScavGain { get; set; } - /// /// On death should items in your secure keep their Find in raid status regardless of how you finished the raid /// @@ -103,15 +91,3 @@ public record RaidMenuSettings [JsonPropertyName("randomTime")] public bool RandomTime { get; set; } } - -public record RaidSave -{ - [JsonExtensionData] - public Dictionary? ExtensionData { get; set; } - - /// - /// Should loot gained from raid be saved - /// - [JsonPropertyName("loot")] - public bool Loot { get; set; } -} diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InsuranceConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InsuranceConfig.cs index db5d274b..d2bbbd89 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InsuranceConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InsuranceConfig.cs @@ -14,18 +14,6 @@ public record InsuranceConfig : BaseConfig [JsonPropertyName("returnChancePercent")] public Dictionary ReturnChancePercent { get; set; } = []; - /// - /// Item slots that should never be returned as insurance - /// - [JsonPropertyName("blacklistedEquipment")] - public List BlacklistedEquipment { get; set; } = []; - - /// - /// Some slots should always be removed, e.g. 'cartridges' - /// - [JsonPropertyName("slotIdsToAlwaysRemove")] - public List SlotIdsToAlwaysRemove { get; set; } = []; - /// /// Override to control how quickly insurance is processed/returned in seconds /// diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs index 64af64a8..61e967ed 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/InventoryConfig.cs @@ -8,12 +8,6 @@ public record InventoryConfig : BaseConfig [JsonPropertyName("kind")] public override string Kind { get; set; } = "spt-inventory"; - /// - /// Should new items purchased by flagged as found in raid - /// - [JsonPropertyName("newItemsMarkedFound")] - public bool NewItemsMarkedFound { get; set; } - [JsonPropertyName("randomLootContainers")] public required Dictionary RandomLootContainers { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/MatchConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/MatchConfig.cs index b49a3c29..6f86f971 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/MatchConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/MatchConfig.cs @@ -9,7 +9,4 @@ public record MatchConfig : BaseConfig [JsonPropertyName("enabled")] public bool Enabled { get; set; } - - [JsonPropertyName("randomiseMapContainers")] - public required Dictionary RandomiseMapContainers { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs index eb07f6ef..9d622de2 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PlayerScavConfig.cs @@ -31,9 +31,6 @@ public record KarmaLevel [JsonPropertyName("equipmentBlacklist")] public required Dictionary> EquipmentBlacklist { get; set; } - [JsonPropertyName("labsAccessCardChancePercent")] - public double? LabsAccessCardChancePercent { get; set; } - [JsonPropertyName("lootItemsToAddChancePercent")] public required Dictionary LootItemsToAddChancePercent { get; set; } } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs index 08b2f013..c8c3bb61 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/PmcConfig.cs @@ -148,9 +148,6 @@ public record PmcConfig : BaseConfig [JsonPropertyName("addSecureContainerLootFromBotConfig")] public required bool AddSecureContainerLootFromBotConfig { get; set; } - [JsonPropertyName("addPrefixToSameNamePMCAsPlayerChance")] - public required int? AddPrefixToSameNamePMCAsPlayerChance { get; set; } - [JsonPropertyName("lootItemLimitsRub")] public required List? LootItemLimitsRub { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs index de76ed16..64ba7e85 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RagfairConfig.cs @@ -18,13 +18,13 @@ public record RagfairConfig : BaseConfig /// Default values used to hydrate `runIntervalSeconds` with /// [JsonPropertyName("runIntervalValues")] - public RunIntervalValues RunIntervalValues { get; set; } + public required RunIntervalValues RunIntervalValues { get; set; } /// /// Player listing settings /// [JsonPropertyName("sell")] - public Sell Sell { get; set; } + public required Sell Sell { get; set; } /// /// Trader ids + should their assorts be listed on flea @@ -33,10 +33,10 @@ public record RagfairConfig : BaseConfig public required Dictionary Traders { get; set; } [JsonPropertyName("dynamic")] - public Dynamic Dynamic { get; set; } + public required Dynamic Dynamic { get; set; } [JsonPropertyName("tieredFlea")] - public TieredFlea TieredFlea { get; set; } + public required TieredFlea TieredFlea { get; set; } } public record Sell @@ -54,13 +54,13 @@ public record Sell /// Settings to control chances of offer being sold /// [JsonPropertyName("chance")] - public Chance Chance { get; set; } + public required Chance Chance { get; set; } /// /// Settings to control how long it takes for a player offer to sell /// [JsonPropertyName("time")] - public MinMax Time { get; set; } + public required MinMax Time { get; set; } /// /// Seconds from clicking remove to remove offer from market @@ -120,16 +120,16 @@ public record Dynamic /// Barter offer specific settings /// [JsonPropertyName("barter")] - public BarterDetails Barter { get; set; } + public required BarterDetails Barter { get; set; } [JsonPropertyName("pack")] - public PackDetails Pack { get; set; } + public required PackDetails Pack { get; set; } /// /// Dynamic offer price below handbook adjustment values /// [JsonPropertyName("offerAdjustment")] - public OfferAdjustment OfferAdjustment { get; set; } + public required OfferAdjustment OfferAdjustment { get; set; } /// /// How many offers should expire before an offer regeneration occurs @@ -141,13 +141,13 @@ public record Dynamic /// How many offers should be listed /// [JsonPropertyName("offerItemCount")] - public Dictionary> OfferItemCount { get; set; } + public required Dictionary> OfferItemCount { get; set; } /// /// How much should the price of an offer vary by (percent 0.8 = 80%, 1.2 = 120%) /// [JsonPropertyName("priceRanges")] - public PriceRanges PriceRanges { get; set; } + public required PriceRanges PriceRanges { get; set; } /// /// Should default presets to listed only or should non-standard presets found in globals.json be listed too @@ -159,40 +159,40 @@ public record Dynamic /// Tpls that should not use the variable price system when their quality is less than 100% (lower dura/uses = lower price) /// [JsonPropertyName("ignoreQualityPriceVarianceBlacklist")] - public HashSet IgnoreQualityPriceVarianceBlacklist { get; set; } + public required HashSet IgnoreQualityPriceVarianceBlacklist { get; set; } [JsonPropertyName("endTimeSeconds")] - public MinMax EndTimeSeconds { get; set; } + public required MinMax EndTimeSeconds { get; set; } /// /// Settings to control the durability range of item items listed on flea /// [JsonPropertyName("condition")] - public Dictionary Condition { get; set; } + public required Dictionary Condition { get; set; } /// /// Size stackable items should be listed for in percent of max stack size /// [JsonPropertyName("stackablePercent")] - public MinMax StackablePercent { get; set; } + public required MinMax StackablePercent { get; set; } /// /// Items that cannot be stacked can have multiples sold in one offer, what range of values can be listed /// [JsonPropertyName("nonStackableCount")] - public MinMax NonStackableCount { get; set; } + public required MinMax NonStackableCount { get; set; } /// /// Range of rating offers for items being listed /// [JsonPropertyName("rating")] - public MinMax Rating { get; set; } + public required MinMax Rating { get; set; } /// /// Armor specific flea settings /// [JsonPropertyName("armor")] - public ArmorSettings Armor { get; set; } + public required ArmorSettings Armor { get; set; } /// /// A multipler to apply to individual tpls price just prior to item quality adjustment @@ -207,13 +207,13 @@ public record Dynamic /// Percentages to sell offers in each currency /// [JsonPropertyName("currencies")] - public Dictionary Currencies { get; set; } + public required Dictionary Currencies { get; set; } /// /// Item tpls that should be forced to sell as a single item /// [JsonPropertyName("showAsSingleStack")] - public HashSet ShowAsSingleStack { get; set; } + public required HashSet ShowAsSingleStack { get; set; } /// /// Should christmas/halloween items be removed from flea when not within the seasonal bounds @@ -225,19 +225,19 @@ public record Dynamic /// Flea blacklist settings /// [JsonPropertyName("blacklist")] - public RagfairBlacklist Blacklist { get; set; } + public required RagfairBlacklist Blacklist { get; set; } /// /// Dict of price limits keyed by item type /// [JsonPropertyName("unreasonableModPrices")] - public Dictionary UnreasonableModPrices { get; set; } + public required Dictionary UnreasonableModPrices { get; set; } /// /// Custom rouble prices for items to override values from prices.json /// [JsonPropertyName("itemPriceOverrideRouble")] - public Dictionary ItemPriceOverrideRouble { get; set; } + public required Dictionary ItemPriceOverrideRouble { get; set; } } public record PriceRanges @@ -246,13 +246,13 @@ public record PriceRanges public Dictionary? ExtensionData { get; set; } [JsonPropertyName("default")] - public MinMax Default { get; set; } + public required MinMax Default { get; set; } [JsonPropertyName("preset")] - public MinMax Preset { get; set; } + public required MinMax Preset { get; set; } [JsonPropertyName("pack")] - public MinMax Pack { get; set; } + public required MinMax Pack { get; set; } } public record BarterDetails @@ -300,7 +300,7 @@ public record BarterDetails /// Item Tpls to never be turned into a barter /// [JsonPropertyName("itemTypeBlacklist")] - public HashSet ItemTypeBlacklist { get; set; } + public required HashSet ItemTypeBlacklist { get; set; } } public record PackDetails @@ -330,7 +330,7 @@ public record PackDetails /// item types to allow being a pack /// [JsonPropertyName("itemTypeWhitelist")] - public HashSet ItemTypeWhitelist { get; set; } + public required HashSet ItemTypeWhitelist { get; set; } } public record OfferAdjustment @@ -375,13 +375,13 @@ public record Condition public double ConditionChance { get; set; } [JsonPropertyName("current")] - public MinMax Current { get; set; } + public required MinMax Current { get; set; } [JsonPropertyName("max")] - public MinMax Max { get; set; } + public required MinMax Max { get; set; } [JsonPropertyName("_name")] - public string Name { get; set; } + public string? Name { get; set; } } public record RagfairBlacklist @@ -399,7 +399,7 @@ public record RagfairBlacklist /// Custom blacklist for item Tpls /// [JsonPropertyName("custom")] - public HashSet Custom { get; set; } + public required HashSet Custom { get; set; } /// /// BSG blacklist a large number of items from flea, true = use blacklist @@ -423,7 +423,7 @@ public record RagfairBlacklist /// Maximum level an armor plate can be found in a flea-listed armor item /// [JsonPropertyName("armorPlate")] - public ArmorPlateBlacklistSettings ArmorPlate { get; set; } + public required ArmorPlateBlacklistSettings ArmorPlate { get; set; } /// /// Should specific categories be blacklisted from the flea, true = use blacklist @@ -435,7 +435,7 @@ public record RagfairBlacklist /// Custom category blacklist for parent Ids /// [JsonPropertyName("customItemCategoryList")] - public HashSet CustomItemCategoryList { get; set; } + public required HashSet CustomItemCategoryList { get; set; } } public record ArmorPlateBlacklistSettings @@ -453,7 +453,7 @@ public record ArmorPlateBlacklistSettings /// Item slots to NOT remove from items on flea /// [JsonPropertyName("ignoreSlots")] - public HashSet IgnoreSlots { get; set; } + public required HashSet IgnoreSlots { get; set; } } public record UnreasonableModPrices @@ -480,7 +480,7 @@ public record UnreasonableModPrices public int NewPriceHandbookMultiplier { get; set; } [JsonPropertyName("itemType")] - public string ItemType { get; set; } + public string? ItemType { get; set; } } public record ArmorSettings @@ -513,13 +513,13 @@ public record TieredFlea /// key: tpl, value: playerlevel /// [JsonPropertyName("unlocksTpl")] - public Dictionary UnlocksTpl { get; set; } + public required Dictionary UnlocksTpl { get; set; } /// /// key: item type id, value: playerlevel /// [JsonPropertyName("unlocksType")] - public Dictionary UnlocksType { get; set; } + public required Dictionary UnlocksType { get; set; } [JsonPropertyName("ammoTplUnlocks")] public Dictionary? AmmoTplUnlocks { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs index dbc2770f..414af769 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/RepairConfig.cs @@ -14,9 +14,6 @@ public record RepairConfig : BaseConfig [JsonPropertyName("applyRandomizeDurabilityLoss")] public bool ApplyRandomizeDurabilityLoss { get; set; } - [JsonPropertyName("weaponSkillRepairGain")] - public double WeaponSkillRepairGain { get; set; } - [JsonPropertyName("armorKitSkillPointGainPerRepairPointMultiplier")] public double ArmorKitSkillPointGainPerRepairPointMultiplier { get; set; } diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs index 0e1d63b9..9b9b5acb 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Config/WeatherConfig.cs @@ -14,10 +14,10 @@ public record WeatherConfig : BaseConfig public double? Acceleration { get; set; } [JsonPropertyName("weather")] - public WeatherValues? Weather { get; set; } + public required WeatherValues Weather { get; set; } [JsonPropertyName("seasonDates")] - public List? SeasonDates { get; set; } + public required List SeasonDates { get; set; } [JsonPropertyName("overrideSeason")] public Season? OverrideSeason { get; set; }