Skip to content

New option for Quality Flasks and Fixed CanPickUp #2

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
Alchemist-VII wants to merge 2 commits into
base: master
Choose a base branch
from
Open

New option for Quality Flasks and Fixed CanPickUp #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a34047a
1
Jun 29, 2020
896b0b3
New Option for Quality Flask and fixed CanPickUp.
Jun 29, 2020
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
15 changes: 11 additions & 4 deletions PickIt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
using System.Windows.Forms;
using Input = ExileCore.Input;


namespace PickIt
{
public class PickIt : BaseSettingsPlugin<PickItSettings>
Expand Down Expand Up @@ -337,6 +338,12 @@ public bool OverrideChecks(CustomItem item)

if (Settings.Gems && item.Quality >= Settings.GemQuality.Value && item.ClassName.Contains("Skill Gem")) return true;

#endregion

#region Flasks

if (Settings.Flasks && item.Quality >= Settings.FlaskQuality.Value && item.ClassName.Contains("Flask")) return true;

#endregion

#region Uniques
Expand Down Expand Up @@ -445,9 +452,9 @@ private IEnumerator FindItemToPick()
{
currentLabels = GameController.Game.IngameState.IngameUi.ItemsOnGroundLabels
.Where(x => x.Address != 0 &&
x.ItemOnGround?.Path != null &&
x.ItemOnGround?.Path != null && x.CanPickUp &&
x.IsVisible && x.Label.GetClientRectCache.Center.PointInRectangle(rect) &&
(x.CanPickUp || x.MaxTimeForPickUp.TotalSeconds <= 0) || x.ItemOnGround?.Path == morphPath)
(x.MaxTimeForPickUp.TotalSeconds <= 0) || x.ItemOnGround?.Path == morphPath)
.Select(x => new CustomItem(x, GameController.Files,
x.ItemOnGround.DistancePlayer, _weightsRules, x.ItemOnGround?.Path == morphPath))
.OrderByDescending(x => x.Weight).ThenBy(x => x.Distance).ToList();
Expand All @@ -456,9 +463,9 @@ private IEnumerator FindItemToPick()
{
currentLabels = GameController.Game.IngameState.IngameUi.ItemsOnGroundLabels
.Where(x => x.Address != 0 &&
x.ItemOnGround?.Path != null &&
x.ItemOnGround?.Path != null && x.CanPickUp &&
x.IsVisible && x.Label.GetClientRectCache.Center.PointInRectangle(rect) &&
(x.CanPickUp || x.MaxTimeForPickUp.TotalSeconds <= 0) || x.ItemOnGround?.Path == morphPath)
(x.MaxTimeForPickUp.TotalSeconds <= 0) || x.ItemOnGround?.Path == morphPath)
.Select(x => new CustomItem(x, GameController.Files,
x.ItemOnGround.DistancePlayer, _weightsRules, x.ItemOnGround?.Path == morphPath))
.OrderBy(x => x.Distance).ToList();
Expand Down
4 changes: 4 additions & 0 deletions PickItSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ public PickItSettings()
QuestItems = new ToggleNode(true);
Gems = new ToggleNode(true);
GemQuality = new RangeNode<int>(1, 0, 20);
Flasks = new ToggleNode(false);
FlaskQuality = new RangeNode<int>(1, 0, 20);
GroundChests = new ToggleNode(false);
ShaperItems = new ToggleNode(true);
ElderItems = new ToggleNode(true);
Expand Down Expand Up @@ -115,6 +117,8 @@ public PickItSettings()
public ToggleNode MapFragments { get; set; }
public ToggleNode Gems { get; set; }
public RangeNode<int> GemQuality { get; set; }
public ToggleNode Flasks { get; set; }
public RangeNode<int> FlaskQuality { get; set; }
public ToggleNode QuestItems { get; set; }
public ToggleNode GroundChests { get; set; }
public ToggleNode LeftClickToggleNode { get; set; }
Expand Down