clank/rodecomp
1
0
Fork 0
Code Issues Wiki Activity

Maintenance: [forced, user-approved] Family G18: remove the Skills bundle family (ClientSkills, SkillUseLevels, SkillWindows, Compani

Browse source 
Batch #10230 by ragnarok-clanker: forced by an admin (9 lower score(s), 42 changed function(s)); checked with 339 compiled unit(s), including every includer of Source/Client/Mode/CGameMode.h, Source/Client/Session.h, Source/Contents/Skills/ClientSkills.h, Source/Contents/Skills/PlayerSkillBundle.h, Source/UI/Shortcuts/ShortcutDetails.h, Source/UI/Shortcuts/ShortcutPainting.h, Source/UI/Shortcuts/ShortcutPress.h, Source/UI/Shortcuts/UIQuickSlotWnd.h, Source/UI/UIBasicCtrl.h, Source/Network/Packets/SkillUpdatePacket.h.
Deletes: Source/Network/Packets/SkillUpdatePacket.h
This commit is contained in:
ragnarok-clanker 2026-11-03 09:49:00 +00:00
commit 9b04a3cae5
30 changed files with 147 additions and 394 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/UI/Shortcuts/UIQuickSlotWnd.cpp
View file

@ -55,7 +55,7 @@ void UIQuickSlotWnd::Slot25(int x, int y) {
QuickSlotPainting& painting = *this->m_painting;
const QuickSlotEntry entry = this->m_entries[index];
if (entry.skill) {
CSkillInfo skill = painting.skills.Lookup(entry.id);
CSkillInfo skill = g_session.LookupSkill(entry.id);
if (skill.available && skill.level) {
if (CGameMode* mode = static_cast<CGameMode*>(g_modeMgr.GetGameMode())) {
mode->drag.BeginSkill(g_windowMgr, ResourceMgr::Instance(), 16, skill.id, skill.name, entry.count, index);
@ -102,7 +102,7 @@ void UIQuickSlotWnd::Slot28(int x, int y) {
text.clear();
} else if (this->m_entries[this->m_selected].skill) {
LuaScript& script = *g_session.m_hotkeyScript;
CSkillInfo skill = painting.skills.Lookup(id);
CSkillInfo skill = g_session.LookupSkill(id);
const int level = this->m_entries[this->m_selected].count;
const int sp = skill.UseSpAmount(script, level);
const int ap = skill.UseApAmount(script, level);
@ -212,8 +212,7 @@ int UIQuickSlotWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argumen
continue;
}
ClientSkills& skills = this->m_painting->skills;
CSkillInfo skill = skills.bundle.Lookup(source.itemId, skills.classMode, skills.HasEffect(1717), skills.HasEffect(1716));
CSkillInfo skill = g_session.m_skillBundle.Lookup(source.itemId);
if (skill.available == 0) {
std::list<ShortcutCooldownRecord>& records = this->m_painting->cooldowns.records;
const auto record = std::find_if(records.begin(), records.end(), [&](const ShortcutCooldownRecord& value) { return value.id == source.itemId; });
@ -224,12 +223,12 @@ int UIQuickSlotWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argumen
}
}
skill = skills.LookupFirst(source.itemId);
skill = g_session.LookupHomunSkill(source.itemId);
if (skill.available == 0) {
skill = skills.LookupOther(source.itemId);
skill = g_session.LookupMercSkill(source.itemId);
}
if (skill.available == 0) {
skill = skills.LookupAdditional(source.itemId);
skill = g_session.LookupAdditionalSkill(source.itemId);
}
}
@ -299,7 +298,7 @@ int UIQuickSlotWnd::SendMsg(UIWindow* sender, int message, std::intptr_t argumen
return 0;
}
CSkillInfo skill = this->m_painting->skills.Lookup(entry.id);
CSkillInfo skill = g_session.LookupSkill(entry.id);
if (skill.level != 0 && skill.available != 0) {
static_cast<CMode*>(g_charViewMode)->SendMsg(0x71, reinterpret_cast<int>(&skill), entry.count, 0, 0);
}