diff --git a/modules/game_bot/default_config/icons.lua b/modules/game_bot/default_config/icons.lua index 396bef1..a0e7857 100644 --- a/modules/game_bot/default_config/icons.lua +++ b/modules/game_bot/default_config/icons.lua @@ -3,7 +3,7 @@ addIcon("dancing", {outfit={mount=0,feet=0,legs=0,body=176,type=128,auxType=0,addons=3,head=48}, hotkey="F5", text="dance"}, macro(100, "dance", function() turn(math.random(0,3)) end)) - +--[[ addIcon("ctrl", {outfit={mount=0,feet=10,legs=10,body=176,type=129,auxType=0,addons=3,head=48}, text="press ctrl to move icon"}, function(widget, enabled) if enabled then info("icon on") @@ -36,3 +36,4 @@ addIcon("text", {text="text\nonly\nicon", switchable=true}, function(widget, ena info("icon with text clicked") end) +]]-- \ No newline at end of file diff --git a/modules/game_bot/functions/map.lua b/modules/game_bot/functions/map.lua index eddd98a..e1bd6a0 100644 --- a/modules/game_bot/functions/map.lua +++ b/modules/game_bot/functions/map.lua @@ -142,7 +142,6 @@ context.findPath = function(startPos, destPos, maxDist, params) if math.abs(x) >= marginMin or math.abs(y) >= marginMin then local dest = (destPos.x + x) .. "," .. (destPos.y + y) .. "," .. destPos.z local node = paths[dest] - print(node) if node and (not bestCandidate or bestCandidate[1] > node[1]) then bestCandidate = node bestCandidatePos = dest diff --git a/modules/game_bot/functions/ui.lua b/modules/game_bot/functions/ui.lua index 31201d4..7b7c568 100644 --- a/modules/game_bot/functions/ui.lua +++ b/modules/game_bot/functions/ui.lua @@ -17,11 +17,10 @@ context.addTab = function(name) context.tabs:setOn(true) local newTab = context.tabs:addTab(name, g_ui.createWidget('BotPanel')).tabPanel.content - print(#(context.tabs.tabs)) if #(context.tabs.tabs) > 5 then for k,tab in pairs(context.tabs.tabs) do tab:setPadding(3) - tab:setFont('cipsoftFont') + tab:setFont('small-9px') end end diff --git a/modules/game_shop/shop.lua b/modules/game_shop/shop.lua index 2d615ae..2b0dc83 100644 --- a/modules/game_shop/shop.lua +++ b/modules/game_shop/shop.lua @@ -144,7 +144,7 @@ function onStoreInit(url, coins) end function onStoreCategories(categories) - if otcv8shop then return end + if not shop or otcv8shop then return end local correctCategories = {} for i, category in ipairs(categories) do table.insert(correctCategories, { @@ -158,7 +158,7 @@ function onStoreCategories(categories) end function onStoreOffers(categoryName, offers) - if otcv8shop then return end + if not shop or otcv8shop then return end local updated = false for i, category in ipairs(CATEGORIES) do @@ -197,7 +197,7 @@ function onStoreOffers(categoryName, offers) end function onStoreTransactionHistory(currentPage, hasNextPage, offers) - if otcv8shop then return end + if not shop or otcv8shop then return end HISTORY = {} for i, offer in ipairs(offers) do table.insert(HISTORY, { @@ -219,16 +219,17 @@ function onStoreTransactionHistory(currentPage, hasNextPage, offers) end function onStorePurchase(message) - if otcv8shop then return end + if not shop or otcv8shop then return end processMessage({title="Successful shop purchase", msg=message}) end function onStoreError(errorType, message) - if otcv8shop then return end + if not shop or otcv8shop then return end processMessage({title="Shop error", msg=message}) end function onCoinBalance(coins, transferableCoins) + if not shop or otcv8shop then return end shop.infoPanel.points:setText(tr("Points:") .. " " .. coins) shop.infoPanel.buy:hide() shop.infoPanel:setHeight(20) @@ -461,6 +462,8 @@ function addOffer(category, data) if category ~= 0 then offer.onDoubleClick = buyOffer offer.buyButton.onClick = function() buyOffer(offer) end + else + offer.buyButton:hide() end end