Skip to content
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.

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

fix: QuickLoot wrong order (fix issues#906) #1003

Merged
merged 1 commit into from
Dec 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions modules/game_quickloot/quickloot.lua
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,9 @@ function QuickLoot.Define()
quickLootController.ui.fallbackPanel.checkbox:setChecked(fallback)
-- LuaFormatter off
local slotBags = {
{ color = "#484848", name = "Unassigned", type = 1 },
{ color = "#484848", name = "Unassigned", type = 31 },
{ color = "#414141", name = "Gold", type = 30 },
{ color = "#484848", name = "Armors", type = 31 },
{ color = "#484848", name = "Armors", type = 1 },
{ color = "#414141", name = "Amulets", type = 2 },
{ color = "#484848", name = "Boots", type = 3 },
{ color = "#414141", name = "Containers", type = 4 },
Expand Down Expand Up @@ -259,8 +259,8 @@ function QuickLoot.Define()

for _, container in pairs(lootContainers) do
if container[1] == id then
local lootContainerId = container[2]
local obtainerContainerId = container[3]
local lootContainerId = container[3]
local obtainerContainerId = container[2]

widget.item:setItemId(lootContainerId)
widget.item2:setItemId(obtainerContainerId)
Expand Down
36 changes: 18 additions & 18 deletions modules/game_quickloot/quickloot.otui
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ QuicklootBagLabel < UIWidget
margin-left: 2
SelectBagButton
id: selectBag
&click: 6
&Select:0
&borrar:1
&click: 2
&Select:4
&borrar:5
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right

Expand All @@ -61,28 +61,28 @@ QuicklootBagLabel < UIWidget
anchors.verticalCenter: parent.verticalCenter
anchors.right: selectBag.left
margin-right: 5
&click: 6
&Select:0
&borrar:1
&click: 2
&Select:4
&borrar:5
@onClick: modules.game_quickloot.QuickLoot.clearItem(self)
Item
id: item
anchors.verticalCenter: parent.verticalCenter
anchors.right: removeBag.left
margin-right: 5
opacity: 1.0
&click: 6
&Select:0
&borrar:1
&click: 2
&Select:4
&borrar:5
@onClick: modules.game_quickloot.QuickLoot.openContainer(self)
$pressed:
opacity: 0.5

SelectBagButton
id: selectBag2
&click: 2
&Select:4
&borrar:5
&click: 6
&Select:0
&borrar:1
anchors.verticalCenter: parent.verticalCenter
anchors.right: item.left
margin-right: 5
Expand All @@ -92,18 +92,18 @@ QuicklootBagLabel < UIWidget
anchors.verticalCenter: parent.verticalCenter
anchors.right: selectBag2.left
margin-right: 5
&click: 2
&Select:4
&borrar:5
&click: 6
&Select:0
&borrar:1
@onClick: modules.game_quickloot.QuickLoot.clearItem(self)
Item
id: item2
anchors.verticalCenter: parent.verticalCenter
anchors.right: removeBag2.left
margin-right: 5
&click: 2
&Select:4
&borrar:5
&click: 6
&Select:0
&borrar:1
opacity: 1.0
@onClick: modules.game_quickloot.QuickLoot.openContainer(self)
$pressed:
Expand Down
Loading