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

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

@ -159,7 +159,7 @@ void CHARACTER::Initialize()
m_pkChrTarget = NULL;
m_pkMuyeongEvent = NULL;
m_pkFlameSpiritEvent = NULL;
m_pkWarpNPCEvent = NULL;
m_pkDeadEvent = NULL;
@ -490,7 +490,7 @@ void CHARACTER::Destroy()
m_set_pkChrSpawnedBy.clear();
StopMuyeongEvent();
StopFlameSpiritEvent();
event_cancel(&m_pkWarpNPCEvent);
event_cancel(&m_pkRecoveryEvent);
event_cancel(&m_pkDeadEvent);
@ -3432,7 +3432,7 @@ void CHARACTER::PointChange(BYTE type, int amount, bool bAmount, bool bBroadcast
case POINT_KILL_HP_RECOVERY: // 75
case POINT_HIT_HP_RECOVERY:
case POINT_HIT_SP_RECOVERY:
case POINT_MANASHIELD:
case POINT_DARK_PROTECTION:
case POINT_ATT_BONUS:
case POINT_DEF_BONUS:
case POINT_SKILL_DAMAGE_BONUS:
@ -4807,11 +4807,11 @@ void CHARACTER::OnMove(bool bIsAttack)
if (IsAffectFlag(AFF_NINJA_BLADEFIGHT_DISGUISE))
{
RemoveAffect(SKILL_NINJA_BLADEFIGHT_DISGUISE);
SetAffectedEunhyung();
SetAffectedDisguise();
}
else
{
ClearAffectedEunhyung();
ClearAffectedDisguise();
}
/*if (IsAffectFlag(AFF_JEONSIN))

24
src/game/src/char.h
View File

@ -75,7 +75,7 @@ enum
FLY_FIREWORK_CHRISTMAS,
FLY_CHAIN_LIGHTNING,
FLY_HP_SMALL,
FLY_SKILL_MUYEONG,
FLY_SKILL_FLAME_SPIRIT,
};
enum EDamageType
@ -225,7 +225,7 @@ enum EPointTypes
POINT_HIT_HP_RECOVERY, // 100
POINT_HIT_SP_RECOVERY, // 101
POINT_MANASHIELD, // 102 흑신수호 스킬에 의한 마나쉴드 효과 정도
POINT_DARK_PROTECTION, // 102 흑신수호 스킬에 의한 마나쉴드 효과 정도
POINT_PARTY_BUFFER_BONUS, // 103
POINT_PARTY_SKILL_MASTER_BONUS, // 104
@ -1414,15 +1414,15 @@ class CHARACTER : public CEntity, public CFSM, public CHorseRider
DWORD m_adwMobSkillCooltime[MOB_SKILL_MAX_NUM];
// END_OF_MOB_SKILL
// for SKILL_MUYEONG
// for SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT
public:
void StartMuyeongEvent();
void StopMuyeongEvent();
void StartFlameSpiritEvent();
void StopFlameSpiritEvent();
private:
LPEVENT m_pkMuyeongEvent;
LPEVENT m_pkFlameSpiritEvent;
// for SKILL_CHAIN lighting
// for SKILL_SHAMAN_HEALING_LIGHTNING_CLAW lighting
public:
int GetChainLightningIndex() const { return m_iChainLightingIndex; }
void IncChainLightningIndex() { ++m_iChainLightingIndex; }
@ -1435,14 +1435,14 @@ class CHARACTER : public CEntity, public CFSM, public CHorseRider
int m_iChainLightingIndex;
CHARACTER_SET m_setExceptChainLighting;
// for SKILL_EUNHYUNG
// for SKILL_NINJA_BLADEFIGHT_DISGUISE
public:
void SetAffectedEunhyung();
void ClearAffectedEunhyung() { m_dwAffectedEunhyungLevel = 0; }
bool GetAffectedEunhyung() const { return m_dwAffectedEunhyungLevel; }
void SetAffectedDisguise();
void ClearAffectedDisguise() { m_dwAffectedDisguiseLevel = 0; }
bool GetAffectedDisguise() const { return m_dwAffectedDisguiseLevel; }
private:
DWORD m_dwAffectedEunhyungLevel;
DWORD m_dwAffectedDisguiseLevel;
//
// Skill levels

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

@ -660,9 +660,9 @@ void CHARACTER::ComputeAffect(CAffect * pkAff, bool bAdd)
if (pkAff->dwType == SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT)
{
if (bAdd)
StartMuyeongEvent();
StartFlameSpiritEvent();
else
StopMuyeongEvent();
StopFlameSpiritEvent();
}
}

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

@ -2024,9 +2024,9 @@ bool CHARACTER::Damage(LPCHARACTER pAttacker, int dam, EDamageType type) // retu
//
if (IsAffectFlag(AFF_SURA_BLACKMAGIC_DARK_PROTECTION))
{
// POINT_MANASHIELD 는 작아질수록 좋다
// POINT_DARK_PROTECTION ´Â ÀÛ¾ÆÁú¼ö·Ï ÁÁ´Ù
int iDamageSPPart = dam / 3;
int iDamageToSP = iDamageSPPart * GetPoint(POINT_MANASHIELD) / 100;
int iDamageToSP = iDamageSPPart * GetPoint(POINT_DARK_PROTECTION) / 100;
int iSP = GetSP();
// SP가 있으면 무조건 데미지 절반 감소
@ -2039,7 +2039,7 @@ bool CHARACTER::Damage(LPCHARACTER pAttacker, int dam, EDamageType type) // retu
{
// 정신력이 모자라서 피가 더 깍여야할??
PointChange(POINT_SP, -GetSP());
dam -= iSP * 100 / std::max(GetPoint(POINT_MANASHIELD), 1);
dam -= iSP * 100 / std::max(GetPoint(POINT_DARK_PROTECTION), 1);
}
}
@ -2845,7 +2845,7 @@ class CFuncShoot
return;
m_me->m_SkillUseInfo[m_bType].SetMainTargetVID(dwTargetVID);
/*if (m_bType == SKILL_BIPABU || m_bType == SKILL_KWANKYEOK)
/*if (m_bType == SKILL_SHAMAN_DRAGON_FLYING_TALISMAN || m_bType == SKILL_NINJA_ARCHERY_ARROW_SHOWER)
m_me->m_SkillUseInfo[m_bType].ResetHitCount();*/
}
@ -2943,7 +2943,7 @@ class CFuncShoot
case SKILL_NINJA_ARCHERY_REPETITIVE_SHOT: // 연사
{
//int iUseArrow = 2 + (m_me->GetSkillPower(SKILL_YEONSA) *6/100);
//int iUseArrow = 2 + (m_me->GetSkillPower(SKILL_NINJA_ARCHERY_REPETITIVE_SHOT) *6/100);
int iUseArrow = 1;
// 토탈만 계산하는경우
@ -3000,7 +3000,7 @@ class CFuncShoot
if (pkVictim->CanBeginFight())
pkVictim->BeginFight(m_me);
SPDLOG_DEBUG("{} gigung {}", m_me->GetName(), pkVictim->GetName());
SPDLOG_DEBUG("{} poison arrow {}", m_me->GetName(), pkVictim->GetName());
m_me->ComputeSkill(m_bType, pkVictim);
m_me->UseArrow(pkArrow, iUseArrow);
}
@ -3018,7 +3018,7 @@ class CFuncShoot
if (pkVictim->CanBeginFight())
pkVictim->BeginFight(m_me);
SPDLOG_DEBUG("{} hwajo {}", m_me->GetName(), pkVictim->GetName());
SPDLOG_DEBUG("{} fire arrow {}", m_me->GetName(), pkVictim->GetName());
m_me->ComputeSkill(m_bType, pkVictim);
m_me->UseArrow(pkArrow, iUseArrow);
}

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

@ -127,9 +127,9 @@ int CHARACTER::GetChainLightningMaxCount() const
return aiChainLightningCountBySkillLevel[std::min<int>(SKILL_MAX_LEVEL, GetSkillLevel(SKILL_SHAMAN_HEALING_LIGHTNING_CLAW))];
}
void CHARACTER::SetAffectedEunhyung()
void CHARACTER::SetAffectedDisguise()
{
m_dwAffectedEunhyungLevel = GetSkillPower(SKILL_NINJA_BLADEFIGHT_DISGUISE);
m_dwAffectedDisguiseLevel = GetSkillPower(SKILL_NINJA_BLADEFIGHT_DISGUISE);
}
void CHARACTER::SetSkillGroup(BYTE bSkillGroup)
@ -1159,10 +1159,10 @@ struct FuncSplashDamage
m_pkSk->SetPointVar("chain", m_pkChr->GetChainLightningIndex());
m_pkChr->IncChainLightningIndex();
bool bUnderEunhyung = m_pkChr->GetAffectedEunhyung() > 0; // ÀÌ°Ç ¿Ö ¿©±â¼­ ÇÏÁö??
bool bUnderDisguise = m_pkChr->GetAffectedDisguise() > 0; // ÀÌ°Ç ¿Ö ¿©±â¼­ ÇÏÁö??
m_pkSk->SetPointVar("ek", m_pkChr->GetAffectedEunhyung()*1./100);
//m_pkChr->ClearAffectedEunhyung();
m_pkSk->SetPointVar("ek", m_pkChr->GetAffectedDisguise()*1./100);
//m_pkChr->ClearAffectedDisguise();
SetPolyVarForAttack(m_pkChr, m_pkSk, m_pkWeapon);
int iAmount = 0;
@ -1192,7 +1192,7 @@ struct FuncSplashDamage
{
adjust = 1.5f;
if (bUnderEunhyung)
if (bUnderDisguise)
adjust += 0.5f;
if (m_pkChr->GetWear(WEAR_WEAPON) && m_pkChr->GetWear(WEAR_WEAPON)->GetSubType() == WEAPON_DAGGER)
@ -1210,7 +1210,7 @@ struct FuncSplashDamage
if ( !LC_IsYMIR() )
{
if (bUnderEunhyung)
if (bUnderDisguise)
adjust += 0.5f;
if (m_pkChr->GetWear(WEAR_WEAPON) && m_pkChr->GetWear(WEAR_WEAPON)->GetSubType() == WEAPON_DAGGER)
@ -2704,7 +2704,7 @@ EVENTFUNC(skill_muyoung_event)
if (!ch->IsAffectFlag(AFF_SURA_BLACKMAGIC_FLAME_SPIRIT))
{
ch->StopMuyeongEvent();
ch->StopFlameSpiritEvent();
return 0;
}
@ -2716,7 +2716,7 @@ EVENTFUNC(skill_muyoung_event)
// 2. Shoot!
if (f.GetVictim())
{
ch->CreateFly(FLY_SKILL_MUYEONG, f.GetVictim());
ch->CreateFly(FLY_SKILL_FLAME_SPIRIT, f.GetVictim());
ch->ComputeSkill(SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT, f.GetVictim());
}
}
@ -2724,20 +2724,20 @@ EVENTFUNC(skill_muyoung_event)
return PASSES_PER_SEC(3);
}
void CHARACTER::StartMuyeongEvent()
void CHARACTER::StartFlameSpiritEvent()
{
if (m_pkMuyeongEvent)
if (m_pkFlameSpiritEvent)
return;
char_event_info* info = AllocEventInfo<char_event_info>();
info->ch = this;
m_pkMuyeongEvent = event_create(skill_muyoung_event, info, PASSES_PER_SEC(1));
m_pkFlameSpiritEvent = event_create(skill_muyoung_event, info, PASSES_PER_SEC(1));
}
void CHARACTER::StopMuyeongEvent()
void CHARACTER::StopFlameSpiritEvent()
{
event_cancel(&m_pkMuyeongEvent);
event_cancel(&m_pkFlameSpiritEvent);
}
void CHARACTER::SkillLearnWaitMoreTimeMessage(DWORD ms)

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

@ -72,7 +72,7 @@ struct SPointOnType
{ "HIT_HP_RECOVER", POINT_HIT_HP_RECOVERY },
{ "HIT_SP_RECOVER", POINT_HIT_SP_RECOVERY },
{ "CRITICAL", POINT_CRITICAL_PCT },
{ "MANASHIELD", POINT_MANASHIELD },
{ "MANASHIELD", POINT_DARK_PROTECTION },
{ "SKILL_DAMAGE_BONUS", POINT_SKILL_DAMAGE_BONUS },
{ "NORMAL_HIT_DAMAGE_BONUS", POINT_NORMAL_HIT_DAMAGE_BONUS },
{ "\n", POINT_NONE },