diff --git a/E3Next/Data/SpellRequest.cs b/E3Next/Data/SpellRequest.cs index 08957bc3..a67ceed6 100644 --- a/E3Next/Data/SpellRequest.cs +++ b/E3Next/Data/SpellRequest.cs @@ -17,7 +17,7 @@ public SpellRequest(string spellName, IniData parsedData = null):base(spellName, { } - public static new SpellRequest FromProto(SpellData source) + public static SpellRequest FromProto(SpellData source) { SpellRequest r = new SpellRequest(); r.AfterEvent = source.AfterEvent; diff --git a/E3Next/Processors/Basics.cs b/E3Next/Processors/Basics.cs index 1b90a685..ff051cb2 100644 --- a/E3Next/Processors/Basics.cs +++ b/E3Next/Processors/Basics.cs @@ -331,28 +331,28 @@ public static void RegisterEvents() //coth, or summoned by a mob? ///a Tae Ew warder says 'You will not evade me, Alara!' ///You have been summoned! - if (Assist.AllowControl) return; //this is our driver and most likely a tank, ignore this. - - _spawns.RefreshList();//make sure we get a new refresh of this zone. - //check to see if your target is on top of you, if so... well, good luck! - Int32 targetID = MQ.Query("${Target.ID}"); - if(_spawns.TryByID(targetID, out var spawn)) - { - if(spawn.Distance<5 && spawn.Aggressive && spawn.TypeDesc=="NPC") - { - //oh dear, the mob is in your face, best of luck. - if(Movement.AnchorTarget>0) - { - Movement.MoveToAnchor(); - } - } - else - { - //you have been cothed, reset stuff - Movement.Reset(); - Assist.Reset(); - } - } + //if (Assist.AllowControl) return; //this is our driver and most likely a tank, ignore this. + + // _spawns.RefreshList();//make sure we get a new refresh of this zone. + // //check to see if your target is on top of you, if so... well, good luck! + // Int32 targetID = MQ.Query("${Target.ID}"); + // if(_spawns.TryByID(targetID, out var spawn)) + // { + // if(spawn.Distance<5 && spawn.Aggressive && spawn.TypeDesc=="NPC") + // { + // //oh dear, the mob is in your face, best of luck. + // if(Movement.AnchorTarget>0) + // { + // Movement.MoveToAnchor(); + // } + // } + // else + // { + // //you have been cothed, reset stuff + // Movement.Reset(); + // Assist.Reset(); + // } + // } }); // EventProcessor.RegisterEvent("AskedForRaidInvite", "(.+) tells you, 'raidadd'", (x) => diff --git a/E3Next/Processors/BuffCheck.cs b/E3Next/Processors/BuffCheck.cs index 8eb9c3f1..e6612b6e 100644 --- a/E3Next/Processors/BuffCheck.cs +++ b/E3Next/Processors/BuffCheck.cs @@ -1455,14 +1455,7 @@ private static void BuffAuras() string currentAura = MQ.Query("${Me.Aura[1]}"); if (currentAura != "NULL") { - //we already have an aura, check if its different - //if (currentAura.Equals(_selectAura.SpellName, StringComparison.OrdinalIgnoreCase)) - { - //don't need to do anything - return; - } - //else remove it as we are putting on something else. - MQ.Cmd($"/removeaura {currentAura}"); + return; } //need to put on new aura diff --git a/E3Next/Processors/Zoning.cs b/E3Next/Processors/Zoning.cs index 521d4fe9..16c690c8 100644 --- a/E3Next/Processors/Zoning.cs +++ b/E3Next/Processors/Zoning.cs @@ -191,7 +191,6 @@ private static void InitZoneLookup() } - private static Int32 _recordingMaxDelta = 10; [ClassInvoke(Class.All)] public static void RecordZoneData() { diff --git a/E3Next/Resources/BuildDate.txt b/E3Next/Resources/BuildDate.txt index e8546fa6..80305c7f 100644 --- a/E3Next/Resources/BuildDate.txt +++ b/E3Next/Resources/BuildDate.txt @@ -1 +1 @@ -Sat 11/23/2024 21:03:31.78 +Sun 11/24/2024 14:33:23.27 diff --git a/E3Next/Settings/FeatureSettings/LootStackable.cs b/E3Next/Settings/FeatureSettings/LootStackable.cs index ba86ea94..5108a5f3 100644 --- a/E3Next/Settings/FeatureSettings/LootStackable.cs +++ b/E3Next/Settings/FeatureSettings/LootStackable.cs @@ -10,7 +10,6 @@ namespace E3Core.Settings.FeatureSettings { public class LootStackable : BaseSettings { - IniData _stackableAlwaysLootData; string _fileName; public IniData parsedData; public HashSet AlwaysStackableItems = new HashSet(StringComparer.OrdinalIgnoreCase); diff --git a/E3Next/Utility/e3util.cs b/E3Next/Utility/e3util.cs index 36e69172..52ac01e1 100644 --- a/E3Next/Utility/e3util.cs +++ b/E3Next/Utility/e3util.cs @@ -213,11 +213,7 @@ public static void TryMoveToTarget() e3util.NavToSpawnID(targetID); return; - //exit from TryMoveToTarget if we've reached the target - if (MQ.Query("${Target.Distance}") < E3.GeneralSettings.Movement_NavStopDistance) - { - return; - } + } } diff --git a/E3NextUI/E3UI.cs b/E3NextUI/E3UI.cs index 74f85cae..4281146e 100644 --- a/E3NextUI/E3UI.cs +++ b/E3NextUI/E3UI.cs @@ -79,10 +79,11 @@ private const int HTBOTTOMLEFT = 16, HTBOTTOMRIGHT = 17; const int _ = 10; // you can rename this variable if you like - Rectangle Top { get { return new Rectangle(0, 0, this.ClientSize.Width, _); } } - Rectangle Left { get { return new Rectangle(0, 0, _, this.ClientSize.Height); } } - Rectangle Bottom { get { return new Rectangle(0, this.ClientSize.Height - _, this.ClientSize.Width, _); } } - Rectangle Right { get { return new Rectangle(this.ClientSize.Width - _, 0, _, this.ClientSize.Height); } } + + new Rectangle Top { get { return new Rectangle(0, 0, this.ClientSize.Width, _); } } + new Rectangle Left { get { return new Rectangle(0, 0, _, this.ClientSize.Height); } } + new Rectangle Bottom { get { return new Rectangle(0, this.ClientSize.Height - _, this.ClientSize.Width, _); } } + new Rectangle Right { get { return new Rectangle(this.ClientSize.Width - _, 0, _, this.ClientSize.Height); } } Rectangle TopLeft { get { return new Rectangle(0, 0, _, _); } } Rectangle TopRight { get { return new Rectangle(this.ClientSize.Width - _, 0, _, _); } } diff --git a/E3NextUI/Util/GlobalKeyboard.cs b/E3NextUI/Util/GlobalKeyboard.cs index 1dda93bb..f873aa0a 100644 --- a/E3NextUI/Util/GlobalKeyboard.cs +++ b/E3NextUI/Util/GlobalKeyboard.cs @@ -19,7 +19,7 @@ class globalKeyboardHook /// defines the callback type for the hook /// public delegate int keyboardHookProc(int code, int wParam, ref keyboardHookStruct lParam); - public event EventHandler KeyboardPressed; + //public event EventHandler KeyboardPressed; private static keyboardHookProc _functionProc; public struct keyboardHookStruct {