lineage2/L2Bot2.0
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: change skill updating

Browse Source
This commit is contained in:
k0t9i
2023-10-13 00:12:55 +04:00
parent ac7bde68e9
commit a7a9b626f4
3 changed files with 99 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
L2BotDll/Versions/Interlude/Factories/SkillFactory.h
View File

@@ -25,6 +25,17 @@ namespace Interlude
virtual ~SkillFactory() = default;
std::shared_ptr<Entities::Skill> Create(const uint32_t skillId, const uint32_t level, const uint32_t isActive) const
{
return std::make_shared<Entities::Skill>(BuildSkillData(skillId, level, isActive));
}
void Update(std::shared_ptr<Entities::Skill>& skill, const uint32_t skillId, const uint32_t level, const uint32_t isActive) const
{
skill->Update(BuildSkillData(skillId, level, isActive));
}
private:
const Entities::Skill::Data BuildSkillData(const uint32_t skillId, const uint32_t level, const uint32_t isActive) const
{
const auto data = m_L2GameData.GetMSData(skillId, level);
@@ -34,7 +45,7 @@ namespace Interlude
const auto description = data && data->description ? data->description : L"";
const auto iconEntry = data ? m_FName.GetEntry(data->iconNameIndex) : nullptr;
return std::make_shared<Entities::Skill>(
return {
skillId,
static_cast<uint8_t>(level),
isActive != 1,
@@ -43,10 +54,7 @@ namespace Interlude
std::wstring(name),
std::wstring(description),
iconEntry ? std::wstring(iconEntry->value) : L"",
false,
false,
false
);
};
}
private:

33
L2BotDll/Versions/Interlude/Repositories/SkillRepository.h
View File

@@ -128,18 +128,23 @@ namespace Interlude
const auto skillInfo = casted.GetSkillInfo();
const auto skillId = skillInfo[2];
auto skill = m_Factory.Create(
skillInfo[2],
skillInfo[1],
skillInfo[0]
);
if (m_Skills.find(skillId) == m_Skills.end())
{
m_Skills.emplace(skill->GetId(), skill);
auto skill = m_Factory.Create(
skillInfo[2],
skillInfo[1],
skillInfo[0]
);
m_Skills[skill->GetId()] = skill;
}
else
{
m_Skills[skillId]->Update(skill.get());
m_Factory.Update(
m_Skills[skillId],
skillInfo[2],
skillInfo[1],
skillInfo[0]
);
}
m_NewSkills[skillId] = skillId;
}
@@ -161,18 +166,18 @@ namespace Interlude
const auto& skill = m_Skills[skillId];
skill->UpdateReloadingState(true);
skill->UpdateCastingState(true);
skill->StartReloading();
skill->StartCasting();
m_UsedSkillId = skill->GetId();
m_ReloadingTimers.StartTimer(skill->GetId(), skillInfo[3], [this] (uint32_t skillId) {
std::shared_lock<std::shared_timed_mutex>(m_Mutex);
m_Skills[skillId]->UpdateReloadingState(false);
m_Skills[skillId]->StopReloading();
});
m_CastingTimers.StartTimer(skill->GetId(), skillInfo[2], [this] (uint32_t skillId) {
std::shared_lock<std::shared_timed_mutex>(m_Mutex);
m_Skills[skillId]->UpdateCastingState(false);
m_Skills[skillId]->StopCasting();
});
}
}
@@ -195,7 +200,7 @@ namespace Interlude
const auto& skill = m_Skills[m_UsedSkillId];
skill->UpdateCastingState(false);
skill->StopCasting();
m_CastingTimers.StopTimer(skill->GetId());
m_UsedSkillId = 0;
@@ -227,11 +232,11 @@ namespace Interlude
if (skill->IsToggled() && !needToToggle)
{
skill->UpdateToggle(false);
skill->ToggleOff();
}
else if (!skill->IsToggled() && needToToggle && isAura)
{
skill->UpdateToggle(true);
skill->ToggleOn();
}
}
}