haydukk11/server
1
0
Fork 0
forked from metin2/server
Code Pull Requests Activity

More english names for skills enum

Browse Source
This commit is contained in:
Haydukk 2024-11-10 18:49:22 +02:00
parent 3f65939333
commit 8dec8ff802
4 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,13 +223,13 @@ bool CHARACTER::IsLearnableSkill(DWORD dwSkillVnum) const
if (6 == pkSkill->dwType)
{
if (SKILL_7_A_ANTI_TANHWAN <= dwSkillVnum && dwSkillVnum <= SKILL_7_D_ANTI_YONGBI)
if (SKILL_7_A_ANTI_WAR_BODY_DASH <= dwSkillVnum && dwSkillVnum <= SKILL_7_D_ANTI_SHAMAN_DRAGON_SHOOTING_DRAGON)
{
for (int i=0 ; i < 4 ; i++)
{
if (unsigned(SKILL_7_A_ANTI_TANHWAN + i) != dwSkillVnum)
if (unsigned(SKILL_7_A_ANTI_WAR_BODY_DASH + i) != dwSkillVnum)
{
if (0 != GetSkillLevel(SKILL_7_A_ANTI_TANHWAN + i))
if (0 != GetSkillLevel(SKILL_7_A_ANTI_WAR_BODY_DASH + i))
{
return false;
}
@ -239,13 +239,13 @@ bool CHARACTER::IsLearnableSkill(DWORD dwSkillVnum) const
return true;
}
if (SKILL_8_A_ANTI_GIGONGCHAM <= dwSkillVnum && dwSkillVnum <= SKILL_8_D_ANTI_BYEURAK)
if (SKILL_8_A_ANTI_WAR_MENTAL_BASH <= dwSkillVnum && dwSkillVnum <= SKILL_8_D_ANTI_SHAMAN_HEALING_SUMMON_LIGHTNING)
{
for (int i=0 ; i < 4 ; i++)
{
if (unsigned(SKILL_8_A_ANTI_GIGONGCHAM + i) != dwSkillVnum)
if (unsigned(SKILL_8_A_ANTI_WAR_MENTAL_BASH + i) != dwSkillVnum)
{
if (0 != GetSkillLevel(SKILL_8_A_ANTI_GIGONGCHAM + i))
if (0 != GetSkillLevel(SKILL_8_A_ANTI_WAR_MENTAL_BASH + i))
return false;
}
}
@ -698,7 +698,7 @@ void CHARACTER::SkillLevelUp(DWORD dwVnum, BYTE bMethod)
return;
}
if (SKILL_7_A_ANTI_TANHWAN <= dwVnum && dwVnum <= SKILL_8_D_ANTI_BYEURAK)
if (SKILL_7_A_ANTI_WAR_BODY_DASH <= dwVnum && dwVnum <= SKILL_8_D_ANTI_SHAMAN_HEALING_SUMMON_LIGHTNING)
{
if (0 == GetSkillLevel(dwVnum))
return;
@ -1354,14 +1354,14 @@ struct FuncSplashDamage
switch (m_pkSk->dwVnum)
{
case SKILL_WAR_BODY_DASH: AntiSkillID = SKILL_7_A_ANTI_TANHWAN; break;
case SKILL_NINJA_BLADEFIGHT_AMBUSH: AntiSkillID = SKILL_7_B_ANTI_AMSEOP; break;
case SKILL_SURA_WEAPONRY_FINGER_STRIKE: AntiSkillID = SKILL_7_C_ANTI_SWAERYUNG; break;
case SKILL_SHAMAN_DRAGON_SHOOTING_DRAGON: AntiSkillID = SKILL_7_D_ANTI_YONGBI; break;
case SKILL_WAR_MENTAL_BASH: AntiSkillID = SKILL_8_A_ANTI_GIGONGCHAM; break;
case SKILL_NINJA_ARCHERY_REPETITIVE_SHOT: AntiSkillID = SKILL_8_B_ANTI_YEONSA; break;
case SKILL_SURA_BLACKMAGIC_DARK_ORB: AntiSkillID = SKILL_8_C_ANTI_MAHWAN; break;
case SKILL_SHAMAN_HEALING_SUMMON_LIGHTNING: AntiSkillID = SKILL_8_D_ANTI_BYEURAK; break;
case SKILL_WAR_BODY_DASH: AntiSkillID = SKILL_7_A_ANTI_WAR_BODY_DASH; break;
case SKILL_NINJA_BLADEFIGHT_AMBUSH: AntiSkillID = SKILL_7_B_ANTI_NINJA_BLADEFIGHT_AMBUSH; break;
case SKILL_SURA_WEAPONRY_FINGER_STRIKE: AntiSkillID = SKILL_7_C_ANTI_SURA_WEAPONRY_FINGER_STRIKE; break;
case SKILL_SHAMAN_DRAGON_SHOOTING_DRAGON: AntiSkillID = SKILL_7_D_ANTI_SHAMAN_DRAGON_SHOOTING_DRAGON; break;
case SKILL_WAR_MENTAL_BASH: AntiSkillID = SKILL_8_A_ANTI_WAR_MENTAL_BASH; break;
case SKILL_NINJA_ARCHERY_REPETITIVE_SHOT: AntiSkillID = SKILL_8_B_ANTI_NINJA_ARCHERY_REPETITIVE_SHOT; break;
case SKILL_SURA_BLACKMAGIC_DARK_ORB: AntiSkillID = SKILL_8_C_ANTI_SURA_BLACKMAGIC_DARK_ORB; break;
case SKILL_SHAMAN_HEALING_SUMMON_LIGHTNING: AntiSkillID = SKILL_8_D_ANTI_SHAMAN_HEALING_SUMMON_LIGHTNING; break;
}
if (0 != AntiSkillID)

16
src/game/src/cmd_general.cpp
View File

@ -848,15 +848,15 @@ ACMD(do_skillup)
case SKILL_HORSE_ESCAPE:
case SKILL_HORSE_WILDATTACK_RANGE:
case SKILL_7_A_ANTI_TANHWAN:
case SKILL_7_B_ANTI_AMSEOP:
case SKILL_7_C_ANTI_SWAERYUNG:
case SKILL_7_D_ANTI_YONGBI:
case SKILL_7_A_ANTI_WAR_BODY_DASH:
case SKILL_7_B_ANTI_NINJA_BLADEFIGHT_AMBUSH:
case SKILL_7_C_ANTI_SURA_WEAPONRY_FINGER_STRIKE:
case SKILL_7_D_ANTI_SHAMAN_DRAGON_SHOOTING_DRAGON:
case SKILL_8_A_ANTI_GIGONGCHAM:
case SKILL_8_B_ANTI_YEONSA:
case SKILL_8_C_ANTI_MAHWAN:
case SKILL_8_D_ANTI_BYEURAK:
case SKILL_8_A_ANTI_WAR_MENTAL_BASH:
case SKILL_8_B_ANTI_NINJA_ARCHERY_REPETITIVE_SHOT:
case SKILL_8_C_ANTI_SURA_BLACKMAGIC_DARK_ORB:
case SKILL_8_D_ANTI_SHAMAN_HEALING_SUMMON_LIGHTNING:
case SKILL_ADD_HP:
case SKILL_RESIST_PENETRATE:

6
src/game/src/guild_war.cpp
View File

@ -615,10 +615,10 @@ void CGuild::EndWar(DWORD dwOppGID)
LPCHARACTER ch = *it;
ch->RemoveAffect(GUILD_SKILL_BLOOD);
ch->RemoveAffect(GUILD_SKILL_BLESS);
ch->RemoveAffect(GUILD_SKILL_SEONGHWI);
ch->RemoveAffect(GUILD_SKILL_ARMOUR);
ch->RemoveAffect(GUILD_SKILL_ACCEL);
ch->RemoveAffect(GUILD_SKILL_BUNNO);
ch->RemoveAffect(GUILD_SKILL_JUMUN);
ch->RemoveAffect(GUILD_SKILL_RAGE);
ch->RemoveAffect(GUILD_SKILL_CAST);
ch->RemoveBadAffect();
}

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

@ -123,16 +123,16 @@ enum ESkillIndexes
// 공통 스킬
// 7
SKILL_7_A_ANTI_TANHWAN = 112,
SKILL_7_B_ANTI_AMSEOP,
SKILL_7_C_ANTI_SWAERYUNG,
SKILL_7_D_ANTI_YONGBI,
SKILL_7_A_ANTI_WAR_BODY_DASH = 112,
SKILL_7_B_ANTI_NINJA_BLADEFIGHT_AMBUSH,
SKILL_7_C_ANTI_SURA_WEAPONRY_FINGER_STRIKE,
SKILL_7_D_ANTI_SHAMAN_DRAGON_SHOOTING_DRAGON,
// 8
SKILL_8_A_ANTI_GIGONGCHAM,
SKILL_8_B_ANTI_YEONSA,
SKILL_8_C_ANTI_MAHWAN,
SKILL_8_D_ANTI_BYEURAK,
SKILL_8_A_ANTI_WAR_MENTAL_BASH,
SKILL_8_B_ANTI_NINJA_ARCHERY_REPETITIVE_SHOT,
SKILL_8_C_ANTI_SURA_BLACKMAGIC_DARK_ORB,
SKILL_8_D_ANTI_SHAMAN_HEALING_SUMMON_LIGHTNING,
// 보조 스킬
@ -157,13 +157,13 @@ enum ESkillIndexes
SKILL_RESIST_PENETRATE = 142, // 철통
GUILD_SKILL_START = 151,
GUILD_SKILL_EYE = 151,
GUILD_SKILL_BLOOD = 152,
GUILD_SKILL_BLESS = 153,
GUILD_SKILL_SEONGHWI = 154,
GUILD_SKILL_ACCEL = 155,
GUILD_SKILL_BUNNO = 156,
GUILD_SKILL_JUMUN = 157,
GUILD_SKILL_EYE = 151, // Dragon's Eye (unused?)
GUILD_SKILL_BLOOD = 152, // Blood of Dragon God
GUILD_SKILL_BLESS = 153, // Benediction of Dragon God
GUILD_SKILL_ARMOUR = 154, // Holy Armour
GUILD_SKILL_ACCEL = 155, // Acceleration
GUILD_SKILL_RAGE = 156, // Rage of Dragon God
GUILD_SKILL_CAST = 157, // Casting Aid
GUILD_SKILL_TELEPORT = 158,
GUILD_SKILL_DOOR = 159,
GUILD_SKILL_END = 162,