diff --git a/Libraries/Core/Helpers/Dialogue/AbstractDialogChatBot.cs b/Libraries/Core/Helpers/Dialogue/AbstractDialogChatBot.cs index 242c6645..aca6cdaa 100644 --- a/Libraries/Core/Helpers/Dialogue/AbstractDialogChatBot.cs +++ b/Libraries/Core/Helpers/Dialogue/AbstractDialogChatBot.cs @@ -43,7 +43,6 @@ public abstract class AbstractDialogChatBot( null ); // due to BSG being dumb with messages we need a mandatory timeout between messages so they get out on the right order - // TODO: there must be a better way of doing this TimeoutCallback.RunInTimespan( () => { diff --git a/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs b/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs index 52323a16..1cc6f631 100644 --- a/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs +++ b/Libraries/Core/Models/Eft/Common/Tables/BotBase.cs @@ -399,7 +399,6 @@ public record FoundInRaidItem public string? ItemId { get; set; } } -// TODO: Same as Aggressor? public record Victim { public string? AccountId { get; set; } @@ -474,26 +473,13 @@ public record DamageHistory public string? LethalDamagePart { get; set; } [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public LethalDamage? LethalDamage { get; set; } + public DamageStats? LethalDamage { get; set; } [JsonConverter(typeof(ArrayToObjectFactoryConverter))] [JsonIgnore(Condition = JsonIgnoreCondition.Never)] public BodyPartsDamageHistory? BodyParts { get; set; } } -// TODO: this record seems exactly the same as DamageStats, why have it? -public record LethalDamage -{ - public double? Amount { get; set; } - public string? Type { get; set; } - public string? SourceId { get; set; } - - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public string? OverDamageFrom { get; set; } - public bool? Blunt { get; set; } - public double? ImpactsCount { get; set; } -} - public record BodyPartsDamageHistory { public List? Head { get; set; } @@ -511,6 +497,7 @@ public record DamageStats public double? Amount { get; set; } public string? Type { get; set; } public string? SourceId { get; set; } + [JsonIgnore(Condition = JsonIgnoreCondition.Never)] public string? OverDamageFrom { get; set; } public bool? Blunt { get; set; } public double? ImpactsCount { get; set; }