change hacky fix to use stringToNumberFactoryConverter
This commit is contained in:
@@ -194,8 +194,6 @@ public class QuestHelper(
|
||||
/// <returns>true if loyalty is high enough to fulfill quest requirement</returns>
|
||||
public bool TraderLoyaltyLevelRequirementCheck(QuestCondition questProperties, PmcData profile)
|
||||
{
|
||||
var value = (JsonElement)questProperties.Value;
|
||||
var requiredLoyaltyLevel = value.GetDouble();
|
||||
if (!profile.TradersInfo.TryGetValue(
|
||||
questProperties.Target.IsItem
|
||||
? questProperties.Target.Item
|
||||
@@ -210,7 +208,7 @@ public class QuestHelper(
|
||||
|
||||
return CompareAvailableForValues(
|
||||
trader.LoyaltyLevel.Value,
|
||||
requiredLoyaltyLevel,
|
||||
questProperties.Value.Value,
|
||||
questProperties.CompareMethod
|
||||
);
|
||||
}
|
||||
|
||||
@@ -439,28 +439,12 @@ public record QuestCondition
|
||||
set;
|
||||
} // TODO: string[] | string
|
||||
|
||||
private double? _value;
|
||||
[JsonPropertyName("value")]
|
||||
public object? Value
|
||||
[JsonConverter(typeof(StringToNumberFactoryConverter))]
|
||||
public double? Value
|
||||
{
|
||||
get => _value;
|
||||
set
|
||||
{
|
||||
if (value is JsonElement element)
|
||||
{
|
||||
if (element.ValueKind == JsonValueKind.String)
|
||||
{
|
||||
_value = double.Parse(element.GetString());
|
||||
return;
|
||||
}
|
||||
|
||||
if (element.ValueKind == JsonValueKind.Number)
|
||||
{
|
||||
_value = element.GetDouble();
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
[JsonPropertyName("type")]
|
||||
|
||||
Reference in New Issue
Block a user