chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/CWXDEV/server-csharp

Browse Source
This commit is contained in:
CWX
2025-01-06 22:15:18 +00:00
parent fdf913c88c 6ab4c4e092
commit a6dbd3ea0c
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Models/Eft/Common/Globals.cs
+28 -28
View File
@@ -448,8 +448,8 @@ public class Config
[JsonPropertyName("ArmorMaterials")] [JsonPropertyName("ArmorMaterials")]
public ArmorMaterials ArmorMaterials { get; set; } public ArmorMaterials ArmorMaterials { get; set; }
// [JsonPropertyName("ArenaEftTransferSettings")] [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 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")] [JsonPropertyName("KarmaCalculationSettings")]
public KarmaCalculationSettings KarmaCalculationSettings { get; set; } public KarmaCalculationSettings KarmaCalculationSettings { get; set; }
@@ -1723,32 +1723,32 @@ public class KarmaCalculationSettings
public double MinSurvivedRaidCount { get; set; } public double MinSurvivedRaidCount { get; set; }
} }
// public class ArenaEftTransferSettings public class ArenaEftTransferSettings
// { {
// [JsonPropertyName("arenaEftTransferSettings")] [JsonPropertyName("arenaEftTransferSettings")]
// public ArenaEftTransferSettings ArenaEftTransferSettings { get; set; } public ArenaEftTransferSettingsDetails ArenaEftTransferSettingsDetails { get; set; }
// } }
//
// public class ArenaEftTransferSettings public class ArenaEftTransferSettingsDetails
// { {
// [JsonPropertyName("arenaManagerReputationTaxMultiplier")] [JsonPropertyName("arenaManagerReputationTaxMultiplier")]
// public double ArenaManagerReputationTaxMultiplier { get; set; } public double ArenaManagerReputationTaxMultiplier { get; set; }
//
// [JsonPropertyName("charismaTaxMultiplier")] [JsonPropertyName("charismaTaxMultiplier")]
// public double CharismaTaxMultiplier { get; set; } public double CharismaTaxMultiplier { get; set; }
//
// [JsonPropertyName("creditPriceTaxMultiplier")] [JsonPropertyName("creditPriceTaxMultiplier")]
// public double CreditPriceTaxMultiplier { get; set; } public double CreditPriceTaxMultiplier { get; set; }
//
// [JsonPropertyName("rubTaxMultiplier")] [JsonPropertyName("rubTaxMultiplier")]
// public double RubTaxMultiplier { get; set; } public double RubTaxMultiplier { get; set; }
//
// [JsonPropertyName("transferLimitsByGameEdition")] [JsonPropertyName("transferLimitsByGameEdition")]
// public Dictionary<string, double> TransferLimitsByGameEdition { get; set; } public Dictionary<string, double> TransferLimitsByGameEdition { get; set; }
//
// [JsonPropertyName("transferLimitsSettings")] [JsonPropertyName("transferLimitsSettings")]
// public Dictionary<string, double> TransferLimitsSettings { get; set; } public Dictionary<string, double> TransferLimitsSettings { get; set; }
// } }
public class ArmorMaterials public class ArmorMaterials
{ {