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

MRMJ-1: Messenger & Skills fixes

Browse Source
This commit is contained in:
Mind Rapist
2025-12-14 05:17:16 +02:00
parent da619922cb
commit 0f79d890ba
53 changed files with 1387 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/char_battle.cpp
View File

@@ -774,6 +774,7 @@ void CHARACTER::Reward(bool bItemDrop)
if (pkAttacker->IsPC())
{
if (GetLevel() - pkAttacker->GetLevel() >= -10)
{
if (pkAttacker->GetRealAlignment() < 0)
{
if (pkAttacker->IsEquipUniqueItem(UNIQUE_ITEM_FASTER_ALIGNMENT_UP_BY_KILL))
@@ -782,7 +783,10 @@ void CHARACTER::Reward(bool bItemDrop)
pkAttacker->UpdateAlignment(7);
}
else
{
pkAttacker->UpdateAlignment(2);
}
}
pkAttacker->SetQuestNPCID(GetVID());
quest::CQuestManager::instance().Kill(pkAttacker->GetPlayerID(), GetRaceNum());
@@ -2287,6 +2291,10 @@ bool CHARACTER::Damage(LPCHARACTER pAttacker, int dam, EDamageType type) // retu
//
if (!cannot_dead)
{
#ifdef FIX_NEG_HP
if (GetHP() - dam <= 0)
dam = GetHP();
#endif
PointChange(POINT_HP, -dam, false);
}