diff --git a/modules/game_prey/prey.lua b/modules/game_prey/prey.lua index f6ed4f9..e86f56c 100644 --- a/modules/game_prey/prey.lua +++ b/modules/game_prey/prey.lua @@ -106,8 +106,6 @@ function onHover(widget) local desc = descriptionTable[id] if desc then preyWindow.description:setText(desc) - else - print(id) end end end @@ -209,7 +207,7 @@ function onPreyFreeRolls(slot, timeleft) if not prey then return end for i, panel in pairs({prey.active, prey.inactive}) do local progressBar = panel.reroll.button.time - local price = panel.reroll.button.price.text + local price = panel.reroll.price.text progressBar:setPercent(percent) progressBar:setText(desc) if timeleft == 0 then @@ -221,7 +219,7 @@ end local regex = [[Duration: ([^m]+)]] function onPreyTimeLeft(slot, timeleft) -- tracker - local percent = (timeleft / 2 * 60 * 60) * 100 + local percent = (timeleft / (2 * 60 * 60)) * 100 slot = "slot" .. (slot + 1) local tracker = preyTracker.contentsPanel[slot] tracker.time:setPercent(percent) @@ -240,8 +238,8 @@ function onPreyTimeLeft(slot, timeleft) -- main window local prey = preyWindow[slot] if not prey then return end - local progressbar = prey.active.creatureAndBonus.creature.timeLeft - local desc = timeleftTranslation(timeleft * 60) + local progressbar = prey.active.creatureAndBonus.timeLeft + local desc = timeleftTranslation(timeleft, true) progressbar:setPercent(percent) progressbar:setText(desc) end @@ -427,7 +425,7 @@ end function onPreyActive(slot, currentHolderName, currentHolderOutfit, bonusType, bonusValue, bonusGrade, timeLeft, timeUntilFreeReroll) local tracker = preyTracker.contentsPanel["slot"..(slot + 1)] currentHolderName = capitalFormatStr(currentHolderName) - local percent = (timeLeft / 2 * 60 * 60)*100 + local percent = (timeLeft / (2 * 60 * 60)) * 100 if tracker then tracker.creature:show() tracker.noCreature:hide() @@ -457,7 +455,7 @@ function onPreyActive(slot, currentHolderName, currentHolderOutfit, bonusType, b end setBonusGradeStars(slot, bonusGrade) creatureAndBonus.timeLeft:setPercent(percent) - creatureAndBonus.timeLeft:setText(timeleftTranslation(timeLeft, true)) + creatureAndBonus.timeLeft:setText(timeleftTranslation(timeLeft)) -- bonus reroll prey.active.choose.selectPrey.onClick = function() g_game.preyAction(slot, PREY_ACTION_BONUSREROLL, 0) diff --git a/otclient_dx.exe b/otclient_dx.exe index c651ad6..6dc4919 100644 Binary files a/otclient_dx.exe and b/otclient_dx.exe differ diff --git a/otclient_gl.exe b/otclient_gl.exe index 818778a..ed2c547 100644 Binary files a/otclient_gl.exe and b/otclient_gl.exe differ diff --git a/otclient_linux b/otclient_linux index aa3698b..ee2da4b 100644 Binary files a/otclient_linux and b/otclient_linux differ diff --git a/otclient_mac b/otclient_mac index cc1b115..3e46363 100644 Binary files a/otclient_mac and b/otclient_mac differ diff --git a/otclientv8.apk b/otclientv8.apk index c713e0f..d10ced1 100644 Binary files a/otclientv8.apk and b/otclientv8.apk differ