Skip to content

fix: Icon updates and equipping items via the actionbar #1119

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

Merged
mehah merged 12 commits into from
Mar 18, 2025
Merged

fix: Icon updates and equipping items via the actionbar #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
52d18c0
update icons
andreoam Mar 16, 2025
781d3b8
Merge branch 'mehah:main' into main
andreoam Mar 16, 2025
4f84016
up
andreoam Mar 15, 2025
1a44229
Prey
andreoam Mar 16, 2025
1ca3dcb
Update shop.png
andreoam Mar 16, 2025
383b38a
up
andreoam Mar 16, 2025
2a22e4a
updating suggestions
andreoam Mar 16, 2025
5ffdfb4
update actionbar
andreoam Mar 16, 2025
8b05e7a
Merge branch 'mehah:main' into main
andreoam Mar 16, 2025
70071f2
Update game_actionbar.lua
andreoam Mar 8, 2025
eeca62d
Update src/client/luafunctions.cpp
andreoam Mar 17, 2025
2f21b2d
Update mods/game_bot/functions/const.lua
andreoam Mar 17, 2025
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
Binary file modified data/images/game/prey/prey_smallstore.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/game/prey/prey_smallstore_clicked.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/topbuttons/shop.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions mods/game_bot/functions/const.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ context.InventorySlotAmmo = 10
context.InventorySlotPurse = 11
context.InventorySlotFirst = 1
context.InventorySlotLast = 10

context.GameColorizedLootValue = GameColorizedLootValue
19 changes: 16 additions & 3 deletions modules/game_actionbar/game_actionbar.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,17 @@ function terminate()
if editHotkeyWindow then
closeEditHotkeyWindow()
end
if spellsPanel then
disconnect(spellsPanel, {
onChildFocusChange = function(self, focusedChild)
if focusedChild == nil then
return
end
updatePreviewSpell(focusedChild)
end
})
end

end

function online()
Expand Down Expand Up @@ -667,8 +678,9 @@ function setupHotkeys()
elseif slot.useType == 'useOnSelf' then
modules.game_hotkeys.executeHotkeyItem(HOTKEY_USEONSELF, slot.itemId, slot.subType)
elseif slot.useType == 'equip' then
local item = g_game.findPlayerItem(slot.itemId, -1, slot.getTier)
local item = Item.create(slot.itemId)
Copy link
Copy Markdown
Contributor

@Vysius Vysius Mar 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why create instead getting from player?

Copy link
Copy Markdown
Contributor Author

@andreoam andreoam Mar 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

obter do player so estava equipando os itens em backpacks abertas, Utilizei a mesma logica do otcv8

Copy link
Copy Markdown
Contributor

@Vysius Vysius Mar 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

English please

if item then
item:setTier(slot.getTier)
g_game.equipItem(item)
end
end
Expand Down Expand Up @@ -710,8 +722,9 @@ function setupHotkeys()
elseif slot.useType == 'useOnSelf' then
modules.game_hotkeys.executeHotkeyItem(HOTKEY_USEONSELF, slot.itemId, slot.subType)
elseif slot.useType == 'equip' then
local item = g_game.findPlayerItem(slot.itemId, -1, slot.getTier)
local item = Item.create(slot.itemId)
if item then
item:setTier(slot.getTier)
g_game.equipItem(item)
end
end
Expand Down Expand Up @@ -1135,4 +1148,4 @@ end

function getPanelActionbar()
return actionBar
end
end
Copy link
Copy Markdown
Contributor

@kokekanon kokekanon Mar 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
end
end

20 changes: 11 additions & 9 deletions modules/game_prey/prey.otui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LockedPreyPanel < Panel
height: 64
background-color: #1c4161
margin-top: 3
@onClick: modules.game_shop.show()
@onClick: modules.game_mainpanel.toggleStore()

UIWidget
id: shopPermButton
Expand All @@ -23,7 +23,7 @@ LockedPreyPanel < Panel
image-source: /images/game/prey/prey_perm_test
size: 195 67
image-clip: 0 0 204 67
@onClick: modules.game_shop.show()
@onClick: modules.game_mainpanel.toggleStore()
@onHoverChange: modules.game_prey.onHover(self)

$pressed:
Expand All @@ -37,7 +37,7 @@ LockedPreyPanel < Panel
height: 64
background-color: #1c4161
margin-top: 7
@onClick: modules.game_shop.show()
@onClick: modules.game_mainpanel.toggleStore()

UIWidget
id: shopTempButton
Expand All @@ -46,7 +46,7 @@ LockedPreyPanel < Panel
image-source: /images/game/prey/prey_temp_test
size: 195 67
image-clip: 0 0 204 67
@onClick: modules.game_shop.show()
@onClick: modules.game_mainpanel.toggleStore()
@onHoverChange: modules.game_prey.onHover(self)

$pressed:
Expand Down Expand Up @@ -603,16 +603,18 @@ MainWindow
id: openStore
anchors.left: prev.right
margin-left: 10
size: 20 20
size: 26 20
anchors.verticalCenter: closeButton.verticalCenter
tooltip: Go to the Store to get more Prey Wildcards!
image-source: /images/topbuttons/shop
image-clip: 0 0 20 20
image-source: /images/game/prey/prey_smallstore
image-clip: 0 0 26 20
background-color: #17354e
@onClick: modules.game_shop.show()
@onClick: modules.game_mainpanel.toggleStore()

$pressed:
image-clip: 0 20 20 20
image-clip: 0 0 26 20
image-source: /images/game/prey/prey_smallstore_clicked
image-clip: -1 -1 27 21

PreyCreature < Panel
height: 22
Expand Down
4 changes: 2 additions & 2 deletions modules/game_store/game_store.otui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,12 @@ StoreWindow
anchors.left: prev.right
margin-left: 5
margin-bottom: 2
!tooltip: tr('get Tibia Coins')
!tooltip: tr('Get Tibia Coins')
image-color: green
icon: /images/ui/tibiaCoin
icon-align: center
icon-offset: 10 -1
text-offset: -18 0
text-offset: -10 0
!text: tr('Get')
font: cipsoftFont
@onClick: modules.game_store.getCoinsWebsite()
Expand Down
Binary file modified modules/game_store/images/icon-trade.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified modules/game_store/images/iconTransfer.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/client/luafunctions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,7 @@ void Client::registerLuaFunctions()

g_lua.bindClassMemberFunction<Item>("setCount", &Item::setCount);
g_lua.bindClassMemberFunction<Item>("setTooltip", &Item::setTooltip);
g_lua.bindClassMemberFunction<Item>("setTier", &Item::setTier);

g_lua.bindClassMemberFunction<Item>("getCount", &Item::getCount);
g_lua.bindClassMemberFunction<Item>("getSubType", &Item::getSubType);
Expand Down
Loading