diff --git a/data/images/game/prey/prey_smallstore.png b/data/images/game/prey/prey_smallstore.png index d9b622a8e5..539f41c9a9 100644 Binary files a/data/images/game/prey/prey_smallstore.png and b/data/images/game/prey/prey_smallstore.png differ diff --git a/data/images/game/prey/prey_smallstore_clicked.png b/data/images/game/prey/prey_smallstore_clicked.png new file mode 100644 index 0000000000..fb1b22b517 Binary files /dev/null and b/data/images/game/prey/prey_smallstore_clicked.png differ diff --git a/data/images/topbuttons/shop.png b/data/images/topbuttons/shop.png index 21d69807d8..a492a454ef 100644 Binary files a/data/images/topbuttons/shop.png and b/data/images/topbuttons/shop.png differ diff --git a/mods/game_bot/functions/const.lua b/mods/game_bot/functions/const.lua index c43757d8e9..973cebc1ab 100644 --- a/mods/game_bot/functions/const.lua +++ b/mods/game_bot/functions/const.lua @@ -23,3 +23,5 @@ context.InventorySlotAmmo = 10 context.InventorySlotPurse = 11 context.InventorySlotFirst = 1 context.InventorySlotLast = 10 + +context.GameColorizedLootValue = GameColorizedLootValue diff --git a/modules/game_actionbar/game_actionbar.lua b/modules/game_actionbar/game_actionbar.lua index 8817deb0c3..53c3536ebe 100644 --- a/modules/game_actionbar/game_actionbar.lua +++ b/modules/game_actionbar/game_actionbar.lua @@ -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() @@ -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) if item then + item:setTier(slot.getTier) g_game.equipItem(item) end end @@ -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 @@ -1135,4 +1148,4 @@ end function getPanelActionbar() return actionBar -end +end \ No newline at end of file diff --git a/modules/game_prey/prey.otui b/modules/game_prey/prey.otui index 57f2993137..9cf3ee17f6 100644 --- a/modules/game_prey/prey.otui +++ b/modules/game_prey/prey.otui @@ -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 @@ -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: @@ -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 @@ -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: @@ -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 diff --git a/modules/game_store/game_store.otui b/modules/game_store/game_store.otui index 33b186d796..f040ca90d2 100644 --- a/modules/game_store/game_store.otui +++ b/modules/game_store/game_store.otui @@ -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() diff --git a/modules/game_store/images/icon-trade.png b/modules/game_store/images/icon-trade.png index d6f008884b..e390e9184a 100644 Binary files a/modules/game_store/images/icon-trade.png and b/modules/game_store/images/icon-trade.png differ diff --git a/modules/game_store/images/iconTransfer.png b/modules/game_store/images/iconTransfer.png index 1751dc6900..ba441f03e0 100644 Binary files a/modules/game_store/images/iconTransfer.png and b/modules/game_store/images/iconTransfer.png differ diff --git a/src/client/luafunctions.cpp b/src/client/luafunctions.cpp index da42753cca..0cb94cb699 100644 --- a/src/client/luafunctions.cpp +++ b/src/client/luafunctions.cpp @@ -711,6 +711,7 @@ void Client::registerLuaFunctions() g_lua.bindClassMemberFunction("setCount", &Item::setCount); g_lua.bindClassMemberFunction("setTooltip", &Item::setTooltip); + g_lua.bindClassMemberFunction("setTier", &Item::setTier); g_lua.bindClassMemberFunction("getCount", &Item::getCount); g_lua.bindClassMemberFunction("getSubType", &Item::getSubType);