Bug fixes for preys and imbuing

This commit is contained in:
OTCv8
2020-03-15 00:12:12 +01:00
parent 304e2f02ae
commit b471981601
11 changed files with 11 additions and 19 deletions

View File

@@ -32,20 +32,21 @@ function init()
groupsCombo.onOptionChange = function(widget)
imbueLevelsCombo:clear()
if itemImbuements ~= nil then
local selectedGroup = widget:getCurrentOption()["text"]
selectedImbue = itemImbuements[widget.currentIndex]
local selectedGroup = groupsCombo:getCurrentOption().text
for _,imbuement in ipairs(itemImbuements) do
if imbuement["group"] == selectedGroup then
emptyImbue.imbuement:addOption(imbuement["name"])
emptyImbue.imbuement:addOption(imbuement["name"])
end
end
imbueLevelsCombo.onOptionChange(imbueLevelsCombo) -- update options
end
end
imbueLevelsCombo.onOptionChange = function(widget)
setProtection(false)
local selectedGroup = groupsCombo:getCurrentOption().text
for _,imbuement in ipairs(itemImbuements) do
if imbuement["group"] == selectedImbue["group"] then
if imbuement["group"] == selectedGroup then
if #imbuement["sources"] == widget.currentIndex then
selectedImbue = imbuement
for i,source in ipairs(imbuement["sources"]) do

View File

@@ -868,9 +868,6 @@ function refreshViewMode()
gameMapPanel:setMarginLeft(0)
gameMapPanel:setMarginRight(0)
gameMapPanel:setMarginTop(0)
if modules.game_textmessage then
modules.game_textmessage.messagesPanel:setMarginTop(0)
end
else
gameLeftPanels:setMarginTop(modules.client_topmenu.getTopMenu():getHeight() - gameLeftPanels:getPaddingTop())
gameRightPanels:setMarginTop(modules.client_topmenu.getTopMenu():getHeight() - gameRightPanels:getPaddingTop())
@@ -954,11 +951,7 @@ function updateSize()
gameMapPanel:setMarginLeft(margin)
gameMapPanel:setMarginRight(margin)
end
if modules.game_textmessage then
modules.game_textmessage.messagesPanel:setMarginTop(-gameMapPanel:getMarginTop())
end
if modules.game_bot then
for i, child in ipairs(gameMapPanel:getChildren()) do
if child.botIcon and child.onGeometryChange then

View File

@@ -129,6 +129,7 @@ function show()
end
preyWindow:show()
preyWindow:raise()
preyWindow:focus()
g_game.preyRequest() -- update preys
end

View File

@@ -8,7 +8,6 @@ TextMessageLabel < UILabel
Panel
anchors.fill: gameMapPanel
anchors.bottom: gameBottomPanel.top
focusable: false
Panel

View File

@@ -131,10 +131,6 @@ function ProtocolLogin:sendLoginPacket()
msg:encryptRsa()
end
if g_game.getFeature(GamePacketSizeU32) then
self:enableBigPackets()
end
if g_game.getFeature(GameProtocolChecksum) then
self:enableChecksum()
end