metin2/server
metin2/server
2
2
Fork 10
Code Issues 12 Pull Requests 3 Packages Projects Releases Wiki Activity

WIP: Rename identifiers containing Korean words in source code #33

Draft
haydukk11 wants to merge 6 commits from haydukk11/server:no-korean-names into master
pull from: haydukk11/server:no-korean-names
merge into: metin2:master
Conversation 1 Commits 6 Files Changed 15 +8 -8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e91f9b40a1 - Show all commits

2
src/game/src/affect.h
View File

@ -152,7 +152,7 @@ enum EAffectBits
AFF_SHAMAN_HEALING_ATTACK, // 증력술
AFF_WAR_BODY_DASH, // 탄환격용 달리기어펙트
AFF_SURA_WEAPONRY_DISPEL, // 파법술
AFF_WAR_MENTAL_SWORD_STRIKE_WITH_FALL, // õ±ÙÃß
AFF_WAR_MENTAL_STRONG_BODY_WITH_FALL, // õ±ÙÃß
AFF_POLYMORPH,
AFF_WAR_FLAG1,
AFF_WAR_FLAG2,

4
src/game/src/char_affect.cpp
View File

@ -747,7 +747,7 @@ void CHARACTER::RemoveGoodAffect()
RemoveAffect(SKILL_WAR_BODY_BERSERK);
RemoveAffect(SKILL_WAR_BODY_AURA);
RemoveAffect(SKILL_WAR_MENTAL_STUMP);
RemoveAffect(SKILL_WAR_MENTAL_STRONG_BODY);
RemoveAffect(SKILL_NINJA_BLADEFIGHT_STEALTH);
RemoveAffect(SKILL_NINJA_ARCHERY_FEATHER_WALK);
RemoveAffect(SKILL_SURA_WEAPONRY_ENCHANTED_BLADE);
@ -775,7 +775,7 @@ bool CHARACTER::IsGoodAffect(BYTE bAffectType) const
case (SKILL_WAR_BODY_BERSERK):
case (SKILL_WAR_BODY_AURA):
case (SKILL_WAR_MENTAL_STUMP):
case (SKILL_WAR_MENTAL_STRONG_BODY):
case (SKILL_NINJA_BLADEFIGHT_STEALTH):
case (SKILL_NINJA_ARCHERY_FEATHER_WALK):
case (SKILL_SURA_WEAPONRY_ENCHANTED_BLADE):

10
src/game/src/char_skill.cpp
View File

@ -2280,13 +2280,13 @@ int CHARACTER::ComputeSkill(DWORD dwVnum, LPCHARACTER pkVictim, BYTE bSkillLevel
//if (g_iUseLocale)
if ( !LC_IsYMIR() )
{
if ((pkSk->dwVnum == SKILL_WAR_MENTAL_STUMP && GetUsedSkillMasterType(pkSk->dwVnum) < SKILL_GRAND_MASTER))
affact_flag = AFF_WAR_MENTAL_SWORD_STRIKE_WITH_FALL;
if ((pkSk->dwVnum == SKILL_WAR_MENTAL_STRONG_BODY && GetUsedSkillMasterType(pkSk->dwVnum) < SKILL_GRAND_MASTER))
affact_flag = AFF_WAR_MENTAL_STRONG_BODY_WITH_FALL;
}
else
{
if ((pkSk->dwVnum == SKILL_WAR_MENTAL_STUMP && GetUsedSkillMasterType(pkSk->dwVnum) < SKILL_MASTER))
affact_flag = AFF_WAR_MENTAL_SWORD_STRIKE_WITH_FALL;
if ((pkSk->dwVnum == SKILL_WAR_MENTAL_STRONG_BODY && GetUsedSkillMasterType(pkSk->dwVnum) < SKILL_MASTER))
affact_flag = AFF_WAR_MENTAL_STRONG_BODY_WITH_FALL;
}
// END_OF_ADD_GRANDMASTER_SKILL
@ -3524,7 +3524,7 @@ bool CHARACTER::CheckSkillHitCount(const BYTE SkillID, const VID TargetVID)
{
case SKILL_SURA_WEAPONRY_DRAGON_SWIRL:
case SKILL_SURA_BLACKMAGIC_FLAME_STRIKE:
case SKILL_WAR_MENTAL_STRONG_BODY:
case SKILL_WAR_MENTAL_STUMP:
case SKILL_SHAMAN_DRAGON_DRAGONS_ROAR:
SPDLOG_WARN("SkillHack: cannot use attack packet for skill({})", SkillID);
return false;