metin-server/m2dev-server-src
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
Mind Rapist
2026-02-15 21:40:33 +02:00
parent 9ca28852b8
commit 05c59511cd
5 changed files with 71 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/game/char_item.cpp
View File

@@ -4869,19 +4869,32 @@ bool CHARACTER::UseItemEx(LPITEM item, TItemPos DestCell)
case USE_MONEYBAG:
break;
// MR-12: Overwrite lower value affects
case USE_AFFECT :
{
if (FindAffect(item->GetValue(0), aApplyInfo[item->GetValue(1)].bPointType))
const DWORD affectType = item->GetValue(0);
const BYTE applyType = aApplyInfo[item->GetValue(1)].bPointType;
const long applyValue = item->GetValue(2);
const long applyDuration = item->GetValue(3);
CAffect* existing = FindAffect(affectType, applyType);
if (existing)
{
ChatPacket(CHAT_TYPE_INFO, LC_TEXT("이미 효과가 걸려 있습니다."));
}
else
{
AddAffect(item->GetValue(0), aApplyInfo[item->GetValue(1)].bPointType, item->GetValue(2), 0, item->GetValue(3), 0, false);
item->SetCount(item->GetCount() - 1);
if (applyValue <= existing->lApplyValue)
{
ChatPacket(CHAT_TYPE_INFO, LC_TEXT("이미 효과가 걸려 있습니다."));
break;
}
RemoveAffect(existing);
}
AddAffect(affectType, applyType, applyValue, 0, applyDuration, 0, false);
item->SetCount(item->GetCount() - 1);
}
break;
// MR-12: -- END OF -- Overwrite lower value affects
case USE_CREATE_STONE:
AutoGiveItem(number(28000, 28013));