From b379d58ea37e8b775e751ee5457497f71c59ec5e Mon Sep 17 00:00:00 2001 From: Rutherther Date: Fri, 20 Jan 2023 22:09:20 +0100 Subject: [PATCH] fix(combat): prevent using combo skills until support is added --- .../Techniques/SimpleAttackTechnique.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Extensions/NosSmooth.Extensions.Combat/Techniques/SimpleAttackTechnique.cs b/Extensions/NosSmooth.Extensions.Combat/Techniques/SimpleAttackTechnique.cs index 8d99c4e2759e9afc6897620d00a873717aba6386..995b6bfce860e837ee741c676bc21ec121f06c98 100644 --- a/Extensions/NosSmooth.Extensions.Combat/Techniques/SimpleAttackTechnique.cs +++ b/Extensions/NosSmooth.Extensions.Combat/Techniques/SimpleAttackTechnique.cs @@ -15,6 +15,7 @@ using NosSmooth.Game.Apis.Safe; using NosSmooth.Game.Data.Characters; using NosSmooth.Game.Data.Entities; using NosSmooth.Game.Data.Inventory; +using NosSmooth.Game.Extensions; using Remora.Results; namespace NosSmooth.Extensions.Combat.Techniques; @@ -129,9 +130,10 @@ public class SimpleAttackTechnique : ICombatTechnique .Where ( x => x.Info is not null && x.Info.HitType != HitType.AlliesInZone - && x.Info.SkillType == SkillType.Player - ) - .Where(x => !x.IsOnCooldown && characterMp >= (x.Info?.MpCost ?? long.MaxValue)); + && x.Info.SkillType == SkillType.Player && + !x.IsOnCooldown && characterMp >= (x.Info?.MpCost ?? long.MaxValue) && + !x.Info!.IsComboSkill() + ); var skillResult = _skillSelector.GetSelectedSkill(usableSkills); if (!skillResult.IsDefined(out var currentSkill))