Skip to content

dwNeedItemFix MagicSkillMng.cpp #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

dwNeedItemFix MagicSkillMng.cpp #277

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d841bc1
dwNeedItemFix MagicSkillMng.cpp
UTengine Apr 24, 2025
7ff377e
Had to comment this out
UTengine Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions src/game/MagicSkillMng.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,17 +209,17 @@ bool CMagicSkillMng::CheckValidSkillMagic(__TABLE_UPC_SKILL * pSkill) {
int LeftItem = s_pPlayer->ItemClass_LeftHand();
int RightItem = s_pPlayer->ItemClass_RightHand();

if (pSkill->iNeedSkill == 1055 || pSkill->iNeedSkill == 2055) {
if ((LeftItem != ITEM_CLASS_SWORD && LeftItem != ITEM_CLASS_AXE && LeftItem != ITEM_CLASS_MACE) ||
(RightItem != ITEM_CLASS_SWORD && RightItem != ITEM_CLASS_AXE && RightItem != ITEM_CLASS_MACE)) {
return false;
}
} else if (pSkill->iNeedSkill == 1056 || pSkill->iNeedSkill == 2056) {
if (RightItem != ITEM_CLASS_SWORD_2H && RightItem != ITEM_CLASS_AXE_2H && RightItem != ITEM_CLASS_MACE_2H &&
RightItem != ITEM_CLASS_POLEARM) {
return false;
}
}
//if (pSkill->iNeedSkill == 1055 || pSkill->iNeedSkill == 2055) {
// if ((LeftItem != ITEM_CLASS_SWORD && LeftItem != ITEM_CLASS_AXE && LeftItem != ITEM_CLASS_MACE) ||
// (RightItem != ITEM_CLASS_SWORD && RightItem != ITEM_CLASS_AXE && RightItem != ITEM_CLASS_MACE)) {
// return false;
// }
//} else if (pSkill->iNeedSkill == 1056 || pSkill->iNeedSkill == 2056) {
// if (RightItem != ITEM_CLASS_SWORD_2H && RightItem != ITEM_CLASS_AXE_2H && RightItem != ITEM_CLASS_MACE_2H &&
// RightItem != ITEM_CLASS_POLEARM) {
// return false;
// }
//}

if (pInfoBase->iHP < pSkill->iExhaustHP) {
return false;
Expand All @@ -228,10 +228,12 @@ bool CMagicSkillMng::CheckValidSkillMagic(__TABLE_UPC_SKILL * pSkill) {
int LeftItem1 = LeftItem / 10;
int RightItem1 = RightItem / 10;

if (pSkill->dwNeedItem != 0 && pSkill->dwNeedItem != LeftItem1 && pSkill->dwNeedItem != RightItem1) {
if (pSkill->dwNeedItem != 0 && pSkill->dwNeedItem != 9 && pSkill->dwNeedItem != LeftItem1 &&
pSkill->dwNeedItem != RightItem1) {
return false;
}
if (pSkill->dwNeedItem == 0 && (pSkill->dw1stTableType == 1 || pSkill->dw2ndTableType == 1)) {
if (pSkill->dwNeedItem == 0 && pSkill->dwNeedItem != 9 &&
(pSkill->dw1stTableType == 1 || pSkill->dw2ndTableType == 1)) {
if (LeftItem != 11 && (LeftItem1 < 1 || LeftItem1 > 5) && RightItem1 != 11 &&
(RightItem1 < 1 || RightItem1 > 5)) {
return false;
Expand Down Expand Up @@ -560,7 +562,7 @@ bool CMagicSkillMng::CheckValidCondition(int iTargetID, __TABLE_UPC_SKILL * pSki
int LeftItem = s_pPlayer->ItemClass_LeftHand();
int RightItem = s_pPlayer->ItemClass_RightHand();

if (pSkill->iNeedSkill == 1055 || pSkill->iNeedSkill == 2055) {
/*if (pSkill->iNeedSkill == 1055 || pSkill->iNeedSkill == 2055) {
if ((LeftItem != ITEM_CLASS_SWORD && LeftItem != ITEM_CLASS_AXE && LeftItem != ITEM_CLASS_MACE) ||
(RightItem != ITEM_CLASS_SWORD && RightItem != ITEM_CLASS_AXE && RightItem != ITEM_CLASS_MACE)) {
std::string buff;
Expand All @@ -576,7 +578,7 @@ bool CMagicSkillMng::CheckValidCondition(int iTargetID, __TABLE_UPC_SKILL * pSki
m_pGameProcMain->MsgOutput(buff, 0xffffff00);
return false;
}
}
}*/

if (pInfoBase->iHP < pSkill->iExhaustHP) {
std::string buff;
Expand All @@ -588,13 +590,15 @@ bool CMagicSkillMng::CheckValidCondition(int iTargetID, __TABLE_UPC_SKILL * pSki
int LeftItem1 = LeftItem / 10;
int RightItem1 = RightItem / 10;

if (pSkill->dwNeedItem != 0 && pSkill->dwNeedItem != LeftItem1 && pSkill->dwNeedItem != RightItem1) {
if (pSkill->dwNeedItem != 0 && pSkill->dwNeedItem != 9 && pSkill->dwNeedItem != 9 &&
pSkill->dwNeedItem != LeftItem1 && pSkill->dwNeedItem != RightItem1) {
std::string buff;
::_LoadStringFromResource(IDS_SKILL_FAIL_INVALID_ITEM, buff);
m_pGameProcMain->MsgOutput(buff, 0xffffff00);
return false;
}
if (pSkill->dwNeedItem == 0 && (pSkill->dw1stTableType == 1 || pSkill->dw2ndTableType == 1)) {
if (pSkill->dwNeedItem == 0 && pSkill->dwNeedItem != 9 &&
(pSkill->dw1stTableType == 1 || pSkill->dw2ndTableType == 1)) {
if (LeftItem != 11 && (LeftItem1 < 1 || LeftItem1 > 5) && RightItem1 != 11 &&
(RightItem1 < 1 || RightItem1 > 5)) {
std::string buff;
Expand Down