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

Merge branch 'sp-tarkov:main' into main

Browse Source
This commit is contained in:
CWX
2025-01-06 21:51:59 +00:00
committed by GitHub
parent b292dcb0b5 4553fc3f27
commit 6ab4c4e092
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")]
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<string, double> TransferLimitsByGameEdition { get; set; }
//
// [JsonPropertyName("transferLimitsSettings")]
// public Dictionary<string, double> 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<string, double> TransferLimitsByGameEdition { get; set; }
[JsonPropertyName("transferLimitsSettings")]
public Dictionary<string, double> TransferLimitsSettings { get; set; }
}
public class ArmorMaterials
{