ExtraDepletionBehavior

[XLightningStormL]

ExtraDepletionBehavior is a dynamic way of expanding upon TakeInventory and UseInventory* with additional behaviour, whilst also preventing code bloat from custom inventory use and take functions.

Extremely useful for weight systems, requires at least 1 item in reserve to function (use DetachFromOwner for when the final item is dropped)

*SetInventory should also be theoretically supported, at least on the takeinventory side

[RicardoLuis0]

hmm, what about renaming it to DepleteBy and moving the whole depletion logic to it?
ex.:

virtual void DepleteBy(int by)
{
    if (!amount || by >= amount)
    {
        DepleteOrDestroy();
    }
    else
    {
        amount -= by;
    }
}

[XLightningStormL]

hmm, what about renaming it to DepleteBy and moving the whole depletion logic to it? ex.:

virtual void DepleteBy(int by)
{
    if (!amount || by >= amount)
    {
        DepleteOrDestroy();
    }
    else
    {
        amount -= by;
    }
}

Moving the depletion logic to it was the original concept (see here: https://forum.zdoom.org/viewtopic.php?t=79266 and combining the two would definitely be the way to go. My idea was more a functioning proof of concept. Hmm.

[XLightningStormL]

Alright I've just changed HandleDecrement to DepleteBy behavior as per @RicardoLuis0 's suggestion. Also tested it privately and it works perfectly.

Though I am not sure if usedItem is necessary or not, I only threw it in because it was present in UsedInventory, and I want to try an avoid any inadvertent effects from not including it.

[RicardoLuis0]

wouldn't this --Amount <= 0 && usedItem make it decrese by one extra with every single call of DepleteBy?

[RicardoLuis0]

item.DepleteBy(1) just by itself without --Amount <= 0 && usedItem will have the same result as the if(--item.Amount <= 0) item.DepleteOrDestroy(); in UseInventory

[MajorCooke]

Don't forget there's infinite ammo powerups, and the "infinite ammo/items" gameplay options.

[XLightningStormL]

Alright, both are done. Additionally threw in a sv_infiniteinventory check for custominventory items when they are taken with the cvar active. Tested, and all good, so that should be it at the moment.

[MajorCooke]

I was wrong. TakeInventory is never called if sv_infiniteinventory is true, so this part alone should be reverted. Otherwise this could cause some problems.

Sorry about that.

[MajorCooke]

The check here should be amount < 1, not !amount.

amount is an integer and it can be negative.

[XLightningStormL]

Both changes pushed now.