Skip to content

Fix for issue #28 / #29 related to Mark as Junk vs. Stack All Items binding #31

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

Fix for issue #28 / #29 related to Mark as Junk vs. Stack All Items binding #31

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
a67210a
Fixed github issue related to stack all items vs. mark as junk.
trentapple Jan 28, 2017
1f3a2f1
Fixed github issue #29 (related to stack all items vs. mark as junk).
trentapple Jan 28, 2017
c92deb8
Fix for height of entries
trentapple Apr 28, 2017
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
2 changes: 1 addition & 1 deletion BUI_Shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<Control name="BUI_GamepadMenuEntryLabelSizedTemplate" virtual="true">
<OnInitialized>
ZO_SharedGamepadEntry_OnInitialized(self)
ZO_SharedGamepadEntry_SetHeightFromLabel(self)
ZO_SharedGamepadEntry_SetHeightFromLabels(self)
</OnInitialized>
</Control>

Expand Down
76 changes: 40 additions & 36 deletions Modules/Inventory/Inventory.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1515,15 +1515,19 @@ function BUI.Inventory.Class:InitializeKeybindStrip()
--},
{
name = function()
if (self.selectedItemUniqueId ~= nil) then
local targetData = self.itemList:GetTargetData()
local bag, index = ZO_Inventory_GetBagAndIndex(targetData)
if (IsItemJunk(bag, index)) then
return GetString(SI_ITEM_ACTION_UNMARK_AS_JUNK)
if(BUI.Settings.Modules["Inventory"].enableJunk) then
if (self.selectedItemUniqueId ~= nil) then
local targetData = self.itemList:GetTargetData()
local bag, index = ZO_Inventory_GetBagAndIndex(targetData)
if (IsItemJunk(bag, index)) then
return GetString(SI_ITEM_ACTION_UNMARK_AS_JUNK)
end
end

return GetString(SI_ITEM_ACTION_MARK_AS_JUNK)
end

return GetString(SI_ITEM_ACTION_MARK_AS_JUNK)
return GetString(SI_ITEM_ACTION_STACK_ALL)

--local selectedData = self.categoryList.selectedData
--return (selectedData.filterType == ITEMFILTERTYPE_JUNK) and GetString(SI_ITEM_ACTION_UNMARK_AS_JUNK) or
Expand All @@ -1535,41 +1539,41 @@ function BUI.Inventory.Class:InitializeKeybindStrip()
disabledDuringSceneHiding = true,

visible = function()
if (self.selectedItemUniqueId ~= nil) then
--*--if self.selectedItemUniqueId ~= nil then
local targetData = self.itemList:GetTargetData()
return IsInventorySlotLockedOrJunk(targetData)
--*--return ZO_InventorySlot_CanDestroyItem(targetData)
else
local targetData = self.itemList:GetTargetData()
if (targetData ~= nil) then
return IsInventorySlotLockedOrJunk(targetData)
--*--return true
if(BUI.Settings.Modules["Inventory"].enableJunk) then
if (self.selectedItemUniqueId ~= nil) then
--*--if self.selectedItemUniqueId ~= nil then
local targetData = self.itemList:GetTargetData()
return IsInventorySlotLockedOrJunk(targetData)
--*--return ZO_InventorySlot_CanDestroyItem(targetData)
else
local targetData = self.itemList:GetTargetData()
if (targetData ~= nil) then
return IsInventorySlotLockedOrJunk(targetData)
--*--return true
end
end

return false
end
----return (self.selectedItemUniqueId ~= nil)
--local targetData = self.itemList:GetTargetData()
--if (self.selectedItemUniqueId ~= nil) then
--local bag, index = ZO_Inventory_GetBagAndIndex(targetData)
--return not IsItemJunk(bag, index)
--return self.selectedItemUniqueId ~= nil and ZO_InventorySlot_CanDestroyItem(targetData)
--end
return false

return true
end,

callback = function()
if (self.selectedItemUniqueId ~= nil) then
local targetData = self.itemList:GetTargetData()
local bag, index = ZO_Inventory_GetBagAndIndex(targetData)
local isJunk = not IsItemJunk(bag, index)
if (not IsItemPlayerLocked(bag, index) or (IsItemPlayerLocked(bag, index) and not isJunk)) then
SetItemIsJunk(bag, index, isJunk)
PlaySound(isJunk and SOUNDS.INVENTORY_ITEM_JUNKED or SOUNDS.INVENTORY_ITEM_UNJUNKED)
--*--if(ZO_InventorySlot_CanDestroyItem(targetData) and ZO_InventorySlot_InitiateDestroyItem(targetData)) then
--*-- self.itemList:Deactivate()
--*-- self.listWaitingOnDestroyRequest = self.itemList
end
end
if(BUI.Settings.Modules["Inventory"].enableJunk) then
if (self.selectedItemUniqueId ~= nil) then
local targetData = self.itemList:GetTargetData()
local bag, index = ZO_Inventory_GetBagAndIndex(targetData)
local isJunk = not IsItemJunk(bag, index)
if (not IsItemPlayerLocked(bag, index) or (IsItemPlayerLocked(bag, index) and not isJunk)) then
SetItemIsJunk(bag, index, isJunk)
PlaySound(isJunk and SOUNDS.INVENTORY_ITEM_JUNKED or SOUNDS.INVENTORY_ITEM_UNJUNKED)
end
end
else
-- Stack All Items
StackBag(BAG_BACKPACK)
end
end
}
}
Expand Down