From abb8ab04abbfddf72b9a02a8497c0c8124bf4b02 Mon Sep 17 00:00:00 2001 From: Arkanion Date: Sat, 14 Nov 2015 19:59:53 +0100 Subject: [PATCH 1/3] 5.22 HotFix && Implemented new Items. - Arkanion --- SFXUtility/Features/Activators/AutoJump.cs | 22 ++++++---- SFXUtility/Features/Activators/Potion.cs | 15 +++---- SFXUtility/Features/Activators/Revealer.cs | 47 +++++++++++---------- SFXUtility/Features/Drawings/PerfectWard.cs | 8 ++-- SFXUtility/Features/Events/Trinket.cs | 23 +++------- 5 files changed, 53 insertions(+), 62 deletions(-) diff --git a/SFXUtility/Features/Activators/AutoJump.cs b/SFXUtility/Features/Activators/AutoJump.cs index 7475d6e6..b0deeeee 100644 --- a/SFXUtility/Features/Activators/AutoJump.cs +++ b/SFXUtility/Features/Activators/AutoJump.cs @@ -226,19 +226,25 @@ private SpellSlot GetWardSlot() { return ItemData.Warding_Totem_Trinket.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Greater_Stealth_Totem_Trinket.GetItem().IsOwned() && - ItemData.Greater_Stealth_Totem_Trinket.GetItem().IsReady()) + if (ItemData.Eye_of_the_Equinox.GetItem().IsOwned() && + ItemData.Eye_of_the_Equinox.GetItem().IsReady()) { - return ItemData.Greater_Stealth_Totem_Trinket.GetItem().Slots.FirstOrDefault(); + return ItemData.Eye_of_the_Equinox.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Farsight_Orb_Trinket.GetItem().IsOwned() && - ItemData.Farsight_Orb_Trinket.GetItem().IsReady()) + if (ItemData.Eye_of_the_Oasis.GetItem().IsOwned() && + ItemData.Eye_of_the_Oasis.GetItem().IsReady()) { - return ItemData.Farsight_Orb_Trinket.GetItem().Slots.FirstOrDefault(); + return ItemData.Eye_of_the_Oasis.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Stealth_Ward.GetItem().IsOwned() && ItemData.Stealth_Ward.GetItem().IsReady()) + if (ItemData.Eye_of_the_Watchers.GetItem().IsOwned() && + ItemData.Eye_of_the_Equinox.GetItem().IsReady()) { - return ItemData.Stealth_Ward.GetItem().Slots.FirstOrDefault(); + return ItemData.Eye_of_the_Watchers.GetItem().Slots.FirstOrDefault(); + } + if (ItemData.Farsight_Alteration.GetItem().IsOwned() && + ItemData.Farsight_Alteration.GetItem().IsReady()) + { + return ItemData.Farsight_Alteration.GetItem().Slots.FirstOrDefault(); } } catch (Exception ex) diff --git a/SFXUtility/Features/Activators/Potion.cs b/SFXUtility/Features/Activators/Potion.cs index 000ed806..c6c9d350 100644 --- a/SFXUtility/Features/Activators/Potion.cs +++ b/SFXUtility/Features/Activators/Potion.cs @@ -41,17 +41,12 @@ internal class Potion : Child { private readonly List _potions = new List { - new PotionStruct( - "ItemCrystalFlask", (ItemId) ItemData.Crystalline_Flask.Id, 1, - new[] { PotionType.Health, PotionType.Mana }), + new PotionStruct("ItemHuntersPotion", (ItemId) ItemData.Hunters_Potion.Id, 1, new[] { PotionType.Health, PotionType.Mana }), + new PotionStruct("ItemRefillablePotion", (ItemId) ItemData.Refillable_Potion.Id, 1, new[] { PotionType.Health}), + new PotionStruct("ItemCorruptingPotion", (ItemId) ItemData.Corrupting_Potion.Id, 0, new[] { PotionType.Health, PotionType.Mana }), new PotionStruct("RegenerationPotion", (ItemId) ItemData.Health_Potion.Id, 0, new[] { PotionType.Health }), - new PotionStruct( - "ItemMiniRegenPotion", (ItemId) ItemData.Total_Biscuit_of_Rejuvenation.Id, 0, - new[] { PotionType.Health }), - new PotionStruct( - "ItemMiniRegenPotion", (ItemId) ItemData.Total_Biscuit_of_Rejuvenation2.Id, 0, - new[] { PotionType.Health }), - new PotionStruct("FlaskOfCrystalWater", (ItemId) ItemData.Mana_Potion.Id, 0, new[] { PotionType.Mana }) + new PotionStruct("ItemMiniRegenPotion", (ItemId) ItemData.Total_Biscuit_of_Rejuvenation.Id, 0, new[] { PotionType.Health }), + new PotionStruct("ItemMiniRegenPotion", (ItemId) ItemData.Total_Biscuit_of_Rejuvenation2.Id, 0, new[] { PotionType.Health }) }; public Potion(Activators parent) : base(parent) diff --git a/SFXUtility/Features/Activators/Revealer.cs b/SFXUtility/Features/Activators/Revealer.cs index 0f9497bc..e95dc697 100644 --- a/SFXUtility/Features/Activators/Revealer.cs +++ b/SFXUtility/Features/Activators/Revealer.cs @@ -254,20 +254,20 @@ private SpellSlot GetRevealSlot(bool bush) { if (!bush) { - if (ItemData.Oracles_Lens_Trinket.GetItem().IsOwned() && - ItemData.Oracles_Lens_Trinket.GetItem().IsReady()) + if (ItemData.Vision_Ward.GetItem().IsOwned() && ItemData.Vision_Ward.GetItem().IsReady()) { - return ItemData.Oracles_Lens_Trinket.GetItem().Slots.FirstOrDefault(); + return ItemData.Vision_Ward.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Greater_Vision_Totem_Trinket.GetItem().IsOwned() && - ItemData.Greater_Vision_Totem_Trinket.GetItem().IsReady()) + if (ItemData.Oracle_Alteration.GetItem().IsOwned() && + ItemData.Oracle_Alteration.GetItem().IsReady()) { - return ItemData.Greater_Vision_Totem_Trinket.GetItem().Slots.FirstOrDefault(); + return ItemData.Oracle_Alteration.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Vision_Ward.GetItem().IsOwned() && ItemData.Vision_Ward.GetItem().IsReady()) + if (ItemData.Sweeping_Lens_Trinket.GetItem().IsOwned() && + ItemData.Sweeping_Lens_Trinket.GetItem().IsReady()) { - return ItemData.Vision_Ward.GetItem().Slots.FirstOrDefault(); - } + return ItemData.Sweeping_Lens_Trinket.GetItem().Slots.FirstOrDefault(); + } } else { @@ -279,29 +279,30 @@ private SpellSlot GetRevealSlot(bool bush) { return ItemData.Ruby_Sightstone.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Warding_Totem_Trinket.GetItem().IsOwned() && - ItemData.Warding_Totem_Trinket.GetItem().IsReady()) + if (ItemData.Eye_of_the_Equinox.GetItem().IsOwned() && + ItemData.Eye_of_the_Equinox.GetItem().IsReady()) { - return ItemData.Warding_Totem_Trinket.GetItem().Slots.FirstOrDefault(); + return ItemData.Eye_of_the_Equinox.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Greater_Stealth_Totem_Trinket.GetItem().IsOwned() && - ItemData.Greater_Stealth_Totem_Trinket.GetItem().IsReady()) + if (ItemData.Eye_of_the_Oasis.GetItem().IsOwned() && + ItemData.Eye_of_the_Oasis.GetItem().IsReady()) { - return ItemData.Greater_Stealth_Totem_Trinket.GetItem().Slots.FirstOrDefault(); + return ItemData.Eye_of_the_Oasis.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Scrying_Orb_Trinket.GetItem().IsOwned() && - ItemData.Scrying_Orb_Trinket.GetItem().IsReady()) + if (ItemData.Eye_of_the_Watchers.GetItem().IsOwned() && + ItemData.Eye_of_the_Equinox.GetItem().IsReady()) { - return ItemData.Scrying_Orb_Trinket.GetItem().Slots.FirstOrDefault(); + return ItemData.Eye_of_the_Watchers.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Farsight_Orb_Trinket.GetItem().IsOwned() && - ItemData.Farsight_Orb_Trinket.GetItem().IsReady()) + if (ItemData.Warding_Totem_Trinket.GetItem().IsOwned() && + ItemData.Warding_Totem_Trinket.GetItem().IsReady()) { - return ItemData.Farsight_Orb_Trinket.GetItem().Slots.FirstOrDefault(); + return ItemData.Warding_Totem_Trinket.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Stealth_Ward.GetItem().IsOwned() && ItemData.Stealth_Ward.GetItem().IsReady()) + if (ItemData.Farsight_Alteration.GetItem().IsOwned() && + ItemData.Farsight_Alteration.GetItem().IsReady()) { - return ItemData.Stealth_Ward.GetItem().Slots.FirstOrDefault(); + return ItemData.Farsight_Alteration.GetItem().Slots.FirstOrDefault(); } } } diff --git a/SFXUtility/Features/Drawings/PerfectWard.cs b/SFXUtility/Features/Drawings/PerfectWard.cs index 705ad5ad..d57ff868 100644 --- a/SFXUtility/Features/Drawings/PerfectWard.cs +++ b/SFXUtility/Features/Drawings/PerfectWard.cs @@ -48,13 +48,15 @@ internal class PerfectWard : Child ItemData.Wriggles_Lantern.Id, ItemData.Sightstone.Id, ItemData.Ruby_Sightstone.Id, - ItemData.Explorers_Ward.Id + ItemData.Explorers_Ward.Id, + ItemData.Eye_of_the_Equinox.Id, + ItemData.Eye_of_the_Oasis.Id, + ItemData.Eye_of_the_Watchers.Id }; private readonly List _pinkWards = new List { - ItemData.Stealth_Ward.Id, - ItemData.Greater_Stealth_Totem_Trinket.Id + ItemData.Vision_Ward.Id }; private readonly List _wardSpots = new List diff --git a/SFXUtility/Features/Events/Trinket.cs b/SFXUtility/Features/Events/Trinket.cs index 43ebe915..05207d1d 100644 --- a/SFXUtility/Features/Events/Trinket.cs +++ b/SFXUtility/Features/Events/Trinket.cs @@ -31,6 +31,7 @@ You should have received a copy of the GNU General Public License using SFXUtility.Library.Extensions.LeagueSharp; using SFXUtility.Library.Extensions.NET; using SFXUtility.Library.Logger; +using ItemData = LeagueSharp.Common.Data.ItemData; #endregion @@ -96,7 +97,6 @@ protected override sealed void OnLoad() Menu.AddSubMenu(levelMenu); Menu.AddSubMenu(eventsMenu); - Menu.AddItem(new MenuItem(Menu.Name + "SellUpgraded", "Sell Upgraded").SetValue(false)); Menu.AddItem(new MenuItem(Menu.Name + "Enabled", "Enabled").SetValue(false)); Parent.Menu.AddSubMenu(Menu); @@ -120,24 +120,11 @@ private void OnGameUpdate(EventArgs args) if (ObjectManager.Player.IsDead || ObjectManager.Player.InShop()) { - if (!Menu.Item(Menu.Name + "SellUpgraded").GetValue()) - { - if (ObjectManager.Player.HasItem(ItemId.Greater_Vision_Totem_Trinket) || - ObjectManager.Player.HasItem(ItemId.Greater_Stealth_Totem_Trinket) || - ObjectManager.Player.HasItem(ItemId.Farsight_Orb_Trinket) || - ObjectManager.Player.HasItem(ItemId.Oracles_Lens_Trinket)) - { - return; - } - } - var hasYellow = ObjectManager.Player.HasItem(ItemId.Warding_Totem_Trinket) || - ObjectManager.Player.HasItem(ItemId.Greater_Vision_Totem_Trinket) || - ObjectManager.Player.HasItem(ItemId.Greater_Stealth_Totem_Trinket); - var hasBlue = ObjectManager.Player.HasItem(ItemId.Scrying_Orb_Trinket) || - ObjectManager.Player.HasItem(ItemId.Farsight_Orb_Trinket); - var hasRed = ObjectManager.Player.HasItem(ItemId.Sweeping_Lens_Trinket) || - ObjectManager.Player.HasItem(ItemId.Oracles_Lens_Trinket); + var hasYellow = ItemData.Warding_Totem_Trinket.GetItem().IsOwned(); + var hasBlue = ItemData.Farsight_Alteration.GetItem().IsOwned(); + var hasRed = ItemData.Sweeping_Lens_Trinket.GetItem().IsOwned() || + ItemData.Oracle_Alteration.GetItem().IsOwned(); if (Menu.Item(Menu.Name + "EventsEnabled").GetValue()) { From db1e4e33c771d30755ef32b788ec720a06ee8ac4 Mon Sep 17 00:00:00 2001 From: Arkanion Date: Sat, 14 Nov 2015 20:09:13 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Added=20Red=20Trinket=20Reveal=20for=20Bush?= =?UTF-8?q?es,=205.22=20Patch=20(Spawn=C2=B4s=20Particles=20above=20Enemys?= =?UTF-8?q?).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SFXUtility/Features/Activators/Revealer.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/SFXUtility/Features/Activators/Revealer.cs b/SFXUtility/Features/Activators/Revealer.cs index e95dc697..f22a9c5d 100644 --- a/SFXUtility/Features/Activators/Revealer.cs +++ b/SFXUtility/Features/Activators/Revealer.cs @@ -304,6 +304,16 @@ private SpellSlot GetRevealSlot(bool bush) { return ItemData.Farsight_Alteration.GetItem().Slots.FirstOrDefault(); } + if (ItemData.Oracle_Alteration.GetItem().IsOwned() && + ItemData.Oracle_Alteration.GetItem().IsReady()) + { + return ItemData.Oracle_Alteration.GetItem().Slots.FirstOrDefault(); + } + if (ItemData.Sweeping_Lens_Trinket.GetItem().IsOwned() && + ItemData.Sweeping_Lens_Trinket.GetItem().IsReady()) + { + return ItemData.Sweeping_Lens_Trinket.GetItem().Slots.FirstOrDefault(); + } } } catch (Exception ex) From 8c0988a286bf804e925a66bb12ec60d07076b4db Mon Sep 17 00:00:00 2001 From: Arkanion Date: Sun, 15 Nov 2015 17:44:23 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Implemented=20Tracker=C2=B4s=20Knife=20(New?= =?UTF-8?q?=20Jungle=20Item=20-=20Wards)=20for=20Reveal=20and=20AutoJump?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SFXUtility/Features/Activators/AutoJump.cs | 19 ++++++++-------- SFXUtility/Features/Activators/Revealer.cs | 25 ++++++++++------------ 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/SFXUtility/Features/Activators/AutoJump.cs b/SFXUtility/Features/Activators/AutoJump.cs index b0deeeee..749a5856 100644 --- a/SFXUtility/Features/Activators/AutoJump.cs +++ b/SFXUtility/Features/Activators/AutoJump.cs @@ -221,28 +221,27 @@ private SpellSlot GetWardSlot() { return ItemData.Ruby_Sightstone.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Warding_Totem_Trinket.GetItem().IsOwned() && - ItemData.Warding_Totem_Trinket.GetItem().IsReady()) + if (ItemData.Trackers_Knife.GetItem().IsOwned() && ItemData.Ruby_Sightstone.GetItem().IsReady()) + { + return ItemData.Trackers_Knife.GetItem().Slots.FirstOrDefault(); + } + if (ItemData.Warding_Totem_Trinket.GetItem().IsOwned() && ItemData.Warding_Totem_Trinket.GetItem().IsReady()) { return ItemData.Warding_Totem_Trinket.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Eye_of_the_Equinox.GetItem().IsOwned() && - ItemData.Eye_of_the_Equinox.GetItem().IsReady()) + if (ItemData.Eye_of_the_Equinox.GetItem().IsOwned() && ItemData.Eye_of_the_Equinox.GetItem().IsReady()) { return ItemData.Eye_of_the_Equinox.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Eye_of_the_Oasis.GetItem().IsOwned() && - ItemData.Eye_of_the_Oasis.GetItem().IsReady()) + if (ItemData.Eye_of_the_Oasis.GetItem().IsOwned() && ItemData.Eye_of_the_Oasis.GetItem().IsReady()) { return ItemData.Eye_of_the_Oasis.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Eye_of_the_Watchers.GetItem().IsOwned() && - ItemData.Eye_of_the_Equinox.GetItem().IsReady()) + if (ItemData.Eye_of_the_Watchers.GetItem().IsOwned() && ItemData.Eye_of_the_Equinox.GetItem().IsReady()) { return ItemData.Eye_of_the_Watchers.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Farsight_Alteration.GetItem().IsOwned() && - ItemData.Farsight_Alteration.GetItem().IsReady()) + if (ItemData.Farsight_Alteration.GetItem().IsOwned() && ItemData.Farsight_Alteration.GetItem().IsReady()) { return ItemData.Farsight_Alteration.GetItem().Slots.FirstOrDefault(); } diff --git a/SFXUtility/Features/Activators/Revealer.cs b/SFXUtility/Features/Activators/Revealer.cs index f22a9c5d..ce701c3b 100644 --- a/SFXUtility/Features/Activators/Revealer.cs +++ b/SFXUtility/Features/Activators/Revealer.cs @@ -279,38 +279,35 @@ private SpellSlot GetRevealSlot(bool bush) { return ItemData.Ruby_Sightstone.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Eye_of_the_Equinox.GetItem().IsOwned() && - ItemData.Eye_of_the_Equinox.GetItem().IsReady()) + if (ItemData.Trackers_Knife.GetItem().IsOwned() && ItemData.Trackers_Knife.GetItem().IsReady()) + { + return ItemData.Trackers_Knife.GetItem().Slots.FirstOrDefault(); + } + if (ItemData.Eye_of_the_Equinox.GetItem().IsOwned() && ItemData.Eye_of_the_Equinox.GetItem().IsReady()) { return ItemData.Eye_of_the_Equinox.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Eye_of_the_Oasis.GetItem().IsOwned() && - ItemData.Eye_of_the_Oasis.GetItem().IsReady()) + if (ItemData.Eye_of_the_Oasis.GetItem().IsOwned() && ItemData.Eye_of_the_Oasis.GetItem().IsReady()) { return ItemData.Eye_of_the_Oasis.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Eye_of_the_Watchers.GetItem().IsOwned() && - ItemData.Eye_of_the_Equinox.GetItem().IsReady()) + if (ItemData.Eye_of_the_Watchers.GetItem().IsOwned() && ItemData.Eye_of_the_Equinox.GetItem().IsReady()) { return ItemData.Eye_of_the_Watchers.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Warding_Totem_Trinket.GetItem().IsOwned() && - ItemData.Warding_Totem_Trinket.GetItem().IsReady()) + if (ItemData.Warding_Totem_Trinket.GetItem().IsOwned() && ItemData.Warding_Totem_Trinket.GetItem().IsReady()) { return ItemData.Warding_Totem_Trinket.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Farsight_Alteration.GetItem().IsOwned() && - ItemData.Farsight_Alteration.GetItem().IsReady()) + if (ItemData.Farsight_Alteration.GetItem().IsOwned() && ItemData.Farsight_Alteration.GetItem().IsReady()) { return ItemData.Farsight_Alteration.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Oracle_Alteration.GetItem().IsOwned() && - ItemData.Oracle_Alteration.GetItem().IsReady()) + if (ItemData.Oracle_Alteration.GetItem().IsOwned() && ItemData.Oracle_Alteration.GetItem().IsReady()) { return ItemData.Oracle_Alteration.GetItem().Slots.FirstOrDefault(); } - if (ItemData.Sweeping_Lens_Trinket.GetItem().IsOwned() && - ItemData.Sweeping_Lens_Trinket.GetItem().IsReady()) + if (ItemData.Sweeping_Lens_Trinket.GetItem().IsOwned() && ItemData.Sweeping_Lens_Trinket.GetItem().IsReady()) { return ItemData.Sweeping_Lens_Trinket.GetItem().Slots.FirstOrDefault(); }