Skip to content

5.22 HotFix && Implemented new Items. - Arkanion #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Arkanion wants to merge 3 commits into
base: master
Choose a base branch
from
Open

5.22 HotFix && Implemented new Items. - Arkanion #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abb8ab0
5.22 HotFix && Implemented new Items. - Arkanion
Arkanion Nov 14, 2015
db1e4e3
Added Red Trinket Reveal for Bushes, 5.22 Patch (Spawn´s Particles ab…
Arkanion Nov 14, 2015
8c0988a
Implemented Tracker´s Knife (New Jungle Item - Wards) for Reveal and …
Arkanion Nov 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions SFXUtility/Features/Activators/AutoJump.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,24 +221,29 @@ 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.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.Eye_of_the_Equinox.GetItem().Slots.FirstOrDefault();
}
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.Farsight_Orb_Trinket.GetItem().IsOwned() &&
ItemData.Farsight_Orb_Trinket.GetItem().IsReady())
if (ItemData.Eye_of_the_Watchers.GetItem().IsOwned() && ItemData.Eye_of_the_Equinox.GetItem().IsReady())
{
return ItemData.Farsight_Orb_Trinket.GetItem().Slots.FirstOrDefault();
return ItemData.Eye_of_the_Watchers.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();
}
}
catch (Exception ex)
Expand Down
15 changes: 5 additions & 10 deletions SFXUtility/Features/Activators/Potion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,12 @@ internal class Potion : Child<Activators>
{
private readonly List<PotionStruct> _potions = new List<PotionStruct>
{
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)
Expand Down
54 changes: 31 additions & 23 deletions SFXUtility/Features/Activators/Revealer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -279,29 +279,37 @@ 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.Trackers_Knife.GetItem().IsOwned() && ItemData.Trackers_Knife.GetItem().IsReady())
{
return ItemData.Warding_Totem_Trinket.GetItem().Slots.FirstOrDefault();
return ItemData.Trackers_Knife.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.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())
{
return ItemData.Eye_of_the_Watchers.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.Scrying_Orb_Trinket.GetItem().IsOwned() &&
ItemData.Scrying_Orb_Trinket.GetItem().IsReady())
if (ItemData.Farsight_Alteration.GetItem().IsOwned() && ItemData.Farsight_Alteration.GetItem().IsReady())
{
return ItemData.Scrying_Orb_Trinket.GetItem().Slots.FirstOrDefault();
return ItemData.Farsight_Alteration.GetItem().Slots.FirstOrDefault();
}
if (ItemData.Farsight_Orb_Trinket.GetItem().IsOwned() &&
ItemData.Farsight_Orb_Trinket.GetItem().IsReady())
if (ItemData.Oracle_Alteration.GetItem().IsOwned() && ItemData.Oracle_Alteration.GetItem().IsReady())
{
return ItemData.Farsight_Orb_Trinket.GetItem().Slots.FirstOrDefault();
return ItemData.Oracle_Alteration.GetItem().Slots.FirstOrDefault();
}
if (ItemData.Stealth_Ward.GetItem().IsOwned() && ItemData.Stealth_Ward.GetItem().IsReady())
if (ItemData.Sweeping_Lens_Trinket.GetItem().IsOwned() && ItemData.Sweeping_Lens_Trinket.GetItem().IsReady())
{
return ItemData.Stealth_Ward.GetItem().Slots.FirstOrDefault();
return ItemData.Sweeping_Lens_Trinket.GetItem().Slots.FirstOrDefault();
}
}
}
Expand Down
8 changes: 5 additions & 3 deletions SFXUtility/Features/Drawings/PerfectWard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,15 @@ internal class PerfectWard : Child<Drawings>
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<int> _pinkWards = new List<int>
{
ItemData.Stealth_Ward.Id,
ItemData.Greater_Stealth_Totem_Trinket.Id
ItemData.Vision_Ward.Id
};

private readonly List<WardSpot> _wardSpots = new List<WardSpot>
Expand Down
23 changes: 5 additions & 18 deletions SFXUtility/Features/Events/Trinket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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);
Expand All @@ -120,24 +120,11 @@ private void OnGameUpdate(EventArgs args)

if (ObjectManager.Player.IsDead || ObjectManager.Player.InShop())
{
if (!Menu.Item(Menu.Name + "SellUpgraded").GetValue<bool>())
{
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<bool>())
{
Expand Down