Skip to content

fix: skill Miniwindows in Old protocol #1477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nottinghster merged 9 commits into from
Dec 2, 2025
Merged

fix: skill Miniwindows in Old protocol #1477

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bc3f466
fix: skill Miniwindows in Old protocol
kokekanon Nov 28, 2025
8ff8c6d
.
kokekanon Nov 28, 2025
84b1826
fix skill
kokekanon Nov 28, 2025
47b6ff1
Update skills.lua
kokekanon Nov 28, 2025
a37124d
Update skills.lua
kokekanon Nov 28, 2025
4f913d0
re-run action
kokekanon Nov 28, 2025
791ca0f
.
kokekanon Nov 28, 2025
92f37b1
Update skills.lua
kokekanon Nov 28, 2025
26d5723
Merge remote-tracking branch 'upstream/main' into fix-skill
kokekanon Nov 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 27 additions & 54 deletions modules/game_skills/skills.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,15 @@ local SKILL_GROUPS = {
individual = {
'level', 'stamina', 'offlineTraining', 'magiclevel', 'skillId0', 'skillId1',
'skillId2', 'skillId3', 'skillId4', 'skillId5', 'skillId6'
},
GameAdditionalSkills = {
'skillId7', 'skillId8', 'skillId9', 'skillId10', 'skillId11', 'skillId12', 'separadorOnOffenceInfoChange'
},
GameForgeSkillStats = {
'skillId13', 'skillId14', 'skillId15'
},
GameForgeSkillStats1332 = {
'skillId16'
}
}

Expand Down Expand Up @@ -267,33 +276,18 @@ local function toggleGroupVisibility(groupName)
end

local function hideOldClientStats()
local version = g_game.getClientVersion()
if g_game.getClientVersion() >= 1412 then
return
end

setSkillGroupVisibility('offence', false)
setSkillGroupVisibility('defence', false)
setSkillGroupVisibility('misc', false)

local function hideUnnamedSeparators(widget)
if not widget then return end

local children = widget:getChildren()
for _, child in pairs(children) do
if child:getClassName() == 'HorizontalSeparator' and (not child:getId() or child:getId() == '') then
child:setVisible(false)
elseif child:getClassName() == 'UIWidget' and (not child:getId() or child:getId() == '') then
local childHeight = child:getHeight()
local childChildrenCount = #child:getChildren()
if childHeight <= 15 and childChildrenCount == 0 then
child:setVisible(false)
end
end
hideUnnamedSeparators(child)
end
end

hideUnnamedSeparators(skillsWindow)
setSkillGroupVisibility('misc', false)
setSkillGroupVisibility('GameAdditionalSkills', g_game.getFeature(GameAdditionalSkills))
setSkillGroupVisibility('GameForgeSkillStats', g_game.getFeature(GameForgeSkillStats))
setSkillGroupVisibility('GameForgeSkillStats1332', g_game.getFeature(GameForgeSkillStats1332) and version >= 1332)
end

local function hideMenuOptionsForOldClients(menu)
Expand Down Expand Up @@ -743,7 +737,7 @@ function online()
skillsWindow:setupOnStart()
setupUIButtons()
refresh()

hideOldClientStats()
if g_game.getFeature(GameEnterGameShowAppearance) then
skillsWindow:recursiveGetChildById('regenerationTime'):getChildByIndex(1):setText('Food')
skillsWindow:recursiveGetChildById('experience'):getChildByIndex(1):setText('XP')
Expand All @@ -760,10 +754,7 @@ function online()
if sepDefense and sepDefense:isVisible() then
sepDefense:setVisible(false)
end
local sepOffence = skillsWindow:recursiveGetChildById('separadorOnOffenceInfoChange')
if sepOffence and sepOffence:isVisible() then
sepOffence:setVisible(false)
end


local lockButton = skillsWindow:recursiveGetChildById('lockButton')
local contextMenuButton = skillsWindow:recursiveGetChildById('contextMenuButton')
Expand All @@ -790,6 +781,7 @@ function refresh()

if expSpeedEvent then
expSpeedEvent:cancel()
expSpeedEvent = nil
end
expSpeedEvent = cycleEvent(checkExpSpeed, 30 * 1000)

Expand All @@ -805,41 +797,23 @@ function refresh()
onRegenerationChange(player, player:getRegenerationTime())
onSpeedChange(player, player:getSpeed())

local hasAdditionalSkills = g_game.getFeature(GameAdditionalSkills)
for i = Skill.Fist, Skill.Transcendence do
onSkillChange(player, i, player:getSkillLevel(i), player:getSkillLevelPercent(i))

if i > Skill.Fishing then
local ativedAdditionalSkills = hasAdditionalSkills
if ativedAdditionalSkills then
if g_game.getClientVersion() >= 1281 then
if i == Skill.LifeLeechAmount or i == Skill.ManaLeechAmount then
ativedAdditionalSkills = false
elseif g_game.getClientVersion() < 1332 and Skill.Transcendence then
ativedAdditionalSkills = false
elseif i >= Skill.Fatal and player:getSkillLevel(i) <= 0 then
ativedAdditionalSkills = false
end
elseif g_game.getClientVersion() < 1281 and i >= Skill.Fatal then
ativedAdditionalSkills = false
end
end
toggleSkill('skillId' .. i, ativedAdditionalSkills)
end
end

update()
updateHeight()
hideOldClientStats()
loadSkillsVisibilitySettings()
-- Always show default Offence, Defence, and Misc stats when loading window
onFlatDamageHealingChange(player, statsCache.flatDamageHealing)
onAttackInfoChange(player, statsCache.attackValue, statsCache.attackElement)
onConvertedDamageChange(player, statsCache.convertedDamage, statsCache.convertedElement)
onImbuementsChange(player, statsCache.lifeLeech, statsCache.manaLeech, statsCache.critChance, statsCache.critDamage, statsCache.onslaught)
onDefenseInfoChange(player, statsCache.defense, statsCache.armor, statsCache.mitigation, statsCache.dodge, statsCache.damageReflection)
onCombatAbsorbValuesChange(player, statsCache.combatAbsorbValues)
onForgeBonusesChange(player, statsCache.momentum, statsCache.transcendence, statsCache.amplification)
if g_game.getClientVersion() >= 1412 then
-- Always show default Offence, Defence, and Misc stats when loading window
onFlatDamageHealingChange(player, statsCache.flatDamageHealing)
onAttackInfoChange(player, statsCache.attackValue, statsCache.attackElement)
onConvertedDamageChange(player, statsCache.convertedDamage, statsCache.convertedElement)
onImbuementsChange(player, statsCache.lifeLeech, statsCache.manaLeech, statsCache.critChance, statsCache.critDamage, statsCache.onslaught)
onDefenseInfoChange(player, statsCache.defense, statsCache.armor, statsCache.mitigation, statsCache.dodge, statsCache.damageReflection)
onCombatAbsorbValuesChange(player, statsCache.combatAbsorbValues)
onForgeBonusesChange(player, statsCache.momentum, statsCache.transcendence, statsCache.amplification)
end
end

function loadSkillsVisibilitySettings()
Expand Down Expand Up @@ -1413,7 +1387,6 @@ function onImbuementsChange(localPlayer, lifeLeech, manaLeech, critChance, critD
critDamage = "You get +1% of the damage dealt as mana",
onslaught = "You get +1% of the damage dealt as hit points"
}

skillsWindow:recursiveGetChildById("criticalHit"):setVisible(true)
setSkillValueWithTooltips('lifeLeech', lifeLeech, tooltips.lifeLeech, true)
setSkillValueWithTooltips('manaLeech', manaLeech, tooltips.manaLeech, true)
Expand Down