From 3f659393333fd1eeaa50443c4e9b31abd4d98571 Mon Sep 17 00:00:00 2001 From: Haydukk Date: Sun, 10 Nov 2024 17:58:52 +0200 Subject: [PATCH 1/6] Use english names for skills enum --- src/game/src/char.cpp | 2 +- src/game/src/char_affect.cpp | 62 ++++++++++++------------- src/game/src/char_battle.cpp | 34 +++++++------- src/game/src/char_item.cpp | 6 +-- src/game/src/char_skill.cpp | 78 +++++++++++++++---------------- src/game/src/guild.cpp | 2 +- src/game/src/input_main.cpp | 26 +++++------ src/game/src/skill.h | 90 ++++++++++++++++++------------------ 8 files changed, 150 insertions(+), 150 deletions(-) diff --git a/src/game/src/char.cpp b/src/game/src/char.cpp index 3b44242..ef323f9 100644 --- a/src/game/src/char.cpp +++ b/src/game/src/char.cpp @@ -4806,7 +4806,7 @@ void CHARACTER::OnMove(bool bIsAttack) if (IsAffectFlag(AFF_EUNHYUNG)) { - RemoveAffect(SKILL_EUNHYUNG); + RemoveAffect(SKILL_NINJA_BLADEFIGHT_DISGUISE); SetAffectedEunhyung(); } else diff --git a/src/game/src/char_affect.cpp b/src/game/src/char_affect.cpp index 2beb8bd..1596842 100644 --- a/src/game/src/char_affect.cpp +++ b/src/game/src/char_affect.cpp @@ -471,7 +471,7 @@ void CHARACTER::LoadAffect(DWORD dwCount, TPacketAffectElement * pElements) for (DWORD i = 0; i < dwCount; ++i, ++pElements) { // 무영진은 로드하지않는다. - if (pElements->dwType == SKILL_MUYEONG) + if (pElements->dwType == SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT) continue; if (AFFECT_AUTO_HP_RECOVERY == pElements->dwType || AFFECT_AUTO_SP_RECOVERY == pElements->dwType) @@ -657,7 +657,7 @@ void CHARACTER::ComputeAffect(CAffect * pkAff, bool bAdd) else PointChange(pkAff->bApplyOn, -pkAff->lApplyValue); - if (pkAff->dwType == SKILL_MUYEONG) + if (pkAff->dwType == SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT) { if (bAdd) StartMuyeongEvent(); @@ -745,20 +745,20 @@ void CHARACTER::RemoveGoodAffect() RemoveAffect(AFFECT_CON); RemoveAffect(AFFECT_CHINA_FIREWORK); - RemoveAffect(SKILL_JEONGWI); - RemoveAffect(SKILL_GEOMKYUNG); - RemoveAffect(SKILL_CHUNKEON); - RemoveAffect(SKILL_EUNHYUNG); - RemoveAffect(SKILL_GYEONGGONG); - RemoveAffect(SKILL_GWIGEOM); - RemoveAffect(SKILL_TERROR); - RemoveAffect(SKILL_JUMAGAP); - RemoveAffect(SKILL_MANASHILED); - RemoveAffect(SKILL_HOSIN); - RemoveAffect(SKILL_REFLECT); - RemoveAffect(SKILL_KWAESOK); - RemoveAffect(SKILL_JEUNGRYEOK); - RemoveAffect(SKILL_GICHEON); + RemoveAffect(SKILL_WAR_BODY_BERSERK); + RemoveAffect(SKILL_WAR_BODY_AURA); + RemoveAffect(SKILL_WAR_MENTAL_SWORD_STRIKE); + RemoveAffect(SKILL_NINJA_BLADEFIGHT_DISGUISE); + RemoveAffect(SKILL_NINJA_ARCHERY_FEATHER_WALK); + RemoveAffect(SKILL_SURA_WEAPONRY_ENCHANTED_BLADE); + RemoveAffect(SKILL_SURA_WEAPONRY_FEAR); + RemoveAffect(SKILL_SURA_WEAPONRY_ENCHANTED_ARMOUR); + RemoveAffect(SKILL_SURA_BLACKMAGIC_DARK_PROTECTION); + RemoveAffect(SKILL_SHAMAN_DRAGON_BLESSING); + RemoveAffect(SKILL_SHAMAN_DRAGON_REFLECT); + RemoveAffect(SKILL_SHAMAN_HEALING_SWIFTNESS); + RemoveAffect(SKILL_SHAMAN_HEALING_ATTACK); + RemoveAffect(SKILL_SHAMAN_DRAGON_DRAGONS_AID); } bool CHARACTER::IsGoodAffect(BYTE bAffectType) const @@ -773,20 +773,20 @@ bool CHARACTER::IsGoodAffect(BYTE bAffectType) const case (AFFECT_CON): case (AFFECT_CHINA_FIREWORK): - case (SKILL_JEONGWI): - case (SKILL_GEOMKYUNG): - case (SKILL_CHUNKEON): - case (SKILL_EUNHYUNG): - case (SKILL_GYEONGGONG): - case (SKILL_GWIGEOM): - case (SKILL_TERROR): - case (SKILL_JUMAGAP): - case (SKILL_MANASHILED): - case (SKILL_HOSIN): - case (SKILL_REFLECT): - case (SKILL_KWAESOK): - case (SKILL_JEUNGRYEOK): - case (SKILL_GICHEON): + case (SKILL_WAR_BODY_BERSERK): + case (SKILL_WAR_BODY_AURA): + case (SKILL_WAR_MENTAL_SWORD_STRIKE): + case (SKILL_NINJA_BLADEFIGHT_DISGUISE): + case (SKILL_NINJA_ARCHERY_FEATHER_WALK): + case (SKILL_SURA_WEAPONRY_ENCHANTED_BLADE): + case (SKILL_SURA_WEAPONRY_FEAR): + case (SKILL_SURA_WEAPONRY_ENCHANTED_ARMOUR): + case (SKILL_SURA_BLACKMAGIC_DARK_PROTECTION): + case (SKILL_SHAMAN_DRAGON_BLESSING): + case (SKILL_SHAMAN_DRAGON_REFLECT): + case (SKILL_SHAMAN_HEALING_SWIFTNESS): + case (SKILL_SHAMAN_HEALING_ATTACK): + case (SKILL_SHAMAN_DRAGON_DRAGONS_AID): return true; } return false; @@ -806,7 +806,7 @@ void CHARACTER::RemoveBadAffect() RemoveAffect(AFFECT_SLOW); // 투속마령 - RemoveAffect(SKILL_TUSOK); + RemoveAffect(SKILL_SURA_BLACKMAGIC_SPIRIT_STRIKE); // 저주 //RemoveAffect(SKILL_CURSE); diff --git a/src/game/src/char_battle.cpp b/src/game/src/char_battle.cpp index 86056c9..089ebec 100644 --- a/src/game/src/char_battle.cpp +++ b/src/game/src/char_battle.cpp @@ -1661,7 +1661,7 @@ bool CHARACTER::Damage(LPCHARACTER pAttacker, int dam, EDamageType type) // retu { if (IsAffectFlag(AFF_TERROR)) { - int pct = GetSkillPower(SKILL_TERROR) / 400; + int pct = GetSkillPower(SKILL_SURA_WEAPONRY_FEAR) / 400; if (Random::get(1, 100) <= pct) return false; @@ -1817,10 +1817,10 @@ bool CHARACTER::Damage(LPCHARACTER pAttacker, int dam, EDamageType type) // retu } if (IsAffectFlag(AFF_JEONGWIHON)) - dam = (int) (dam * (100 + GetSkillPower(SKILL_JEONGWI) * 25 / 100) / 100); + dam = (int) (dam * (100 + GetSkillPower(SKILL_WAR_BODY_BERSERK) * 25 / 100) / 100); if (IsAffectFlag(AFF_TERROR)) - dam = (int) (dam * (95 - GetSkillPower(SKILL_TERROR) / 5) / 100); + dam = (int) (dam * (95 - GetSkillPower(SKILL_SURA_WEAPONRY_FEAR) / 5) / 100); if (IsAffectFlag(AFF_HOSIN)) dam = dam * (100 - GetPoint(POINT_RESIST_NORMAL_DAMAGE)) / 100; @@ -2941,7 +2941,7 @@ class CFuncShoot } break; - case SKILL_YEONSA: // 연사 + case SKILL_NINJA_ARCHERY_REPETITIVE_SHOT: // 연사 { //int iUseArrow = 2 + (m_me->GetSkillPower(SKILL_YEONSA) *6/100); int iUseArrow = 1; @@ -2970,7 +2970,7 @@ class CFuncShoot break; - case SKILL_KWANKYEOK: + case SKILL_NINJA_ARCHERY_ARROW_SHOWER: { int iUseArrow = 1; @@ -2989,7 +2989,7 @@ class CFuncShoot } break; - case SKILL_GIGUNG: + case SKILL_NINJA_ARCHERY_POISON_ARROW: { int iUseArrow = 1; if (iUseArrow == m_me->GetArrowAndBow(&pkBow, &pkArrow, iUseArrow)) @@ -3007,7 +3007,7 @@ class CFuncShoot } break; - case SKILL_HWAJO: + case SKILL_NINJA_ARCHERY_FIRE_ARROW: { int iUseArrow = 1; if (iUseArrow == m_me->GetArrowAndBow(&pkBow, &pkArrow, iUseArrow)) @@ -3045,15 +3045,15 @@ class CFuncShoot break; - case SKILL_MARYUNG: + case SKILL_SURA_BLACKMAGIC_DARK_STRIKE: //case SKILL_GUMHWAN: - case SKILL_TUSOK: - case SKILL_BIPABU: - case SKILL_NOEJEON: - case SKILL_GEOMPUNG: - case SKILL_SANGONG: - case SKILL_MAHWAN: - case SKILL_PABEOB: + case SKILL_SURA_BLACKMAGIC_SPIRIT_STRIKE: + case SKILL_SHAMAN_DRAGON_FLYING_TALISMAN: + case SKILL_SHAMAN_HEALING_LIGHTNING_THROW: + case SKILL_WAR_MENTAL_AMBUSH: + case SKILL_NINJA_BLADEFIGHT_POISONOUS_CLOUD: + case SKILL_SURA_BLACKMAGIC_DARK_ORB: + case SKILL_SURA_WEAPONRY_DISPEL: //case SKILL_CURSE: { m_me->OnMove(true); @@ -3067,7 +3067,7 @@ class CFuncShoot } break; - case SKILL_CHAIN: + case SKILL_SHAMAN_HEALING_LIGHTNING_CLAW: { m_me->OnMove(true); pkVictim->OnMove(); @@ -3082,7 +3082,7 @@ class CFuncShoot } break; - case SKILL_YONGBI: + case SKILL_SHAMAN_DRAGON_SHOOTING_DRAGON: { m_me->OnMove(true); } diff --git a/src/game/src/char_item.cpp b/src/game/src/char_item.cpp index 0992df7..099a31c 100644 --- a/src/game/src/char_item.cpp +++ b/src/game/src/char_item.cpp @@ -478,10 +478,10 @@ void CHARACTER::SetWear(BYTE bCell, LPITEM item) { // 귀검 사용 시 벗는 것이라면 효과를 없애야 한다. if (IsAffectFlag(AFF_GWIGUM)) - RemoveAffect(SKILL_GWIGEOM); + RemoveAffect(SKILL_SURA_WEAPONRY_ENCHANTED_BLADE); if (IsAffectFlag(AFF_GEOMGYEONG)) - RemoveAffect(SKILL_GEOMKYUNG); + RemoveAffect(SKILL_WAR_BODY_AURA); } } @@ -7277,7 +7277,7 @@ void CHARACTER::AutoRecoveryItemProcess(const EAffectTypes type) return; { - const DWORD stunSkills[] = { SKILL_TANHWAN, SKILL_GEOMPUNG, SKILL_BYEURAK, SKILL_GIGUNG }; + const DWORD stunSkills[] = { SKILL_WAR_BODY_DASH, SKILL_WAR_MENTAL_AMBUSH, SKILL_SHAMAN_HEALING_SUMMON_LIGHTNING, SKILL_NINJA_ARCHERY_POISON_ARROW }; for (size_t i=0 ; i < sizeof(stunSkills)/sizeof(DWORD) ; ++i) { diff --git a/src/game/src/char_skill.cpp b/src/game/src/char_skill.cpp index c2fb144..d36674e 100644 --- a/src/game/src/char_skill.cpp +++ b/src/game/src/char_skill.cpp @@ -68,7 +68,7 @@ bool TSkillUseInfo::HitOnce(DWORD dwVnum) SPDLOG_DEBUG("__HitOnce NextUse {} current {} count {} scount {}", dwNextSkillUsableTime, get_dword_time(), iHitCount, iSplashCount); - if (dwNextSkillUsableTime && dwNextSkillUsableTime(SKILL_MAX_LEVEL, GetSkillLevel(SKILL_CHAIN))]; + return aiChainLightningCountBySkillLevel[std::min(SKILL_MAX_LEVEL, GetSkillLevel(SKILL_SHAMAN_HEALING_LIGHTNING_CLAW))]; } void CHARACTER::SetAffectedEunhyung() { - m_dwAffectedEunhyungLevel = GetSkillPower(SKILL_EUNHYUNG); + m_dwAffectedEunhyungLevel = GetSkillPower(SKILL_NINJA_BLADEFIGHT_DISGUISE); } void CHARACTER::SetSkillGroup(BYTE bSkillGroup) @@ -1017,7 +1017,7 @@ EVENTFUNC(ChainLightningEvent) if (pkTarget) { pkChrVictim->CreateFly(FLY_CHAIN_LIGHTNING, pkTarget); - pkChr->ComputeSkill(SKILL_CHAIN, pkTarget); + pkChr->ComputeSkill(SKILL_SHAMAN_HEALING_LIGHTNING_CLAW, pkTarget); pkChr->AddChainLightningExcept(pkTarget); } else @@ -1092,7 +1092,7 @@ struct FuncSplashDamage if (m_pkChr->IsPC()) // 길드 스킬은 쿨타임 처리를 하지 않는다. if (!(m_pkSk->dwVnum >= GUILD_SKILL_START && m_pkSk->dwVnum <= GUILD_SKILL_END)) - if (!m_bDisableCooltime && m_pInfo && !m_pInfo->HitOnce(m_pkSk->dwVnum) && m_pkSk->dwVnum != SKILL_MUYEONG) + if (!m_bDisableCooltime && m_pInfo && !m_pInfo->HitOnce(m_pkSk->dwVnum) && m_pkSk->dwVnum != SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT) { SPDLOG_TRACE("check guild skill {}", m_pkChr->GetName()); return; @@ -1183,7 +1183,7 @@ struct FuncSplashDamage //////////////////////////////////////////////////////////////////////////////// iAmount = -iAmount; - if (m_pkSk->dwVnum == SKILL_AMSEOP) + if (m_pkSk->dwVnum == SKILL_NINJA_BLADEFIGHT_AMBUSH) { float fDelta = GetDegreeDelta(m_pkChr->GetRotation(), pkChrVictim->GetRotation()); float adjust; @@ -1220,7 +1220,7 @@ struct FuncSplashDamage iAmount = (int) (iAmount * adjust); } - else if (m_pkSk->dwVnum == SKILL_GUNGSIN) + else if (m_pkSk->dwVnum == SKILL_NINJA_BLADEFIGHT_FAST_ATTACK) { float adjust = 1.0; @@ -1346,7 +1346,7 @@ struct FuncSplashDamage if (pkChrVictim->CanBeginFight()) pkChrVictim->BeginFight(m_pkChr); - if (m_pkSk->dwVnum == SKILL_CHAIN) + if (m_pkSk->dwVnum == SKILL_SHAMAN_HEALING_LIGHTNING_CLAW) SPDLOG_DEBUG("{} CHAIN INDEX {} DAM {} DT {}", m_pkChr->GetName(), m_pkChr->GetChainLightningIndex() - 1, iDam, (int) dt); { @@ -1354,14 +1354,14 @@ struct FuncSplashDamage switch (m_pkSk->dwVnum) { - case SKILL_TANHWAN: AntiSkillID = SKILL_7_A_ANTI_TANHWAN; break; - case SKILL_AMSEOP: AntiSkillID = SKILL_7_B_ANTI_AMSEOP; break; - case SKILL_SWAERYUNG: AntiSkillID = SKILL_7_C_ANTI_SWAERYUNG; break; - case SKILL_YONGBI: AntiSkillID = SKILL_7_D_ANTI_YONGBI; break; - case SKILL_GIGONGCHAM: AntiSkillID = SKILL_8_A_ANTI_GIGONGCHAM; break; - case SKILL_YEONSA: AntiSkillID = SKILL_8_B_ANTI_YEONSA; break; - case SKILL_MAHWAN: AntiSkillID = SKILL_8_C_ANTI_MAHWAN; break; - case SKILL_BYEURAK: AntiSkillID = SKILL_8_D_ANTI_BYEURAK; break; + 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; } if (0 != AntiSkillID) @@ -1505,7 +1505,7 @@ struct FuncSplashDamage m_pkChr->PointChange(POINT_SP, iDam * iPct / 100); } - if (m_pkSk->dwVnum == SKILL_CHAIN && m_pkChr->GetChainLightningIndex() < m_pkChr->GetChainLightningMaxCount()) + if (m_pkSk->dwVnum == SKILL_SHAMAN_HEALING_LIGHTNING_CLAW && m_pkChr->GetChainLightningIndex() < m_pkChr->GetChainLightningMaxCount()) { chain_lightning_event_info* info = AllocEventInfo(); @@ -1563,11 +1563,11 @@ struct FuncSplashAffect if (DISTANCE_APPROX(m_x - pkChr->GetX(), m_y - pkChr->GetY()) < m_iDist) { SPDLOG_TRACE("FuncSplashAffect step 2 : name:{} vnum:{} iDur:{}", pkChr->GetName(), m_dwVnum, m_iDuration); - if (m_dwVnum == SKILL_TUSOK) + if (m_dwVnum == SKILL_SURA_BLACKMAGIC_SPIRIT_STRIKE) if (pkChr->CanBeginFight()) pkChr->BeginFight(m_pkChrAttacker); - if (pkChr->IsPC() && m_dwVnum == SKILL_TUSOK) + if (pkChr->IsPC() && m_dwVnum == SKILL_SURA_BLACKMAGIC_SPIRIT_STRIKE) pkChr->AddAffect(m_dwVnum, m_bPointOn, m_iAmount, m_dwAffectFlag, m_iDuration/3, m_iSPCost, m_bOverride); else pkChr->AddAffect(m_dwVnum, m_bPointOn, m_iAmount, m_dwAffectFlag, m_iDuration, m_iSPCost, m_bOverride); @@ -1795,7 +1795,7 @@ int CHARACTER::ComputeSkillAtPosition(DWORD dwVnum, const PIXEL_POSITION& posTar if (IsPC()) if (!(dwVnum >= GUILD_SKILL_START && dwVnum <= GUILD_SKILL_END)) // 길드 스킬은 쿨타임 처리를 하지 않는다. - if (!m_bDisableCooltime && !m_SkillUseInfo[dwVnum].HitOnce(dwVnum) && dwVnum != SKILL_MUYEONG) + if (!m_bDisableCooltime && !m_SkillUseInfo[dwVnum].HitOnce(dwVnum) && dwVnum != SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT) { return BATTLE_NONE; } @@ -2108,7 +2108,7 @@ int CHARACTER::ComputeSkill(DWORD dwVnum, LPCHARACTER pkVictim, BYTE bSkillLevel // END_OF_REMOVE_BAD_AFFECT_BUG_FIX if (IS_SET(pkSk->dwFlag, SKILL_FLAG_ATTACK | SKILL_FLAG_USE_MELEE_DAMAGE | SKILL_FLAG_USE_MAGIC_DAMAGE) && - !(pkSk->dwVnum == SKILL_MUYEONG && pkVictim == this) && !(pkSk->IsChargeSkill() && pkVictim == this)) + !(pkSk->dwVnum == SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT && pkVictim == this) && !(pkSk->IsChargeSkill() && pkVictim == this)) { bool bAdded = false; @@ -2136,7 +2136,7 @@ int CHARACTER::ComputeSkill(DWORD dwVnum, LPCHARACTER pkVictim, BYTE bSkillLevel if (IsPC()) if (!(dwVnum >= GUILD_SKILL_START && dwVnum <= GUILD_SKILL_END)) // 길드 스킬은 쿨타임 처리를 하지 않는다. - if (!m_bDisableCooltime && !m_SkillUseInfo[dwVnum].HitOnce(dwVnum) && dwVnum != SKILL_MUYEONG) + if (!m_bDisableCooltime && !m_SkillUseInfo[dwVnum].HitOnce(dwVnum) && dwVnum != SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT) { return BATTLE_NONE; } @@ -2222,7 +2222,7 @@ int CHARACTER::ComputeSkill(DWORD dwVnum, LPCHARACTER pkVictim, BYTE bSkillLevel } else { - if (dwVnum == SKILL_MUYEONG) + if (dwVnum == SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT) { pkSk->kDurationPoly.SetVar("k", k/*bSkillLevel*/); pkSk->kDurationSPCostPoly.SetVar("k", k/*bSkillLevel*/); @@ -2280,12 +2280,12 @@ int CHARACTER::ComputeSkill(DWORD dwVnum, LPCHARACTER pkVictim, BYTE bSkillLevel //if (g_iUseLocale) if ( !LC_IsYMIR() ) { - if ((pkSk->dwVnum == SKILL_CHUNKEON && 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; } else { - if ((pkSk->dwVnum == SKILL_CHUNKEON && GetUsedSkillMasterType(pkSk->dwVnum) < SKILL_MASTER)) + if ((pkSk->dwVnum == SKILL_WAR_MENTAL_SWORD_STRIKE && GetUsedSkillMasterType(pkSk->dwVnum) < SKILL_MASTER)) affact_flag = AFF_CHEONGEUN_WITH_FALL; } // END_OF_ADD_GRANDMASTER_SKILL @@ -2493,7 +2493,7 @@ bool CHARACTER::UseSkill(DWORD dwVnum, LPCHARACTER pkVictim, bool bUseGrandMaste } // Toggle 할 때는 SP를 쓰지 않음 (SelfOnly로 구분) - if ((0 != pkSk->dwAffectFlag || pkSk->dwVnum == SKILL_MUYEONG) && (pkSk->dwFlag & SKILL_FLAG_TOGGLE) && RemoveAffect(pkSk->dwVnum)) + if ((0 != pkSk->dwAffectFlag || pkSk->dwVnum == SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT) && (pkSk->dwFlag & SKILL_FLAG_TOGGLE) && RemoveAffect(pkSk->dwVnum)) { return true; } @@ -2515,7 +2515,7 @@ bool CHARACTER::UseSkill(DWORD dwVnum, LPCHARACTER pkVictim, bool bUseGrandMaste DWORD dwCur = get_dword_time(); - if (dwVnum == SKILL_TERROR && m_SkillUseInfo[dwVnum].bUsed && m_SkillUseInfo[dwVnum].dwNextSkillUsableTime > dwCur ) + if (dwVnum == SKILL_SURA_WEAPONRY_FEAR && m_SkillUseInfo[dwVnum].bUsed && m_SkillUseInfo[dwVnum].dwNextSkillUsableTime > dwCur ) { SPDLOG_DEBUG(" SKILL_TERROR's Cooltime is not delta over {}", m_SkillUseInfo[dwVnum].dwNextSkillUsableTime - dwCur ); return false; @@ -2568,7 +2568,7 @@ bool CHARACTER::UseSkill(DWORD dwVnum, LPCHARACTER pkVictim, bool bUseGrandMaste if (IS_SET(pkSk->dwFlag, SKILL_FLAG_SELFONLY)) pkVictim = this; - if (pkSk->dwVnum == SKILL_MUYEONG || pkSk->IsChargeSkill() && !IsAffectFlag(AFF_TANHWAN_DASH) && !pkVictim) + if (pkSk->dwVnum == SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT || pkSk->IsChargeSkill() && !IsAffectFlag(AFF_TANHWAN_DASH) && !pkVictim) { // 처음 사용하는 무영진은 자신에게 Affect를 붙인다. pkVictim = this; @@ -2593,7 +2593,7 @@ bool CHARACTER::UseSkill(DWORD dwVnum, LPCHARACTER pkVictim, bool bUseGrandMaste } } - if (dwVnum == SKILL_CHAIN) + if (dwVnum == SKILL_SHAMAN_HEALING_LIGHTNING_CLAW) { ResetChainLightningIndex(); AddChainLightningExcept(pkVictim); @@ -2604,9 +2604,9 @@ bool CHARACTER::UseSkill(DWORD dwVnum, LPCHARACTER pkVictim, bool bUseGrandMaste ComputeSkill(dwVnum, this); else if (!IS_SET(pkSk->dwFlag, SKILL_FLAG_ATTACK)) ComputeSkill(dwVnum, pkVictim); - else if (dwVnum == SKILL_BYEURAK) + else if (dwVnum == SKILL_SHAMAN_HEALING_SUMMON_LIGHTNING) ComputeSkill(dwVnum, pkVictim); - else if (dwVnum == SKILL_MUYEONG || pkSk->IsChargeSkill()) + else if (dwVnum == SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT || pkSk->IsChargeSkill()) ComputeSkill(dwVnum, pkVictim); m_dwLastSkillTime = get_dword_time(); @@ -2717,7 +2717,7 @@ EVENTFUNC(skill_muyoung_event) if (f.GetVictim()) { ch->CreateFly(FLY_SKILL_MUYEONG, f.GetVictim()); - ch->ComputeSkill(SKILL_MUYEONG, f.GetVictim()); + ch->ComputeSkill(SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT, f.GetVictim()); } } @@ -3522,10 +3522,10 @@ bool CHARACTER::CheckSkillHitCount(const BYTE SkillID, const VID TargetVID) switch (SkillID) { - case SKILL_YONGKWON: - case SKILL_HWAYEOMPOK: - case SKILL_DAEJINGAK: - case SKILL_PAERYONG: + case SKILL_SURA_WEAPONRY_DRAGON_SWIRL: + case SKILL_SURA_BLACKMAGIC_FLAME_STRIKE: + case SKILL_WAR_MENTAL_STRONG_BODY: + case SKILL_SHAMAN_DRAGON_DRAGONS_ROAR: SPDLOG_WARN("SkillHack: cannot use attack packet for skill({})", SkillID); return false; } @@ -3538,8 +3538,8 @@ bool CHARACTER::CheckSkillHitCount(const BYTE SkillID, const VID TargetVID) switch (SkillID) { - case SKILL_SAMYEON: - case SKILL_CHARYUN: + case SKILL_WAR_BODY_THREE_WAY_CUT: + case SKILL_NINJA_BLADEFIGHT_ROLLING_DAGGER: MaxAttackCountPerTarget = 3; break; @@ -3547,7 +3547,7 @@ bool CHARACTER::CheckSkillHitCount(const BYTE SkillID, const VID TargetVID) MaxAttackCountPerTarget = 5; break; - case SKILL_YEONSA: + case SKILL_NINJA_ARCHERY_REPETITIVE_SHOT: MaxAttackCountPerTarget = 7; break; diff --git a/src/game/src/guild.cpp b/src/game/src/guild.cpp index a0eed4a..bbb5ecf 100644 --- a/src/game/src/guild.cpp +++ b/src/game/src/guild.cpp @@ -1274,7 +1274,7 @@ void CGuild::UseSkill(DWORD dwVnum, LPCHARACTER ch, DWORD pid) ch->RemoveAffect(AFFECT_REVIVE_INVISIBLE); if (ch->IsAffectFlag(AFF_EUNHYUNG)) - ch->RemoveAffect(SKILL_EUNHYUNG); + ch->RemoveAffect(SKILL_NINJA_BLADEFIGHT_DISGUISE); double k =1.0*m_data.abySkill[dwRealVnum]/pkSk->bMaxLevel; pkSk->kSPCostPoly.SetVar("k", k); diff --git a/src/game/src/input_main.cpp b/src/game/src/input_main.cpp index dd137e6..2136cfe 100644 --- a/src/game/src/input_main.cpp +++ b/src/game/src/input_main.cpp @@ -1704,19 +1704,19 @@ void CInputMain::Attack(LPCHARACTER ch, const BYTE header, const char* data) switch (type->type) { - case SKILL_GEOMPUNG: - case SKILL_SANGONG: - case SKILL_YEONSA: - case SKILL_KWANKYEOK: - case SKILL_HWAJO: - case SKILL_GIGUNG: - case SKILL_PABEOB: - case SKILL_MARYUNG: - case SKILL_TUSOK: - case SKILL_MAHWAN: - case SKILL_BIPABU: - case SKILL_NOEJEON: - case SKILL_CHAIN: + case SKILL_WAR_MENTAL_AMBUSH: + case SKILL_NINJA_BLADEFIGHT_POISONOUS_CLOUD: + case SKILL_NINJA_ARCHERY_REPETITIVE_SHOT: + case SKILL_NINJA_ARCHERY_ARROW_SHOWER: + case SKILL_NINJA_ARCHERY_FIRE_ARROW: + case SKILL_NINJA_ARCHERY_POISON_ARROW: + case SKILL_SURA_WEAPONRY_DISPEL: + case SKILL_SURA_BLACKMAGIC_DARK_STRIKE: + case SKILL_SURA_BLACKMAGIC_SPIRIT_STRIKE: + case SKILL_SURA_BLACKMAGIC_DARK_ORB: + case SKILL_SHAMAN_DRAGON_FLYING_TALISMAN: + case SKILL_SHAMAN_HEALING_LIGHTNING_THROW: + case SKILL_SHAMAN_HEALING_LIGHTNING_CLAW: case SKILL_HORSE_WILDATTACK_RANGE: if (HEADER_CG_SHOOT != type->header) { diff --git a/src/game/src/skill.h b/src/game/src/skill.h index 824890e..510544c 100644 --- a/src/game/src/skill.h +++ b/src/game/src/skill.h @@ -46,80 +46,80 @@ enum ESkillIndexes // 무사 전사 계열 // A - SKILL_SAMYEON = 1, // 삼연참(세번베기) - SKILL_PALBANG, // 팔방풍우 + SKILL_WAR_BODY_THREE_WAY_CUT = 1, // 삼연참(세번베기) + SKILL_WAR_BODY_SWORD_SPIN, // 팔방풍우 // S - SKILL_JEONGWI, // 전귀혼 - SKILL_GEOMKYUNG, // 검경 - SKILL_TANHWAN, // 탄환격 + SKILL_WAR_BODY_BERSERK, // 전귀혼 + SKILL_WAR_BODY_AURA, // 검경 + SKILL_WAR_BODY_DASH, // 탄환격 // 무사 기공 계열 // A - SKILL_GIGONGCHAM = 16, // 기공참 - SKILL_GYOKSAN, // 격산타우 - SKILL_DAEJINGAK, // 대진각 + SKILL_WAR_MENTAL_BASH = 16, // 기공참 + SKILL_WAR_MENTAL_POUNDING, // 격산타우 + SKILL_WAR_MENTAL_STRONG_BODY, // 대진각 // S - SKILL_CHUNKEON, // 천근추 - SKILL_GEOMPUNG, // 검풍 + SKILL_WAR_MENTAL_SWORD_STRIKE, // 천근추 + SKILL_WAR_MENTAL_AMBUSH, // 검풍 // 자객 암살 계열 // A - SKILL_AMSEOP = 31, // 암습 - SKILL_GUNGSIN, // 궁신탄영 - SKILL_CHARYUN, // 차륜살 + SKILL_NINJA_BLADEFIGHT_AMBUSH = 31, // 암습 + SKILL_NINJA_BLADEFIGHT_FAST_ATTACK, // 궁신탄영 + SKILL_NINJA_BLADEFIGHT_ROLLING_DAGGER, // 차륜살 // S - SKILL_EUNHYUNG, // 은형법 - SKILL_SANGONG, // 산공분 + SKILL_NINJA_BLADEFIGHT_DISGUISE, // 은형법 + SKILL_NINJA_BLADEFIGHT_POISONOUS_CLOUD, // 산공분 // 자객 궁수 계열 // A - SKILL_YEONSA = 46, // 연사 - SKILL_KWANKYEOK, // 관격술 - SKILL_HWAJO, // 화조파 + SKILL_NINJA_ARCHERY_REPETITIVE_SHOT = 46, // 연사 + SKILL_NINJA_ARCHERY_ARROW_SHOWER, // 관격술 + SKILL_NINJA_ARCHERY_FIRE_ARROW, // 화조파 // S - SKILL_GYEONGGONG, // 경공술 - SKILL_GIGUNG, // 기궁 + SKILL_NINJA_ARCHERY_FEATHER_WALK, // 경공술 + SKILL_NINJA_ARCHERY_POISON_ARROW, // 기궁 // 수라 검 // A - SKILL_SWAERYUNG = 61, // 쇄령지 - SKILL_YONGKWON, // 용권파 + SKILL_SURA_WEAPONRY_FINGER_STRIKE = 61, // 쇄령지 + SKILL_SURA_WEAPONRY_DRAGON_SWIRL, // 용권파 // S - SKILL_GWIGEOM, // 귀검 - SKILL_TERROR, // 공포 - SKILL_JUMAGAP, // 주마갑 - SKILL_PABEOB, // 파법술 + SKILL_SURA_WEAPONRY_ENCHANTED_BLADE, // 귀검 + SKILL_SURA_WEAPONRY_FEAR, // 공포 + SKILL_SURA_WEAPONRY_ENCHANTED_ARMOUR, // 주마갑 + SKILL_SURA_WEAPONRY_DISPEL, // 파법술 // 수라 마법 // A - SKILL_MARYUNG = 76, // 마령 - SKILL_HWAYEOMPOK, // 화염폭 - SKILL_MUYEONG, // 무영진 + SKILL_SURA_BLACKMAGIC_DARK_STRIKE = 76, // 마령 + SKILL_SURA_BLACKMAGIC_FLAME_STRIKE, // 화염폭 + SKILL_SURA_BLACKMAGIC_FLAME_SPIRIT, // 무영진 // S - SKILL_MANASHILED, // 흑신수호 - SKILL_TUSOK, // 투속마령 - SKILL_MAHWAN, // 마환격 + SKILL_SURA_BLACKMAGIC_DARK_PROTECTION, // 흑신수호 + SKILL_SURA_BLACKMAGIC_SPIRIT_STRIKE, // 투속마령 + SKILL_SURA_BLACKMAGIC_DARK_ORB, // 마환격 // 무당 용신 // A - SKILL_BIPABU = 91, - SKILL_YONGBI, // 용비광사파 - SKILL_PAERYONG, // 패룡나한무 + SKILL_SHAMAN_DRAGON_FLYING_TALISMAN = 91, + SKILL_SHAMAN_DRAGON_SHOOTING_DRAGON, // 용비광사파 + SKILL_SHAMAN_DRAGON_DRAGONS_ROAR, // 패룡나한무 // S //SKILL_BUDONG, // 부동박부 - SKILL_HOSIN, // 호신 - SKILL_REFLECT, // 보호 - SKILL_GICHEON, // 기천대공 + SKILL_SHAMAN_DRAGON_BLESSING, // 호신 + SKILL_SHAMAN_DRAGON_REFLECT, // 보호 + SKILL_SHAMAN_DRAGON_DRAGONS_AID, // 기천대공 // 무당 뇌신 // A - SKILL_NOEJEON = 106, // 뇌전령 - SKILL_BYEURAK, // 벼락 - SKILL_CHAIN, // 체인라이트닝 + SKILL_SHAMAN_HEALING_LIGHTNING_THROW = 106, // 뇌전령 + SKILL_SHAMAN_HEALING_SUMMON_LIGHTNING, // 벼락 + SKILL_SHAMAN_HEALING_LIGHTNING_CLAW, // 체인라이트닝 // S - SKILL_JEONGEOP, // 정업인 - SKILL_KWAESOK, // 이동속도업 - SKILL_JEUNGRYEOK, // 증력술 + SKILL_SHAMAN_HEALING_CURE, // 정업인 + SKILL_SHAMAN_HEALING_SWIFTNESS, // 이동속도업 + SKILL_SHAMAN_HEALING_ATTACK, // 증력술 // 공통 스킬 // 7 @@ -215,7 +215,7 @@ class CSkillProto bool IsChargeSkill() { - return dwVnum == SKILL_TANHWAN || dwVnum == SKILL_HORSE_CHARGE; + return dwVnum == SKILL_WAR_BODY_DASH || dwVnum == SKILL_HORSE_CHARGE; } // 3차 적용 -- 2.45.2 From 8dec8ff802806bcbb5568458096372eed1bba405 Mon Sep 17 00:00:00 2001 From: Haydukk Date: Sun, 10 Nov 2024 18:49:22 +0200 Subject: [PATCH 2/6] More english names for skills enum --- src/game/src/char_skill.cpp | 30 +++++++++++++++--------------- src/game/src/cmd_general.cpp | 16 ++++++++-------- src/game/src/guild_war.cpp | 6 +++--- src/game/src/skill.h | 30 +++++++++++++++--------------- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/game/src/char_skill.cpp b/src/game/src/char_skill.cpp index d36674e..d14569f 100644 --- a/src/game/src/char_skill.cpp +++ b/src/game/src/char_skill.cpp @@ -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) diff --git a/src/game/src/cmd_general.cpp b/src/game/src/cmd_general.cpp index 51a9277..ead429a 100644 --- a/src/game/src/cmd_general.cpp +++ b/src/game/src/cmd_general.cpp @@ -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: diff --git a/src/game/src/guild_war.cpp b/src/game/src/guild_war.cpp index f8b5486..216d0ac 100644 --- a/src/game/src/guild_war.cpp +++ b/src/game/src/guild_war.cpp @@ -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(); } diff --git a/src/game/src/skill.h b/src/game/src/skill.h index 510544c..a00b917 100644 --- a/src/game/src/skill.h +++ b/src/game/src/skill.h @@ -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, -- 2.45.2 From 6fe53c2f7627bb96891e41fca2958d0511d87756 Mon Sep 17 00:00:00 2001 From: Haydukk Date: Sun, 10 Nov 2024 19:40:18 +0200 Subject: [PATCH 3/6] English names for affects enum --- src/game/src/affect.h | 36 ++++++++++++++++++------------------ src/game/src/char.cpp | 2 +- src/game/src/char_battle.cpp | 20 ++++++++++---------- src/game/src/char_item.cpp | 4 ++-- src/game/src/char_skill.cpp | 20 ++++++++++---------- src/game/src/char_state.cpp | 2 +- src/game/src/guild.cpp | 2 +- src/game/src/skill.h | 4 ++-- src/game/src/trigger.cpp | 4 ++-- 9 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/game/src/affect.h b/src/game/src/affect.h index 90e610b..729a47a 100644 --- a/src/game/src/affect.h +++ b/src/game/src/affect.h @@ -133,26 +133,26 @@ enum EAffectBits AFF_FISH_MIND, - AFF_JEONGWIHON, // 전귀혼 - AFF_GEOMGYEONG, // 검경 - AFF_CHEONGEUN, // 천근추 - AFF_GYEONGGONG, // 경공술 - AFF_EUNHYUNG, // 은형법 - AFF_GWIGUM, // 귀검 - AFF_TERROR, // 공포 - AFF_JUMAGAP, // 주마갑 - AFF_HOSIN, // 호신 - AFF_BOHO, // 보호 - AFF_KWAESOK, // 쾌속 - AFF_MANASHIELD, // 마나쉴드 - AFF_MUYEONG, // 무영진 affect + AFF_WAR_BODY_BERSERK, // 전귀혼 + AFF_WAR_BODY_AURA, // 검경 + AFF_WAR_MENTAL_STRONG_BODY, // 천근추 + AFF_NINJA_ARCHERY_FEATHER_WALK, // 경공술 + AFF_NINJA_BLADEFIGHT_DISGUISE, // 은형법 + AFF_SURA_WEAPONRY_ENCHANTED_BLADE, // 귀검 + AFF_SURA_WEAPONRY_FEAR, // 공포 + AFF_SURA_WEAPONRY_ENCHANTED_ARMOUR, // 주마갑 + AFF_SHAMAN_DRAGON_BLESSING, // 호신 + AFF_SHAMAN_DRAGON_REFLECT, // 보호 + AFF_SHAMAN_HEALING_SWIFTNESS, // 쾌속 + AFF_SURA_BLACKMAGIC_DARK_PROTECTION, // 마나쉴드 + AFF_SURA_BLACKMAGIC_FLAME_SPIRIT, // 무영진 affect AFF_REVIVE_INVISIBLE, // 부활시 잠시동안 무적 AFF_FIRE, // 지속 불 데미지 - AFF_GICHEON, // 기천대공 - AFF_JEUNGRYEOK, // 증력술 - AFF_TANHWAN_DASH, // 탄환격용 달리기어펙트 - AFF_PABEOP, // 파법술 - AFF_CHEONGEUN_WITH_FALL, // 천근추 + AFF_SHAMAN_DRAGON_DRAGONS_AID, // 기천대공 + AFF_SHAMAN_HEALING_ATTACK, // 증력술 + AFF_WAR_BODY_DASH, // 탄환격용 달리기어펙트 + AFF_SURA_WEAPONRY_DISPEL, // 파법술 + AFF_WAR_MENTAL_SWORD_STRIKE_WITH_FALL, // 천근추 AFF_POLYMORPH, AFF_WAR_FLAG1, AFF_WAR_FLAG2, diff --git a/src/game/src/char.cpp b/src/game/src/char.cpp index ef323f9..0347718 100644 --- a/src/game/src/char.cpp +++ b/src/game/src/char.cpp @@ -4804,7 +4804,7 @@ void CHARACTER::OnMove(bool bIsAttack) if (IsAffectFlag(AFF_REVIVE_INVISIBLE)) RemoveAffect(AFFECT_REVIVE_INVISIBLE); - if (IsAffectFlag(AFF_EUNHYUNG)) + if (IsAffectFlag(AFF_NINJA_BLADEFIGHT_DISGUISE)) { RemoveAffect(SKILL_NINJA_BLADEFIGHT_DISGUISE); SetAffectedEunhyung(); diff --git a/src/game/src/char_battle.cpp b/src/game/src/char_battle.cpp index 089ebec..cd84f97 100644 --- a/src/game/src/char_battle.cpp +++ b/src/game/src/char_battle.cpp @@ -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 (IsAffectFlag(AFF_TERROR)) + if (IsAffectFlag(AFF_SURA_WEAPONRY_FEAR)) { int pct = GetSkillPower(SKILL_SURA_WEAPONRY_FEAR) / 400; @@ -1722,9 +1722,9 @@ bool CHARACTER::Damage(LPCHARACTER pAttacker, int dam, EDamageType type) // retu dam *= 2; 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; - 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); - if (IsAffectFlag(AFF_TERROR)) + if (IsAffectFlag(AFF_SURA_WEAPONRY_FEAR)) 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; // @@ -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 는 작아질수록 좋다 int iDamageSPPart = dam / 3; @@ -3186,7 +3186,7 @@ LPCHARACTER CHARACTER::GetNearestVictim(LPCHARACTER pkChr) if (!pAttacker) continue; - if (pAttacker->IsAffectFlag(AFF_EUNHYUNG) || + if (pAttacker->IsAffectFlag(AFF_NINJA_BLADEFIGHT_DISGUISE) || pAttacker->IsAffectFlag(AFF_INVISIBILITY) || pAttacker->IsAffectFlag(AFF_REVIVE_INVISIBLE)) continue; diff --git a/src/game/src/char_item.cpp b/src/game/src/char_item.cpp index 099a31c..370e2a0 100644 --- a/src/game/src/char_item.cpp +++ b/src/game/src/char_item.cpp @@ -477,10 +477,10 @@ void CHARACTER::SetWear(BYTE bCell, LPITEM item) if (!item && bCell == WEAR_WEAPON) { // 귀검 사용 시 벗는 것이라면 효과를 없애야 한다. - if (IsAffectFlag(AFF_GWIGUM)) + if (IsAffectFlag(AFF_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); } } diff --git a/src/game/src/char_skill.cpp b/src/game/src/char_skill.cpp index d14569f..5a22c02 100644 --- a/src/game/src/char_skill.cpp +++ b/src/game/src/char_skill.cpp @@ -1400,7 +1400,7 @@ struct FuncSplashDamage if (Random::get(1, 100) <= iAmount2) { 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; } @@ -2233,7 +2233,7 @@ int CHARACTER::ComputeSkill(DWORD dwVnum, LPCHARACTER pkVictim, BYTE bSkillLevel if (pkVictim == this) AddAffect(dwVnum, POINT_NONE, 0, - AFF_MUYEONG, + AFF_SURA_BLACKMAGIC_FLAME_SPIRIT, iDur, (int) pkSk->kDurationSPCostPoly.Eval(), true); @@ -2281,12 +2281,12 @@ int CHARACTER::ComputeSkill(DWORD dwVnum, LPCHARACTER pkVictim, BYTE bSkillLevel if ( !LC_IsYMIR() ) { 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 { 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 @@ -2336,7 +2336,7 @@ int CHARACTER::ComputeSkill(DWORD dwVnum, LPCHARACTER pkVictim, BYTE bSkillLevel iDur2 += GetPoint(POINT_PARTY_BUFFER_BONUS); 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 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 (IsAffectFlag(AFF_TANHWAN_DASH) || pkVictim && pkVictim != this) + if (IsAffectFlag(AFF_WAR_BODY_DASH) || pkVictim && pkVictim != this) { if (!pkVictim) return false; - if (!IsAffectFlag(AFF_TANHWAN_DASH)) + if (!IsAffectFlag(AFF_WAR_BODY_DASH)) { if (!UseSkill(dwVnum, this)) return false; @@ -2568,7 +2568,7 @@ bool CHARACTER::UseSkill(DWORD dwVnum, LPCHARACTER pkVictim, bool bUseGrandMaste if (IS_SET(pkSk->dwFlag, SKILL_FLAG_SELFONLY)) 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를 붙인다. pkVictim = this; @@ -2702,7 +2702,7 @@ EVENTFUNC(skill_muyoung_event) return 0; } - if (!ch->IsAffectFlag(AFF_MUYEONG)) + if (!ch->IsAffectFlag(AFF_SURA_BLACKMAGIC_FLAME_SPIRIT)) { ch->StopMuyeongEvent(); return 0; diff --git a/src/game/src/char_state.cpp b/src/game/src/char_state.cpp index 9e7becb..8518fda 100644 --- a/src/game/src/char_state.cpp +++ b/src/game/src/char_state.cpp @@ -197,7 +197,7 @@ namespace if (pkChr->IsDead()) return; - if (pkChr->IsAffectFlag(AFF_EUNHYUNG) || + if (pkChr->IsAffectFlag(AFF_NINJA_BLADEFIGHT_DISGUISE) || pkChr->IsAffectFlag(AFF_INVISIBILITY) || pkChr->IsAffectFlag(AFF_REVIVE_INVISIBLE)) return; diff --git a/src/game/src/guild.cpp b/src/game/src/guild.cpp index bbb5ecf..e17358b 100644 --- a/src/game/src/guild.cpp +++ b/src/game/src/guild.cpp @@ -1273,7 +1273,7 @@ void CGuild::UseSkill(DWORD dwVnum, LPCHARACTER ch, DWORD pid) if (ch->IsAffectFlag(AFF_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); double k =1.0*m_data.abySkill[dwRealVnum]/pkSk->bMaxLevel; diff --git a/src/game/src/skill.h b/src/game/src/skill.h index a00b917..2b49c08 100644 --- a/src/game/src/skill.h +++ b/src/game/src/skill.h @@ -57,9 +57,9 @@ enum ESkillIndexes // A SKILL_WAR_MENTAL_BASH = 16, // 기공참 SKILL_WAR_MENTAL_POUNDING, // 격산타우 - SKILL_WAR_MENTAL_STRONG_BODY, // 대진각 + SKILL_WAR_MENTAL_SWORD_STRIKE, // 대진각 // S - SKILL_WAR_MENTAL_SWORD_STRIKE, // 천근추 + SKILL_WAR_MENTAL_STRONG_BODY, // 천근추 SKILL_WAR_MENTAL_AMBUSH, // 검풍 // 자객 암살 계열 diff --git a/src/game/src/trigger.cpp b/src/game/src/trigger.cpp index ceb1a51..4252457 100644 --- a/src/game/src/trigger.cpp +++ b/src/game/src/trigger.cpp @@ -95,12 +95,12 @@ class FuncFindMobVictim if (pkChr->IsDead()) return false; - if (pkChr->IsAffectFlag(AFF_EUNHYUNG) || + if (pkChr->IsAffectFlag(AFF_NINJA_BLADEFIGHT_DISGUISE) || pkChr->IsAffectFlag(AFF_INVISIBILITY) || pkChr->IsAffectFlag(AFF_REVIVE_INVISIBLE)) 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() ) return false; -- 2.45.2 From ba8bad43376a24624f6f05de9da217aa0ff82d12 Mon Sep 17 00:00:00 2001 From: Haydukk Date: Sun, 10 Nov 2024 19:55:59 +0200 Subject: [PATCH 4/6] Rename other variables related to korean skill names --- src/game/src/char.cpp | 10 +++++----- src/game/src/char.h | 24 ++++++++++++------------ src/game/src/char_affect.cpp | 4 ++-- src/game/src/char_battle.cpp | 14 +++++++------- src/game/src/char_skill.cpp | 28 ++++++++++++++-------------- src/game/src/skill.cpp | 2 +- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/game/src/char.cpp b/src/game/src/char.cpp index 0347718..4be6a94 100644 --- a/src/game/src/char.cpp +++ b/src/game/src/char.cpp @@ -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)) diff --git a/src/game/src/char.h b/src/game/src/char.h index 4fe039f..f984118 100644 --- a/src/game/src/char.h +++ b/src/game/src/char.h @@ -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 diff --git a/src/game/src/char_affect.cpp b/src/game/src/char_affect.cpp index 1596842..f618ed0 100644 --- a/src/game/src/char_affect.cpp +++ b/src/game/src/char_affect.cpp @@ -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(); } } diff --git a/src/game/src/char_battle.cpp b/src/game/src/char_battle.cpp index cd84f97..397e953 100644 --- a/src/game/src/char_battle.cpp +++ b/src/game/src/char_battle.cpp @@ -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); } diff --git a/src/game/src/char_skill.cpp b/src/game/src/char_skill.cpp index 5a22c02..9b05fb7 100644 --- a/src/game/src/char_skill.cpp +++ b/src/game/src/char_skill.cpp @@ -127,9 +127,9 @@ int CHARACTER::GetChainLightningMaxCount() const return aiChainLightningCountBySkillLevel[std::min(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(); 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) diff --git a/src/game/src/skill.cpp b/src/game/src/skill.cpp index d402423..97647e7 100644 --- a/src/game/src/skill.cpp +++ b/src/game/src/skill.cpp @@ -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 }, -- 2.45.2 From 9c2ed2781eb6c9319ad58b015f276379b6e22046 Mon Sep 17 00:00:00 2001 From: Haydukk Date: Sun, 10 Nov 2024 20:23:11 +0200 Subject: [PATCH 5/6] Fix skill names --- src/game/src/affect.h | 2 +- src/game/src/char.cpp | 8 ++++---- src/game/src/char.h | 10 +++++----- src/game/src/char_affect.cpp | 12 ++++++------ src/game/src/char_battle.cpp | 4 ++-- src/game/src/char_item.cpp | 2 +- src/game/src/char_skill.cpp | 26 +++++++++++++------------- src/game/src/char_state.cpp | 2 +- src/game/src/cmd_general.cpp | 2 +- src/game/src/guild.cpp | 4 ++-- src/game/src/input_main.cpp | 2 +- src/game/src/skill.h | 14 +++++++------- src/game/src/trigger.cpp | 2 +- 13 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/game/src/affect.h b/src/game/src/affect.h index 729a47a..b4b1b49 100644 --- a/src/game/src/affect.h +++ b/src/game/src/affect.h @@ -137,7 +137,7 @@ enum EAffectBits AFF_WAR_BODY_AURA, // 검경 AFF_WAR_MENTAL_STRONG_BODY, // 천근추 AFF_NINJA_ARCHERY_FEATHER_WALK, // 경공술 - AFF_NINJA_BLADEFIGHT_DISGUISE, // 은형법 + AFF_NINJA_BLADEFIGHT_STEALTH, // 은형법 AFF_SURA_WEAPONRY_ENCHANTED_BLADE, // 귀검 AFF_SURA_WEAPONRY_FEAR, // 공포 AFF_SURA_WEAPONRY_ENCHANTED_ARMOUR, // 주마갑 diff --git a/src/game/src/char.cpp b/src/game/src/char.cpp index 4be6a94..d05f83a 100644 --- a/src/game/src/char.cpp +++ b/src/game/src/char.cpp @@ -4804,14 +4804,14 @@ void CHARACTER::OnMove(bool bIsAttack) if (IsAffectFlag(AFF_REVIVE_INVISIBLE)) RemoveAffect(AFFECT_REVIVE_INVISIBLE); - if (IsAffectFlag(AFF_NINJA_BLADEFIGHT_DISGUISE)) + if (IsAffectFlag(AFF_NINJA_BLADEFIGHT_STEALTH)) { - RemoveAffect(SKILL_NINJA_BLADEFIGHT_DISGUISE); - SetAffectedDisguise(); + RemoveAffect(SKILL_NINJA_BLADEFIGHT_STEALTH); + SetAffectedStealth(); } else { - ClearAffectedDisguise(); + ClearAffectedStealth(); } /*if (IsAffectFlag(AFF_JEONSIN)) diff --git a/src/game/src/char.h b/src/game/src/char.h index f984118..ca215ad 100644 --- a/src/game/src/char.h +++ b/src/game/src/char.h @@ -1435,14 +1435,14 @@ class CHARACTER : public CEntity, public CFSM, public CHorseRider int m_iChainLightingIndex; CHARACTER_SET m_setExceptChainLighting; - // for SKILL_NINJA_BLADEFIGHT_DISGUISE + // for SKILL_NINJA_BLADEFIGHT_STEALTH public: - void SetAffectedDisguise(); - void ClearAffectedDisguise() { m_dwAffectedDisguiseLevel = 0; } - bool GetAffectedDisguise() const { return m_dwAffectedDisguiseLevel; } + void SetAffectedStealth(); + void ClearAffectedStealth() { m_dwAffectedStealthLevel = 0; } + bool GetAffectedStealth() const { return m_dwAffectedStealthLevel; } private: - DWORD m_dwAffectedDisguiseLevel; + DWORD m_dwAffectedStealthLevel; // // Skill levels diff --git a/src/game/src/char_affect.cpp b/src/game/src/char_affect.cpp index f618ed0..54527e1 100644 --- a/src/game/src/char_affect.cpp +++ b/src/game/src/char_affect.cpp @@ -747,8 +747,8 @@ void CHARACTER::RemoveGoodAffect() RemoveAffect(SKILL_WAR_BODY_BERSERK); RemoveAffect(SKILL_WAR_BODY_AURA); - RemoveAffect(SKILL_WAR_MENTAL_SWORD_STRIKE); - RemoveAffect(SKILL_NINJA_BLADEFIGHT_DISGUISE); + RemoveAffect(SKILL_WAR_MENTAL_STUMP); + RemoveAffect(SKILL_NINJA_BLADEFIGHT_STEALTH); RemoveAffect(SKILL_NINJA_ARCHERY_FEATHER_WALK); RemoveAffect(SKILL_SURA_WEAPONRY_ENCHANTED_BLADE); RemoveAffect(SKILL_SURA_WEAPONRY_FEAR); @@ -758,7 +758,7 @@ void CHARACTER::RemoveGoodAffect() RemoveAffect(SKILL_SHAMAN_DRAGON_REFLECT); RemoveAffect(SKILL_SHAMAN_HEALING_SWIFTNESS); RemoveAffect(SKILL_SHAMAN_HEALING_ATTACK); - RemoveAffect(SKILL_SHAMAN_DRAGON_DRAGONS_AID); + RemoveAffect(SKILL_SHAMAN_DRAGON_DRAGONS_STRENGTH); } bool CHARACTER::IsGoodAffect(BYTE bAffectType) const @@ -775,8 +775,8 @@ bool CHARACTER::IsGoodAffect(BYTE bAffectType) const case (SKILL_WAR_BODY_BERSERK): case (SKILL_WAR_BODY_AURA): - case (SKILL_WAR_MENTAL_SWORD_STRIKE): - case (SKILL_NINJA_BLADEFIGHT_DISGUISE): + case (SKILL_WAR_MENTAL_STUMP): + case (SKILL_NINJA_BLADEFIGHT_STEALTH): case (SKILL_NINJA_ARCHERY_FEATHER_WALK): case (SKILL_SURA_WEAPONRY_ENCHANTED_BLADE): case (SKILL_SURA_WEAPONRY_FEAR): @@ -786,7 +786,7 @@ bool CHARACTER::IsGoodAffect(BYTE bAffectType) const case (SKILL_SHAMAN_DRAGON_REFLECT): case (SKILL_SHAMAN_HEALING_SWIFTNESS): case (SKILL_SHAMAN_HEALING_ATTACK): - case (SKILL_SHAMAN_DRAGON_DRAGONS_AID): + case (SKILL_SHAMAN_DRAGON_DRAGONS_STRENGTH): return true; } return false; diff --git a/src/game/src/char_battle.cpp b/src/game/src/char_battle.cpp index 397e953..9ecbad2 100644 --- a/src/game/src/char_battle.cpp +++ b/src/game/src/char_battle.cpp @@ -3050,7 +3050,7 @@ class CFuncShoot case SKILL_SURA_BLACKMAGIC_SPIRIT_STRIKE: case SKILL_SHAMAN_DRAGON_FLYING_TALISMAN: case SKILL_SHAMAN_HEALING_LIGHTNING_THROW: - case SKILL_WAR_MENTAL_AMBUSH: + case SKILL_WAR_MENTAL_SWORD_STRIKE: case SKILL_NINJA_BLADEFIGHT_POISONOUS_CLOUD: case SKILL_SURA_BLACKMAGIC_DARK_ORB: case SKILL_SURA_WEAPONRY_DISPEL: @@ -3186,7 +3186,7 @@ LPCHARACTER CHARACTER::GetNearestVictim(LPCHARACTER pkChr) if (!pAttacker) continue; - if (pAttacker->IsAffectFlag(AFF_NINJA_BLADEFIGHT_DISGUISE) || + if (pAttacker->IsAffectFlag(AFF_NINJA_BLADEFIGHT_STEALTH) || pAttacker->IsAffectFlag(AFF_INVISIBILITY) || pAttacker->IsAffectFlag(AFF_REVIVE_INVISIBLE)) continue; diff --git a/src/game/src/char_item.cpp b/src/game/src/char_item.cpp index 370e2a0..ba93ecd 100644 --- a/src/game/src/char_item.cpp +++ b/src/game/src/char_item.cpp @@ -7277,7 +7277,7 @@ void CHARACTER::AutoRecoveryItemProcess(const EAffectTypes type) return; { - const DWORD stunSkills[] = { SKILL_WAR_BODY_DASH, SKILL_WAR_MENTAL_AMBUSH, SKILL_SHAMAN_HEALING_SUMMON_LIGHTNING, SKILL_NINJA_ARCHERY_POISON_ARROW }; + const DWORD stunSkills[] = { SKILL_WAR_BODY_DASH, SKILL_WAR_MENTAL_SWORD_STRIKE, SKILL_SHAMAN_HEALING_SUMMON_LIGHTNING, SKILL_NINJA_ARCHERY_POISON_ARROW }; for (size_t i=0 ; i < sizeof(stunSkills)/sizeof(DWORD) ; ++i) { diff --git a/src/game/src/char_skill.cpp b/src/game/src/char_skill.cpp index 9b05fb7..f00bb21 100644 --- a/src/game/src/char_skill.cpp +++ b/src/game/src/char_skill.cpp @@ -127,9 +127,9 @@ int CHARACTER::GetChainLightningMaxCount() const return aiChainLightningCountBySkillLevel[std::min(SKILL_MAX_LEVEL, GetSkillLevel(SKILL_SHAMAN_HEALING_LIGHTNING_CLAW))]; } -void CHARACTER::SetAffectedDisguise() +void CHARACTER::SetAffectedStealth() { - m_dwAffectedDisguiseLevel = GetSkillPower(SKILL_NINJA_BLADEFIGHT_DISGUISE); + m_dwAffectedStealthLevel = GetSkillPower(SKILL_NINJA_BLADEFIGHT_STEALTH); } void CHARACTER::SetSkillGroup(BYTE bSkillGroup) @@ -239,13 +239,13 @@ bool CHARACTER::IsLearnableSkill(DWORD dwSkillVnum) const return true; } - if (SKILL_8_A_ANTI_WAR_MENTAL_BASH <= dwSkillVnum && dwSkillVnum <= SKILL_8_D_ANTI_SHAMAN_HEALING_SUMMON_LIGHTNING) + if (SKILL_8_A_ANTI_WAR_MENTAL_SPIRIT_STRIKE <= dwSkillVnum && dwSkillVnum <= SKILL_8_D_ANTI_SHAMAN_HEALING_SUMMON_LIGHTNING) { for (int i=0 ; i < 4 ; i++) { - if (unsigned(SKILL_8_A_ANTI_WAR_MENTAL_BASH + i) != dwSkillVnum) + if (unsigned(SKILL_8_A_ANTI_WAR_MENTAL_SPIRIT_STRIKE + i) != dwSkillVnum) { - if (0 != GetSkillLevel(SKILL_8_A_ANTI_WAR_MENTAL_BASH + i)) + if (0 != GetSkillLevel(SKILL_8_A_ANTI_WAR_MENTAL_SPIRIT_STRIKE + i)) return false; } } @@ -1159,10 +1159,10 @@ struct FuncSplashDamage m_pkSk->SetPointVar("chain", m_pkChr->GetChainLightningIndex()); m_pkChr->IncChainLightningIndex(); - bool bUnderDisguise = m_pkChr->GetAffectedDisguise() > 0; // 이건 왜 여기서 하지?? + bool bUnderStealth = m_pkChr->GetAffectedStealth() > 0; // 이건 왜 여기서 하지?? - m_pkSk->SetPointVar("ek", m_pkChr->GetAffectedDisguise()*1./100); - //m_pkChr->ClearAffectedDisguise(); + m_pkSk->SetPointVar("ek", m_pkChr->GetAffectedStealth()*1./100); + //m_pkChr->ClearAffectedStealth(); SetPolyVarForAttack(m_pkChr, m_pkSk, m_pkWeapon); int iAmount = 0; @@ -1192,7 +1192,7 @@ struct FuncSplashDamage { adjust = 1.5f; - if (bUnderDisguise) + if (bUnderStealth) 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 (bUnderDisguise) + if (bUnderStealth) adjust += 0.5f; if (m_pkChr->GetWear(WEAR_WEAPON) && m_pkChr->GetWear(WEAR_WEAPON)->GetSubType() == WEAPON_DAGGER) @@ -1358,7 +1358,7 @@ struct FuncSplashDamage 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_WAR_MENTAL_SPIRIT_STRIKE: AntiSkillID = SKILL_8_A_ANTI_WAR_MENTAL_SPIRIT_STRIKE; 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; @@ -2280,12 +2280,12 @@ int CHARACTER::ComputeSkill(DWORD dwVnum, LPCHARACTER pkVictim, BYTE bSkillLevel //if (g_iUseLocale) if ( !LC_IsYMIR() ) { - if ((pkSk->dwVnum == SKILL_WAR_MENTAL_SWORD_STRIKE && GetUsedSkillMasterType(pkSk->dwVnum) < SKILL_GRAND_MASTER)) + if ((pkSk->dwVnum == SKILL_WAR_MENTAL_STUMP && GetUsedSkillMasterType(pkSk->dwVnum) < SKILL_GRAND_MASTER)) affact_flag = AFF_WAR_MENTAL_SWORD_STRIKE_WITH_FALL; } else { - if ((pkSk->dwVnum == SKILL_WAR_MENTAL_SWORD_STRIKE && GetUsedSkillMasterType(pkSk->dwVnum) < SKILL_MASTER)) + if ((pkSk->dwVnum == SKILL_WAR_MENTAL_STUMP && GetUsedSkillMasterType(pkSk->dwVnum) < SKILL_MASTER)) affact_flag = AFF_WAR_MENTAL_SWORD_STRIKE_WITH_FALL; } // END_OF_ADD_GRANDMASTER_SKILL diff --git a/src/game/src/char_state.cpp b/src/game/src/char_state.cpp index 8518fda..73a7d0e 100644 --- a/src/game/src/char_state.cpp +++ b/src/game/src/char_state.cpp @@ -197,7 +197,7 @@ namespace if (pkChr->IsDead()) return; - if (pkChr->IsAffectFlag(AFF_NINJA_BLADEFIGHT_DISGUISE) || + if (pkChr->IsAffectFlag(AFF_NINJA_BLADEFIGHT_STEALTH) || pkChr->IsAffectFlag(AFF_INVISIBILITY) || pkChr->IsAffectFlag(AFF_REVIVE_INVISIBLE)) return; diff --git a/src/game/src/cmd_general.cpp b/src/game/src/cmd_general.cpp index ead429a..65b1dbc 100644 --- a/src/game/src/cmd_general.cpp +++ b/src/game/src/cmd_general.cpp @@ -853,7 +853,7 @@ ACMD(do_skillup) case SKILL_7_C_ANTI_SURA_WEAPONRY_FINGER_STRIKE: case SKILL_7_D_ANTI_SHAMAN_DRAGON_SHOOTING_DRAGON: - case SKILL_8_A_ANTI_WAR_MENTAL_BASH: + case SKILL_8_A_ANTI_WAR_MENTAL_SPIRIT_STRIKE: 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: diff --git a/src/game/src/guild.cpp b/src/game/src/guild.cpp index e17358b..5cd46cc 100644 --- a/src/game/src/guild.cpp +++ b/src/game/src/guild.cpp @@ -1273,8 +1273,8 @@ void CGuild::UseSkill(DWORD dwVnum, LPCHARACTER ch, DWORD pid) if (ch->IsAffectFlag(AFF_REVIVE_INVISIBLE)) ch->RemoveAffect(AFFECT_REVIVE_INVISIBLE); - if (ch->IsAffectFlag(AFF_NINJA_BLADEFIGHT_DISGUISE)) - ch->RemoveAffect(SKILL_NINJA_BLADEFIGHT_DISGUISE); + if (ch->IsAffectFlag(AFF_NINJA_BLADEFIGHT_STEALTH)) + ch->RemoveAffect(SKILL_NINJA_BLADEFIGHT_STEALTH); double k =1.0*m_data.abySkill[dwRealVnum]/pkSk->bMaxLevel; pkSk->kSPCostPoly.SetVar("k", k); diff --git a/src/game/src/input_main.cpp b/src/game/src/input_main.cpp index 2136cfe..e018a48 100644 --- a/src/game/src/input_main.cpp +++ b/src/game/src/input_main.cpp @@ -1704,7 +1704,7 @@ void CInputMain::Attack(LPCHARACTER ch, const BYTE header, const char* data) switch (type->type) { - case SKILL_WAR_MENTAL_AMBUSH: + case SKILL_WAR_MENTAL_SWORD_STRIKE: case SKILL_NINJA_BLADEFIGHT_POISONOUS_CLOUD: case SKILL_NINJA_ARCHERY_REPETITIVE_SHOT: case SKILL_NINJA_ARCHERY_ARROW_SHOWER: diff --git a/src/game/src/skill.h b/src/game/src/skill.h index 2b49c08..876f8ff 100644 --- a/src/game/src/skill.h +++ b/src/game/src/skill.h @@ -55,12 +55,12 @@ enum ESkillIndexes // 무사 기공 계열 // A - SKILL_WAR_MENTAL_BASH = 16, // 기공참 - SKILL_WAR_MENTAL_POUNDING, // 격산타우 - SKILL_WAR_MENTAL_SWORD_STRIKE, // 대진각 + SKILL_WAR_MENTAL_SPIRIT_STRIKE = 16, // 기공참 + SKILL_WAR_MENTAL_BASH, // 격산타우 + SKILL_WAR_MENTAL_STUMP, // 대진각 // S SKILL_WAR_MENTAL_STRONG_BODY, // 천근추 - SKILL_WAR_MENTAL_AMBUSH, // 검풍 + SKILL_WAR_MENTAL_SWORD_STRIKE, // 검풍 // 자객 암살 계열 // A @@ -68,7 +68,7 @@ enum ESkillIndexes SKILL_NINJA_BLADEFIGHT_FAST_ATTACK, // 궁신탄영 SKILL_NINJA_BLADEFIGHT_ROLLING_DAGGER, // 차륜살 // S - SKILL_NINJA_BLADEFIGHT_DISGUISE, // 은형법 + SKILL_NINJA_BLADEFIGHT_STEALTH, // 은형법 SKILL_NINJA_BLADEFIGHT_POISONOUS_CLOUD, // 산공분 // 자객 궁수 계열 @@ -109,7 +109,7 @@ enum ESkillIndexes //SKILL_BUDONG, // 부동박부 SKILL_SHAMAN_DRAGON_BLESSING, // 호신 SKILL_SHAMAN_DRAGON_REFLECT, // 보호 - SKILL_SHAMAN_DRAGON_DRAGONS_AID, // 기천대공 + SKILL_SHAMAN_DRAGON_DRAGONS_STRENGTH, // 기천대공 // 무당 뇌신 // A @@ -129,7 +129,7 @@ enum ESkillIndexes SKILL_7_D_ANTI_SHAMAN_DRAGON_SHOOTING_DRAGON, // 8 - SKILL_8_A_ANTI_WAR_MENTAL_BASH, + SKILL_8_A_ANTI_WAR_MENTAL_SPIRIT_STRIKE, SKILL_8_B_ANTI_NINJA_ARCHERY_REPETITIVE_SHOT, SKILL_8_C_ANTI_SURA_BLACKMAGIC_DARK_ORB, SKILL_8_D_ANTI_SHAMAN_HEALING_SUMMON_LIGHTNING, diff --git a/src/game/src/trigger.cpp b/src/game/src/trigger.cpp index 4252457..2dce09f 100644 --- a/src/game/src/trigger.cpp +++ b/src/game/src/trigger.cpp @@ -95,7 +95,7 @@ class FuncFindMobVictim if (pkChr->IsDead()) return false; - if (pkChr->IsAffectFlag(AFF_NINJA_BLADEFIGHT_DISGUISE) || + if (pkChr->IsAffectFlag(AFF_NINJA_BLADEFIGHT_STEALTH) || pkChr->IsAffectFlag(AFF_INVISIBILITY) || pkChr->IsAffectFlag(AFF_REVIVE_INVISIBLE)) return false; -- 2.45.2 From e91f9b40a13f29d1faab196c0fe866f79ddbd9c5 Mon Sep 17 00:00:00 2001 From: Haydukk Date: Sun, 10 Nov 2024 20:40:23 +0200 Subject: [PATCH 6/6] Fix mental war error --- src/game/src/affect.h | 2 +- src/game/src/char_affect.cpp | 4 ++-- src/game/src/char_skill.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/game/src/affect.h b/src/game/src/affect.h index b4b1b49..b921de9 100644 --- a/src/game/src/affect.h +++ b/src/game/src/affect.h @@ -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, diff --git a/src/game/src/char_affect.cpp b/src/game/src/char_affect.cpp index 54527e1..c78238f 100644 --- a/src/game/src/char_affect.cpp +++ b/src/game/src/char_affect.cpp @@ -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): diff --git a/src/game/src/char_skill.cpp b/src/game/src/char_skill.cpp index f00bb21..884423a 100644 --- a/src/game/src/char_skill.cpp +++ b/src/game/src/char_skill.cpp @@ -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; -- 2.45.2