diff --git a/data/styles/10-progressbars.otui b/data/styles/10-progressbars.otui index 2b36a00f..1946016d 100644 --- a/data/styles/10-progressbars.otui +++ b/data/styles/10-progressbars.otui @@ -8,6 +8,8 @@ ProgressBar < UIProgressBar $!on: visible: false + margin-top: 0 + margin-bottom: 0 height: 0 LifeProgressBar < UIProgressBar diff --git a/modules/game_healthinfo/healthinfo.lua b/modules/game_healthinfo/healthinfo.lua index 01b6567f..397fddcd 100644 --- a/modules/game_healthinfo/healthinfo.lua +++ b/modules/game_healthinfo/healthinfo.lua @@ -164,12 +164,27 @@ end function setHealthTooltip(tooltip) healthTooltip = tooltip + + local localPlayer = g_game.getLocalPlayer() + if localPlayer then + healthBar:setTooltip(tr(healthTooltip, localPlayer:getHealth(), localPlayer:getMaxHealth())) + end end function setManaTooltip(tooltip) manaTooltip = tooltip + + local localPlayer = g_game.getLocalPlayer() + if localPlayer then + manaBar:setTooltip(tr(manaTooltip, localPlayer:getMana(), localPlayer:getMaxMana())) + end end function setExperienceTooltip(tooltip) experienceTooltip = tooltip + + local localPlayer = g_game.getLocalPlayer() + if localPlayer then + experienceBar:setTooltip(tr(experienceTooltip, localPlayer:getLevelPercent(), localPlayer:getLevel()+1)) + end end diff --git a/modules/game_healthinfo/healthinfo.otui b/modules/game_healthinfo/healthinfo.otui index ab8830db..12e09be2 100644 --- a/modules/game_healthinfo/healthinfo.otui +++ b/modules/game_healthinfo/healthinfo.otui @@ -67,7 +67,7 @@ MiniWindow icon: /images/topbuttons/healthinfo id: healthInfoWindow !text: tr('Health Info') - height: 124 + height: 123 @onClose: modules.game_healthinfo.onMiniWindowClose() &save: true diff --git a/src/client/item.cpp b/src/client/item.cpp index cde73a60..a5438157 100644 --- a/src/client/item.cpp +++ b/src/client/item.cpp @@ -210,7 +210,7 @@ int Item::getSubType() { if(isSplash() || isFluidContainer()) return m_countOrSubType; - if(g_game.getProtocolVersion() >= 860) + if(g_game.getProtocolVersion() > 862) return 0; return 1; }