Replaced minmaxdouble + minmaxint with generic minmax<T>

Updated various doubles to be ints
This commit is contained in:
Chomp
2025-02-10 10:44:24 +00:00
parent 08b5caf337
commit 3219718d27
39 changed files with 187 additions and 225 deletions
@@ -2,15 +2,15 @@ using System.Text.Json.Serialization;
namespace Core.Models.Common;
public record MinMaxInt
public record MinMax<T>
{
public MinMaxInt(int min, int max)
public MinMax(T min, T max)
{
Min = min;
Max = max;
}
public MinMaxInt()
public MinMax()
{
}
@@ -22,14 +22,14 @@ public record MinMaxInt
}
[JsonPropertyName("max")]
public int? Max
public T Max
{
get;
set;
}
[JsonPropertyName("min")]
public int? Min
public T Min
{
get;
set;
@@ -1,37 +0,0 @@
using System.Text.Json.Serialization;
namespace Core.Models.Common;
public record MinMaxDouble
{
public MinMaxDouble(double min, double max)
{
Min = min;
Max = max;
}
public MinMaxDouble()
{
}
[JsonPropertyName("type")]
public string? Type
{
get;
set;
}
[JsonPropertyName("max")]
public double? Max
{
get;
set;
}
[JsonPropertyName("min")]
public double? Min
{
get;
set;
}
}
@@ -870,7 +870,7 @@ public record NonWaveGroupScenario
}
}
public record Limit : MinMaxDouble
public record Limit : MinMax<int>
{
[JsonPropertyName("items")]
public object[] Items
@@ -1383,7 +1383,7 @@ public record ChancedEnemy
}
}
public record MinMaxBot : MinMaxDouble
public record MinMaxBot : MinMax<int>
{
[JsonPropertyName("WildSpawnType")]
public string? WildSpawnType
@@ -446,7 +446,7 @@ public record Experience
}
[JsonPropertyName("level")]
public MinMaxDouble? Level
public MinMax<int>? Level
{
get;
set;
@@ -456,7 +456,7 @@ public record Experience
* key = bot difficulty
*/
[JsonPropertyName("reward")]
public Dictionary<string, MinMaxDouble>? Reward
public Dictionary<string, MinMax<double>>? Reward
{
get;
set;
@@ -616,19 +616,19 @@ public record BotTypeHealth
set;
}
public MinMaxDouble? Energy
public MinMax<double>? Energy
{
get;
set;
}
public MinMaxDouble? Hydration
public MinMax<double>? Hydration
{
get;
set;
}
public MinMaxDouble? Temperature
public MinMax<double>? Temperature
{
get;
set;
@@ -637,43 +637,43 @@ public record BotTypeHealth
public record BodyPart
{
public MinMaxDouble? Chest
public MinMax<double>? Chest
{
get;
set;
}
public MinMaxDouble? Head
public MinMax<double>? Head
{
get;
set;
}
public MinMaxDouble? LeftArm
public MinMax<double>? LeftArm
{
get;
set;
}
public MinMaxDouble? LeftLeg
public MinMax<double>? LeftLeg
{
get;
set;
}
public MinMaxDouble? RightArm
public MinMax<double>? RightArm
{
get;
set;
}
public MinMaxDouble? RightLeg
public MinMax<double>? RightLeg
{
get;
set;
}
public MinMaxDouble? Stomach
public MinMax<double>? Stomach
{
get;
set;
@@ -832,13 +832,13 @@ public record ItemPools
public record BotDbSkills
{
public Dictionary<string, MinMaxDouble>? Common
public Dictionary<string, MinMax<double>>? Common
{
get;
set;
}
public Dictionary<string, MinMaxDouble>? Mastering
public Dictionary<string, MinMax<double>>? Mastering
{
get;
set;
@@ -232,21 +232,21 @@ public record ScavRecipe
public record EndProducts
{
[JsonPropertyName("Common")]
public MinMaxDouble? Common
public MinMax<int>? Common
{
get;
set;
}
[JsonPropertyName("Rare")]
public MinMaxDouble? Rare
public MinMax<int>? Rare
{
get;
set;
}
[JsonPropertyName("Superrare")]
public MinMaxDouble? Superrare
public MinMax<int>? Superrare
{
get;
set;
@@ -3,7 +3,7 @@ using Core.Models.Common;
namespace Core.Models.Eft.Ragfair;
public record GetItemPriceResult : MinMaxDouble
public record GetItemPriceResult : MinMax<double>
{
[JsonPropertyName("avg")]
public double? Avg
@@ -39,7 +39,7 @@ public record BotGenerationDetails
/// Active players current level
/// </summary>
[JsonPropertyName("playerLevel")]
public double? PlayerLevel
public int? PlayerLevel
{
get;
set;
@@ -56,7 +56,7 @@ public record BotGenerationDetails
/// Level specific overrides for PMC level
/// </summary>
[JsonPropertyName("locationSpecificPmcLevelOverride")]
public MinMaxDouble? LocationSpecificPmcLevelOverride
public MinMax<int> LocationSpecificPmcLevelOverride
{
get;
set;
@@ -66,7 +66,7 @@ public record BotGenerationDetails
/// Delta of highest level of bot e.g. 50 means 50 levels above player
/// </summary>
[JsonPropertyName("botRelativeLevelDeltaMax")]
public double? BotRelativeLevelDeltaMax
public int? BotRelativeLevelDeltaMax
{
get;
set;
@@ -76,7 +76,7 @@ public record BotGenerationDetails
/// Delta of lowest level of bot e.g. 50 means 50 levels below player
/// </summary>
[JsonPropertyName("botRelativeLevelDeltaMin")]
public double? BotRelativeLevelDeltaMin
public int? BotRelativeLevelDeltaMin
{
get;
set;
@@ -117,7 +117,7 @@ public record AirdropLoot
/// Min/max of weapons inside crate
/// </summary>
[JsonPropertyName("weaponPresetCount")]
public MinMaxInt? WeaponPresetCount
public MinMax<int>? WeaponPresetCount
{
get;
set;
@@ -127,7 +127,7 @@ public record AirdropLoot
/// Min/max of armors (head/chest/rig) inside crate
/// </summary>
[JsonPropertyName("armorPresetCount")]
public MinMaxInt? ArmorPresetCount
public MinMax<int>? ArmorPresetCount
{
get;
set;
@@ -137,7 +137,7 @@ public record AirdropLoot
/// Min/max of items inside crate
/// </summary>
[JsonPropertyName("itemCount")]
public MinMaxInt ItemCount
public MinMax<int> ItemCount
{
get;
set;
@@ -147,7 +147,7 @@ public record AirdropLoot
/// Min/max of sealed weapon boxes inside crate
/// </summary>
[JsonPropertyName("weaponCrateCount")]
public MinMaxInt WeaponCrateCount
public MinMax<int> WeaponCrateCount
{
get;
set;
@@ -187,7 +187,7 @@ public record AirdropLoot
/// Items to limit stack size of key: item tpl value: min/max stack size
/// </summary>
[JsonPropertyName("itemStackLimits")]
public Dictionary<string, MinMaxInt> ItemStackLimits
public Dictionary<string, MinMax<int>> ItemStackLimits
{
get;
set;
@@ -221,7 +221,7 @@ public record AirdropLoot
}
[JsonPropertyName("forcedLoot")]
public Dictionary<string, MinMaxInt>? ForcedLoot
public Dictionary<string, MinMax<int>>? ForcedLoot
{
get;
set;
@@ -251,7 +251,7 @@ public record AssaultToBossConversion
}
[JsonPropertyName("bossConvertMinMax")]
public Dictionary<string, MinMaxDouble> BossConvertMinMax
public Dictionary<string, MinMax<double>> BossConvertMinMax
{
get;
set;
@@ -599,7 +599,7 @@ public record WalletLootSettings
}
[JsonPropertyName("itemCount")]
public MinMaxDouble ItemCount
public MinMax<int> ItemCount
{
get;
set;
@@ -843,7 +843,7 @@ public record RandomisationDetails
/// Between what levels do these randomisation setting apply to
/// </summary>
[JsonPropertyName("levelRange")]
public MinMaxDouble LevelRange
public MinMax<int> LevelRange
{
get;
set;
@@ -950,7 +950,7 @@ public record EquipmentFilterDetails
/// Between what levels do these equipment filter setting apply to
/// </summary>
[JsonPropertyName("levelRange")]
public MinMaxDouble LevelRange
public MinMax<int> LevelRange
{
get;
set;
@@ -993,7 +993,7 @@ public record WeightingAdjustmentDetails
/// Between what levels do these weight settings apply to
/// </summary>
[JsonPropertyName("levelRange")]
public MinMaxDouble LevelRange
public MinMax<int> LevelRange
{
get;
set;
@@ -1050,7 +1050,7 @@ public record AdjustmentDetails
public class ArmorPlateWeights
{
[JsonPropertyName("levelRange")]
public MinMaxDouble LevelRange
public MinMax<int> LevelRange
{
get;
set;
@@ -127,7 +127,7 @@ public record CultistCircleSettings
}
[JsonPropertyName("rewardPriceMultiplerMinMax")]
public MinMaxDouble RewardPriceMultiplerMinMax
public MinMax<double> RewardPriceMultiplerMinMax
{
get;
set;
@@ -211,7 +211,7 @@ public record CultistCircleSettings
/// Overrides for reward stack sizes, keyed by item tpl
/// </summary>
[JsonPropertyName("directRewardStackSize")]
public Dictionary<string, MinMaxDouble> DirectRewardStackSize
public Dictionary<string, MinMax<int>> DirectRewardStackSize
{
get;
set;
@@ -238,14 +238,14 @@ public record CultistCircleSettings
}
[JsonPropertyName("currencyRewards")]
public Dictionary<string, MinMaxDouble> CurrencyRewards
public Dictionary<string, MinMax<int>> CurrencyRewards
{
get;
set;
}
}
public record CraftTimeThreshold : MinMaxDouble
public record CraftTimeThreshold : MinMax<int>
{
[JsonPropertyName("craftTimeSeconds")]
public int CraftTimeSeconds
@@ -132,14 +132,14 @@ public record SealedAirdropContainerSettings
}
[JsonPropertyName("weaponModRewardLimits")]
public Dictionary<string, MinMaxInt> WeaponModRewardLimits
public Dictionary<string, MinMax<int>> WeaponModRewardLimits
{
get;
set;
}
[JsonPropertyName("rewardTypeLimits")]
public Dictionary<string, MinMaxInt> RewardTypeLimits
public Dictionary<string, MinMax<int>> RewardTypeLimits
{
get;
set;
@@ -341,7 +341,7 @@ public record CustomWaves
}
}
public record BotTypeLimit : MinMaxDouble
public record BotTypeLimit : MinMax<int>
{
[JsonPropertyName("type")]
public string Type
+10 -10
View File
@@ -115,7 +115,7 @@ public record PmcConfig : BaseConfig
* MinMax count of weapons to have in backpack
*/
[JsonPropertyName("looseWeaponInBackpackLootMinMax")]
public MinMaxDouble LooseWeaponInBackpackLootMinMax
public MinMax<int> LooseWeaponInBackpackLootMinMax
{
get;
set;
@@ -200,7 +200,7 @@ public record PmcConfig : BaseConfig
* Percentage chance a bot from a wave is converted into a PMC, first key = map, second key = bot wildspawn type (assault/exusec), value: min+max chance to be converted
*/
[JsonPropertyName("convertIntoPmcChance")]
public Dictionary<string, Dictionary<string, MinMaxDouble>> ConvertIntoPmcChance
public Dictionary<string, Dictionary<string, MinMax<double>>> ConvertIntoPmcChance
{
get;
set;
@@ -210,7 +210,7 @@ public record PmcConfig : BaseConfig
* How many levels above player level can a PMC be
*/
[JsonPropertyName("botRelativeLevelDeltaMax")]
public double BotRelativeLevelDeltaMax
public int BotRelativeLevelDeltaMax
{
get;
set;
@@ -220,7 +220,7 @@ public record PmcConfig : BaseConfig
* How many levels below player level can a PMC be
*/
[JsonPropertyName("botRelativeLevelDeltaMin")]
public double BotRelativeLevelDeltaMin
public int BotRelativeLevelDeltaMin
{
get;
set;
@@ -251,7 +251,7 @@ public record PmcConfig : BaseConfig
}
[JsonPropertyName("locationSpecificPmcLevelOverride")]
public Dictionary<string, MinMaxDouble> LocationSpecificPmcLevelOverride
public Dictionary<string, MinMax<int>> LocationSpecificPmcLevelOverride
{
get;
set;
@@ -383,7 +383,7 @@ public record SlotLootSettings
}
}
public record MinMaxLootValue : MinMaxDouble
public record MinMaxLootValue : MinMax<double>
{
[JsonPropertyName("value")]
public double Value
@@ -393,24 +393,24 @@ public record MinMaxLootValue : MinMaxDouble
}
}
public record MinMaxLootItemValue : MinMaxDouble
public record MinMaxLootItemValue : MinMax<double>
{
[JsonPropertyName("backpack")]
public MinMaxDouble Backpack
public MinMax<double> Backpack
{
get;
set;
}
[JsonPropertyName("pocket")]
public MinMaxDouble Pocket
public MinMax<double> Pocket
{
get;
set;
}
[JsonPropertyName("vest")]
public MinMaxDouble Vest
public MinMax<double> Vest
{
get;
set;
@@ -596,7 +596,7 @@ public record PickupTypeWithMaxCount
public record EliminationConfig : BaseQuestConfig
{
[JsonPropertyName("levelRange")]
public MinMaxDouble? LevelRange
public MinMax<int>? LevelRange
{
get;
set;
@@ -93,7 +93,7 @@ public record Sell
* Settings to control how long it takes for a player offer to sell
*/
[JsonPropertyName("time")]
public MinMaxDouble Time
public MinMax<double> Time
{
get;
set;
@@ -204,7 +204,7 @@ public record Dynamic
[JsonPropertyName("offerItemCount")]
/** How many offers should be listed */
public MinMaxDouble OfferItemCount
public MinMax<int> OfferItemCount
{
get;
set;
@@ -235,7 +235,7 @@ public record Dynamic
}
[JsonPropertyName("endTimeSeconds")]
public MinMaxDouble EndTimeSeconds
public MinMax<int> EndTimeSeconds
{
get;
set;
@@ -251,7 +251,7 @@ public record Dynamic
[JsonPropertyName("stackablePercent")]
/** Size stackable items should be listed for in percent of max stack size */
public MinMaxDouble StackablePercent
public MinMax<double> StackablePercent
{
get;
set;
@@ -259,7 +259,7 @@ public record Dynamic
[JsonPropertyName("nonStackableCount")]
/** Items that cannot be stacked can have multiples sold in one offer, what range of values can be listed */
public MinMaxDouble NonStackableCount
public MinMax<int> NonStackableCount
{
get;
set;
@@ -267,7 +267,7 @@ public record Dynamic
[JsonPropertyName("rating")]
/** Range of rating offers for items being listed */
public MinMaxDouble Rating
public MinMax<double> Rating
{
get;
set;
@@ -348,21 +348,21 @@ public record Dynamic
public record PriceRanges
{
[JsonPropertyName("default")]
public MinMaxDouble Default
public MinMax<double> Default
{
get;
set;
}
[JsonPropertyName("preset")]
public MinMaxDouble Preset
public MinMax<double> Preset
{
get;
set;
}
[JsonPropertyName("pack")]
public MinMaxDouble Pack
public MinMax<double> Pack
{
get;
set;
@@ -541,14 +541,14 @@ public record Condition
}
[JsonPropertyName("current")]
public MinMaxDouble Current
public MinMax<double> Current
{
get;
set;
}
[JsonPropertyName("max")]
public MinMaxDouble Max
public MinMax<double> Max
{
get;
set;
@@ -219,7 +219,7 @@ public record BonusSettings
public record BonusValues
{
[JsonPropertyName("valuesMinMax")]
public MinMaxDouble ValuesMinMax
public MinMax<double> ValuesMinMax
{
get;
set;
@@ -229,7 +229,7 @@ public record BonusValues
* What dura is buff active between (min max of current max)
*/
[JsonPropertyName("activeDurabilityPercentMinMax")]
public MinMaxDouble ActiveDurabilityPercentMinMax
public MinMax<double> ActiveDurabilityPercentMinMax
{
get;
set;
@@ -13,7 +13,7 @@ public record ScavCaseConfig : BaseConfig
} = "spt-scavcase";
[JsonPropertyName("rewardItemValueRangeRub")]
public Dictionary<string, MinMaxDouble> RewardItemValueRangeRub
public Dictionary<string, MinMax<double>> RewardItemValueRangeRub
{
get;
set;
@@ -110,21 +110,21 @@ public record MoneyRewards
public record MoneyLevels
{
[JsonPropertyName("common")]
public MinMaxDouble Common
public MinMax<int> Common
{
get;
set;
}
[JsonPropertyName("rare")]
public MinMaxDouble Rare
public MinMax<int> Rare
{
get;
set;
}
[JsonPropertyName("superrare")]
public MinMaxDouble SuperRare
public MinMax<int> SuperRare
{
get;
set;
@@ -148,7 +148,7 @@ public record AmmoRewards
}
[JsonPropertyName("ammoRewardValueRangeRub")]
public Dictionary<string, MinMaxDouble> AmmoRewardValueRangeRub
public Dictionary<string, MinMax<double>> AmmoRewardValueRangeRub
{
get;
set;
@@ -86,7 +86,7 @@ public record UpdateTime
* Seconds between trader resets
*/
[JsonPropertyName("seconds")]
public MinMaxDouble Seconds
public MinMax<int> Seconds
{
get;
set;
@@ -124,14 +124,14 @@ public record FenceConfig
}
[JsonPropertyName("weaponPresetMinMax")]
public MinMaxDouble WeaponPresetMinMax
public MinMax<int> WeaponPresetMinMax
{
get;
set;
}
[JsonPropertyName("equipmentPresetMinMax")]
public MinMaxDouble EquipmentPresetMinMax
public MinMax<int> EquipmentPresetMinMax
{
get;
set;
@@ -179,7 +179,7 @@ public record FenceConfig
* Key: item tpl
*/
[JsonPropertyName("itemStackSizeOverrideMinMax")]
public Dictionary<string, MinMaxDouble?> ItemStackSizeOverrideMinMax
public Dictionary<string, MinMax<int>?> ItemStackSizeOverrideMinMax
{
get;
set;
@@ -294,14 +294,14 @@ public record FenceConfig
public record ItemDurabilityCurrentMax
{
[JsonPropertyName("current")]
public MinMaxDouble Current
public MinMax<double> Current
{
get;
set;
}
[JsonPropertyName("max")]
public MinMaxDouble Max
public MinMax<double> Max
{
get;
set;
@@ -363,14 +363,14 @@ public record DiscountOptions
}
[JsonPropertyName("weaponPresetMinMax")]
public MinMaxDouble WeaponPresetMinMax
public MinMax<int> WeaponPresetMinMax
{
get;
set;
}
[JsonPropertyName("equipmentPresetMinMax")]
public MinMaxDouble EquipmentPresetMinMax
public MinMax<int> EquipmentPresetMinMax
{
get;
set;
@@ -146,7 +146,7 @@ public record SeasonalValues
}
[JsonPropertyName("windGustiness")]
public MinMaxDouble? WindGustiness
public MinMax<double>? WindGustiness
{
get;
set;
@@ -160,7 +160,7 @@ public record SeasonalValues
}
[JsonPropertyName("rainIntensity")]
public MinMaxDouble? RainIntensity
public MinMax<double>? RainIntensity
{
get;
set;
@@ -181,7 +181,7 @@ public record SeasonalValues
}
[JsonPropertyName("pressure")]
public MinMaxDouble? Pressure
public MinMax<double>? Pressure
{
get;
set;
@@ -191,14 +191,14 @@ public record SeasonalValues
public record TempDayNight
{
[JsonPropertyName("day")]
public MinMaxDouble? Day
public MinMax<double>? Day
{
get;
set;
}
[JsonPropertyName("night")]
public MinMaxDouble? Night
public MinMax<double>? Night
{
get;
set;
@@ -10,7 +10,7 @@ public record LootRequest
/// Count of weapons to generate
/// </summary>
[JsonPropertyName("weaponPresetCount")]
public MinMaxInt? WeaponPresetCount
public MinMax<int>? WeaponPresetCount
{
get;
set;
@@ -20,7 +20,7 @@ public record LootRequest
/// Count of armor to generate
/// </summary>
[JsonPropertyName("armorPresetCount")]
public MinMaxInt? ArmorPresetCount
public MinMax<int>? ArmorPresetCount
{
get;
set;
@@ -30,7 +30,7 @@ public record LootRequest
/// Count of items to generate
/// </summary>
[JsonPropertyName("itemCount")]
public MinMaxInt? ItemCount
public MinMax<int>? ItemCount
{
get;
set;
@@ -40,7 +40,7 @@ public record LootRequest
/// Count of sealed weapon crates to generate
/// </summary>
[JsonPropertyName("weaponCrateCount")]
public MinMaxInt? WeaponCrateCount
public MinMax<int>? WeaponCrateCount
{
get;
set;
@@ -77,7 +77,7 @@ public record LootRequest
}
[JsonPropertyName("itemStackLimits")]
public Dictionary<string, MinMaxInt>? ItemStackLimits
public Dictionary<string, MinMax<int>>? ItemStackLimits
{
get;
set;
@@ -127,7 +127,7 @@ public record LootRequest
/// Item tpls + count of items to force include
/// </summary>
[JsonPropertyName("forcedLoot")]
public Dictionary<string, MinMaxInt>? ForcedLoot
public Dictionary<string, MinMax<int>>? ForcedLoot
{
get;
set;