From 4553fc3f276bead076a9a1b718b8f08bb7d92a26 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 6 Jan 2025 21:10:19 +0000 Subject: [PATCH] Globals fix --- Core/Models/Eft/Common/Globals.cs | 56 +++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/Core/Models/Eft/Common/Globals.cs b/Core/Models/Eft/Common/Globals.cs index cf719da9..a523ae92 100644 --- a/Core/Models/Eft/Common/Globals.cs +++ b/Core/Models/Eft/Common/Globals.cs @@ -448,8 +448,8 @@ public class Config [JsonPropertyName("ArmorMaterials")] public ArmorMaterials ArmorMaterials { get; set; } - // [JsonPropertyName("ArenaEftTransferSettings")] - // public ArenaEftTransferSettings ArenaEftTransferSettings { get; set; } // TODO: this needs to be looked into, there are two types further down commented out with the same name + [JsonPropertyName("ArenaEftTransferSettings")] + public ArenaEftTransferSettings ArenaEftTransferSettings { get; set; } // TODO: this needs to be looked into, there are two types further down commented out with the same name [JsonPropertyName("KarmaCalculationSettings")] public KarmaCalculationSettings KarmaCalculationSettings { get; set; } @@ -1723,32 +1723,32 @@ public class KarmaCalculationSettings public double MinSurvivedRaidCount { get; set; } } -// public class ArenaEftTransferSettings -// { -// [JsonPropertyName("arenaEftTransferSettings")] -// public ArenaEftTransferSettings ArenaEftTransferSettings { get; set; } -// } -// -// public class ArenaEftTransferSettings -// { -// [JsonPropertyName("arenaManagerReputationTaxMultiplier")] -// public double ArenaManagerReputationTaxMultiplier { get; set; } -// -// [JsonPropertyName("charismaTaxMultiplier")] -// public double CharismaTaxMultiplier { get; set; } -// -// [JsonPropertyName("creditPriceTaxMultiplier")] -// public double CreditPriceTaxMultiplier { get; set; } -// -// [JsonPropertyName("rubTaxMultiplier")] -// public double RubTaxMultiplier { get; set; } -// -// [JsonPropertyName("transferLimitsByGameEdition")] -// public Dictionary TransferLimitsByGameEdition { get; set; } -// -// [JsonPropertyName("transferLimitsSettings")] -// public Dictionary TransferLimitsSettings { get; set; } -// } +public class ArenaEftTransferSettings +{ + [JsonPropertyName("arenaEftTransferSettings")] + public ArenaEftTransferSettingsDetails ArenaEftTransferSettingsDetails { get; set; } +} + +public class ArenaEftTransferSettingsDetails +{ + [JsonPropertyName("arenaManagerReputationTaxMultiplier")] + public double ArenaManagerReputationTaxMultiplier { get; set; } + + [JsonPropertyName("charismaTaxMultiplier")] + public double CharismaTaxMultiplier { get; set; } + + [JsonPropertyName("creditPriceTaxMultiplier")] + public double CreditPriceTaxMultiplier { get; set; } + + [JsonPropertyName("rubTaxMultiplier")] + public double RubTaxMultiplier { get; set; } + + [JsonPropertyName("transferLimitsByGameEdition")] + public Dictionary TransferLimitsByGameEdition { get; set; } + + [JsonPropertyName("transferLimitsSettings")] + public Dictionary TransferLimitsSettings { get; set; } +} public class ArmorMaterials {