Skip to content

fix: not calling onUnequip when removing items from bag #478

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
LordMidas wants to merge 1 commit into
base: development
Choose a base branch
from
Open

fix: not calling onUnequip when removing items from bag #478

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 39 additions & 1 deletion msu/hooks/items/item_container.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,35 @@
return ret;
}

// Call our skill_container.onUnequip function
q.unequip = @(__original) function( _item )
{
if (_item != null && _item != -1 && _item.getCurrentSlotType() != ::Const.ItemSlot.None && _item.getCurrentSlotType() != ::Const.ItemSlot.Bag && !::MSU.isNull(this.m.Actor) && this.m.Actor.isAlive())
if (_item != null && _item != -1 && _item.getCurrentSlotType() != ::Const.ItemSlot.None && (_item.getCurrentSlotType() != ::Const.ItemSlot.Bag || _item.getSlotType() == ::Const.ItemSlot.Bag) && !::MSU.isNull(this.m.Actor) && this.m.Actor.isAlive())
{
foreach (item in this.m.Items[_item.getSlotType()])
{
if (item == _item)
{
this.m.Actor.getSkills().onUnequip(_item);
break;
}
}
}

// VanillaFix: https://steamcommunity.com/app/365360/discussions/1/684112192552961717/
// `item_container.unequip` not properly removing bagged items while `item_container.equip` puts them in the bag.
if (_item.getSlotType() == ::Const.ItemSlot.Bag)
{
return this.removeFromBag(_item);
}

return __original(_item);
}

// Call our skill_container.onUnequip function
q.removeFromBag = @(__original) function( _item )
{
if (_item.getCurrentSlotType() == this.Const.ItemSlot.Bag && _item.getSlotType() == ::Const.ItemSlot.Bag)
{
foreach (item in this.m.Items[_item.getSlotType()])
{
Expand All @@ -92,4 +118,16 @@

return __original(_item);
}

// Call our skill_container.onUnequip function
q.removeFromBagSlot = @(__original) function( _slot )
{
local item = this.m.Items[::Const.ItemSlot.Bag][_slot];
if (item != null && item.getSlotType() == ::Const.ItemSlot.Bag)
{
this.m.Actor.getSkills().onUnequip(item);
}

return __original(_slot);
}
});