metin-server/m2dev-server-src
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MR-2: Auto-revert POS_FIGHTING after inactivity + Realtime character level updates + Macros removed

Browse Source
This commit is contained in:
Mind Rapist
2025-12-20 01:55:05 +02:00
parent a53600aebf
commit 47caa3e076
15 changed files with 60 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/game/char_skill.cpp
View File

@@ -148,10 +148,8 @@ void CHARACTER::SetSkillGroup(BYTE bSkillGroup)
p.skill_group = m_points.skill_group;
GetDesc()->Packet(&p, sizeof(TPacketGCChangeSkillGroup));
#ifdef FIX_REFRESH_SKILL_COOLDOWN
SkillLevelPacket();
PointsPacket();
#endif
}
int CHARACTER::ComputeCooltime(int time)
@@ -182,13 +180,11 @@ void CHARACTER::SetSkillLevel(DWORD dwVnum, BYTE bLev)
return;
}
#ifdef FIX_REFRESH_SKILL_COOLDOWN
if (dwVnum == SKILL_COMBO && (bLev == 0 || m_pSkillLevels[dwVnum].bLevel == 0) && m_bComboIndex > 0)
{
m_bComboIndex = 0;
ChatPacket(CHAT_TYPE_COMMAND, "combo %d", 0);
}
#endif
m_pSkillLevels[dwVnum].bLevel = MIN(40, bLev);
@@ -200,10 +196,8 @@ void CHARACTER::SetSkillLevel(DWORD dwVnum, BYTE bLev)
m_pSkillLevels[dwVnum].bMasterType = SKILL_MASTER;
else
{
#ifdef FIX_REFRESH_SKILL_COOLDOWN
if (bLev == 0)
ResetOneSkillCoolTime(dwVnum);
#endif
m_pSkillLevels[dwVnum].bMasterType = SKILL_NORMAL;
}
@@ -911,22 +905,18 @@ void CHARACTER::ResetSkill()
m_pSkillLevels[pair.first] = pair.second;
}
#ifdef FIX_REFRESH_SKILL_COOLDOWN
ResetSkillCoolTimes();
#endif
ComputePoints();
SkillLevelPacket();
}
#ifdef FIX_REFRESH_SKILL_COOLDOWN
void CHARACTER::ResetSkillCoolTimes()
{
for (std::map<int, TSkillUseInfo>::iterator it = m_SkillUseInfo.begin(); it != m_SkillUseInfo.end(); ++it)
ResetOneSkillCoolTime(it->first);
}
#endif
void CHARACTER::ComputePassiveSkill(DWORD dwVnum)
{
@@ -3504,9 +3494,7 @@ bool CHARACTER::ResetOneSkill(DWORD dwVnum)
m_pSkillLevels[dwVnum].bMasterType = 0;
m_pSkillLevels[dwVnum].tNextRead = 0;
#ifdef FIX_REFRESH_SKILL_COOLDOWN
ResetOneSkillCoolTime(dwVnum);
#endif
if (level > 17)
level = 17;
@@ -3521,7 +3509,6 @@ bool CHARACTER::ResetOneSkill(DWORD dwVnum)
return true;
}
#ifdef FIX_REFRESH_SKILL_COOLDOWN
void CHARACTER::ResetOneSkillCoolTime(DWORD dwVnum)
{
if (dwVnum >= SKILL_MAX_NUM)
@@ -3549,7 +3536,6 @@ void CHARACTER::ResetOneSkillCoolTime(DWORD dwVnum)
if (pkSk && IS_SET(pkSk->dwFlag, SKILL_FLAG_TOGGLE))
RemoveAffect(pkSk->dwVnum);
}
#endif
bool CHARACTER::CanUseSkill(DWORD dwSkillVnum) const
{