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 +47 -47
9 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6fe53c2f76 - Show all commits

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

@ -133,26 +133,26 @@ enum EAffectBits
AFF_FISH_MIND, AFF_FISH_MIND,
AFF_JEONGWIHON, // 전귀혼 AFF_WAR_BODY_BERSERK, // 전귀혼
AFF_GEOMGYEONG, // 검경 AFF_WAR_BODY_AURA, // 검경
AFF_CHEONGEUN, // 천근추 AFF_WAR_MENTAL_STRONG_BODY, // 천근추
AFF_GYEONGGONG, // 경공술 AFF_NINJA_ARCHERY_FEATHER_WALK, // 경공술
AFF_EUNHYUNG, // 은형법 AFF_NINJA_BLADEFIGHT_DISGUISE, // 은형법
AFF_GWIGUM, // 귀검 AFF_SURA_WEAPONRY_ENCHANTED_BLADE, // 귀검
AFF_TERROR, // 공포 AFF_SURA_WEAPONRY_FEAR, // 공포
AFF_JUMAGAP, // 주마갑 AFF_SURA_WEAPONRY_ENCHANTED_ARMOUR, // 주마갑
AFF_HOSIN, // 호신 AFF_SHAMAN_DRAGON_BLESSING, // 호신
AFF_BOHO, // 보호 AFF_SHAMAN_DRAGON_REFLECT, // 보호
AFF_KWAESOK, // 쾌속 AFF_SHAMAN_HEALING_SWIFTNESS, // 쾌속
AFF_MANASHIELD, // 마나쉴드 AFF_SURA_BLACKMAGIC_DARK_PROTECTION, // 마나쉴드
AFF_MUYEONG, // 무영진 affect AFF_SURA_BLACKMAGIC_FLAME_SPIRIT, // 무영진 affect
AFF_REVIVE_INVISIBLE, // 부활시 잠시동안 무적 AFF_REVIVE_INVISIBLE, // 부활시 잠시동안 무적
AFF_FIRE, // 지속 불 데미지 AFF_FIRE, // 지속 불 데미지
AFF_GICHEON, // 기천대공 AFF_SHAMAN_DRAGON_DRAGONS_AID, // 기천대공
AFF_JEUNGRYEOK, // 증력술 AFF_SHAMAN_HEALING_ATTACK, // 증력술
AFF_TANHWAN_DASH, // 탄환격용 달리기어펙트 AFF_WAR_BODY_DASH, // 탄환격용 달리기어펙트
AFF_PABEOP, // 파법술 AFF_SURA_WEAPONRY_DISPEL, // 파법술
AFF_CHEONGEUN_WITH_FALL, // 천근추 AFF_WAR_MENTAL_SWORD_STRIKE_WITH_FALL, // 천근추
AFF_POLYMORPH, AFF_POLYMORPH,
AFF_WAR_FLAG1, AFF_WAR_FLAG1,
AFF_WAR_FLAG2, AFF_WAR_FLAG2,

2
src/game/src/char.cpp
View File

@ -4804,7 +4804,7 @@ void CHARACTER::OnMove(bool bIsAttack)
if (IsAffectFlag(AFF_REVIVE_INVISIBLE)) if (IsAffectFlag(AFF_REVIVE_INVISIBLE))
RemoveAffect(AFFECT_REVIVE_INVISIBLE); RemoveAffect(AFFECT_REVIVE_INVISIBLE);
if (IsAffectFlag(AFF_EUNHYUNG)) if (IsAffectFlag(AFF_NINJA_BLADEFIGHT_DISGUISE))
{ {
RemoveAffect(SKILL_NINJA_BLADEFIGHT_DISGUISE); RemoveAffect(SKILL_NINJA_BLADEFIGHT_DISGUISE);
SetAffectedEunhyung(); SetAffectedEunhyung();

20
src/game/src/char_battle.cpp
View File

@ -1659,7 +1659,7 @@ bool CHARACTER::Damage(LPCHARACTER pAttacker, int dam, EDamageType type) // retu
// 평타가 아닐 때는 공포 처리 // 평타가 아닐 때는 공포 처리
if (type != DAMAGE_TYPE_NORMAL && type != DAMAGE_TYPE_NORMAL_RANGE) if (type != DAMAGE_TYPE_NORMAL && type != DAMAGE_TYPE_NORMAL_RANGE)
{ {
if (IsAffectFlag(AFF_TERROR)) if (IsAffectFlag(AFF_SURA_WEAPONRY_FEAR))
{ {
int pct = GetSkillPower(SKILL_SURA_WEAPONRY_FEAR) / 400; int pct = GetSkillPower(SKILL_SURA_WEAPONRY_FEAR) / 400;
@ -1722,9 +1722,9 @@ bool CHARACTER::Damage(LPCHARACTER pAttacker, int dam, EDamageType type) // retu
dam *= 2; dam *= 2;
EffectPacket(SE_CRITICAL); EffectPacket(SE_CRITICAL);
if (IsAffectFlag(AFF_MANASHIELD)) if (IsAffectFlag(AFF_SURA_BLACKMAGIC_DARK_PROTECTION))
{ {
RemoveAffect(AFF_MANASHIELD); RemoveAffect(AFF_SURA_BLACKMAGIC_DARK_PROTECTION);
} }
} }
} }
@ -1772,9 +1772,9 @@ bool CHARACTER::Damage(LPCHARACTER pAttacker, int dam, EDamageType type) // retu
dam += GetPoint(POINT_DEF_GRADE) * (100 + GetPoint(POINT_DEF_BONUS)) / 100; dam += GetPoint(POINT_DEF_GRADE) * (100 + GetPoint(POINT_DEF_BONUS)) / 100;
if (IsAffectFlag(AFF_MANASHIELD)) if (IsAffectFlag(AFF_SURA_BLACKMAGIC_DARK_PROTECTION))
{ {
RemoveAffect(AFF_MANASHIELD); RemoveAffect(AFF_SURA_BLACKMAGIC_DARK_PROTECTION);
} }
} }
} }
@ -1816,13 +1816,13 @@ bool CHARACTER::Damage(LPCHARACTER pAttacker, int dam, EDamageType type) // retu
} }
} }
if (IsAffectFlag(AFF_JEONGWIHON)) if (IsAffectFlag(AFF_WAR_BODY_BERSERK))
dam = (int) (dam * (100 + GetSkillPower(SKILL_WAR_BODY_BERSERK) * 25 / 100) / 100); dam = (int) (dam * (100 + GetSkillPower(SKILL_WAR_BODY_BERSERK) * 25 / 100) / 100);
if (IsAffectFlag(AFF_TERROR)) if (IsAffectFlag(AFF_SURA_WEAPONRY_FEAR))
dam = (int) (dam * (95 - GetSkillPower(SKILL_SURA_WEAPONRY_FEAR) / 5) / 100); dam = (int) (dam * (95 - GetSkillPower(SKILL_SURA_WEAPONRY_FEAR) / 5) / 100);
if (IsAffectFlag(AFF_HOSIN)) if (IsAffectFlag(AFF_SHAMAN_DRAGON_BLESSING))
dam = dam * (100 - GetPoint(POINT_RESIST_NORMAL_DAMAGE)) / 100; dam = dam * (100 - GetPoint(POINT_RESIST_NORMAL_DAMAGE)) / 100;
// //
@ -2022,7 +2022,7 @@ bool CHARACTER::Damage(LPCHARACTER pAttacker, int dam, EDamageType type) // retu
// //
// 마나쉴드(흑신수호) // 마나쉴드(흑신수호)
// //
if (IsAffectFlag(AFF_MANASHIELD)) if (IsAffectFlag(AFF_SURA_BLACKMAGIC_DARK_PROTECTION))
{ {
// POINT_MANASHIELD 는 작아질수록 좋다 // POINT_MANASHIELD 는 작아질수록 좋다
int iDamageSPPart = dam / 3; int iDamageSPPart = dam / 3;
@ -3186,7 +3186,7 @@ LPCHARACTER CHARACTER::GetNearestVictim(LPCHARACTER pkChr)
if (!pAttacker) if (!pAttacker)
continue; continue;
if (pAttacker->IsAffectFlag(AFF_EUNHYUNG) || if (pAttacker->IsAffectFlag(AFF_NINJA_BLADEFIGHT_DISGUISE) ||
pAttacker->IsAffectFlag(AFF_INVISIBILITY) || pAttacker->IsAffectFlag(AFF_INVISIBILITY) ||
pAttacker->IsAffectFlag(AFF_REVIVE_INVISIBLE)) pAttacker->IsAffectFlag(AFF_REVIVE_INVISIBLE))
continue; continue;

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

@ -477,10 +477,10 @@ void CHARACTER::SetWear(BYTE bCell, LPITEM item)
if (!item && bCell == WEAR_WEAPON) if (!item && bCell == WEAR_WEAPON)
{ {
// 귀검 사용 시 벗는 것이라면 효과를 없애야 한다. // 귀검 사용 시 벗는 것이라면 효과를 없애야 한다.
if (IsAffectFlag(AFF_GWIGUM)) if (IsAffectFlag(AFF_SURA_WEAPONRY_ENCHANTED_BLADE))
RemoveAffect(SKILL_SURA_WEAPONRY_ENCHANTED_BLADE); RemoveAffect(SKILL_SURA_WEAPONRY_ENCHANTED_BLADE);
if (IsAffectFlag(AFF_GEOMGYEONG)) if (IsAffectFlag(AFF_WAR_BODY_AURA))
RemoveAffect(SKILL_WAR_BODY_AURA); RemoveAffect(SKILL_WAR_BODY_AURA);
} }
} }

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

@ -1400,7 +1400,7 @@ struct FuncSplashDamage
if (Random::get(1, 100) <= iAmount2) if (Random::get(1, 100) <= iAmount2)
{ {
pkChrVictim->RemoveGoodAffect(); pkChrVictim->RemoveGoodAffect();
pkChrVictim->AddAffect(m_pkSk->dwVnum, POINT_NONE, 0, AFF_PABEOP, iDur2, 0, true); pkChrVictim->AddAffect(m_pkSk->dwVnum, POINT_NONE, 0, AFF_SURA_WEAPONRY_DISPEL, iDur2, 0, true);
} }
} }
@ -1999,7 +1999,7 @@ int CHARACTER::ComputeSkill(DWORD dwVnum, LPCHARACTER pkVictim, BYTE bSkillLevel
} }
} }
if (pkVictim->IsAffectFlag(AFF_PABEOP) && pkVictim->IsGoodAffect(dwVnum)) if (pkVictim->IsAffectFlag(AFF_SURA_WEAPONRY_DISPEL) && pkVictim->IsGoodAffect(dwVnum))
{ {
return BATTLE_NONE; return BATTLE_NONE;
} }
@ -2233,7 +2233,7 @@ int CHARACTER::ComputeSkill(DWORD dwVnum, LPCHARACTER pkVictim, BYTE bSkillLevel
if (pkVictim == this) if (pkVictim == this)
AddAffect(dwVnum, AddAffect(dwVnum,
POINT_NONE, 0, POINT_NONE, 0,
AFF_MUYEONG, AFF_SURA_BLACKMAGIC_FLAME_SPIRIT,
iDur, iDur,
(int) pkSk->kDurationSPCostPoly.Eval(), (int) pkSk->kDurationSPCostPoly.Eval(),
true); true);
@ -2281,12 +2281,12 @@ int CHARACTER::ComputeSkill(DWORD dwVnum, LPCHARACTER pkVictim, BYTE bSkillLevel
if ( !LC_IsYMIR() ) if ( !LC_IsYMIR() )
{ {
if ((pkSk->dwVnum == SKILL_WAR_MENTAL_SWORD_STRIKE && GetUsedSkillMasterType(pkSk->dwVnum) < SKILL_GRAND_MASTER)) if ((pkSk->dwVnum == SKILL_WAR_MENTAL_SWORD_STRIKE && GetUsedSkillMasterType(pkSk->dwVnum) < SKILL_GRAND_MASTER))
affact_flag = AFF_CHEONGEUN_WITH_FALL; affact_flag = AFF_WAR_MENTAL_SWORD_STRIKE_WITH_FALL;
} }
else else
{ {
if ((pkSk->dwVnum == SKILL_WAR_MENTAL_SWORD_STRIKE && GetUsedSkillMasterType(pkSk->dwVnum) < SKILL_MASTER)) if ((pkSk->dwVnum == SKILL_WAR_MENTAL_SWORD_STRIKE && GetUsedSkillMasterType(pkSk->dwVnum) < SKILL_MASTER))
affact_flag = AFF_CHEONGEUN_WITH_FALL; affact_flag = AFF_WAR_MENTAL_SWORD_STRIKE_WITH_FALL;
} }
// END_OF_ADD_GRANDMASTER_SKILL // END_OF_ADD_GRANDMASTER_SKILL
@ -2336,7 +2336,7 @@ int CHARACTER::ComputeSkill(DWORD dwVnum, LPCHARACTER pkVictim, BYTE bSkillLevel
iDur2 += GetPoint(POINT_PARTY_BUFFER_BONUS); iDur2 += GetPoint(POINT_PARTY_BUFFER_BONUS);
if (pkSk->IsChargeSkill()) if (pkSk->IsChargeSkill())
pkVictim->AddAffect(pkSk->dwVnum, pkSk->bPointOn2, iAmount2, AFF_TANHWAN_DASH, iDur2, 0, false); pkVictim->AddAffect(pkSk->dwVnum, pkSk->bPointOn2, iAmount2, AFF_WAR_BODY_DASH, iDur2, 0, false);
else else
pkVictim->AddAffect(pkSk->dwVnum, pkSk->bPointOn2, iAmount2, pkSk->dwAffectFlag2, iDur2, 0, false); pkVictim->AddAffect(pkSk->dwVnum, pkSk->bPointOn2, iAmount2, pkSk->dwAffectFlag2, iDur2, 0, false);
} }
@ -2462,12 +2462,12 @@ bool CHARACTER::UseSkill(DWORD dwVnum, LPCHARACTER pkVictim, bool bUseGrandMaste
if (pkSk->IsChargeSkill()) if (pkSk->IsChargeSkill())
{ {
if (IsAffectFlag(AFF_TANHWAN_DASH) || pkVictim && pkVictim != this) if (IsAffectFlag(AFF_WAR_BODY_DASH) || pkVictim && pkVictim != this)
{ {
if (!pkVictim) if (!pkVictim)
return false; return false;
if (!IsAffectFlag(AFF_TANHWAN_DASH)) if (!IsAffectFlag(AFF_WAR_BODY_DASH))
{ {
if (!UseSkill(dwVnum, this)) if (!UseSkill(dwVnum, this))
return false; return false;
@ -2568,7 +2568,7 @@ bool CHARACTER::UseSkill(DWORD dwVnum, LPCHARACTER pkVictim, bool bUseGrandMaste
if (IS_SET(pkSk->dwFlag, SKILL_FLAG_SELFONLY)) if (IS_SET(pkSk->dwFlag, SKILL_FLAG_SELFONLY))
pkVictim = this; pkVictim = this;
if (pkSk->dwVnum == SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT || pkSk->IsChargeSkill() && !IsAffectFlag(AFF_TANHWAN_DASH) && !pkVictim) if (pkSk->dwVnum == SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT || pkSk->IsChargeSkill() && !IsAffectFlag(AFF_WAR_BODY_DASH) && !pkVictim)
{ {
// 처음 사용하는 무영진은 자신에게 Affect를 붙인다. // 처음 사용하는 무영진은 자신에게 Affect를 붙인다.
pkVictim = this; pkVictim = this;
@ -2702,7 +2702,7 @@ EVENTFUNC(skill_muyoung_event)
return 0; return 0;
} }
if (!ch->IsAffectFlag(AFF_MUYEONG)) if (!ch->IsAffectFlag(AFF_SURA_BLACKMAGIC_FLAME_SPIRIT))
{ {
ch->StopMuyeongEvent(); ch->StopMuyeongEvent();
return 0; return 0;

2
src/game/src/char_state.cpp
View File

@ -197,7 +197,7 @@ namespace
if (pkChr->IsDead()) if (pkChr->IsDead())
return; return;
if (pkChr->IsAffectFlag(AFF_EUNHYUNG) || if (pkChr->IsAffectFlag(AFF_NINJA_BLADEFIGHT_DISGUISE) ||
pkChr->IsAffectFlag(AFF_INVISIBILITY) || pkChr->IsAffectFlag(AFF_INVISIBILITY) ||
pkChr->IsAffectFlag(AFF_REVIVE_INVISIBLE)) pkChr->IsAffectFlag(AFF_REVIVE_INVISIBLE))
return; return;

2
src/game/src/guild.cpp
View File

@ -1273,7 +1273,7 @@ void CGuild::UseSkill(DWORD dwVnum, LPCHARACTER ch, DWORD pid)
if (ch->IsAffectFlag(AFF_REVIVE_INVISIBLE)) if (ch->IsAffectFlag(AFF_REVIVE_INVISIBLE))
ch->RemoveAffect(AFFECT_REVIVE_INVISIBLE); ch->RemoveAffect(AFFECT_REVIVE_INVISIBLE);
if (ch->IsAffectFlag(AFF_EUNHYUNG)) if (ch->IsAffectFlag(AFF_NINJA_BLADEFIGHT_DISGUISE))
ch->RemoveAffect(SKILL_NINJA_BLADEFIGHT_DISGUISE); ch->RemoveAffect(SKILL_NINJA_BLADEFIGHT_DISGUISE);
double k =1.0*m_data.abySkill[dwRealVnum]/pkSk->bMaxLevel; double k =1.0*m_data.abySkill[dwRealVnum]/pkSk->bMaxLevel;

4
src/game/src/skill.h
View File

@ -57,9 +57,9 @@ enum ESkillIndexes
// A // A
SKILL_WAR_MENTAL_BASH = 16, // 기공참 SKILL_WAR_MENTAL_BASH = 16, // 기공참
SKILL_WAR_MENTAL_POUNDING, // 격산타우 SKILL_WAR_MENTAL_POUNDING, // 격산타우
SKILL_WAR_MENTAL_STRONG_BODY, // 대진각 SKILL_WAR_MENTAL_SWORD_STRIKE, // 대진각
// S // S
SKILL_WAR_MENTAL_SWORD_STRIKE, // 천근추 SKILL_WAR_MENTAL_STRONG_BODY, // 천근추
SKILL_WAR_MENTAL_AMBUSH, // 검풍 SKILL_WAR_MENTAL_AMBUSH, // 검풍
// 자객 암살 계열 // 자객 암살 계열

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

@ -95,12 +95,12 @@ class FuncFindMobVictim
if (pkChr->IsDead()) if (pkChr->IsDead())
return false; return false;
if (pkChr->IsAffectFlag(AFF_EUNHYUNG) || if (pkChr->IsAffectFlag(AFF_NINJA_BLADEFIGHT_DISGUISE) ||
pkChr->IsAffectFlag(AFF_INVISIBILITY) || pkChr->IsAffectFlag(AFF_INVISIBILITY) ||
pkChr->IsAffectFlag(AFF_REVIVE_INVISIBLE)) pkChr->IsAffectFlag(AFF_REVIVE_INVISIBLE))
return false; return false;
if (pkChr->IsAffectFlag(AFF_TERROR) && m_pkChr->IsImmune(IMMUNE_TERROR) == false ) // 傍器 贸府 if (pkChr->IsAffectFlag(AFF_SURA_WEAPONRY_FEAR) && m_pkChr->IsImmune(IMMUNE_TERROR) == false ) // 傍器 贸府
{ {
if ( pkChr->GetLevel() >= m_pkChr->GetLevel() ) if ( pkChr->GetLevel() >= m_pkChr->GetLevel() )
return false; return false;