diff --git a/Components/Combat/DefaultTargetingProvider.cs b/Components/Combat/DefaultTargetingProvider.cs index 23871b4b..1b00b094 100644 --- a/Components/Combat/DefaultTargetingProvider.cs +++ b/Components/Combat/DefaultTargetingProvider.cs @@ -122,13 +122,16 @@ public async Task HandleTarget(TrinityActor target) target.ToDiaObject() is DiaGizmo obj && !obj.IsDestructibleObject) { + // Do not restart interaction with Gizmo that requires casting. + if (Core.Player.IsCasting) + return true; + // TODO: Fix the interaction condition here. - if (await CommonCoroutines.MoveAndInteract( - obj, - () => obj is GizmoLootContainer lc ? lc.IsOpen : obj.HasBeenOperated) == CoroutineResult.Running) - { + var result = await CommonCoroutines.MoveAndInteract(obj, + () => obj is GizmoLootContainer lc ? lc.IsOpen : obj.HasBeenOperated); + + if (result == CoroutineResult.Running || Core.Player.IsCasting) return true; - } Clear(); return false; diff --git a/Framework/Reference/SkillUtils.cs b/Framework/Reference/SkillUtils.cs index ea2c40e1..871a5e11 100644 --- a/Framework/Reference/SkillUtils.cs +++ b/Framework/Reference/SkillUtils.cs @@ -92,22 +92,13 @@ public static HashSet ActiveIds public static void UpdateActiveSkills() { //Core.Logger.Debug($"UpdateActiveSkills: BotMain.BotThread.ThreadState={BotMain.BotThread?.ThreadState} BotMain.BotThread.IsAlive={BotMain.BotThread?.IsAlive} BotMain.IsRunning={BotMain.IsRunning} BotEvents.IsBotRunning={BotEvents.IsBotRunning}"); - if (ZetaDia.Service.IsInGame) { - using (ZetaDia.Memory.AcquireFrame()) + if (!Zeta.Bot.BotMain.IsRunning) { - //Core.Logger.Debug($"UpdateActiveSkills: Before UpdateActors: BotMain.BotThread.ThreadState={BotMain.BotThread?.ThreadState} BotMain.BotThread.IsAlive={BotMain.BotThread?.IsAlive} BotMain.IsRunning={BotMain.IsRunning} BotEvents.IsBotRunning={BotEvents.IsBotRunning}"); - if(!Zeta.Bot.BotMain.IsRunning) - { - ZetaDia.Actors.Update(); - } - //Core.Logger.Debug($"UpdateActiveSkills: Before AcquireFrame: BotMain.BotThread.ThreadState={BotMain.BotThread?.ThreadState} BotMain.BotThread.IsAlive={BotMain.BotThread?.IsAlive} BotMain.IsRunning={BotMain.IsRunning} BotEvents.IsBotRunning={BotEvents.IsBotRunning}"); - - //Core.Logger.Debug($"UpdateActiveSkills: Before Hotbar.Update: BotMain.BotThread.ThreadState={BotMain.BotThread?.ThreadState} BotMain.BotThread.IsAlive={BotMain.BotThread?.IsAlive} BotMain.IsRunning={BotMain.IsRunning} BotEvents.IsBotRunning={BotEvents.IsBotRunning}"); - - Core.Hotbar.Update(); + ZetaDia.Actors.Update(); } + Core.Hotbar.Update(); } _lastUpdatedActiveSkills = DateTime.UtcNow; _active = CurrentClass.Where(s => Core.Hotbar.ActivePowers.Contains(s.SNOPower)).ToList(); diff --git a/Plugin.cs b/Plugin.cs index b82c8d54..61fa003a 100644 --- a/Plugin.cs +++ b/Plugin.cs @@ -100,7 +100,7 @@ public void OnPulse() public void OnEnabled() { - using (ZetaDia.Memory.AcquireFrame()) + using (ZetaDia.Memory.AcquireFrame(true)) { if (IsEnabled || !Application.Current.CheckAccess()) return; diff --git a/Routines/DemonHunter/DemonHunterShadowImpale.cs b/Routines/DemonHunter/DemonHunterShadowImpale.cs index ae80515b..7e93195c 100644 --- a/Routines/DemonHunter/DemonHunterShadowImpale.cs +++ b/Routines/DemonHunter/DemonHunterShadowImpale.cs @@ -1,23 +1,21 @@ using System; -using Trinity.Framework; -using Trinity.Framework.Helpers; using System.Collections.Generic; using System.ComponentModel; using System.Windows.Controls; using Trinity.Components.Combat.Resources; +using Trinity.Framework; using Trinity.Framework.Actors.ActorTypes; using Trinity.Framework.Grid; +using Trinity.Framework.Helpers; using Trinity.Framework.Objects; using Trinity.Framework.Reference; -using Trinity.UI; using Trinity.Settings; +using Trinity.UI; using Zeta.Common; using Zeta.Game; -using Trinity.Routines.DemonHunter; -using Trinity.Routines; using Zeta.Game.Internals.Actors; -namespace Trinity750.Routines.DemonHunter +namespace Trinity.Routines.DemonHunter { public sealed class DemonHunterShadowImpale : DemonHunterBase, IRoutine { @@ -57,7 +55,7 @@ public sealed class DemonHunterShadowImpale : DemonHunterBase, IRoutine public TrinityPower GetOffensivePower() { - TrinityActor target = CurrentTarget; + var target = CurrentTarget; if (CurrentTarget != null && (!CurrentTarget.IsBoss || @@ -111,7 +109,6 @@ public TrinityPower GetBuffPower() return null; } - public TrinityPower GetDestructiblePower() => DefaultDestructiblePower(); public TrinityPower GetDefensivePower() => null; diff --git a/Settings/ItemList/ItemListEvaluator.cs b/Settings/ItemList/ItemListEvaluator.cs index dbb811b9..90d54988 100644 --- a/Settings/ItemList/ItemListEvaluator.cs +++ b/Settings/ItemList/ItemListEvaluator.cs @@ -622,9 +622,5 @@ internal static bool EvaluateProperty(LRule itemRule, ACDItem item, out float ne newValue = returnValue; return result; } - - - } } - diff --git a/UI/Visualizer/RadarCanvas/RadarCanvas.cs b/UI/Visualizer/RadarCanvas/RadarCanvas.cs index 18bfd30c..d6f7b86e 100644 --- a/UI/Visualizer/RadarCanvas/RadarCanvas.cs +++ b/UI/Visualizer/RadarCanvas/RadarCanvas.cs @@ -217,10 +217,7 @@ private void MouseUpHandler(object sender, MouseButtonEventArgs e) } Cursor = Cursors.Arrow; - using (ZetaDia.Memory.AcquireFrame()) - { - HandleMapClicked(sender, e); - } + HandleMapClicked(sender, e); } private void Clear() diff --git a/UI/Visualizer/Visualizer.xaml b/UI/Visualizer/Visualizer.xaml index 4d86f026..7633adca 100644 --- a/UI/Visualizer/Visualizer.xaml +++ b/UI/Visualizer/Visualizer.xaml @@ -368,8 +368,8 @@ - - + +