Skip to content

feat: add recoverAmount and mods to FlaskInfo; fix: CanBeUsed and ChargesUsed #30

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

feat: add recoverAmount and mods to FlaskInfo; fix: CanBeUsed and ChargesUsed #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8562268
feat: add recoverAmount and mods to FlaskInfo; fix: CanBeUsed and Cha…
beanZ9 Jul 26, 2026
5cec0e2
feat: split recover amount in life and mana
beanZ9 Jul 27, 2026
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
37 changes: 27 additions & 10 deletions State/FlaskInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using ExileCore;
using ExileCore;
using ExileCore.PoEMemory.Components;
using ExileCore.PoEMemory.MemoryObjects;
using ExileCore.Shared.Enums;
using ExileCore.Shared.Helpers;
using System;
using System.Collections.Generic;
using System.Linq;

namespace ReAgent.State;

Expand All @@ -15,10 +16,13 @@ public record FlaskInfo(
[property: Api] int Charges,
[property: Api] int MaxCharges,
[property: Api] int ChargesPerUse,
[property: Api] int LifeRecover,
[property: Api] int ManaRecover,
[property: Api] string ClassName,
[property: Api] string BaseName,
[property: Api] string UniqueName,
[property: Api] float CanBeUsedIn)
[property: Api] float CanBeUsedIn,
[property: Api] List<ItemMod> Mods)
{
[Api]
public string Name => !string.IsNullOrEmpty(UniqueName) ? UniqueName : BaseName;
Expand All @@ -32,20 +36,30 @@ public static FlaskInfo From(
{
if (flaskItem?.Address is 0 or null || flaskItem.Item?.Address is null or 0)
{
return new FlaskInfo(false, false, 0, 1, 1, "", "", "", 100);
return new FlaskInfo(false, false, 0, 1, 1, 0, 0, "", "", "", 100, new List<ItemMod>());
}

var active = false;
var canBeUsedIn = 0f;
bool canbeUsed = false;
int chargesUsed = 0;
int lifeRecover = 0;
int manaRecover = 0;
var chargeComponent = flaskItem.Item.GetComponent<Charges>();
if (state.Player.TryGetComponent<Buffs>(out var playerBuffs))
{
if (flaskItem.Item.TryGetComponent<Flask>(out var flask))
{
var buffNames = GetFlaskBuffNames(flask);
active = playerBuffs.BuffsList.Any(b => buffNames.Contains(b.Name) && b.FlaskSlot == index);
canbeUsed = (chargeComponent?.NumCharges ?? 0) >= (chargeComponent?.ChargesPerUse ?? 1);
chargesUsed = chargeComponent?.ChargesPerUse ?? 1;
var flaskStatsC = flaskItem.Item?.GetComponent<LocalStats>();
if (flaskStatsC?.StatDictionary != null && flaskStatsC.StatDictionary.TryGetValue(GameStat.LocalChargesUsedPct, out var chargesUsedPct)) {
chargesUsed = chargesUsed * (100 + chargesUsedPct) / 100;
}
canbeUsed = (chargeComponent?.NumCharges ?? 0) >= chargesUsed;
lifeRecover = flask?.LifeRecover ?? 0;
manaRecover = flask?.ManaRecover ?? 0;
}

if (flaskItem.Item.TryGetComponent<Tincture>(out var tincture))
Expand Down Expand Up @@ -92,12 +106,15 @@ public static FlaskInfo From(
}

var uniqueName = "";
if (flaskItem.Item.TryGetComponent<Mods>(out var mods))
var modsList = new List<ItemMod>();
if (flaskItem.Item.TryGetComponent<Mods>(out var modsC))
{
uniqueName = mods.UniqueName;
uniqueName = modsC.UniqueName;
modsList = modsC.ExplicitMods;
}

return new FlaskInfo(active, canbeUsed, chargeComponent?.NumCharges ?? 0, chargeComponent?.ChargesMax ?? 1, chargeComponent?.ChargesPerUse ?? 1, className, baseName, uniqueName, canBeUsedIn);
return new FlaskInfo(active, canbeUsed, chargeComponent?.NumCharges ?? 0, chargeComponent?.ChargesMax ?? 1,
chargesUsed, lifeRecover, manaRecover, className, baseName, uniqueName, canBeUsedIn, modsList);
}

private static float CalculateTinctureCanBeUsedIn(GameController state, List<ServerInventory.InventSlotItem> flaskItems, RuleInternalState internalState)
Expand Down